jazor 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = Change Log
 
+== 0.1.3 (2011-12-13)
+
+* Handle HTTPS URLs
+* Use .rvmrc and Bundler in project
+* Convert tests from Test::Unit to RSpec
+
 == 0.1.2 (2011-08-24)
 
 * Apply sort after evaluating expression

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011 Michael T. Conigliaro
+Copyright (C) 2011 Michael Paul Thomas 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

data/README.rdoc

@@ -1,6 +1,6 @@
 = Jazor
 
-Jazor (JSON + razor) is a simple command line JSON parsing tool.
+Jazor (JSON razor) is a simple command line JSON parsing tool.
 
 == Installation
 
@@ -54,18 +54,21 @@ scripts.
   $ jazor '{ "foo": "abc", "bar": [1, 2, 3] }' 'bar.inject { |memo,obj| memo + obj }'
   6
 
-  $ jazor '[1, 2, 3, 4, 5]' 'select { |obj| obj.even? }'
+  $ jazor '[1, 2, 3, 4, 5]' 'select(&:even?)'
   [2, 4]
 
-  $ jazor '[1, 2, 3, 4, 5]' 'select { |obj| obj.odd? }'
+  $ jazor '[1, 2, 3, 4, 5]' 'select(&:odd?)'
   [1, 3, 5]
 
-  $ jazor '["a", "b", "c"]' self.count
-  3
+  $ jazor '["a", "b", "c", "d", "e"]' 'self[1..3]'
+  ["b", "c", "d"]
+
+  $ jazor '[1, 2, 3, 4, 5]' "'odds=%s; evens=%s' % [select(&:odd?).join(','), select(&:even?).join(',')]"
+  odds=1,3,5; evens=2,4
 
 == Authors
 
-* Michael T. Conigliaro <mike [at] conigliaro [dot] org>
+* Michael Paul Thomas Conigliaro <mike [at] conigliaro [dot] org>
 
 == Contributers
 

data/Rakefile

@@ -1,15 +1,15 @@
-task :default => [:test]
+require 'rspec/core/rake_task'
 
-task :test do
-  Dir[File.expand_path(File.join(File.dirname(__FILE__), 'test', 'test_*'))].each do |test|
-    system "ruby -I #{File.expand_path(File.join(File.dirname(__FILE__), 'lib'))} #{test}"
-  end
-end
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
 
+desc 'Build the gem'
 task :build do
   system "gem build *.gemspec"
 end
 
+desc 'Push the gem'
 task :push do
   system "gem push *.gem"
 end

data/bin/jazor

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
 require 'fcntl'
+require 'optparse'
 
 $:.push File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'jazor'

data/lib/jazor.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'net/http'
+require 'net/https'
 require 'pp'
 require 'uri'
 
@@ -10,10 +11,10 @@ require 'json'
 module Jazor
 
   NAME         = 'jazor'
-  VERSION      = '0.1.2'
-  AUTHOR       = 'Michael T. Conigliaro'
+  VERSION      = '0.1.3'
+  AUTHOR       = 'Michael Paul Thomas Conigliaro'
   AUTHOR_EMAIL = 'mike [at] conigliaro [dot] org'
-  DESCRIPTION  = 'Jazor (JSON + razor) 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)
@@ -38,6 +39,10 @@ module Jazor
     def self.method_missing(method, uri, headers={}, data={})
       uri_parsed = URI.parse(uri)
       http = Net::HTTP.new(uri_parsed.host, port=uri_parsed.port)
+      if uri_parsed.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
       request_uri = uri_parsed.query ? "#{uri_parsed.path}?#{uri_parsed.query}" : uri_parsed.path
       request = Net::HTTP.const_get(method.to_s.capitalize).new(request_uri)
       headers.each { |k,v| request.add_field(k, v) }

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: jazor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
-- Michael T. Conigliaro
+- Michael Paul Thomas Conigliaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152331680 !ruby/object:Gem::Requirement
+  requirement: &2151885000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152331680
-description: Jazor (JSON + razor) is a simple command line JSON parsing tool.
+  version_requirements: *2151885000
+description: Jazor (JSON razor) is a simple command line JSON parsing tool.
 email: mike [at] conigliaro [dot] org
 executables:
 - jazor
@@ -35,10 +35,6 @@ files:
 - README.rdoc
 - bin/jazor
 - lib/jazor.rb
-- test/test.json
-- test/test_jazor.rb
-- test/test_jazor_bin.rb
-- test/test_rest_client.rb
 homepage: http://github.com/mconigliaro/jazor
 licenses: []
 post_install_message: 
@@ -59,8 +55,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jazor
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Jazor (JSON + razor) is a simple command line JSON parsing tool.
+summary: Jazor (JSON razor) is a simple command line JSON parsing tool.
 test_files: []

data/test/test.json

@@ -1,32 +0,0 @@
-{
-  "value0": "test",
-  "value1": 123,
-  "value2": 0.123,
-  "array_of_values" : [1, 2, 3],
-  "array_of_arrays" : [
-    [1, 2, 3],
-    [1, 2, 3],
-    [1, 2, 3]
-  ],
-  "array_of_objects": [
-    {"object0":1},
-    {"object1":2},
-    {"object2":3}
-  ],
-  "nested_object": {
-    "value0": "test",
-    "value1": 123,
-    "value2": 0.123,
-    "array_of_values" : [1, 2, 3],
-    "array_of_arrays" : [
-      [1, 2, 3],
-      [1, 2, 3],
-      [1, 2, 3]
-    ],
-    "array_of_objects": [
-      {"object0":0},
-      {"object1":1},
-      {"object2":2}
-    ]
-  }
-}

