ss2json 0.3.2 → 1.0.0.pre

data/lib/ss2json/converter.rb

@@ -0,0 +1,95 @@
+
+require 'roo'
+require 'ss2json/row_converter'
+
+module SS2JSON
+  class Converter
+
+    # Create a new converter the options are:
+    #
+    #   * **:file** Input file.
+    #   * **:sheet** Name of the sheet to use.
+    #   * **:first_row** Which is the first row of real data
+    #   * **:title_row** Where the title of the columns is.
+    #   * **:check_column** Output only the results with a value present on the specific field.
+    #   * **:key_column** Column of the keys for vertical mode.
+    #   * **:value_column** Column of the values.
+    #   * **:converter**: Options passed to the converter: Ss2Json::RowConverter
+    def initialize(options={})
+      @options = options
+      @doc = get_document_type.new(@options[:file])
+      set_default_sheet(@options[:sheet]) if @options[:sheet]
+      set_header_line(@options[:title_row]) if @options[:title_row]
+    end
+
+    def process_horizontal
+      @options[:first_row] += 1
+      @content = []
+      each_hash_row do |hash|
+        @options[:hash_key]
+        @content << hash
+      end
+      @content
+    end
+
+
+    def to_a
+      @doc.to_matrix.to_a
+    end
+
+    def process_vertical
+      hash = {}
+      each_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])
+      @content
+    end
+
+    def sheets
+      @doc.sheets
+    end
+
+    protected
+
+    def set_default_sheet(sheet)
+      @doc.default_sheet = sheet
+    rescue RangeError => e
+      raise if @doc.sheets.include?(sheet)
+      raise "\nThe sheet #{sheet} did not exists. The available sheets are:\n" + sheets.map{|s| "\t* #{s}\n"}.join("")
+    end
+
+    def set_header_line(first_row)
+      @doc.header_line = first_row
+    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] )
+        # TODO: Fix nested_hash to make set and get work on already converted items
+        next if @options[:check_column] && object[@options[:check_column]].nil?
+        yield object
+      end
+    end
+
+    def get_document_type
+      case @options[:file][/\.(.*)$/,1]
+      when /xlsx$/i then Excelx
+      when /xls$/i then Excel
+      when /ods$/i then Openoffice
+      else
+        raise "Unknown format"
+      end
+    end
+
+  end
+end

data/lib/ss2json/row_converter.rb

@@ -1,6 +1,6 @@
 require 'nested_hash'
 
-class Ss2Json
+module SS2JSON
   class RowConverter < NestedHash
 
     # Create a nested_hash from a hash with just one level (key,value).
@@ -19,7 +19,6 @@ class Ss2Json
     protected
 
     def is_valid_key?(key)
-      return !(key =~ Regexp.new("/#{@options[:key_pattern]}/")) if @options[:key_pattern]
       super && ! (key =~ /^i\./i)
     end
 

data/lib/ss2json/version.rb

@@ -1,3 +1,3 @@
-class Ss2Json
-  VERSION = "0.3.2"
+module SS2JSON
+  VERSION = "1.0.0.pre"
 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    = ""
@@ -19,5 +19,16 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "nested_hash"
-  s.add_runtime_dependency "roo", "1.10.1"
+  s.add_runtime_dependency "roo"
+  s.add_runtime_dependency "terminal-table"
+  s.add_runtime_dependency "json"
+  # s.add_runtime_dependency "system_timer"
+
+  # s.add_development_dependency "ronn"
+  # s.add_development_dependency "rake"
+  # s.add_development_dependency "ruby-debug"
+
+#   s.post_install_message = <<-EOF
+# This project have man pages. Install gem-man and follow common instructions on google to be able to access that man pages through man(1)
+# EOF
 end

data/test/catss.fixture

@@ -0,0 +1,9 @@
++-----+------------+-----------+--------------+-------------+--------------+-------------+-----------------+
+| id  | name.first | name.last | child.1.name | child.1.age | child.2.name | child.2.age | i.fiscal_id     |
+| 1.0 | Guillermo  | Alvarez   | pepe         | 2.0         | Juanjo       |             | 7123478912123.0 |
+| 2.0 | Martin     | Luther    | Jr           |             |              |             | 478792345132.0  |
+| 3.0 | Jesper     |           |              |             |              |             | 13478912347.0   |
+| 4.0 |            |           |              |             |              |             |                 |
+| 5.0 |            |           |              |             |              |             |                 |
+| 6.0 |            |           |              |             |              |             |                 |
++-----+------------+-----------+--------------+-------------+--------------+-------------+-----------------+

data/test/catss2.fixture

@@ -0,0 +1,7 @@
++-------------------------------+--------+
+| version                       | 1.2.3  |
+| initial_options.coins         | 450.0  |
+| initial_options.lives         | 5.0    |
+| initial_options.plants.1.name | pepe   |
+| initial_options.plants.2.name | juanjo |
++-------------------------------+--------+

