xlsx-DSL 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b73fe778d6f6293e2532c788c1617ffd3e82e0cbd7052fc27ae219346ba0dc
-  data.tar.gz: 4cf5e09e2514c8f5066b8e355d70c916c70e1ab163355edbeb9bfab633747125
+  metadata.gz: 2b8f324fee676431176640012486127a71154b0ef4ec9e8b63a87690c71df9b9
+  data.tar.gz: 4280a3282d54976d88d71b3b7e417be1062d9115fc7786e1642d918dd2375f3e
 SHA512:
-  metadata.gz: a41a3845ff09928855f77f24725a42a050d84d9524803f774e5b0b622648c3766f0e60238eceb3bc981087ae2be1c58ffb43d8101effc201469db6d5c32d00f8
-  data.tar.gz: 2bcbf5bdc28b0258ba2cd63e8495694c79b3c86fbf6cd7ebd397675140b1a986ff6050c3a68677cf3ee2cb9b660fda65c679dafd01bd3b965ebd43562a4a7610
+  metadata.gz: a101af4e44b1f5b598995a5306ab59670031d61774a7c7a5417c1b66146fa1da1b439a1d4e4c82eb630fb2037466af6774e4e8ef02362f07b95644bd4ef981ec
+  data.tar.gz: 389dc047f3eed14454a6070bb9d7becf575870ad48c6d415017671ca0d85df0ba5b43dd8648ae998cd1405277dd5c212593602a99c3b2956f2eb48a2013effc9

data/lib/xlsx/DSL/version.rb

@@ -1,7 +1,7 @@
 module OpenXML
   module SpreadsheetML
     module DSL
-      VERSION = '0.1.0'
+      VERSION = '0.2.2'
     end
   end
 end

data/lib/xlsx/parser.rb

@@ -4,7 +4,7 @@ module OpenXML
     @@shared_strings = nil
 
     class << self
-      def open xlsx_path
+      def open(xlsx_path)
         Zip::File.open(xlsx_path) do |zf|
           zf.each do |entry|
             content = entry.get_input_stream.read
@@ -19,6 +19,7 @@ module OpenXML
           end
         end
         @@workbook.merge_sheets(@@sheets) if @@sheets
+        yield(@@workbook) if block_given?
         @@workbook
       end
 

data/lib/xlsx/sheet.rb

@@ -18,15 +18,27 @@ module OpenXML
       end
 
       def [] index
-        self.merge_cells.each do |mc|
-          if mc.include?(index)
-            index = mc.top_left
-          end
+        case index
+        when /^[A-Z]+\d+$/
+          retrieve_one_cell index
+        when /^\d+$/
+          retrieve_one_row index
+        when /^[A-Z]+$/
+          retrieve_one_column index
+        when /^(\d+)[\-:](\d+)$/
+          retrieve_rows($1, $2)
+        when /^([A-Z]+)[\-:]([A-Z]+)$/
+          retrieve_columns($1, $2)
+        when /^([A-Z]+)(\d+)[\-:]([A-Z]+)(\d+)$/
+          retrieve_one_matrix($1, $2, $3, $4)
+        else
+          raise IndexError, 'Invalid index'
         end
-        self.sheet_data[index] 
       end
 
-      alias at_cell []
+      def at_cell index
+        retrieve_one_cell index
+      end
 
       def self.parser content
         doc = Nokogiri::XML content
@@ -65,6 +77,61 @@ module OpenXML
       def max_row
         /[A-Z]+(\d+)$/.match(dimension)[1]
       end
+
+      private
+
+      def retrieve_one_cell index
+        self.merge_cells.each do |mc|
+          if mc.include?(index)
+            index = mc.top_left
+          end
+        end
+        self.sheet_data[index].value
+      end
+
+      def retrieve_one_row index
+        cells = []
+        ('A'..max_column).each do |col|
+          cells << retrieve_one_cell(col+index)
+        end
+        cells
+      end
+
+      def retrieve_rows(one, two)
+        cells = []
+        (one.to_i..two.to_i).each do |row_index|
+          cells << retrieve_one_row(row_index.to_s)
+        end
+        cells
+      end
+
+      def retrieve_one_column index
+        cells = []
+        (1..max_row.to_i).each do |row|
+          cells << retrieve_one_cell(index+row.to_s)
+        end
+        cells
+      end
+
+      def retrieve_columns(one, two)
+        cells = []
+        (one..two).each do |column_index|
+          cells << retrieve_one_column(column_index)
+        end
+        cells
+      end
+      
+      def retrieve_one_matrix (one, two, three, four)
+        cells = []
+        (two.to_i..four.to_i).each do |row_index|
+          row = []
+          (one..three).each do |column_index|
+            row << retrieve_one_cell(column_index+row_index.to_s)
+          end
+          cells << row
+        end
+        cells
+      end
     end
 
     class MergeCell

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsx-DSL
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Cyan Yan