ss2json 0.1.1 → 0.2.0

data/Changelog

@@ -1,3 +1,8 @@
+2012-05-29  Guillermo Alvarez <guillermo@cientifico.net>
+
+	* cli.rb (process_horizontal): Support for generating hash output instead of
+	an array using one of the keys.
+
 2012-05-24  Guillermo Alvarez <guillermo@cientifico.net>
 
 	* cli.rb (initi_document) : If you specify an invalid sheets, the message

data/lib/ss2json/cli.rb

@@ -38,6 +38,7 @@ class Ss2Json
         @doc.sheets.join("\n")
       else
         if options[:orientation] == :horizontal
+          @options[:first_row] += 1
           process_horizontal
         elsif options[:orientation] == :vertical
           process_vertical
@@ -61,20 +62,42 @@ class Ss2Json
     end
 
     def process_horizontal
-      @content = []
-      (@options[:first_row]+1).upto(@doc.last_row).each do |row_n|
-        row = @doc.find(row_n)[0]
-        object = RowConverter.new(row, @options[:converter])
-        if @options[:check_column]
-          next unless object[@options[:check_column]]
+      if @options[:hash_key]
+        @content = {}
+        each_hash_row do |hash|
+          if value = hash.get(@options[:hash_key])
+            hash.delete(@options[:hash_key]) unless @options[:dont_remove_key]
+            @content[value] = hash
+          end
         end
-        @content << object
+
+      else
+        @content = []
+        each_hash_row do |hash|
+          @options[:hash_key]
+          @content << hash
+        end
+      end
+    end
+
+    def each_row
+      (@options[:first_row]).upto(@doc.last_row).each do |row_n|
+        yield row_n
+      end
+    end
+
+    def each_hash_row
+      each_row do |row|
+        row = @doc.find(row)[0]
+        object = RowConverter.new(row,@options[:converter])
+        next if @options[:check_column] && object[@options[:check_column]].nil?
+        yield object
       end
     end
 
     def process_vertical
       hash = {}
-      @options[:first_row].upto(@doc.last_row) do |row|
+      each_row do |row|
         key = @doc.cell(row, @options[:key_column])
         value = @doc.cell(row, @options[:value_column])
         hash[key] = value

data/lib/ss2json/options.rb

@@ -66,14 +66,24 @@ class Ss2Json
           @options[:first_row] = row.to_i
         end
 
+        opts.separator "\nHorizontal mode options:"
+
+        opts.on("-u", "--use-key KEY", "Generate a hash instead of an array using KEY as the hash index key") do |key|
+          @options[:hash_key] = key
+        end
+
+        opts.on("--dont-remove-key", "Don't remove key from the hash") do
+          @options[:dont_remove_key] = true
+        end
+
         opts.separator "\nVertical mode options:"
 
-        opts.on("-k", "--key-column", "Column where the keys are (Default to 1)") do |column|
+        opts.on("-k", "--key-column COLUMN_NUMBER", "Column where the keys are (Default to 1)") do |column|
           die("Can't understand the column #{column}. Use a number") unless column =~ /\A\d*\z/
           @options[:key_column] = column.to_i
         end
 
-        opts.on("-a", "--value-column", "Column where the values are (Default to 2)") do |column|
+        opts.on("-a", "--value-column COLUMN_NUMBER", "Column where the values are (Default to 2)") do |column|
           die("Can't understand the column #{column}. Use a number") unless column =~ /\A\d*\z/
           @options[:value_column] = column.to_i
         end

data/lib/ss2json/row_converter.rb

@@ -26,7 +26,7 @@ class Ss2Json
       false
     end
 
-    def process(key,value)
+    def set(key,value)
       super if valid_value?(value)
     end
 

data/lib/ss2json/version.rb

@@ -1,3 +1,3 @@
 class Ss2Json
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ss2json
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Guillermo A\xCC\x81lvarez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 +00:00
+date: 2012-05-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency