phocoder-rb 0.1.3 → 0.1.6

data/VERSION

@@ -1 +1,2 @@
-0.1.3
+0.1.6
+

data/lib/phocoder/base.rb

@@ -28,15 +28,19 @@ module Phocoder
     end
     
     def self.decode(content, format=nil)
-      if content.is_a?(String)
-        if format.to_s == 'xml'
-          Hash.from_xml(content)
+      begin
+        if content.is_a?(String)
+          if format.to_s == 'xml'
+            Hash.from_xml(content)
+          else
+            ActiveSupport::JSON.decode(content)
+          end
         else
-          ActiveSupport::JSON.decode(content)
+          content
         end
-      else
+      rescue Exception => e
         content
-      end
+      end   
     end
 
     def decode(content, format=nil)

data/lib/phocoder/job.rb

@@ -1,9 +1,13 @@
 module Phocoder
   class Job < Base
+   
+    def self.pick_format(options)
+      options[:format] || "json" 
+    end
     
     def self.create(params={}, options={})
       params = apply_api_key(params, options[:format])
-      HTTP.post("#{options[:base_url] || base_url}/jobs",
+      HTTP.post("#{options[:base_url] || base_url}/jobs.#{pick_format options}",
                            encode(params, options[:format]),
                            options)
     end
@@ -14,27 +18,27 @@ module Phocoder
                 :per_page => options.delete(:per_page) || 50,
                 :state    => options.delete(:state) }
 
-      HTTP.get("#{options[:base_url] || base_url}/jobs", merge_params(options, params))
+      HTTP.get("#{options[:base_url] || base_url}/jobs.#{pick_format options}", merge_params(options, params))
     end
 
     def self.details(job_id, options={})
       params = {:api_key => options.delete(:api_key) || api_key}
-      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}", merge_params(options, params))
+      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}.#{pick_format options}", merge_params(options, params))
     end
 
     def self.resubmit(job_id, options={})
       params = {:api_key => options.delete(:api_key) || api_key}
-      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/resubmit", merge_params(options, params))
+      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/resubmit.#{pick_format options}", merge_params(options, params))
     end
 
     def self.cancel(job_id, options={})
       params = {:api_key => options.delete(:api_key) || api_key}
-      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/cancel", merge_params(options, params))
+      HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/cancel.#{pick_format options}", merge_params(options, params))
     end
 
     def self.delete(job_id, options={})
       params = {:api_key => options.delete(:api_key) || api_key}
-      HTTP.delete("#{options[:base_url] || base_url}/jobs/#{job_id}", merge_params(options, params))
+      HTTP.delete("#{options[:base_url] || base_url}/jobs/#{job_id}.#{pick_format options}", merge_params(options, params))
     end
     
     

