xlsx-DSL 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc3eb8adbfbca8a31fb1adff9126a38fdadf3d4dd73aabc4874c05c2de1f5d97
-  data.tar.gz: e61fab9f1c1ce62af7e2ef6db0346be7e82159990a40bea4b4e907f465cd9cdd
+  metadata.gz: c314c67097a8eea0664778863993d6bf29b0baf9ac968d2e89de1a3ba2ce01df
+  data.tar.gz: 6a9517d877d3438587ee3531993da82442ecda5d22716f06454659209f750bbc
 SHA512:
-  metadata.gz: 584bb010504350658722f97236d7770a732981061b74e15f9670dff46d03711d1bbf27ad6cae4ddfd2e1560bc17dc9e0b817240fd05625c324ecad3627e78639
-  data.tar.gz: 6723d75aa93814a01dff665eccfd293bd7b963e00d82dce794a70016e550e216b97ef601844f339373733f9088ef00aa9a689c5292d990b350b82006c2198d6a
+  metadata.gz: bc018aad5627bbd53fab5038d1814dad06e195ed6d163b9ad026185018ab2e659de5450aadc9d9e0057873052702029fb0efc235edabf75c355523d7887934f0
+  data.tar.gz: f371514e2388a66519c22ade8ea4f9d92bb6035b044e8751913acb1727d5b48e8408556e39bd4dd8d0d14338c4c2d3aede98c1a76d3e0488e5e1c017ada16fab

data/lib/xlsx/DSL/version.rb

@@ -1,7 +1,7 @@
 module OpenXML
   module SpreadsheetML
     module DSL
-      VERSION = '0.2.3'
+      VERSION = '0.3.0'
     end
   end
 end

data/lib/xlsx/DSL.rb

@@ -3,6 +3,7 @@
   nokogiri
 
   xlsx/parser
+  xlsx/parser_helper
   xlsx/shared_string
   xlsx/sheet
   xlsx/sheet_data

data/lib/xlsx/parser.rb

@@ -1,10 +1,9 @@
 module OpenXML
   module SpreadsheetML
-    @@sheets = []
-    @@shared_strings = nil
-
-    class << self
-      def open(xlsx_path)
+    class Workbook
+      def initialize xlsx_path
+        @sheets = []
+        @shared_strings = nil
         Zip::File.open(xlsx_path) do |zf|
           zf.each do |entry|
             content = entry.get_input_stream.read
@@ -18,23 +17,27 @@ module OpenXML
             end
           end
         end
-        @@workbook.merge_sheets(@@sheets) if @@sheets
-        yield(@@workbook) if block_given?
-        @@workbook
+        merge_sheets(@sheet_names) if @sheet_names
+        merge_shared_strings(@shared_strings) if @shared_strings
+        yield(self) if block_given?
+      end
+        
+      class << self
+        alias open new
       end
 
       private
-
+  
       def workbook_parser content
-        @@workbook = Workbook.parser content
+        parser content
       end
-
+  
       def shared_strings_parser content
-        $shared_strings = SharedString.parser content || []
+        @shared_strings = SharedString.parser content || []
       end
-
+  
       def sheet_parser content
-        @@sheets << Sheet.parser(content)
+        @sheets << Sheet.parser(content)
       end
     end
   end

data/lib/xlsx/parser_helper.rb

@@ -0,0 +1,7 @@
+module OpenXML
+  module SpreadsheetML
+    def self.open xlsx_path
+      Workbook.new xlsx_path
+    end
+  end
+end

data/lib/xlsx/shared_string.rb

@@ -1,6 +1,14 @@
 module OpenXML
   module SpreadsheetML
     class SharedString
+      def initialize values # values is an array
+        @values = values
+      end
+
+      def [] index
+        @values[index]
+      end
+
       def self.parser content
         values = []
         doc = Nokogiri::XML content
@@ -8,7 +16,7 @@ module OpenXML
         t_tags.each do |t|
           values << t.text
         end
-        values
+        SharedString.new values
       end
     end
   end

data/lib/xlsx/sheet.rb

@@ -1,12 +1,16 @@
 module OpenXML
   module SpreadsheetML
-    Sheet = Struct.new(
-      :dimension, :sheet_data, :merge_cells, :sheet_views,
-      :name, :sheetId, :rid
-    )
     MergeCell = Struct.new(:range)
 
     class Sheet
+      attr_accessor :dimension, :sheet_data, :merge_cells, :sheet_views, :name, :sheetId, :rid
+      
+      def initialize dimension = nil, sheet_data = nil, merge_cells = nil
+        @dimension = dimension
+        @sheet_data = sheet_data || {}
+        @merge_cells = merge_cells || {}
+      end
+      
       def + sheet
         self.dimension = self.dimension || sheet.dimension
         self.sheet_data = self.sheet_data || sheet.sheet_data
@@ -78,6 +82,12 @@ module OpenXML
         /[A-Z]+(\d+)$/.match(dimension)[1]
       end
 
+      def merge_shared_strings shared_strings_reference
+        self.sheet_data.each do |index, cell|
+          cell.shared_strings_pointer = shared_strings_reference
+        end
+      end
+
       private
 
       def retrieve_one_cell index

data/lib/xlsx/sheet_data.rb

@@ -2,11 +2,11 @@ module OpenXML
   module SpreadsheetML
     SheetData = Struct.new(:rows)
     Row = Struct.new(:index, :columns)
-    Cell = Struct.new(:type, :v, :formula)
+    Cell = Struct.new(:type, :v, :formula, :shared_strings_pointer)
 
     class Cell
       def value
-        return $shared_strings[self.v.to_i] if self.type == 's'
+        return shared_strings_pointer[self.v.to_i] if self.type == 's'
         self.v
       end
     end

data/lib/xlsx/workbook.rb

@@ -1,11 +1,8 @@
 module OpenXML
   module SpreadsheetML
-    Workbook = Struct.new(
-      :sheets, :theme, :styles, :calc_chain, 
-      :xml_maps
-    )
-
     class Workbook
+      attr_accessor :sheets, :theme, :styles, :calc_chain, :xml_maps
+
       def [] index
         self.sheets.each do |sheet|
           return sheet if sheet.name == index
@@ -18,12 +15,20 @@ module OpenXML
         self.sheets.zip(sheets) do |x, y|
           new_sheets << x + y
         end
-        self.sheets = new_sheets
+        sheets = new_sheets
         self
       end
 
-      def self.parser content
-        sheets = []
+      def merge_shared_strings shared_strings_reference
+        sheets.each do |sheet|
+          sheet.merge_shared_strings shared_strings_reference
+        end
+      end
+
+      private
+
+      def parser content
+        @sheet_names = []
         doc = Nokogiri::XML content
         sheet_tags = doc.css('sheet')
         sheet_tags.each do |s|
@@ -31,9 +36,8 @@ module OpenXML
           sheet.name = s[:name]
           sheet.sheetId = s[:sheetId]
           sheet.rid = s['r:id']
-          sheets << sheet
+          @sheet_names << sheet
         end
-        Workbook.new(sheets = sheets)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsx-DSL
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Cyan Yan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -61,6 +61,7 @@ files:
 - lib/xlsx/DSL.rb
 - lib/xlsx/DSL/version.rb
 - lib/xlsx/parser.rb
+- lib/xlsx/parser_helper.rb
 - lib/xlsx/shared_string.rb
 - lib/xlsx/sheet.rb
 - lib/xlsx/sheet_data.rb
@@ -77,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="