jazor 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -0,0 +1,24 @@
+= Change Log
+
+== 0.1.1 (2011-08-24)
+
+* Added sort option (Dan Hopkins)
+
+== 0.1.0 (2011-08-23)
+
+* Code refactoring
+* Documentation rewrite
+* Changed test option to a switch that operates on all expressions
+
+== 0.0.4 (2011-01-25)
+
+* Print help summary on absence of input
+* Bug fixes
+
+== 0.0.3 (2011-01-25)
+
+* Bug fixes
+
+== 0.0.2 (2011-01-24)
+
+* Initial public release

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 Michael T. Conigliaro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Jazor
 
-Jazor (rhymes with "razor") is a simple command line JSON parsing tool.
+Jazor (JSON + razor) is a simple command line JSON parsing tool.
 
 == Installation
 
@@ -63,6 +63,10 @@ scripts.
   $ jazor '["a", "b", "c"]' self.count
   3
 
-== Author
+== Authors
 
-Michael T. Conigliaro <mike [at] conigliaro [dot] org>
+* Michael T. Conigliaro <mike [at] conigliaro [dot] org>
+
+== Contributers
+
+* {Daniel Hopkins}[https://github.com/danielhopkins]

data/bin/jazor

@@ -40,6 +40,12 @@ OptionParser.new do |opts|
     options[:rest_request] = opt
   end
 
+  if Jazor::HAS_ORDERED_HASH
+    opts.on('-s', '--sort', "Sort output") do
+      options[:sort] = true
+    end
+  end
+
   opts.on_tail('-h', '--help', 'Show this message') do
     puts opts.help
     exit
@@ -74,6 +80,14 @@ begin
     end
   end
 
+  if options[:sort] && obj.respond_to?(:sort)
+    obj = if obj.respond_to?(:keys) && obj.respond_to?(:values)
+      Hash[obj.sort]
+    else
+      obj.sort{ |a,b| a.to_s <=> b.to_s }
+    end
+  end
+
   (ARGV.length > 0 ? ARGV[0..ARGV.length] : [nil]).each do |expression|
     result = expression.nil? ? obj : obj.instance_eval(expression)
     if options[:test]

data/lib/jazor.rb

@@ -10,15 +10,17 @@ require 'json'
 module Jazor
 
   NAME         = 'jazor'
-  VERSION      = '0.1.0'
+  VERSION      = '0.1.1'
   AUTHOR       = 'Michael T. Conigliaro'
   AUTHOR_EMAIL = 'mike [at] conigliaro [dot] org'
-  DESCRIPTION  = 'Jazor is a simple command line JSON parsing tool'
+  DESCRIPTION  = 'Jazor (JSON + razor) is a simple command line JSON parsing tool.'
   URL          = 'http://github.com/mconigliaro/jazor'
 
   LOG = Logger.new(STDOUT)
   LOG.level = Logger::INFO
 
+  HAS_ORDERED_HASH = (RUBY_VERSION.split('.').map(&:to_i) <=> [1, 9, 1]) >= 0
+
   def self.parse(input=nil)
     # FIXME: https://github.com/flori/json/issues/16
     obj = (JSON.parse(input) rescue false) || (Integer(input) rescue false) || (Float(input) rescue false) || String(input)

data/test/test_jazor_bin.rb

@@ -43,4 +43,17 @@ class TestExecute < Test::Unit::TestCase
     assert `#{@jazor_bin} -t #{@init_file} 'value1==1234'` =~ /failed/
   end
 
+  def test_sorting
+    if Jazor::HAS_ORDERED_HASH
+      {
+        '[3, 2, 1]'          => [1, 2, 3],
+        '["foo", "bar", 1]'  => [1, 'bar', 'foo'],
+        '{"foo":1, "bar":2}' => {'bar' => 2, 'foo' => 1},
+        '{"1":1, "bar":2}'   => {'1' => 1, 'bar' => 2}
+      }.each do |k,v|
+        assert JSON.parse(`#{@jazor_bin} -s '#{k}'`) == v
+      end
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jazor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael T. Conigliaro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -34,7 +34,7 @@ dependencies:
 description: |
   = Jazor
   
-  Jazor (rhymes with "razor") is a simple command line JSON parsing tool.
+  Jazor (JSON + razor) is a simple command line JSON parsing tool.
   
   == Installation
   
@@ -97,12 +97,15 @@ description: |
     $ jazor '["a", "b", "c"]' self.count
     3
   
-  == Author
+  == Authors
+  
+  * Michael T. Conigliaro <mike [at] conigliaro [dot] org>
+  
+  == Contributers
   
-  Michael T. Conigliaro <mike [at] conigliaro [dot] org>
+  * {Daniel Hopkins}[https://github.com/danielhopkins]
 
-email: 
-- mike [at] conigliaro [dot] org
+email: mike [at] conigliaro [dot] org
 executables: 
 - jazor
 extensions: []
@@ -110,7 +113,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- COPYING.txt
+- CHANGELOG.rdoc
+- LICENSE
 - Rakefile
 - README.rdoc
 - bin/jazor
@@ -151,6 +155,6 @@ rubyforge_project: jazor
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Jazor is a simple command line JSON parsing tool
+summary: Jazor (JSON + razor) is a simple command line JSON parsing tool.
 test_files: []
 

data/COPYING.txt

@@ -1,23 +0,0 @@
-# Copyright (C) 2011 by Michael T. Conigliaro. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# No portion of this Software shall be used in any application which does not
-# use the ReportGrid platform to provide some subset of its functionality.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#