ss2json 1.0.0.pre → 1.0.0.pre1

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require 'rubygems'
-require 'bundler/setup'
 
 
 
@@ -9,8 +8,9 @@ require 'bundler/setup'
 #   sh "ruby -I lib -rubygems test/**/*_test.rb"
 # end
 
-# require 'rake/testtask'
-#
-# Rake::TestTask.new do |t|
-#   t.pattern = "test/**/*_test.rb"
-# end
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = true
+end

data/bin/ss2json

@@ -5,6 +5,8 @@ if ARGV[0] && !(ARGV[0] =~ /^-/)
     require "ss2json-commands/#{ARGV[0]}"
     kommand = SS2JSON::Command.const_get(ARGV[0].gsub(/^.|_./){|a| a[-1].chr.upcase})
     $0="#{$0} #{ARGV[0]}"
+    kommand.new(ARGV[1..-1])
+  rescue LoadError => e
     $stderr.puts "ss2json: '#{ARGV[0]}' is not a ss2json command. See 'ss2json --help'. (#{e.message})"
     exit -1
   end

data/lib/ss2json/converter.rb

@@ -86,6 +86,7 @@ module SS2JSON
       when /xlsx$/i then Excelx
       when /xls$/i then Excel
       when /ods$/i then Openoffice
+      when /csv$/i then Csv
       else
         raise "Unknown format"
       end

data/lib/ss2json/version.rb

@@ -1,3 +1,3 @@
 module SS2JSON
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre1"
 end

data/test/commands/constants/constants_test.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'json'
+
+class ToConstantsCommandTest < Test::Unit::TestCase
+  CMD="ruby -I lib -rubygems bin/ss2json constants"
+
+  # Fixture helper
+  def f(name); File.join( File.dirname(__FILE__), name ) ; end
+  def r(path); File.read f(path); end
+
+  def test_without_commands
+    assert_equal r("output_constants.txt"), `#{CMD} 2>&1`
+  end
+
+  def test_to_constants
+    output = `#{CMD} #{f "table.csv"} | python -mjson.tool`
+    assert_equal r("output_constants_table.txt"), output
+  end
+end
+

data/test/commands/constants/output_constants.txt

@@ -0,0 +1,15 @@
+Incorrect number of parameters
+Usage: bin/ss2json constants FILENAME [options]
+    -s, --sheet SHEET_NAME           Use other that the first table
+    -r, --first-row ROW_NUMBER       Set the first row
+    -k, --key-column COLUMN_NUMBER   Column where the keys are (Default to 1)
+    -a, --value-column COLUMN_NUMBER Column where the values are (Default to 2)
+
+Data options:
+    -i, --ignore-value VALUE         Ignore the fields with that value. Could be use several times
+    -b, --include-blank              Generate a json with the values included in the ignore list
+    -d, --disable-conversion         Disable the conversion from floats to integers
+    -l, --disable-first-letter       Will disable the downcase of the first letter of the key
+
+    -h, --help                       Show this help
+        --version                    Show the version

data/test/commands/constants/output_constants_table.txt

@@ -0,0 +1,9 @@
+{
+    "planet": {
+        "name": " Earth", 
+        "population": " 4", 
+        "system": {
+            "name": " Solar"
+        }
+    }
+}

data/test/commands/constants/table.csv

@@ -0,0 +1,4 @@
+planet.name, Earth
+planet.population, 4
+planet.system.name, Solar
+i.accout_number, 65

data/test/commands/to_array/output_to_array.txt

@@ -0,0 +1,15 @@
+Incorrect number of parameters
+Usage: bin/ss2json to_array FILENAME [options]
+    -s, --sheet SHEET_NAME           Use other that the first table
+    -t, --title-row ROW_NUMBER       Row in wich the titles are. Default: 1
+    -r, --first-row ROW_NUMBER       Set the first row
+    -c, --check-column NAME          Only output objects wich his property NAME is not in IGNORED VALUES
+
+Data options:
+    -i, --ignore-value VALUE         Ignore the fields with that value. Could be use several times
+    -b, --include-blank              Generate a json with the values included in the ignore list
+    -d, --disable-conversion         Disable the conversion from floats to integers
+    -l, --disable-first-letter       Will disable the downcase of the first letter of the key
+
+    -h, --help                       Show this help
+        --version                    Show the version

data/test/commands/to_array/output_to_array_table.txt

@@ -0,0 +1,13 @@
+[
+    {
+        "id": "3", 
+        "person": {
+            "name": "Pepe"
+        }
+    }, 
+    {
+        "person": {
+            "name": "Ramon"
+        }
+    }
+]

data/test/commands/to_array/table.csv

@@ -0,0 +1,5 @@
+id,person.name,person.age,i.notes
+1,Guillermo,2,"asdf"
+3,Pepe,,
+,Ramon,,
+

data/test/commands/to_array/to_array_test.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'json'
+
+class ToArrayCommandTest < Test::Unit::TestCase
+
+
+  CMD="ruby -I lib -rubygems bin/ss2json to_array"
+
+  # Fixture helper
+  def f(name); File.join( File.dirname(__FILE__), name ) ; end
+  def r(path); File.read f(path); end
+
+  def test_without_commands
+    assert_equal r("output_to_array.txt"), `#{CMD} 2>&1`
+  end
+
+  def test_to_array
+    output = `#{CMD} #{f "table.csv"} | python -mjson.tool`
+    assert_equal r("output_to_array_table.txt"), output
+  end
+end
+

