csv2json 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4bd184909e84a50e1c7b8194c9745304cc9452b2
+  data.tar.gz: ae813c982d6423683b30966835e6f99cca001576
+SHA512:
+  metadata.gz: aec64661bf440449ee161b6d1bb526cb5153e0749154a98507219881dc4b7e20bea9da9df5448590c9dfc714d54fec3ad895608aefa685d50188dacc00a06b7d
+  data.tar.gz: e06d877886ecefca9d22f3791ba959ad43cfe2b227243b46826cb51cc45ccbdf9101524a565dcd4349e0d1525a6e49828ea7da1b59ca05c2a03db39e7a878edf

data/README.md

@@ -1,17 +1,16 @@
 # csv2json
 
-Clients were sending me XLS files, but my webs consume JSON. So I needed to convert them to JSON easily from command-line. 
-Tried to google for solution and surprisingly enough nothing solid existed.
+Clients were sending me XLS files but my webs consume JSONs. So I needed to convert them to JSON easily from command-line...
 
 ## Solution
 
 - export XLS as a CSV file (I use OpenOffice.org for this)
-- run `csv2json file.csv > file.json`
+- run `csv2json file.csv > file.json` (or `json2csv file.json > file.csv`)
 - there is no step 3
 
 ### Sample
 
-note: make sure your XLS table has the first row with column names
+note: make sure your XLS table has the first row with column names, or use the -H option to provide some
 
 This CSV file:
 
@@ -20,44 +19,62 @@ This CSV file:
     thumbnails/,images/,paris_02.jpg,262,350,paris_02.jpg,75,56
     
 gets turned into this JSON: 
-
-    [
-      {
-        "thumbwidth": 75,
-        "imgsrc": "paris_01.jpg",
-        "thumbsrc": "paris_01.jpg",
-        "height": 262,
-        "imgpath": "images/",
-        "thumbheight": 56,
-        "thumbpath": "thumbnails/",
-        "width": 350
-      },
-      {
-        "thumbwidth": 75,
-        "imgsrc": "paris_02.jpg",
-        "thumbsrc": "paris_02.jpg",
-        "height": 350,
-        "imgpath": "images/",
-        "thumbheight": 56,
-        "thumbpath": "thumbnails/",
-        "width": 262
-      }
-    ]
+```json
+[
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_01.jpg",
+    "thumbsrc": "paris_01.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_02.jpg",
+    "thumbsrc": "paris_02.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  }
+]
+```
 
 ### Installation
 
-`sudo gem install csv2json --source http://rubygems.org`
+`sudo gem install csv2json`
 
 ### Usage
 
-    Usage: csv2json [INPUT] [OPTIONS]
+Usage: csv2json [INPUT] [OPTIONS]
+
+    Specific options:
+        -s, --separator SEP              Set separator character surrounded by single quotes (default is ',')
+        -o, --output FILE                Write output to a file
+        -p, --pretty                     Pretty-format JSON output
+        -k, --skip-headers-from-file     Ignore the headers (first line) in the file; use with --headers to set your own
+        -H, --headers HEADERS            Supply list of headers, where no headers exist in the file, or where you're using -k to ignore them
+        -h, --help                       Show this message
+        -v, --version                    Show version
+
+We also provide `json2csv`, which converts in the opposite direction.
+
+    Usage: json2csv [INPUT] [OPTIONS]
 
     Specific options:
         -s, --separator SEP              Set separator character surrounded by single quotes (default is ',')
         -o, --output FILE                Write output to a file
+        -H, --headers HEADERS            Supply sorted list of headers, by which to order the columns in the CSV. These must match the key names in the JSON.
         -h, --help                       Show this message
         -v, --version                    Show version
 
+
+Note: JSON field order is explicitly unsorted, so if you want predictable field order for CSV output, use the -H option.
+
 ### Alternative usage
 
 common usage is `csv2json file.csv > file.json`