data/test/cli_test.rb

@@ -0,0 +1,61 @@
+
+
+require 'ss2json'
+require 'test/unit'
+
+class Ss2Json::RowConverterTest < Test::Unit::TestCase
+
+  def test_class
+    nested_hash = Ss2Json::RowConverter.new({})
+    nested_hash.is_a?(Hash)
+  end
+
+  def test_ignored_values_option
+    options = {:ignored_values => ["???"]}
+    new_hash = Ss2Json::RowConverter.new({"adsf" => '???'},options)
+    assert_equal({}, new_hash)
+    new_hash = Ss2Json::RowConverter.new({"asdf" => 'asdf'}, options)
+    assert_equal({"asdf" => 'asdf' }, new_hash)
+  end
+
+  def test_show_null_option
+    initial_hash = {"asdf" => nil}
+    new_hash = Ss2Json::RowConverter.new(initial_hash,{:show_null => false})
+    assert_equal({}, new_hash)
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash,{:show_null => true})
+    assert_equal({"asdf" => nil}, new_hash)
+  end
+
+  def test_dont_convert_option
+    initial_hash = { "asdf" => 3.0 }
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash, {:dont_convert => true})
+    assert_equal(initial_hash, new_hash)
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash, {:dont_convert => false})
+    assert_equal(initial_hash, { "asdf" => 3 })
+  end
+
+  def test_downcase_first_letter
+    initial_hash = { "Asdf.pepe" => 3, "asdf.Jose" => 5 }
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash, {:downcase_first_letter => false})
+    assert_equal({"Asdf"=>{"pepe"=>3}, "asdf"=>{"Jose"=>5}}, new_hash)
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash, {:downcase_first_letter => true})
+    assert_equal({"asdf" => {"pepe" => 3, "jose" => 5}}, new_hash)
+  end
+
+  def test_it_ignore_ignored_fields
+    initial_hash = { "i.asdf" => 5}
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash)
+    assert_equal({}, new_hash)
+
+    initial_hash = { "name.i" => 5}
+
+    new_hash = Ss2Json::RowConverter.new(initial_hash)
+    assert_equal({"name" => {"i" => 5}}, new_hash)
+  end
+end

data/test/integration_test.rb

@@ -0,0 +1,90 @@
+require 'test/unit'
+require 'json'
+
+class Ss2JsonIntegrationTest < Test::Unit::TestCase
+
+
+  def call(cmd, args)
+    `ruby -I lib -rubygems bin/#{cmd} #{args}`
+  end
+
+  def callP(cmd,args)
+    JSON.parse(call(cmd,args))
+  end
+
+
+
+  # def test_vertical
+  #   data = [ { "child"=>[{"name"=>"pepe", "age"=>2}, {"name"=>"Juanjo"}], "id"=>1, "name"=>{"last"=>"Alvarez", "first"=>"Guillermo"} }, { "child"=>[{"name"=>"Jr"}], "id"=>2, "name"=>{"last"=>"Luther", "first"=>"Martin"} }, {"id"=>3, "name"=>{"first"=>"Jesper"}}, {"id"=>4}, {"id"=>5}, {"id"=>6}]
+  #   assert_equal data, ss2jsonP("-f test/ss2json.xls -s Test1")
+  # end
+
+  # def test_check_flag
+  #   data = [{"child"=>[{"name"=>"pepe", "age"=>2}, {"name"=>"Juanjo"}], "name"=>{"last"=>"Alvarez", "first"=>"Guillermo"}, "id"=>1}, {"child"=>[{"name"=>"Jr"}], "name"=>{"last"=>"Luther", "first"=>"Martin"}, "id"=>2}, {"name"=>{"first"=>"Jesper"}, "id"=>3}]
+  #   assert_equal data, ss2jsonP("-f test/ss2json.xls -s Test1 -c 'name'")
+  # end
+
+  # def test_use_key
+  #   data = []
+  #   assert_equal data, ss2jsonP("-f test/ss2json.xls -s Test1 -u 'uuid'")
+  # end
+
+
+
+  def test_lsss
+    assert_equal "Test1\nTest2\nTest3\nTest4\n", call('lsss', 'test/ss2json.xls')
+  end
+
+  def test_catss
+    expected = File.read('test/catss.fixture')
+    assert_equal expected , call('catss', 'test/ss2json.xls')
+  end
+
+  def test_catss_with_sheet
+    expected = File.read('test/catss2.fixture')
+    assert_equal expected , call('catss', 'test/ss2json.xls Test3')
+  end
+
+  def test_ss2json_horizontal
+    expected = [
+      { "child"=> [ { "age"=> 2, "name"=> "pepe" }, { "name"=> "Juanjo" } ], "id"=> 1, "name"=> { "last"=> "Alvarez", "first"=> "Guillermo" } },
+      { "child"=> [ { "name"=> "Jr" } ], "id"=> 2, "name"=> { "last"=> "Luther", "first"=> "Martin" } },
+      { "id"=> 3, "name"=> { "first"=> "Jesper" } },
+      { "id"=> 4 },
+      { "id"=> 5 },
+      { "id"=> 6 }
+    ]
+    assert_equal expected, callP('ss2json-horizontal', 'test/ss2json.xls -s Test1')
+  end
+
+  def test_ss2json_horizontal_with_check
+    expected = [
+      { "child"=> [ { "age"=> 2, "name"=> "pepe" }, { "name"=> "Juanjo" } ], "id"=> 1, "name"=> { "last"=> "Alvarez", "first"=> "Guillermo" } },
+      { "child"=> [ { "name"=> "Jr" } ], "id"=> 2, "name"=> { "last"=> "Luther", "first"=> "Martin" } },
+      { "id"=> 3, "name"=> { "first"=> "Jesper" } }
+    ]
+    assert_equal expected, callP('ss2json-horizontal', 'test/ss2json.xls -s Test1 -c name')
+  end
+
+  def test_ss2json_hash
+    expected = [
+      { "child"=> [ { "age"=> 2, "name"=> "pepe" }, { "name"=> "Juanjo" } ], "id"=> 1, "name"=> { "last"=> "Alvarez", "first"=> "Guillermo" } },
+      { "child"=> [ { "name"=> "Jr" } ], "id"=> 2, "name"=> { "last"=> "Luther", "first"=> "Martin" } },
+      { "id"=> 3, "name"=> { "first"=> "Jesper" } }
+    ]
+    assert_equal expected, callP('ss2json-horizontal-hash', 'test/ss2json.xls id -s Test1')
+  end
+
+  def test_ss2json_vertical
+    expected = {}
+    assert_equal expected, callP('ss2json-vertical', 'test/ss2json.xls -s Test3')
+  end
+
+
+# compress-json
+# merge-jsons
+# order-json
+# ss2json-horizontal
+# ss2json-horizontal-hash
+# ss2json-vertical
+end

