jazor 0.1.4 → 0.1.5

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "json"
+gem "term-ansicolor"
 
 group :development do
   gem "rake"

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    term-ansicolor (1.0.7)
 
 PLATFORMS
   ruby
@@ -20,3 +21,4 @@ DEPENDENCIES
   json
   rake
   rspec
+  term-ansicolor

data/README.md

@@ -68,6 +68,11 @@ scripts.
 
 ## Change Log
 
+### 0.1.5 (2012-03-23)
+
+* Add --colorize option
+* Bug fixes
+
 ### 0.1.4 (2012-03-05)
 
 * Add --quirks-mode option

data/bin/jazor

@@ -8,6 +8,7 @@ require "jazor"
 
 options = {
   :quirks_mode  => false,
+  :colorize     => false,
   :test         => false,
   :rest_data    => {},
   :rest_headers => {},
@@ -28,6 +29,10 @@ OptionParser.new do |opts|
     options[:rest_headers][key.strip] = value.strip
   end
 
+  opts.on("-c", "--colorize", "Colorize output") do |opt|
+    options[:colorize] = true
+  end
+
   opts.on("-t", "--test", "Enable expression testing") do |opt|
     options[:test] = true
   end
@@ -76,7 +81,7 @@ begin
     Jazor::LOG.debug("Reading JSON from STDIN")
     Jazor::parse(STDIN.read, parse_options)
   elsif !ARGV[0].nil?
-    if ARGV[0] =~ URI::regexp
+    if ARGV[0] =~ /^#{URI::regexp}$/
       Jazor::LOG.debug("Reading JSON from URI: #{ARGV[0]}")
       Jazor::parse(Jazor::RestClient.send(options[:rest_request], ARGV.shift, options[:rest_headers], options[:rest_data]).body, parse_options)
     elsif File.readable?(ARGV[0])
@@ -108,7 +113,7 @@ begin
       end
     else
       if [Hash, Array].include?(result.class)
-        puts JSON.pretty_generate(result)
+        puts options[:colorize] ? Jazor::colorize(JSON.pretty_generate(result)) : JSON.pretty_generate(result)
       elsif result.is_a?(String)
         puts "\"#{result}\""
       else

data/lib/jazor.rb

@@ -6,12 +6,13 @@ require "logger"
 require "net/http"
 require "net/https"
 require "pp"
+require "term/ansicolor"
 require "uri"
 
 module Jazor
 
   NAME         = "jazor"
-  VERSION      = "0.1.4"
+  VERSION      = "0.1.5"
   AUTHOR       = "Michael Paul Thomas Conigliaro"
   AUTHOR_EMAIL = "mike [at] conigliaro [dot] org"
   DESCRIPTION  = "Jazor (JSON razor) is a simple command line JSON parsing tool."
@@ -34,6 +35,15 @@ module Jazor
     result
   end
 
+  def self.colorize(input)
+    input = input.gsub(/"(.*)":/, "\\1:".bold) # Key
+    input = input.gsub(/"(#{URI::regexp})"/i, "\\1".magenta.underline) # URL
+    input = input.gsub(/"(.*)"/, "\"\\1\"".green) # String
+    input = input.gsub(/(\s+[-+]?\d*\.?\d+)(,?)$/, "\\1".cyan + "\\2") # Numeric
+    input = input.gsub(/(\s+(true|false))(,?)$/, "\\1".blue + "\\3") # Boolean
+    input = input.gsub(/(\s+null)(,?)$/, "\\1".red + "\\2") # Null
+  end
+
   class RestClient
     def self.method_missing(method, uri, headers={}, data={})
       uri_parsed = URI.parse(uri)
@@ -67,3 +77,7 @@ class Hash
     end
   end
 end
+
+class String
+  include Term::ANSIColor
+end

data/spec/jazor_lib_spec.rb

@@ -5,7 +5,7 @@ describe "Jazor lib" do
     @test_hash = JSON.parse(@test_file)
   end
 
-  %w{String Integer Float TrueClass FalseClass Array}.each do |t|
+  %w{String Integer Float TrueClass FalseClass NilClass Array}.each do |t|
     it "parses #{t} values in the root object" do
       obj = Jazor::parse(@test_file)["test_#{t}"]
       obj.should be_a Kernel.const_get(t)

data/spec/test.json

@@ -1,8 +1,10 @@
 {
   "test_String":     "123",
+  "test_String_URL": "http://example.com",
   "test_Integer":    123,
   "test_Float":      0.123,
   "test_TrueClass":  true,
   "test_FalseClass": false,
+  "test_Nilclass":   null,
   "test_Array":      [1, 2, 3]
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jazor
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153832180 !ruby/object:Gem::Requirement
+  requirement: &2152522020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153832180
+  version_requirements: *2152522020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153831560 !ruby/object:Gem::Requirement
+  requirement: &2152520240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153831560
+  version_requirements: *2152520240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153830560 !ruby/object:Gem::Requirement
+  requirement: &2152517740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153830560
+  version_requirements: *2152517740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153828820 !ruby/object:Gem::Requirement
+  requirement: &2152531100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153828820
+  version_requirements: *2152531100
 description: Jazor (JSON razor) is a simple command line JSON parsing tool.
 email: mike [at] conigliaro [dot] org
 executables:
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 607493245767784991
+      hash: -2127171486780227476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: