ss2json 0.0.3 → 0.1.0

data/Changelog

@@ -4,6 +4,9 @@
 	right now is cleaner and showing the list of available spreadsheets.
 	* row_converter.rb (sanitize_key) : [bug] sanitify_key fail if the key is
 	just one letter. Now it is fixed.
+	* cli.rb (process_vertical) : New mode for processing in vertical was added.
+	* cli.rb (open) : Added support for old excel files (not so much tested).
+	* options.rb (initialize) : Added --version support.
 
 2012-05-23  Guillermo Alvarez <guillermo@cientifico.net>
 

data/lib/ss2json/cli.rb

@@ -24,6 +24,9 @@ class Ss2Json
     #   * **:sheet** Name of the sheet to use.
     #   * **:first_row** Where the title of the columns is.
     #   * **:check_column** Output only the results with a value present on the specific field.
+    #   * **:orientation** The data orientation (:horizontal/:vertical).
+    #   * **:key_column** Column of the keys for vertical mode.
+    #   * **:value_column** Column of the values.
     #   * **:action** Could
     #     * *:convert* Do the normal conversion.
     #     * *:list* Will list the sheets.
@@ -34,7 +37,13 @@ class Ss2Json
       if options[:action] == :list
         @doc.sheets.join("\n")
       else
-        process_document
+        if options[:orientation] == :horizontal
+          process_horizontal
+        elsif options[:orientation] == :vertical
+          process_vertical
+        else
+          raise "Orientation #{options[:orientation]} not recognized"
+        end
       end
     end
 
@@ -51,7 +60,7 @@ class Ss2Json
       @doc.header_line = @options[:first_row] if @options[:first_row]
     end
 
-    def process_document
+    def process_horizontal
       @content = []
       (@options[:first_row]+1).upto(@doc.last_row).each do |row_n|
         row = @doc.find(row_n)[0]
@@ -63,11 +72,22 @@ class Ss2Json
       end
     end
 
+    def process_vertical
+      hash = {}
+      @options[:first_row].upto(@doc.last_row) do |row|
+        key = @doc.cell(row, @options[:key_column])
+        value = @doc.cell(row, @options[:value_column])
+        hash[key] = value
+      end
+      @content = RowConverter.new(hash, @options[:converter])
+    end
+
 
     def open
       kclass = case @options[:file][/\.(.*)$/,1]
-               when /xlsx/i then Excelx
-               when /ods/i then Openoffice
+               when /xlsx$/i then Excelx
+               when /xls$/i then Excel
+               when /ods$/i then Openoffice
                else
                  raise "Unknown format"
                end

data/lib/ss2json/options.rb

@@ -10,6 +10,9 @@ class Ss2Json
       :file => nil,
       :check_column => nil,
       :action => :convert,
+      :orientation => :horizontal,
+      :key_column => 1,
+      :value_column => 2,
       :converter => {
         :show_null => false,
         :dont_convert => false,
@@ -30,21 +33,53 @@ class Ss2Json
         @help = opts
 
         opts.banner =  "Usage: #{File.basename $0} -f FILENAME [options]"
-        opts.separator ""
+
+        opts.separator "\nMode options:"
+
+        opts.on("-h", "--horizontal", "Normal processing mode (DEFAULT). Can be ommited") do
+          @options[:orientation] = :horizontal
+        end
+
+        opts.on("-v", "--vertical", "Process the spreadhsheet on vertical") do
+          @options[:orientation] = :vertical
+        end
+
+        opts.on("-l", "--list-sheets", "Return the list of sheets") do |file|
+          @options[:action] = :list
+        end
+
+        opts.separator "Common options:"
+
+        opts.on("-f", "--file FILENAME", "Use the filename") do |file|
+          File.file?(file) or die("Can't find the file #{file}.")
+          @options[:file] = File.expand_path(file)
+        end
+
         opts.on("-s", "--sheet SHEET_NAME", "Use other that the first table") do |sheet|
           @options[:sheet] = sheet
         end
 
-        opts.on("-r", "--first-row ROW_NUMBER", "Set the default first row") do |row|
+        opts.separator "\nHorizontal and Vertical mode options:"
+
+        opts.on("-r", "--first-row ROW_NUMBER", "Set the first row") do |row|
           die("Can't understand the row #{row}. Use a number") unless row =~ /\A\d*\z/
-            @options[:first_row] = row.to_i
+          @options[:first_row] = row.to_i
         end
 
-        opts.on("-f", "--file FILENAME", "Use the filename") do |file|
-          File.file?(file) or die("Can't find the file #{file}.")
-          @options[:file] = file
+        opts.separator "\nVertical mode options:"
+
+        opts.on("-k", "--key-column", "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|
+          die("Can't understand the column #{column}. Use a number") unless column =~ /\A\d*\z/
+          @options[:value_column] = column.to_i
         end
 
+        opts.separator "\nData options:"
+
         opts.on("-i", "--ignore-value VALUE", "Ignore the fields with that value. Could be use several times") do |t|
           @options[:converter][:ignored_values] << t
         end
@@ -53,10 +88,6 @@ class Ss2Json
           @options[:converter][:show_null] = true
         end
 
-        opts.on("-c", "--check-column NAME", "Only output objects wich his property NAME is not in IGNORED VALUES") do |t|
-          @options[:check_column] = t
-        end
-
         opts.on("-d", "--disable-conversion", "Disable the conversion from floats to integers") do
           @options[:converter][:dont_convert] = true
         end
@@ -65,18 +96,25 @@ class Ss2Json
           @options[:converter][:downcase_first_letter] = false
         end
 
-        opts.separator ""
+        opts.separator "\nFilter options:"
 
-        opts.on("-l", "--list-sheets", "Return the list of sheets") do |file|
-          @options[:action] = :list
+        opts.on("-c", "--check-column NAME", "Only output objects wich his property NAME is not in IGNORED VALUES") do |t|
+          @options[:check_column] = t
         end
 
-        opts.separator ""
+
+        opts.separator "\n"
 
         opts.on_tail("-h","--help", "Show this help") do
           puts opts
           exit 0
         end
+
+        opts.on_tail("--version", "Show the version") do
+          puts "#{File.basename($0)} Version: #{Ss2Json::VERSION}"
+          exit 0
+        end
+
       end.parse!
 
       die("You need to at least specify a file") if @options[:file].nil?

data/lib/ss2json/version.rb

@@ -1,3 +1,3 @@
-class Ss2json
-  VERSION = "0.0.3"
+class Ss2Json
+  VERSION = "0.1.0"
 end

data/ss2json.gemspec

@@ -4,7 +4,7 @@ require "ss2json/version"
 
 Gem::Specification.new do |s|
   s.name        = "ss2json"
-  s.version     = Ss2json::VERSION
+  s.version     = Ss2Json::VERSION
   s.authors     = ["Guillermo Álvarez"]
   s.email       = ["guillermo@cientifico.net"]
   s.homepage    = ""

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ss2json
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Guillermo A\xCC\x81lvarez"