data/test/row_converter_test.rb

@@ -57,16 +57,4 @@ class Ss2Json::RowConverterTest < Test::Unit::TestCase
     new_hash = Ss2Json::RowConverter.new(initial_hash)
     assert_equal({"name" => {"i" => 5}}, new_hash)
   end
-
-  def test_it_applies_key_pattern
-    initial_hash = { "@name.i" => 5}
-    options = {:key_pattern => '\A[\.\w\-@]+\z'}
-
-    new_hash = Ss2Json::RowConverter.new(initial_hash, options)
-    assert_equal({"@name" => {"i" => 5}}, new_hash)
-
-    new_hash = Ss2Json::RowConverter.new(initial_hash)
-    assert_equal({}, new_hash)
-  end
-
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ss2json
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 1964060728
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 0
+  - pre
+  version: 1.0.0.pre
 platform: ruby
 authors: 
 - "Guillermo A\xCC\x81lvarez"
@@ -15,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-07 00:00:00 Z
+date: 2012-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nested_hash
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: nested_hash
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,29 +30,54 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: roo
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: terminal-table
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 3
         segments: 
-        - 1
-        - 10
-        - 1
-        version: 1.10.1
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   type: :runtime
-  version_requirements: *id002
 description: Convert SpreadSheet documents to json following some conventions.
 email: 
 - guillermo@cientifico.net
 executables: 
-- merge_jsons
 - ss2json
 extensions: []
 
@@ -63,16 +89,27 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/merge_jsons
+- balance.xlsx
 - bin/ss2json
 - doc/ss2json-1.png
 - doc/ss2json-2.png
-- lib/ss2json.rb
-- lib/ss2json/cli.rb
-- lib/ss2json/options.rb
+- lib/ss2json-commands/cat.rb
+- lib/ss2json-commands/compress.rb
+- lib/ss2json-commands/constants.rb
+- lib/ss2json-commands/humanize.rb
+- lib/ss2json-commands/ls.rb
+- lib/ss2json-commands/merge.rb
+- lib/ss2json-commands/to_array.rb
+- lib/ss2json-commands/to_hash.rb
+- lib/ss2json/command.rb
+- lib/ss2json/converter.rb
 - lib/ss2json/row_converter.rb
 - lib/ss2json/version.rb
 - ss2json.gemspec
+- test/catss.fixture
+- test/catss2.fixture
+- test/cli_test.rb
+- test/integration_test.rb
 - test/row_converter_test.rb
 - test/ss2json (1).ods
 - test/ss2json.ods
@@ -97,12 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ss2json
@@ -112,4 +151,3 @@ specification_version: 3
 summary: SpreadSheet to Json convert
 test_files: []
 
-has_rdoc: