rxl 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc98fb78410799a835fa7cece21883df7854bbfb
-  data.tar.gz: 7860d1c3d8093bebf55b72cacf9acd66af52d8b1
+  metadata.gz: c09c4359ae1a518a18f90a988f893fd34cfdf739
+  data.tar.gz: f107bc83640d18fb791be625caaa9c35bac92f94
 SHA512:
-  metadata.gz: 7e04f5d5c7c383fda54713c4676c3fbd7342ede4218259c22720d9c63a24ee394243c7e9474c7c419fcc6a6ca6d3cf00aa00020b1232255f5a2e7f36b9fcc5b4
-  data.tar.gz: a9a28fa571a4dae876c2c71b878fde28df3c857eed76214020418326aeafae79c929d12c9e485d119e1fc046f4ac325633873f77435d21d3cad1c526788c2773
+  metadata.gz: d5988198eec87b44bd2701e1c32d74e688de0a0cf185b8d720ec2c5fd1b990d7fad105f89e4295a9f6f3179187619e9f6fb9f2b30f4fbfd8d016cd3a5dad66a9
+  data.tar.gz: af9f6168bbd3c0fb45626bc9456c85a9e6809bba10428028605efbb21ba74b0fa681d1c2e9c160c7acaecd859f5ef0cebf8069f772c6f48dfac4e170b620d715

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'awesome_print'
-gem 'mitrush'
+gem 'mitrush', '>= 0.2.0'
 gem 'rubocop'
 gem 'rubyXL'

data/lib/rxl/version.rb

@@ -1,3 +1,3 @@
 module Rxl
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/worksheet.rb

@@ -10,8 +10,8 @@ module Worksheet
   ########################################################
 
   def self.rubyxl_to_hash(rubyxl_worksheet)
-    rubyxl_rows = rubyxl_worksheet.each_with_index.map do |rubyxl_row, rubyxl_row_index|
-      { rubyxl_row: rubyxl_row, rubyxl_row_index: rubyxl_row_index }
+    rubyxl_rows = rubyxl_worksheet.map do |rubyxl_row|
+      { rubyxl_row: rubyxl_row, rubyxl_row_index: rubyxl_row ? rubyxl_row.r - 1 : nil }
     end
     hash_worksheet = Cells.rubyxl_to_hash(rubyxl_rows)
     process_sheet_to_populated_block(hash_worksheet)
@@ -71,11 +71,12 @@ module Worksheet
   end
 
   def self.hash_worksheet_to_hash_table(raw_hash)
-    cells = raw_hash[:cells]
+    cells = Mitrush.deep_copy(raw_hash)
     columns = cells.keys.map { |key| key[/\D+/] }.uniq
-    cells.keys.map { |key| key[/\d+/] }.uniq[1..-1].map do |row_number|
-      columns.each_with_object({}) do |column_letter, this_hash|
-        this_hash[cells["#{column_letter}1"][:value]] = cells["#{column_letter}#{row_number}"][:value]
+    row_nums = cells.keys.map { |key| key[/\d+/] }.uniq[1..-1].sort
+    row_nums.map do |row_number|
+      columns.each_with_object({}) do |column_letter, h|
+        h[cells["#{column_letter}1"][:value]] = cells["#{column_letter}#{row_number}"][:value]
       end
     end
   end

metadata

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