data/phocoder-rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phocoder-rb}
-  s.version = "0.1.3"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeremy Green"]
-  s.date = %q{2011-02-10}
+  s.authors = [%q{Jeremy Green}]
+  s.date = %q{2011-12-23}
   s.description = %q{The ruby client for the phocoder.com API.}
   s.email = %q{jagthedrummer@gmail.com}
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -45,9 +44,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jagthedrummer/phocoder-rb}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.7}
   s.summary = %q{The ruby client for the phocoder.com API.}
   s.test_files = [
     "spec/phocoder/http/net_http_spec.rb",
@@ -60,7 +59,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/phocoder/http/net_http_spec.rb

@@ -63,7 +63,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
     describe ".post" do
       it "should POST to specified body to the specified path" do
-        Phocoder::HTTP.http_backend.expects(:post).
+        Phocoder::HTTP::NetHTTP.expects(:post).
                                       with('https://example.com',:body => '{}').
                                       returns(Phocoder::Response.new)
         Phocoder::HTTP::NetHTTP.post('https://example.com',:body => '{}').should_not be_nil
@@ -72,7 +72,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
     describe ".put" do
       it "should PUT to specified body to the specified path" do
-        Phocoder::HTTP.http_backend.expects(:put).
+        Phocoder::HTTP::NetHTTP.expects(:put).
                                       with('https://example.com',:body => '{}').
                                       returns(Phocoder::Response.new)
         Phocoder::HTTP::NetHTTP.put('https://example.com', :body => '{}')
@@ -81,7 +81,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
     describe ".get" do
       it "should GET to specified body to the specified path" do
-        Phocoder::HTTP.http_backend.expects(:get).
+        Phocoder::HTTP::NetHTTP.expects(:get).
                                       with('https://example.com').
                                       returns(Phocoder::Response.new)
         Phocoder::HTTP::NetHTTP.get('https://example.com')
@@ -90,7 +90,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
     describe ".delete" do
       it "should DELETE to specified body to the specified path" do
-        Phocoder::HTTP.http_backend.expects(:delete).
+        Phocoder::HTTP::NetHTTP.expects(:delete).
                                       with('https://example.com').
                                       returns(Phocoder::Response.new)
         Phocoder::HTTP::NetHTTP.delete('https://example.com')

data/spec/phocoder/job_spec.rb

@@ -15,14 +15,14 @@ describe "Phocoder::Job" do
     end
     
     it "should POST to the correct url and return a response" do
-      Phocoder::HTTP.expects(:post).with(@url, @params_as_json, {}).returns(Phocoder::Response.new)
+      Phocoder::HTTP.expects(:post).with(@url + ".json", @params_as_json, {}).returns(Phocoder::Response.new)
       r = Phocoder::Job.create(@params)
       r.class.should == Phocoder::Response
     end
     
     it "should apply the global API key when JSON and no api_key is passed" do
       Phocoder.api_key = 'asdfasdf'
-      Phocoder::HTTP.expects(:post).with(@url,@params_as_json,{}) do |url, params, options|
+      Phocoder::HTTP.expects(:post).with(@url + ".json",@params_as_json,{}) do |url, params, options|
         Phocoder::Base.decode(params)['api_key'].should == Phocoder.api_key
         end.returns(Phocoder::Response.new)
       Phocoder::Job.create(:input => @params[:input])
@@ -31,7 +31,7 @@ describe "Phocoder::Job" do
       
     it "should apply the global API key when XML and no api_key is passed" do
       Phocoder.api_key = 'asdfasdf'
-      Phocoder::HTTP.expects(:post).with(@url,@params_as_xml,{}) do |url, params, options|
+      Phocoder::HTTP.expects(:post).with(@url + ".xml",@params_as_xml,{}) do |url, params, options|
         Phocoder::Base.decode(params, :xml)['api_request']['api_key'].should == Phocoder.api_key
       end.returns(Phocoder::Response.new)
       Phocoder::Job.create({:api_request => {:input => @params[:input]}}, {:format => :xml})
@@ -40,7 +40,7 @@ describe "Phocoder::Job" do
         
     it "should apply the global API key when an XML string is passed and no api_key is passed" do
       Phocoder.api_key = 'asdfasdf'
-      Phocoder::HTTP.expects(:post).with(@url,@params_as_xml,{}) do |url, params, options|
+      Phocoder::HTTP.expects(:post).with(@url + ".json",@params_as_xml,{}) do |url, params, options|
         Phocoder::Base.decode(params, :xml)['api_request']['api_key'] == Phocoder.api_key
       end.returns(Phocoder::Response.new)
       Phocoder::Job.create({:input => @params[:input]}.to_xml(:root => :api_request), {:format => :xml})
@@ -56,7 +56,7 @@ describe "Phocoder::Job" do
     end
 
     it "should GET the correct url and return a response" do
-      Phocoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key,
+      Phocoder::HTTP.stubs(:get).with(@url + ".json", {:params => {:api_key => @api_key,
                                                           :page => 1,
                                                           :per_page => 50,
                                                           :state => nil}}).returns(Phocoder::Response.new)
@@ -64,7 +64,7 @@ describe "Phocoder::Job" do
     end
 
     it "should merge params well" do
-      Phocoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key,
+      Phocoder::HTTP.stubs(:get).with(@url + ".json", {:params => {:api_key => @api_key,
                                                          :page => 1,
                                                          :per_page => 50,
                                                          :some => 'param',
@@ -80,7 +80,7 @@ describe "Phocoder::Job" do
     end
 
     it "should GET the correct url and return a response" do
-      Phocoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
+      Phocoder::HTTP.stubs(:get).with(@url + ".json", {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
       Phocoder::Response.should ==  Phocoder::Job.details(1, :api_key => @api_key).class
     end
   end
@@ -92,7 +92,7 @@ describe "Phocoder::Job" do
     end
 
     it "should GET the correct url and return a response" do
-      Phocoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
+      Phocoder::HTTP.stubs(:get).with(@url + ".json", {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
       Phocoder::Response.should ==  Phocoder::Job.resubmit(1, :api_key => @api_key).class
     end
   end
@@ -104,7 +104,7 @@ describe "Phocoder::Job" do
     end
 
     it "should GET the correct url and return a response" do
-      Phocoder::HTTP.stubs(:get).with(@url, {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
+      Phocoder::HTTP.stubs(:get).with(@url + ".json", {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
       Phocoder::Response.should ==  Phocoder::Job.cancel(1, :api_key => @api_key).class
     end
   end
@@ -116,7 +116,7 @@ describe "Phocoder::Job" do
     end
 
     it "should DELETE the correct url and return a response" do
-      Phocoder::HTTP.stubs(:delete).with(@url, {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
+      Phocoder::HTTP.stubs(:delete).with(@url + ".json", {:params => {:api_key => @api_key}}).returns(Phocoder::Response.new)
       Phocoder::Response.should ==  Phocoder::Job.delete(1, :api_key => @api_key).class
     end
 end

metadata

@@ -1,173 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: phocoder-rb
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeremy Green
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-10 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2011-12-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74393930 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74393930
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &74393690 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74393690
+- !ruby/object:Gem::Dependency
   name: builder
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &74393450 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74393450
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &74393210 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74393210
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &74392970 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id005
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74392970
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &74392730 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.5.1
-  requirement: *id006
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74392730
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &74392490 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74392490
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &74392250 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *74392250
+- !ruby/object:Gem::Dependency
   name: webmock
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &74392010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  requirement: *id009
   type: :development
+  prerelease: false
+  version_requirements: *74392010
 description: The ruby client for the phocoder.com API.
 email: jagthedrummer@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -190,41 +143,35 @@ files:
 - spec/phocoder/phocoder_spec.rb
 - spec/phocoder/response_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jagthedrummer/phocoder-rb
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 536810611
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: The ruby client for the phocoder.com API.
-test_files: 
+test_files:
 - spec/phocoder/http/net_http_spec.rb
 - spec/phocoder/http/typhoeus_spec.rb
 - spec/phocoder/http_spec.rb

data/Gemfile.lock

@@ -1,47 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.0)
-    addressable (2.2.2)
-    autotest (4.4.4)
-    builder (2.1.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mocha (0.9.10)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    redgreen (1.2.2)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    webmock (1.6.1)
-      addressable (>= 2.2.2)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.0.0)
-  autotest (= 4.4.4)
-  builder
-  bundler (~> 1.0.0)
-  i18n
-  jeweler (~> 1.5.1)
-  mocha
-  rcov
-  redgreen (= 1.2.2)
-  rspec (~> 2.1.0)
-  webmock (~> 1.6.0)