data/test/test_jazor.rb

@@ -1,57 +0,0 @@
-require 'test/unit'
-
-class TestExecute < Test::Unit::TestCase
-
-  def setup
-    require 'jazor'
-
-    @init_json = IO.read(File.expand_path(File.join(File.dirname(__FILE__), 'test.json')))
-    @init_hash = JSON.parse(@init_json)
-  end
-
-  def test_root_object
-    assert Jazor::parse(@init_json).is_a?(Hash)
-    assert Jazor::parse(@init_json) == @init_hash
-  end
-
-  def test_values
-    assert Jazor::parse(@init_json).value0.is_a?(String)
-    assert Jazor::parse(@init_json).value1.is_a?(Integer)
-    assert Jazor::parse(@init_json).value2.is_a?(Float)
-    (0..2).each do |i|
-      assert Jazor::parse(@init_json).send("value#{i}") == @init_hash["value#{i}"]
-    end
-  end
-
-  def test_array_of_values
-    assert Jazor::parse(@init_json).array_of_values.is_a?(Array)
-    assert Jazor::parse(@init_json).array_of_values == @init_hash['array_of_values']
-    (0...Jazor::parse(@init_json).array_of_values.length).each do |i|
-      assert Jazor::parse(@init_json).array_of_values[i].is_a?(Integer)
-      assert Jazor::parse(@init_json).array_of_values[i] == @init_hash["array_of_values"][i]
-    end
-  end
-
-  def test_array_of_arrays
-    assert Jazor::parse(@init_json).array_of_arrays.is_a?(Array)
-    (0...Jazor::parse(@init_json).array_of_arrays.length).each do |i|
-      assert Jazor::parse(@init_json).array_of_arrays[i].is_a?(Array)
-      assert Jazor::parse(@init_json).array_of_arrays[i] == @init_hash['array_of_arrays'][i]
-      (0...Jazor::parse(@init_json).array_of_arrays[i].length).each do |j|
-        assert Jazor::parse(@init_json).array_of_arrays[i][j].is_a?(Integer)
-        assert Jazor::parse(@init_json).array_of_arrays[i][j] == @init_hash['array_of_arrays'][i][j]
-      end
-    end
-  end
-
-  def test_array_of_objects
-    assert Jazor::parse(@init_json).array_of_objects.is_a?(Array)
-    (0...Jazor::parse(@init_json).array_of_objects.length).each do |i|
-      assert Jazor::parse(@init_json).array_of_objects[i].is_a?(Hash)
-      assert Jazor::parse(@init_json).array_of_objects[i] == @init_hash['array_of_objects'][i]
-      assert Jazor::parse(@init_json).array_of_objects[i].send("object#{i}").is_a?(Integer)
-      assert Jazor::parse(@init_json).array_of_objects[i].send("object#{i}") == @init_hash['array_of_objects'][i]["object#{i}"]
-    end
-  end
-
-end

data/test/test_jazor_bin.rb

@@ -1,59 +0,0 @@
-require 'test/unit'
-
-class TestExecute < Test::Unit::TestCase
-
-  def setup
-    require 'jazor'
-
-    @init_url    = 'http://github.com/api/v2/json/commits/list/mconigliaro/jazor/master'
-    @init_file   = File.expand_path(File.join(File.dirname(__FILE__), 'test.json'))
-    @init_string = IO.read(@init_file)
-    @jazor_bin   = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'jazor'))
-  end
-
-  def test_without_paramaters
-    assert `#{@jazor_bin}` =~ /Usage:/
-  end
-
-  def test_json_from_stdin
-    assert JSON.parse(`cat #{@init_file} | #{@jazor_bin}`).is_a?(Hash)
-  end
-
-  def test_json_from_url
-    assert JSON.parse(`#{@jazor_bin} '#{@init_url}'`).is_a?(Hash)
-  end
-
-  def test_json_from_file
-    assert JSON.parse(`#{@jazor_bin} #{@init_file}`).is_a?(Hash)
-  end
-
-  def test_json_from_argv
-    assert JSON.parse(`#{@jazor_bin} '#{@init_string}'`).is_a?(Hash)
-  end
-
-  def test_json_from_file_with_expression
-    assert eval(`#{@jazor_bin} #{@init_file} value1`).is_a?(Integer)
-    assert JSON.parse(`#{@jazor_bin} #{@init_file} nested_object`).is_a?(Hash)
-    assert JSON.parse(`#{@jazor_bin} #{@init_file} nested_object.array_of_values`).is_a?(Array)
-    assert eval(`#{@jazor_bin} #{@init_file} dontexist`).nil?
-  end
-
-  def test_json_from_file_with_tests
-    assert `#{@jazor_bin} -t #{@init_file} 'value1==123'` =~ /passed/
-    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

data/test/test_rest_client.rb

@@ -1,19 +0,0 @@
-require 'test/unit'
-
-class TestExecute < Test::Unit::TestCase
-
-  def test_get
-    require 'jazor'
-
-    response = Jazor::RestClient.get('http://ajax.googleapis.com/ajax/services/search/web')
-    assert response.code == '200'
-    assert response.body =~ /"responseStatus": 400/
-  end
-
-  def test_get_with_query_string
-    response = Jazor::RestClient.get('http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=jazor')
-    assert response.code == '200'
-    assert response.body =~ /"responseStatus": 200/
-  end
-
-end