jazor 0.0.2 → 0.0.3

data/README.rdoc

@@ -30,3 +30,7 @@ Jazor is a simple command line JSON parsing tool.
 ==== Testing the value of a JSON "slice"
 
   jazor 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=jazor' -t 'responseData.results.is_a?(Array)'
+
+=== Help
+
+  jazor --help

data/bin/jazor

@@ -41,6 +41,21 @@ module Jazor
     opts.on('-X', '--request REQUEST', 'REST request method (default: %s)' % options[:rest_request]) do |opt|
       options[:rest_request] = opt
     end
+
+    opts.on_tail('-h', '--help', 'Show this message') do
+      puts opts.help
+      exit
+    end
+
+    opts.on_tail('--version', 'Show version') do
+      puts "%s %s\n%s <%s>\n%s" % [opts.program_name, opts.version, AUTHOR, AUTHOR_EMAIL, URL]
+      exit
+    end
+
+    if ARGV.length == 0 && STDIN.fcntl(Fcntl::F_GETFL, 0) != 0
+      puts opts.help
+      exit(1)
+    end
   end.parse!
 
   begin

data/lib/jazor.rb

@@ -1,14 +1,14 @@
 require 'json'
 require 'logger'
+require 'net/http'
 require 'pp'
-
-require 'rest_client'
+require 'uri'
 
 
 module Jazor
 
   NAME = 'jazor'
-  VERSION_INFO = ['0', '0', '2']
+  VERSION_INFO = ['0', '0', '3']
   VERSION = VERSION_INFO.join('.')
   AUTHOR = 'Michael T. Conigliaro'
   AUTHOR_EMAIL = 'mike [at] conigliaro [dot] org'
@@ -41,6 +41,25 @@ module Jazor
 
   end
 
+  class RestClient
+
+    def self.method_missing(method, uri, headers={}, data={})
+      uri_parsed = URI.parse(uri)
+      http = Net::HTTP.new(uri_parsed.host, port=uri_parsed.port)
+      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) }
+      request.set_form_data(data)
+
+      LOG.debug('%s %s: uri=%s headers=%s data=%s' % [self, method.to_s.upcase, File.join(uri_parsed.host, request_uri), headers.to_json, data.to_json])
+      response = http.request(request)
+      LOG.debug('%s result: code=%d body=%s' % [self, response.code, response.body.gsub("\r", ' ').gsub("\n", ' ')])
+
+      response
+    end
+
+  end
+
 end
 
 class Hash

data/test/test_jazor_bin.rb

@@ -14,7 +14,7 @@ class TestExecute < Test::Unit::TestCase
   end
 
   def test_without_paramaters
-    assert eval(`#{@jazor_bin}`).nil?
+    assert `#{@jazor_bin}` =~ /Usage:/
   end
 
   def test_json_from_stdin

data/test/test_rest_client.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+
+$:.push File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'jazor'
+
+
+class TestExecute < Test::Unit::TestCase
+
+  def test_get
+    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jazor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael T. Conigliaro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -07:00
+date: 2011-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,10 +47,10 @@ files:
 - README.rdoc
 - bin/jazor
 - lib/jazor.rb
-- lib/rest_client.rb
 - test/test.json
 - test/test_jazor.rb
 - test/test_jazor_bin.rb
+- test/test_rest_client.rb
 has_rdoc: true
 homepage: http://github.com/mconigliaro/jazor
 licenses: []

data/lib/rest_client.rb

@@ -1,24 +0,0 @@
-require 'net/http'
-require 'uri'
-
-module Jazor
-
-  class RestClient
-
-    def self.method_missing(method, uri, headers={}, data={})
-      uri = URI.parse(uri)
-      http = Net::HTTP.new(uri.host, port=uri.port)
-      request = Net::HTTP.const_get(method.to_s.capitalize).new(uri.path)
-      headers.each { |k,v| request.add_field(k, v) }
-      request.set_form_data(data)
-
-      LOG.debug('%s %s: url=%s headers=%s data=%s' % [self, method.to_s.upcase, File.join(uri.host, uri.path), headers.to_json, data.to_json])
-      response = http.request(request)
-      LOG.debug('%s result: code=%d body="%s"' % [self, response.code, response.body.gsub("\r", ' ').gsub("\n", ' ')])
-
-      response
-    end
-
-  end
-
-end