rubyXL 3.4.33 → 3.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14119a8af99822bbe1fd209a060d5374e92fe921750766cc83fa2cebdf586963
-  data.tar.gz: a3870a59650bd9b32c82bd6ad950aa720cb9f50370b96956eecb522d1c8e8fce
+  metadata.gz: 5fe00b75e714374728a3ddfcc3eb597cf4adbad2ccf56ca8b7ffebfe3f136489
+  data.tar.gz: b6eb25207a43c228c64940f59913cca7d0e2dcdd4a7962839dd4eb626f43707d
 SHA512:
-  metadata.gz: 27f8bf50de4801721703c78a73b156626998d37a7fa1ce76a05e2848d9bf233a29ed91044567b2b02a8cd29487872f2a5ed2eeeb65c45ae6b3fed8b4bfccea25
-  data.tar.gz: 7ba264f255d544ba9efb9bb5aaa272a2ba84442930bf41eb72c6a63571b0ed21a69255975c843b796725ce17ca29c81950b1784a0c027a54dc35e4801ea0870e
+  metadata.gz: 68a8d4c13699db6c15393ee295d23d9990b4524eb2cd85172fc33a1b17e8df99e1c6e16047c42cfb38ff2dc74c230df59d93b55a61f5dd180f4fa9cee5b43e34
+  data.tar.gz: fd3c39b4c193ee0eb92b974e5a64db792b11c521f17aa851986fa8434dcfacebbf8693480cb91d40cc897efba6ab755cf9534f2ef6f680abaac4b303af46c460

data/.circleci/config.yml

@@ -20,11 +20,11 @@ jobs:
       - checkout
 
       # Download and cache dependencies
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "Gemfile.lock" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
+      #- restore_cache:
+      #    keys:
+      #      - v1-dependencies-{{ checksum "Gemfile.lock" }}
+      #      # fallback to using the latest cache if no exact match is found
+      #      - v1-dependencies-
 
       - run:
           name: install dependencies
@@ -32,10 +32,10 @@ jobs:
             gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+      #- save_cache:
+      #    paths:
+      #      - ./vendor/bundle
+      #    key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
       # run tests!
       - run:

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 # Dependencies required to run this gem.
 gem 'nokogiri', '>= 1.10.8'
-gem 'rubyzip', '>= 1.3.0' , :require => 'zip'
+gem 'rubyzip', '>= 3.2.2', require: 'zip'
 
 # Development dependencies.
 group :development, :test do

data/README.rdoc

@@ -1,6 +1,5 @@
 = rubyXL
 {rdoc-image:https://badge.fury.io/rb/rubyXL.svg}[http://badge.fury.io/rb/rubyXL]
-{rdoc-image:https://codeclimate.com/github/weshatheleopard/rubyXL.png}[https://codeclimate.com/github/weshatheleopard/rubyXL]
 {rdoc-image:https://circleci.com/gh/weshatheleopard/rubyXL.svg?style=svg}[https://circleci.com/gh/weshatheleopard/rubyXL]
 
 This gem supports operating on +xlsx+ files (Open XML format). While it is capable
@@ -119,6 +118,9 @@ Please note: these methods are being phased out in favor of the OOXML object mod
 ==== Changing Cells
   worksheet[0][0].change_contents("", worksheet[0][0].formula) # Sets value of cell A1 to empty string, preserves formula
 
+  worksheet[0][0].add_shared_string('some text') # Creates a new Shared String and adds it to the cell.
+                                                 # Later, the same Shared String can be added to other cells.
+
 ==== Changing Fonts
   worksheet.sheet_data[0][0].change_font_bold(true) # Makes A1 bold
   worksheet.change_row_italics(0,true)              # Makes first row italicized
@@ -170,7 +172,7 @@ Please note: these methods are being phased out in favor of the OOXML object mod
 ==== Merging Cells
   worksheet.merge_cells(0, 1, 2, 3)  # Merges B1:D3
   worksheet.merge_cells('A2:C4')     # Merges A2:C4
-  worksheet.merge_cells(row_from: 0, row_to: 1, col_from 2:, col_to: 3) # Merges C1:D2
+  worksheet.merge_cells(row_from: 0, row_to: 1, col_from: 2, col_to: 3) # Merges C1:D2
 
 ==== Insert Row
 This method will insert a row at specified index, pushing all rows below it down. It also copies styles from row above.

data/VERSION

@@ -1 +1 @@
-3.4.33
+3.4.35

data/lib/rubyXL/convenience_methods/cell.rb

@@ -266,10 +266,11 @@ module RubyXL
       worksheet.hyperlinks << hyperlink
     end
 
-#     def add_shared_string(str)
-#       self.datatype = RubyXL::DataType::SHARED_STRING
-#       self.raw_value = @workbook.shared_strings_container.add(str)
-#     end
+    def add_shared_string(str)
+      self.datatype = RubyXL::DataType::SHARED_STRING
+      workbook.shared_strings_container ||= RubyXL::SharedStringsTable.new
+      self.raw_value = workbook.shared_strings_container.add(str)
+    end
   end
 
   RubyXL::Cell.send(:include, RubyXL::CellConvenienceMethods) # ruby 2.1 compat

data/lib/rubyXL/convenience_methods/workbook.rb

@@ -92,6 +92,10 @@ module RubyXL
     def modify_border_color(style_index, direction, color)
       xf = cell_xfs[style_index || 0].dup
       new_border = borders[xf.border_id || 0].dup
+
+      edge = new_border.send(direction)
+      new_border.send("#{direction}=", edge.dup) if edge
+
       new_border.set_edge_color(direction, color)
 
       xf.border_id = borders.find_index { |x| x == new_border } # Reuse existing border, if it exists

data/lib/rubyXL/objects/cell_style.rb

@@ -51,6 +51,7 @@ module RubyXL
     define_attribute(:applyProtection,   :bool)
     define_child_node(RubyXL::Alignment)
     define_child_node(RubyXL::Protection)
+    define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'xf'
   end
 

data/lib/rubyXL/objects/ooxml_object.rb

@@ -13,9 +13,11 @@ module RubyXL
     # the setter/getter method addresses it in the context of descendant class,
     # which is what we need.
     def obtain_class_variable(var_name, default = nil)
-      self.class_variable_get(var_name)
-    rescue NameError
-      self.class_variable_set(var_name, default || {})
+      if self.class_variable_defined? var_name
+        self.class_variable_get(var_name)
+      else
+        self.class_variable_set(var_name, default || {})
+      end
     end
 
     # Defines an attribute of OOXML object.

data/lib/rubyXL/objects/root.rb

@@ -33,7 +33,7 @@ module RubyXL
 
     # Write <tt>.xlsx</tt> to a stream (useful for sending over HTTP)
     def stream
-      stream = Zip::OutputStream.write_buffer { |zipstream|
+      stream = Zip::OutputStream.write_buffer(suppress_extra_fields: true) { |zipstream|
         self.rels_hash = {}
         self.relationship_container.owner = self
         collect_related_objects.compact.each { |obj|