From fd8366970d9cb3f5fb431ba6c40a2a2ac2737615 Mon Sep 17 00:00:00 2001
From: Weston Ganger <weston@westonganger.com>
Date: Thu, 29 Sep 2022 20:45:39 -0700
Subject: Merge axlsx_styler gem into caxlsx

---
 examples/append_styles_example.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 examples/append_styles_example.md

(limited to 'examples/append_styles_example.md')

diff --git a/examples/append_styles_example.md b/examples/append_styles_example.md
new file mode 100644
index 00000000..0dc7792c
--- /dev/null
+++ b/examples/append_styles_example.md
@@ -0,0 +1,31 @@
+## Description
+
+Shows how to append styles after rows have been created using `worksheet.add_style`
+
+## Code
+
+```ruby
+p = Axlsx::Package.new
+wb = p.workbook
+
+wb.add_worksheet do |sheet|
+  sheet.add_row
+  sheet.add_row ["", "Product", "Category",  "Price"]
+  sheet.add_row ["", "Butter", "Dairy",      4.99]
+  sheet.add_row ["", "Bread", "Baked Goods", 3.45]
+  sheet.add_row ["", "Broccoli", "Produce",  2.99]
+
+  sheet.add_style "B2:D2", b: true
+  sheet.add_style "B2:B5", b: true
+  sheet.add_style "B2:D2", bg_color: "95AFBA"
+  sheet.add_style "B3:D5", bg_color: "E2F89C"
+  sheet.add_style "D3:D5", alignment: { horizontal: :left }
+  sheet.add_style ["C3:C4", "D3:D4"], fg_color: "00FF00"
+nd
+
+p.serialize "append_styles.xlsx"
+```
+
+## Output
+
+![Output](images/append_styles.png "Output")
-- 
cgit v1.2.3


From d5db40a886e6675214b247b8eb8c649f30a84f18 Mon Sep 17 00:00:00 2001
From: Weston Ganger <weston@westonganger.com>
Date: Wed, 12 Oct 2022 23:23:31 -0700
Subject: Add example images, Fix axlsx_styler check

---
 examples/add_border_example.md            |   2 +-
 examples/append_styles_example.md         |   4 ++--
 examples/images/add_border_example.png    | Bin 0 -> 7026 bytes
 examples/images/append_styles_example.png | Bin 0 -> 8034 bytes
 lib/axlsx.rb                              |   8 +++-----
 5 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 examples/images/add_border_example.png
 create mode 100644 examples/images/append_styles_example.png

(limited to 'examples/append_styles_example.md')

diff --git a/examples/add_border_example.md b/examples/add_border_example.md
index 934cf183..d64b940d 100644
--- a/examples/add_border_example.md
+++ b/examples/add_border_example.md
@@ -25,4 +25,4 @@ p.serialize "add_border.xlsx"
 
 ## Output
 
-![Output](images/add_border.png "Output")
+![Output](images/add_border_example.png "Output")
diff --git a/examples/append_styles_example.md b/examples/append_styles_example.md
index 0dc7792c..d8cb4696 100644
--- a/examples/append_styles_example.md
+++ b/examples/append_styles_example.md
@@ -21,11 +21,11 @@ wb.add_worksheet do |sheet|
   sheet.add_style "B3:D5", bg_color: "E2F89C"
   sheet.add_style "D3:D5", alignment: { horizontal: :left }
   sheet.add_style ["C3:C4", "D3:D4"], fg_color: "00FF00"
-nd
+end
 
 p.serialize "append_styles.xlsx"
 ```
 
 ## Output
 
-![Output](images/append_styles.png "Output")
+![Output](images/append_styles_example.png "Output")
diff --git a/examples/images/add_border_example.png b/examples/images/add_border_example.png
new file mode 100644
index 00000000..f18ac144
Binary files /dev/null and b/examples/images/add_border_example.png differ
diff --git a/examples/images/append_styles_example.png b/examples/images/append_styles_example.png
new file mode 100644
index 00000000..5b8b2d55
Binary files /dev/null and b/examples/images/append_styles_example.png differ
diff --git a/lib/axlsx.rb b/lib/axlsx.rb
index e02256e6..23082b71 100644
--- a/lib/axlsx.rb
+++ b/lib/axlsx.rb
@@ -32,13 +32,11 @@ require 'set'
 require 'time'
 
 begin
-  require "axlsx_styler"
-
-  if defined?(AxlsxStyler)
+  if Gem.loaded_specs.has_key?("axlsx_styler")
     raise StandardError.new("Please remove `axlsx_styler` from your Gemfile, the associated functionality is now built-in to `caxlsx` directly.")
   end
-rescue LoadError
-  # Do nothing, all good
+rescue
+  # Do nothing
 end
 
 # xlsx generation with charts, images, automated column width, customizable styles
-- 
cgit v1.2.3