rxl 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62aee75c921b3b6e206dadf145c6421d3bf193c24eadb6f42c9905b4c1f27c4b
-  data.tar.gz: a95171c0ebbc1242621af4f2aff4b1157e66c6d0fe601eb44bc8ae83f4e6e34c
+  metadata.gz: 6991fc216795b685c75f3bf7b4222520e428a9b021bac623bc7501e817fd6453
+  data.tar.gz: a99745263d114493fff4802e534f2c97757c7fe75bc6a23726d2a4ad6df7a466
 SHA512:
-  metadata.gz: d3ef588d022f83c7f2cb9042521bd2e20699012fcb9155115a07900a7b9367be30fee4a7cf7815da41f18eff3486b4a6492b7ec6cc15f68dbc25c5ba0a87f647
-  data.tar.gz: f50bc7833adc83c12bd227c404841a45d9aa0eb553c673da144124dde780610cc713f2baf33aca4cf415d771a750e5a07db2f15136a8f21523a4a14d8457c076
+  metadata.gz: 192009987d16a7b84bd611f62ded016dd230eeb9938eb0e963ba2608ce6414de2821d9669537f340299d1788a67b29cb1c39c3b668b48edb1d09be7af8490086
+  data.tar.gz: 71d91a553075e6af3cc4e8e8729cf45e10afe647dc1049abcefd11898064d04a810f1e2d8aaa1f183b4dcee1c1c2494fca8b77829cc9e496b5e938c95f28678f

data/lib/cell.rb

@@ -8,27 +8,26 @@ module Cell
 
   def self.rubyxl_cell_to_hash_cell(rubyxl_cell = nil)
     rubyxl_cell_value = rubyxl_cell.nil? ? RubyXL::Cell.new.value : rubyxl_cell.value
-    values = {
+    {
         value: rubyxl_cell_value,
         format: hash_cell_format(rubyxl_cell_value),
         formula: rubyxl_cell_formula(rubyxl_cell),
-        h_align: rubyxl_cell_horizontal_alignment(rubyxl_cell),
-        v_align: rubyxl_cell_vertical_alignment(rubyxl_cell),
-        bold: rubyxl_cell.is_bolded,
-        fill: rubyxl_cell.fill_color,
-        font_name: rubyxl_cell.font_name,
-        font_size: rubyxl_cell.font_size.to_i,
+        h_align: rubyxl_cell_h_align(rubyxl_cell),
+        v_align: rubyxl_cell_v_align(rubyxl_cell),
+        bold: rubyxl_cell.nil? ? false : rubyxl_cell.is_bolded,
+        fill: rubyxl_cell.nil? ? 'ffffff' : rubyxl_cell.fill_color,
+        font_name: rubyxl_cell.nil? ? 'Calibri' : rubyxl_cell.font_name,
+        font_size: rubyxl_cell.nil? ? 12 : rubyxl_cell.font_size.to_i,
         border: rubyxl_cell_to_border_hash(rubyxl_cell)
     }
-    return values
   end
 
   def self.rubyxl_cell_to_border_hash(rubyxl_cell)
     {
-      top: rubyxl_cell.get_border(:top),
-      bottom: rubyxl_cell.get_border(:bottom),
-      left: rubyxl_cell.get_border(:left),
-      right: rubyxl_cell.get_border(:right)
+      top: rubyxl_cell.nil? ? nil : rubyxl_cell.get_border(:top),
+      bottom: rubyxl_cell.nil? ? nil : rubyxl_cell.get_border(:bottom),
+      left: rubyxl_cell.nil? ? nil : rubyxl_cell.get_border(:left),
+      right: rubyxl_cell.nil? ? nil : rubyxl_cell.get_border(:right)
     }
   end
 
@@ -37,12 +36,12 @@ module Cell
     rubyxl_cell.formula.expression
   end
 
-  def self.rubyxl_cell_horizontal_alignment(rubyxl_cell)
-    return nil if rubyxl_cell.nil? || rubyxl_cell.horizontal_alignment.nil?
+  def self.rubyxl_cell_h_align(rubyxl_cell)
+    return :left if rubyxl_cell.nil? || rubyxl_cell.horizontal_alignment.nil?
     rubyxl_cell.horizontal_alignment.to_sym
   end
 
-  def self.rubyxl_cell_vertical_alignment(rubyxl_cell)
+  def self.rubyxl_cell_v_align(rubyxl_cell)
     return :bottom if rubyxl_cell.nil? || rubyxl_cell.vertical_alignment.nil?
     rubyxl_cell.vertical_alignment.to_sym
   end
@@ -108,8 +107,7 @@ module Cell
     end
     invalid_keys = hash_cell.keys.delete_if { |key| valid_cell_keys.include?(key) }
     unless invalid_keys.empty?
-      valid_cell_keys_string = ":#{valid_cell_keys.join(', :')}"
-      raise(%(invalid cell hash key(s) #{invalid_keys} at path #{trace + [hash_cell_key]}, valid keys are: [#{valid_cell_keys_string}]))
+      raise(%(invalid cell hash key(s) #{invalid_keys} at path #{trace + [hash_cell_key]}))
     end
     # TODO: add validation for hash_cell specification
   end

data/lib/rxl/version.rb

@@ -1,3 +1,3 @@
 module Rxl
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ian McWilliams