data/test/commands/to_hash/output_to_hash.txt

@@ -0,0 +1,15 @@
+Incorrect number of parameters
+Usage: bin/ss2json to_hash FILENAME KEY [options]
+    -s, --sheet SHEET_NAME           Use other that the first table
+    -t, --title-row ROW_NUMBER       Row in wich the titles are. Default: 1
+    -r, --first-row ROW_NUMBER       Set the first row of real data. Default: 2
+    -n, --dont-remove-key            When using a column in the excel as a key for the hash, that column is removed. This option avoid that behaviour
+
+Data options:
+    -i, --ignore-value VALUE         Ignore the fields with that value. Could be use several times
+    -b, --include-blank              Generate a json with the values included in the ignore list
+    -d, --disable-conversion         Disable the conversion from floats to integers
+    -l, --disable-first-letter       Will disable the downcase of the first letter of the key
+
+    -h, --help                       Show this help
+        --version                    Show the version

data/test/commands/to_hash/output_to_hash_table.txt

@@ -0,0 +1,13 @@
+{
+    "1": {
+        "person": {
+            "age": "2", 
+            "name": "Guillermo"
+        }
+    }, 
+    "3": {
+        "person": {
+            "name": "Pepe"
+        }
+    }
+}

data/test/commands/to_hash/table.csv

@@ -0,0 +1,5 @@
+id,person.name,person.age,i.notes
+1,Guillermo,2,"asdf"
+3,Pepe,,
+,Ramon,,
+

data/test/commands/to_hash/to_hash_test.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'json'
+
+class ToHashCommandTest < Test::Unit::TestCase
+
+
+  CMD="ruby -I lib -rubygems bin/ss2json to_hash"
+
+  # Fixture helper
+  def f(name); File.join( File.dirname(__FILE__), name ) ; end
+  def r(path); File.read f(path); end
+
+  def test_without_commands
+    assert_equal r("output_to_hash.txt"), `#{CMD} 2>&1`
+  end
+
+  def test_to_hash
+    output = `#{CMD} #{f "table.csv"} id | python -mjson.tool`
+    assert_equal r("output_to_hash_table.txt"), output
+  end
+end
+

data/test/row_converter_test.rb

@@ -1,60 +1,60 @@
-
-require 'ss2json'
+require 'rubygems'
+require 'ss2json/row_converter'
 require 'test/unit'
 
-class Ss2Json::RowConverterTest < Test::Unit::TestCase
+class SS2JSON::RowConverterTest < Test::Unit::TestCase
 
   def test_class
-    nested_hash = Ss2Json::RowConverter.new({})
+    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)
+    new_hash = SS2JSON::RowConverter.new({"adsf" => '???'},options)
     assert_equal({}, new_hash)
-    new_hash = Ss2Json::RowConverter.new({"asdf" => 'asdf'}, options)
+    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})
+    new_hash = SS2JSON::RowConverter.new(initial_hash,{:show_null => false})
     assert_equal({}, new_hash)
 
-    new_hash = Ss2Json::RowConverter.new(initial_hash,{:show_null => true})
+    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})
+    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})
+    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})
+    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})
+    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)
+    new_hash = SS2JSON::RowConverter.new(initial_hash)
     assert_equal({}, new_hash)
 
     initial_hash = { "name.i" => 5}
 
-    new_hash = Ss2Json::RowConverter.new(initial_hash)
+    new_hash = SS2JSON::RowConverter.new(initial_hash)
     assert_equal({"name" => {"i" => 5}}, new_hash)
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ss2json
 version: !ruby/object:Gem::Version 
-  hash: 1964060728
+  hash: -782823030
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - pre
-  version: 1.0.0.pre
+  - 1
+  version: 1.0.0.pre1
 platform: ruby
 authors: 
 - "Guillermo A\xCC\x81lvarez"
@@ -19,9 +20,9 @@ cert_chain: []
 date: 2012-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: nested_hash
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ 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 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: terminal-table
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,8 +73,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :runtime
+  version_requirements: *id004
 description: Convert SpreadSheet documents to json following some conventions.
 email: 
 - guillermo@cientifico.net
@@ -108,8 +109,18 @@ files:
 - ss2json.gemspec
 - test/catss.fixture
 - test/catss2.fixture
-- test/cli_test.rb
-- test/integration_test.rb
+- test/commands/constants/constants_test.rb
+- test/commands/constants/output_constants.txt
+- test/commands/constants/output_constants_table.txt
+- test/commands/constants/table.csv
+- test/commands/to_array/output_to_array.txt
+- test/commands/to_array/output_to_array_table.txt
+- test/commands/to_array/table.csv
+- test/commands/to_array/to_array_test.rb
+- test/commands/to_hash/output_to_hash.txt
+- test/commands/to_hash/output_to_hash_table.txt
+- test/commands/to_hash/table.csv
+- test/commands/to_hash/to_hash_test.rb
 - test/row_converter_test.rb
 - test/ss2json (1).ods
 - test/ss2json.ods

data/test/cli_test.rb

@@ -1,61 +0,0 @@
-
-
-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

@@ -1,90 +0,0 @@
-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