@@ -91,16 +108,4 @@ or in-memory
 
 ## Authors
 
-* **Antonin Hildebrand** ([http://binaryage.com](http://binaryage.com))
-* **Rafael Souza** ([http://github.com/rafaels](http://github.com/rafaels))
-
----
-
-## Want to contribute?
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+[https://github.com/darwin/csv2json/graphs/contributors](https://github.com/darwin/csv2json/graphs/contributors)

data/Rakefile

@@ -13,7 +13,6 @@ begin
     gem.homepage = "http://github.com/darwin/csv2json"
     gem.authors = ["Antonin Hildebrand", "Rafael Souza"]
     gem.add_dependency "json"
-    gem.add_dependency "fastercsv"
     gem.add_development_dependency "shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -46,7 +45,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/bin/csv2json

@@ -6,7 +6,7 @@ require 'ostruct'
 require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'csv2json.rb') # this form is important for local development
 
 module CSV2JSONRunner
-    
+
     # command-line parsing
     COMMAND = File.basename($0)
     USAGE = "Usage: #{COMMAND} [INPUT] [OPTIONS]"
@@ -14,6 +14,9 @@ module CSV2JSONRunner
     options = OpenStruct.new
     options.output = "-"
     options.separator = ","
+    options.pretty = false
+    options.headers = nil
+    options.skipFirstRow = false
 
     opts = OptionParser.new do |o|
         o.banner = USAGE
@@ -28,6 +31,22 @@ module CSV2JSONRunner
             options.output = fn
         end
 
+        o.on("-p", "--pretty", "Pretty-format JSON output") do 
+            options.pretty = true
+        end
+
+        o.on("-k", "--skip-headers-from-file", "Ignore the headers (first line) in the file; use with --headers to set your own") do |headers|
+            if headers then
+                options.skipFirstRow = true
+            end
+        end
+
+        o.on("-H", "--headers HEADERS", "Supply list of headers, where no headers exist in the file, or where you're using -k to ignore them") do |headers|
+            if headers then
+                options.headers = headers.split(",")
+            end
+        end
+
         o.on_tail("-h", "--help", "Show this message") do
             puts o
             exit
@@ -42,7 +61,7 @@ module CSV2JSONRunner
     begin
         opts.parse!(ARGV)
     rescue
-        die "Unable to parse options: #{$!}"
+        raise "Unable to parse options: #{$!}"
     end
 
     # initialize output handle
@@ -55,11 +74,11 @@ module CSV2JSONRunner
     if ARGV.size > 0
         IN = File.open(ARGV[0], "r")
     else
-        IN = StringIO.new($stdin.read) # cannot be just $stdin.clone because FasterCSV is seeking in file :-(
+        IN = StringIO.new($stdin.read) # cannot be just $stdin.clone because CSV is seeking in file :-(
     end
     
     # run the command
-    CSV2JSON.parse(IN, OUT, nil, :col_sep => options.separator)
+    CSV2JSON.parse(IN, OUT, options.headers, {:col_sep => options.separator}, {:pretty => options.pretty, :skipFirstRow => options.skipFirstRow})
     
     # leave in peace
     OUT.flush

data/bin/json2csv

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require 'optparse'
+require 'ostruct'
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'json2csv.rb') # this form is important for local development
+
+module JSON2CSVRunner
+
+    # command-line parsing
+    COMMAND = File.basename($0)
+    USAGE = "Usage: #{COMMAND} [INPUT] [OPTIONS]"
+
+    options = OpenStruct.new
+    options.output = "-"
+    options.separator = ","
+    options.headers = nil
+
+    opts = OptionParser.new do |o|
+        o.banner = USAGE
+        o.separator ""
+        o.separator "Specific options:"
+
+        o.on("-s", "--separator SEP", "Set separator character surrounded by single quotes (default is ',')") do |sep|
+            options.separator = sep
+        end
+
+        o.on("-o", "--output FILE", "Write output to a file") do |fn|
+            options.output = fn
+        end
+
+        o.on("-H", "--headers HEADERS", "Supply sorted list of headers, by which to order the columns in the CSV. These must match the key names in the JSON.") do |headers|
+            if headers then
+                options.headers = headers.split(",")
+            end
+        end
+
+        o.on_tail("-h", "--help", "Show this message") do
+            puts o
+            exit
+        end
+
+        o.on_tail("-v", "--version", "Show version") do
+            puts CSV2JSON::VERSION
+            exit
+        end
+    end
+
+    begin
+        opts.parse!(ARGV)
+    rescue
+        raise "Unable to parse options: #{$!}"
+    end
+
+    # initialize output handle
+    if options.output == "-"
+        OUT = $stdout.clone
+    else
+        OUT = File.open(options.output, "w")
+    end
+    
+    if ARGV.size > 0
+        IN = File.read(ARGV[0])
+    else
+        IN = STDIN.read
+    end
+
+    # run the command
+    JSON2CSV.parse(IN, OUT, options.headers, {:col_sep => options.separator})
+    
+    # leave in peace
+    OUT.flush
+end

data/csv2json.gemspec

@@ -1,74 +1,71 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: csv2json 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{csv2json}
-  s.version = "0.2.0"
+  s.name = "csv2json"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Antonin Hildebrand", "Rafael Souza"]
-  s.date = %q{2010-03-14}
-  s.default_executable = %q{csv2json}
-  s.description = %q{handy for converting xls files to json}
-  s.email = %q{antonin@hildebrand.cz}
-  s.executables = ["csv2json"]
+  s.date = "2014-03-19"
+  s.description = "handy for converting xls files to json"
+  s.email = "antonin@hildebrand.cz"
+  s.executables = ["csv2json", "json2csv"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "bin/csv2json",
-     "csv2json.gemspec",
-     "lib/csv2json-version.rb",
-     "lib/csv2json.rb",
-     "test/fixtures/addresses.json",
-     "test/fixtures/addresses_comma.csv",
-     "test/fixtures/addresses_pipe.csv",
-     "test/fixtures/addresses_semicolon.csv",
-     "test/fixtures/photos.json",
-     "test/fixtures/photos_comma.csv",
-     "test/fixtures/photos_pipe.csv",
-     "test/fixtures/photos_semicolon.csv",
-     "test/fixtures/population.json",
-     "test/fixtures/population_comma.csv",
-     "test/fixtures/population_pipe.csv",
-     "test/fixtures/population_semicolon.csv",
-     "test/helper.rb",
-     "test/test_csv2json.rb"
-  ]
-  s.homepage = %q{http://github.com/darwin/csv2json}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{.csv to .json converter}
-  s.test_files = [
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "bin/csv2json",
+    "bin/json2csv",
+    "csv2json.gemspec",
+    "lib/csv2json-version.rb",
+    "lib/csv2json.rb",
+    "lib/json2csv.rb",
+    "test/fixtures/addresses.json",
+    "test/fixtures/addresses_comma.csv",
+    "test/fixtures/addresses_pipe.csv",
+    "test/fixtures/addresses_semicolon.csv",
+    "test/fixtures/photos.json",
+    "test/fixtures/photos_comma.csv",
+    "test/fixtures/photos_pipe.csv",
+    "test/fixtures/photos_semicolon.csv",
+    "test/fixtures/population.json",
+    "test/fixtures/population_comma.csv",
+    "test/fixtures/population_pipe.csv",
+    "test/fixtures/population_semicolon.csv",
     "test/helper.rb",
-     "test/test_csv2json.rb"
+    "test/json2csv-fixtures/photos.json",
+    "test/json2csv-fixtures/photos_comma.csv",
+    "test/json2csv-fixtures/photos_pipe.csv",
+    "test/json2csv-fixtures/photos_semicolon.csv",
+    "test/test_csv2json.rb",
+    "test/test_json2csv.rb"
   ]
+  s.homepage = "http://github.com/darwin/csv2json"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.11"
+  s.summary = ".csv to .json converter"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 4
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end

data/lib/csv2json-version.rb

@@ -1,3 +1,3 @@
 module CSV2JSON
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
 end

data/lib/csv2json.rb

@@ -1,6 +1,8 @@
-require 'fastercsv'
+require 'rubygems'
+require 'csv'
 require 'json'
-require 'csv2json-version.rb'
+require 'orderedhash'
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'csv2json-version.rb')
 
 module CSV2JSON
 
@@ -11,23 +13,33 @@ module CSV2JSON
     end
 
     # input and output are file objects, you can use StringIO if you want to work in memory
-    def parse(input, output, headers=nil, options={})
+    def parse(input, output, headers=nil, csvOptions={}, gemOptions={})
         result = Array.new
 
-        FasterCSV.new(input, options).each do |row|
+        CSV.new(input, csvOptions).each do |row|
             # treat first row as headers if the caller didn't provide them
             unless headers 
                 headers = row
                 next
             end
+
+            if gemOptions[:skipFirstRow] then
+                gemOptions[:skipFirstRow] = false
+                next
+            end
             
             # build JSON snippet and append it to the result
-            snippet = Hash.new
+            snippet = OrderedHash.new
             headers.each_index { |i| snippet[headers[i]] = self.convert(row[i]) }
             result << snippet
         end
         
-        output << JSON.pretty_generate(result)
+        if gemOptions[:pretty] == true then
+            output << JSON.pretty_generate(result)
+        else
+            output << JSON.generate(result)
+        end
+
     end
     
     module_function :parse

data/lib/json2csv.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'csv'
+require 'json'
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'csv2json-version.rb')
+
+module JSON2CSV
+
+    def parse(input, output, headers=nil, csvOptions=nil)
+        json = JSON.parse(input)
+
+        unless headers
+            headers = json[0].keys
+        end
+
+        outputCSV = CSV.generate(csvOptions) do |csv|
+            csv << headers
+
+            json.each do |obj|
+                sortedValues = Array.new(headers.length)
+
+                obj.each do |key, val|
+                    headers.each_index { |i|
+                        sortedValues[i] = val if headers[i] == key
+                    }
+                end
+
+                csv << sortedValues
+            end
+        end
+        
+        output << outputCSV
+    end
+
+    module_function :parse
+    
+end

data/test/helper.rb

@@ -5,6 +5,7 @@ require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'csv2json'
+require 'json2csv'
 
 class Test::Unit::TestCase
 end

data/test/json2csv-fixtures/photos.json

@@ -0,0 +1,122 @@
+[
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_01.jpg",
+    "thumbsrc": "paris_01.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_02.jpg",
+    "thumbsrc": "paris_02.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_03.jpg",
+    "thumbsrc": "paris_03.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 56,
+    "imgsrc": "paris_04.jpg",
+    "thumbsrc": "paris_04.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 75,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 56,
+    "imgsrc": "paris_05.jpg",
+    "thumbsrc": "paris_05.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 75,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_06.jpg",
+    "thumbsrc": "paris_06.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 56,
+    "imgsrc": "paris_07.jpg",
+    "thumbsrc": "paris_07.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 75,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 56,
+    "imgsrc": "paris_08.jpg",
+    "thumbsrc": "paris_08.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 75,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 56,
+    "imgsrc": "paris_09.jpg",
+    "thumbsrc": "paris_09.jpg",
+    "height": 350,
+    "imgpath": "images/",
+    "thumbheight": 75,
+    "thumbpath": "thumbnails/",
+    "width": 262
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_10.jpg",
+    "thumbsrc": "paris_10.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_11.jpg",
+    "thumbsrc": "paris_11.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  },
+  {
+    "thumbwidth": 75,
+    "imgsrc": "paris_12.jpg",
+    "thumbsrc": "paris_12.jpg",
+    "height": 262,
+    "imgpath": "images/",
+    "thumbheight": 56,
+    "thumbpath": "thumbnails/",
+    "width": 350
+  }
+]

data/test/json2csv-fixtures/photos_comma.csv

@@ -0,0 +1,13 @@
+thumbpath,imgpath,imgsrc,width,height,thumbsrc,thumbwidth,thumbheight
+thumbnails/,images/,paris_01.jpg,350,262,paris_01.jpg,75,56
+thumbnails/,images/,paris_02.jpg,262,350,paris_02.jpg,75,56
+thumbnails/,images/,paris_03.jpg,350,262,paris_03.jpg,75,56
+thumbnails/,images/,paris_04.jpg,262,350,paris_04.jpg,56,75
+thumbnails/,images/,paris_05.jpg,262,350,paris_05.jpg,56,75
+thumbnails/,images/,paris_06.jpg,350,262,paris_06.jpg,75,56
+thumbnails/,images/,paris_07.jpg,262,350,paris_07.jpg,56,75
+thumbnails/,images/,paris_08.jpg,262,350,paris_08.jpg,56,75
+thumbnails/,images/,paris_09.jpg,262,350,paris_09.jpg,56,75
+thumbnails/,images/,paris_10.jpg,350,262,paris_10.jpg,75,56
+thumbnails/,images/,paris_11.jpg,350,262,paris_11.jpg,75,56
+thumbnails/,images/,paris_12.jpg,350,262,paris_12.jpg,75,56

data/test/json2csv-fixtures/photos_pipe.csv

@@ -0,0 +1,13 @@
+thumbpath|imgpath|imgsrc|width|height|thumbsrc|thumbwidth|thumbheight
+thumbnails/|images/|paris_01.jpg|350|262|paris_01.jpg|75|56
+thumbnails/|images/|paris_02.jpg|262|350|paris_02.jpg|75|56
+thumbnails/|images/|paris_03.jpg|350|262|paris_03.jpg|75|56
+thumbnails/|images/|paris_04.jpg|262|350|paris_04.jpg|56|75
+thumbnails/|images/|paris_05.jpg|262|350|paris_05.jpg|56|75
+thumbnails/|images/|paris_06.jpg|350|262|paris_06.jpg|75|56
+thumbnails/|images/|paris_07.jpg|262|350|paris_07.jpg|56|75
+thumbnails/|images/|paris_08.jpg|262|350|paris_08.jpg|56|75
+thumbnails/|images/|paris_09.jpg|262|350|paris_09.jpg|56|75
+thumbnails/|images/|paris_10.jpg|350|262|paris_10.jpg|75|56
+thumbnails/|images/|paris_11.jpg|350|262|paris_11.jpg|75|56
+thumbnails/|images/|paris_12.jpg|350|262|paris_12.jpg|75|56

data/test/json2csv-fixtures/photos_semicolon.csv

@@ -0,0 +1,13 @@
+thumbpath;imgpath;imgsrc;width;height;thumbsrc;thumbwidth;thumbheight
+thumbnails/;images/;paris_01.jpg;350;262;paris_01.jpg;75;56
+thumbnails/;images/;paris_02.jpg;262;350;paris_02.jpg;75;56
+thumbnails/;images/;paris_03.jpg;350;262;paris_03.jpg;75;56
+thumbnails/;images/;paris_04.jpg;262;350;paris_04.jpg;56;75
+thumbnails/;images/;paris_05.jpg;262;350;paris_05.jpg;56;75
+thumbnails/;images/;paris_06.jpg;350;262;paris_06.jpg;75;56
+thumbnails/;images/;paris_07.jpg;262;350;paris_07.jpg;56;75
+thumbnails/;images/;paris_08.jpg;262;350;paris_08.jpg;56;75
+thumbnails/;images/;paris_09.jpg;262;350;paris_09.jpg;56;75
+thumbnails/;images/;paris_10.jpg;350;262;paris_10.jpg;75;56
+thumbnails/;images/;paris_11.jpg;350;262;paris_11.jpg;75;56
+thumbnails/;images/;paris_12.jpg;350;262;paris_12.jpg;75;56

data/test/test_csv2json.rb

@@ -1,20 +1,25 @@
 require 'helper'
-require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'csv2json.rb') # this form is important for local development
 
 class TestCsv2json < Test::Unit::TestCase
     SEPS = {:comma => ',', :pipe => '|', :semicolon => ';'}
+
     should "parse some test files" do
         fixtures_dir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+
         Dir.chdir(fixtures_dir) do
             Dir.glob('*.csv') do |filename|
                 filename_parts = File.basename(filename, ".csv").split('_')
                 json_template = filename_parts[0] + '.json'
+
+                print "Testing csv2json against #{filename}\n"
+
                 File.open(filename, "r") do |input|
                     output = StringIO.new()
-                    CSV2JSON.parse(input, output, nil, :col_sep => SEPS[filename_parts[1].to_sym] )
+                    CSV2JSON.parse(input, output, nil, {:col_sep => SEPS[filename_parts[1].to_sym]}, {:pretty => true} )
                     template = File.read(json_template)
+
                     output.pos = 0
-                    assert template == output.read
+                    assert JSON.parse(template) == JSON.parse(output.read), "Content doesn't match"
                 end
             end
         end

data/test/test_json2csv.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+class TestJson2Csv < Test::Unit::TestCase
+    SEPS = {:comma => ',', :pipe => '|', :semicolon => ';'}
+
+    should "parse some test files" do
+        fixtures_dir = File.expand_path(File.join(File.dirname(__FILE__), 'json2csv-fixtures'))
+
+        Dir.chdir(fixtures_dir) do
+            Dir.glob('*.json') do |filename|
+                basename = File.basename(filename, ".json")
+
+                print "Testing json2csv against #{filename}\n"
+
+                SEPS.each do |key, val|
+                    template = "#{basename}_#{key.to_sym}.csv"
+                    print "   ... for comparison with #{template} "
+                    headers = ['thumbpath','imgpath','imgsrc','width','height','thumbsrc','thumbwidth','thumbheight']
+
+                    input = File.read(filename)
+                    output = StringIO.new()
+                    JSON2CSV.parse(input, output, headers, {:col_sep => val} )
+
+                    output.pos = 0
+                    fileToCompareTo = File.read(template)
+                    assert_equal output.read.strip, fileToCompareTo.strip
+                    print "OK\n"
+                end
+            end
+        end
+    end
+end

metadata

@@ -1,78 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: csv2json
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Antonin Hildebrand
 - Rafael Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-14 00:00:00 +01:00
-default_executable: csv2json
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: handy for converting xls files to json
 email: antonin@hildebrand.cz
-executables: 
+executables:
 - csv2json
+- json2csv
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
 - bin/csv2json
+- bin/json2csv
 - csv2json.gemspec
 - lib/csv2json-version.rb
 - lib/csv2json.rb
+- lib/json2csv.rb
 - test/fixtures/addresses.json
 - test/fixtures/addresses_comma.csv
 - test/fixtures/addresses_pipe.csv
@@ -86,37 +72,33 @@ files:
 - test/fixtures/population_pipe.csv
 - test/fixtures/population_semicolon.csv
 - test/helper.rb
+- test/json2csv-fixtures/photos.json
+- test/json2csv-fixtures/photos_comma.csv
+- test/json2csv-fixtures/photos_pipe.csv
+- test/json2csv-fixtures/photos_semicolon.csv
 - test/test_csv2json.rb
-has_rdoc: true
+- test/test_json2csv.rb
 homepage: http://github.com/darwin/csv2json
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: .csv to .json converter
-test_files: 
-- test/helper.rb
-- test/test_csv2json.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC