jpp 1.0.0 → 1.1.0

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/bentonporter/jpp.png?branch=master)](https://travis-ci.org/bentonporter/jpp)
+
 jpp
 ===
 
@@ -16,8 +18,9 @@ Or pretty-print JSON from a file:
     
 More usage:
 
-    >> jpp -h                                                                                                                                    benton.porter@bhollis-mbpro
+    >> jpp -h
     Usage: jpp [options] file
+        -i, --indent N                   Number of spaces to indent (default: 2) 
         -s, --sort                       Sort json alphabetically by key
         -v, --version                    Show version
 
@@ -35,4 +38,4 @@ To build and run locally:
 
     git clone git@github.com:bentonporter/jpp.git
     cd jpp
-    gem build jpp.gemspec && gem install jpp-1.0.0.gem
+    gem build jpp.gemspec && gem install jpp-1.1.0.gem

data/Rakefile

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/bin/jpp

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'jpp'
-Jpp.new.main
+Jpp::Jpp.new.main

data/ext/hash.rb

@@ -1,8 +1,10 @@
 class Hash
   def sort_by_key(&block)
-    self.keys.sort(&block).reduce({}) do |seed, key|
-      seed[key] = self[key]
-      seed
+    sorted = {}
+    self.keys.sort(&block).each do |key|
+      value = self[key]
+      sorted[key] = value.is_a?(Hash) ? value.sort_by_key(&block) : value
     end
+    sorted
   end
 end

data/lib/jpp.rb

@@ -1,44 +1,21 @@
 require 'json'
-require 'optparse'
-require 'ostruct'
 require 'hash'
-
-class Jpp
-  VERSION = '1.0.0'
-
-  def main()
-    # Set default values
-    options = OpenStruct.new
-    options.indent = 2
-    options.sort = false
-
-    parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: jpp [options] file'
-
-      opts.on('-i', '--indent N', Integer, "Number of spaces to indent (default: #{options.indent}) ") do |i|
-        options.indent = i
-      end
-
-      opts.on('-s', '--sort', 'Sort json alphabetically by key') do |s|
-        options.sort = s
-      end
-
-      opts.on('-v', '--version', 'Show version') do |v|
+require 'jpp/command_line'
+
+module Jpp
+  class Jpp
+    def main()
+      options = CommandLine.parse(ARGV)
+      
+      if (options.version) 
         puts VERSION
         exit
       end
-    end
 
-    begin parser.parse!
-    rescue OptionParser::ParseError => message
-      puts message
-      puts parser
-      exit 1
+      input = JSON.load(ARGF.read)
+      input = input.sort_by_key() if options.sort and input.is_a?(Hash)       # TODO support sorting hashes within an array
+      output = JSON.pretty_generate(input, :indent => ' ' * options.indent)
+      puts output
     end
-
-    input = JSON.load(ARGF.read)
-    input = input.sort_by_key() if options.sort
-    output = JSON.pretty_generate(input, :indent => ' ' * options.indent)
-    puts output
   end
 end

data/lib/jpp/command_line.rb

@@ -0,0 +1,39 @@
+require 'optparse'
+require 'ostruct'
+require 'jpp/version'
+
+module Jpp
+  class CommandLine
+    def self.parse(args)
+      options = OpenStruct.new
+      options.indent = 2
+      options.sort = false
+      options.version = false
+
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: jpp [options] file'
+
+        opts.on('-i', '--indent N', Integer, "Number of spaces to indent (default: #{options.indent}) ") do |i|
+          options.indent = i
+        end
+
+        opts.on('-s', '--sort', 'Sort json alphabetically by key') do |s|
+          options.sort = s
+        end
+
+        opts.on('-v', '--version', 'Show version') do |v|
+          options.version = v
+        end
+      end
+
+      begin parser.parse!(args)
+      rescue OptionParser::ParseError => message
+        puts message
+        puts parser
+        exit 1        # TODO throw/propagate and let Jpp::Jpp exit 
+      end  
+
+      options
+    end
+  end
+end

data/lib/jpp/version.rb

@@ -0,0 +1,3 @@
+module Jpp
+  VERSION = '1.1.0'
+end

data/test/test_command_line.rb

@@ -0,0 +1,36 @@
+require 'test/unit'
+require 'jpp/command_line'
+
+class TestCommandLine < Test::Unit::TestCase
+
+  def test_default_sort
+    options = Jpp::CommandLine.parse([])      
+    assert !options.sort
+  end
+
+  def test_default_indent
+    options = Jpp::CommandLine.parse([])      
+    assert_equal 2, options.indent
+  end
+
+  def test_default_version
+    options = Jpp::CommandLine.parse([])      
+    assert !options.version
+  end
+
+  def test_sort
+    options = Jpp::CommandLine.parse(['-s'])      
+    assert options.sort
+  end
+
+  def test_indent
+    options = Jpp::CommandLine.parse(['-i', '3'])      
+    assert_equal 3, options.indent
+  end
+
+  def test_version
+    options = Jpp::CommandLine.parse(['-v'])      
+    assert options.version    
+  end
+
+end

data/test/test_hash.rb

@@ -0,0 +1,69 @@
+$:.unshift File.expand_path("../../ext", __FILE__)
+require 'test/unit'
+require 'hash'
+
+class TestHash < Test::Unit::TestCase
+
+  def test_that_it_sorts_strings
+    orig = {
+      'zoo' => 1,
+      'apple' => 2,
+      'pizza' => 3
+    }
+
+    sorted = orig.sort_by_key
+    assert_equal ['apple', 'pizza', 'zoo'], sorted.keys
+  end
+
+  def test_that_it_sorts_integers
+    orig = {
+      4 => 1,
+      1 => 2,
+      3 => 3
+    }
+
+    sorted = orig.sort_by_key
+    assert_equal [1, 3, 4], sorted.keys
+  end
+
+  def test_that_it_sorts_special_chars
+    orig = {
+      'aaa' => 1,
+      '~ccc' => 2,
+      'zzz' => 3
+    }
+
+    sorted = orig.sort_by_key
+    assert_equal ['aaa', 'zzz', '~ccc'], sorted.keys
+  end
+
+  def test_that_it_sorts_nested_hashes
+    orig = {
+      'bob' => 5,
+      'anne' => {
+        'fred' => 1,
+        'catherine' => 9
+      }
+    }
+
+    sorted = orig.sort_by_key
+    assert_equal ['anne', 'bob'], sorted.keys
+    assert_equal ['catherine', 'fred'], sorted['anne'].keys
+  end
+
+  # This is not currently supported, so might as well verify the expected behavior
+  def test_that_hashes_inside_an_array_are_not_sorted
+    orig = {
+      'horse' => 5,
+      'frog' => [{
+        'zebra' => 1,
+        'lion' => 9
+      }]
+    }
+
+    sorted = orig.sort_by_key
+    assert_equal ['frog', 'horse'], sorted.keys
+    assert_equal ['zebra', 'lion'], sorted['frog'].first.keys
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,11 +34,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - bin/jpp
 - ext/hash.rb
+- lib/jpp/command_line.rb
+- lib/jpp/version.rb
 - lib/jpp.rb
-- LICENSE.md
+- test/test_command_line.rb
+- test/test_hash.rb
 - README.md
+- LICENSE.md
 homepage: https://github.com/bentonporter/jpp
 licenses: []
 post_install_message: