capgun 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e106ab5dc96fbf729c5fb2be0085182453ba08
-  data.tar.gz: 7fcd3e5c56d578f657955b1db15479be4d2b49d0
+  metadata.gz: 7f74acbe256464f4efa3abc3c550a015b6ca0649
+  data.tar.gz: fe33d870aed631cf7a76c84d812801f7c2d51c50
 SHA512:
-  metadata.gz: 6ccf5ce211216c28371ee2693fe1cd839a10c4c65a7409da35b1a5118840f26212d39b7fbdda599e8aa8112ae2a3261bf7f493331683a8fc799e40c633b4f1d3
-  data.tar.gz: db3a2ea709c339c7314b72aadecdaa29439739b45893427851b76b6a7b89746144ca3a20af4c31e495b3b62839f24e55f3d5f878a4daaeca9a0798dd0b616b6c
+  metadata.gz: 00fd593ed5aeccd6b9a11554db76f14c2088dca053d645f9e61d2ae5066be29e8446e1001e1a2ac8fa9094994ecac1bae944f1c10be17499228c3fa01a61e6ae
+  data.tar.gz: 1db80b897b5c43b9ff8647bdec83f0b0c51dccac9692e3abd2b84199b8cfff6d43fa0fb5b91797792810bfaf5048f54e8369324dbaa07ec166f2a0f1695a6ede

data/Gemfile.lock

@@ -1,43 +1,51 @@
 PATH
   remote: .
   specs:
-    capgun (0.1.2)
-      activesupport (>= 2.3.9, < 4)
-      faraday (~> 0.8)
-      json
-      multi_json (~> 1.3)
+    capgun (0.2.0)
+      activesupport
+      faraday
+      multi_json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.2.8)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    atomic (1.1.10)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    i18n (0.6.1)
-    json (1.8.0)
-    multi_json (1.3.5)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    multi_json (1.7.7)
     multipart-post (1.2.0)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.4)
+    rake (10.1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    safe_yaml (0.9.3)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    webmock (1.8.7)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+    webmock (1.12.2)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
     yard (0.8.6.1)
 
 PLATFORMS

data/HISTORY.md

@@ -1,6 +1,10 @@
 HISTORY
 =======
 
+0.2.0 - June 27th, 2013
+--------------------------------------------------------------------------------
+* using multi_json gem
+
 0.1.2 - June 11th, 2013
 --------------------------------------------------------------------------------
 * loosen capgun deps on json gem

data/capgun.gemspec

@@ -3,10 +3,9 @@ require "capgun/version"
 
 Gem::Specification.new do |gem|
 
-  gem.add_dependency 'activesupport', ['>= 2.3.9', '< 4']
-  gem.add_dependency 'faraday', '~> 0.8'
-  gem.add_dependency 'json'
-  gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'faraday'
+  gem.add_dependency 'multi_json'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

data/lib/capgun/client.rb

@@ -1,5 +1,4 @@
-require 'json'
-require 'json/pure'
+require 'multi_json'
 require 'ostruct'
 require 'capgun/base'
 require 'capgun/account'

data/lib/capgun/request.rb

@@ -23,7 +23,7 @@ module Capgun
           request.url(path, params)
         when :post
           request.path = path
-          request.body = params.to_json unless params.empty?
+          request.body = MultiJson.dump(params) unless params.empty?
         end
       end
       options[:raw] ? response : response.body

data/lib/capgun/version.rb

@@ -8,12 +8,12 @@ module Capgun
 
     # @return [Integer]
     def self.minor
-      1
+      2
     end
 
     # @return [Integer]
     def self.patch
-      2
+      0
     end
 
     # @return [String, NilClass]

data/spec/capgun/client_spec.rb

@@ -11,7 +11,7 @@ describe Capgun::Client do
     specify "not allowed to get estimates without authorization" do
       stub_request(:post, "https://api.capgun.io/v1/orders/estimate.json").
         with(:body => "{\"url\":\"http://example.com/test\"}",
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 401, :body => fixture("unauthorized.json"), :headers => {})
 
       lambda { Capgun.estimate("http://example.com/test") }.should raise_error(Capgun::Error::Unauthorized, "Unauthorized")
@@ -20,7 +20,7 @@ describe Capgun::Client do
     specify "no urls are submitted for capture" do
       stub_request(:post, "https://api.capgun.io/v1/orders.json").
         with(:body => "{\"url\":\"http://example.com/test\"}",
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 401, :body => fixture("unauthorized.json"), :headers => {})
 
       lambda { Capgun.capture("http://example.com/test") }.should raise_error(Capgun::Error::Unauthorized, "Unauthorized")
@@ -28,7 +28,7 @@ describe Capgun::Client do
 
     specify "not allowed to view on order without authorization" do
       stub_request(:get, "https://api.capgun.io/v1/orders/4fd20a1288f560177600000a.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 401, :body => fixture("unauthorized.json"), :headers => {})
 
       lambda { Capgun.order("4fd20a1288f560177600000a") }.should raise_error(Capgun::Error::Unauthorized, "Unauthorized")
@@ -36,7 +36,7 @@ describe Capgun::Client do
 
     specify "not allowed to view job status without authorization" do
       stub_request(:get, "https://api.capgun.io/v1/jobs/4fd20a1288f5601776000012.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 401, :body => fixture('unauthorized.json'), :headers => {})
 
       lambda { Capgun.status("4fd20a1288f5601776000012") }.should raise_error(Capgun::Error::Unauthorized, "Unauthorized")
@@ -44,7 +44,7 @@ describe Capgun::Client do
 
     specify "not allowed to view account" do
       stub_request(:get, "https://api.capgun.io/v1/account.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 401, :body => fixture('unauthorized.json'), :headers => {})
 
       lambda { Capgun.account }.should raise_error(Capgun::Error::Unauthorized, "Unauthorized")
@@ -67,7 +67,7 @@ describe Capgun::Client do
     specify "get an estimate to capture a url" do
       stub_request(:post, "https://api.capgun.io/v1/orders/estimate.json").
         with(:body => "{\"url\":\"http://example.com/test\"}",
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("estimate.json"), :headers => {})
 
       estimate = Capgun.estimate("http://example.com/test")
@@ -77,7 +77,7 @@ describe Capgun::Client do
     specify "estimate with options in a block" do
       stub_request(:post, "https://api.capgun.io/v1/orders/estimate.json").
         with(:body => '{"viewport":"1024x2048","packages":["images","viewport"],"url":"http://example.com/test"}',
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("estimate-with-options.json"), :headers => {})
 
       estimate = Capgun.estimate("http://example.com/test", :viewport => "200x100") do |options|
@@ -90,7 +90,7 @@ describe Capgun::Client do
     specify "urls are submitted for capture" do
       stub_request(:post, "https://api.capgun.io/v1/orders.json").
         with(:body => "{\"url\":\"http://example.com/test\"}",
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("order.json"), :headers => {})
 
       order = Capgun.capture("http://example.com/test")
@@ -101,7 +101,7 @@ describe Capgun::Client do
     specify "capture with options can be in a block" do
       stub_request(:post, "https://api.capgun.io/v1/orders.json").
         with(:body => '{"packages":["images","viewport"],"viewport":"1024x2048","url":"http://example.com/test"}',
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("order-with-options.json"), :headers => {})
 
       order = Capgun.capture("http://example.com/test", :packages => [ :images, :viewport ], :viewport => "1024x2048")
@@ -114,7 +114,7 @@ describe Capgun::Client do
     specify "capture with options can be in a block" do
       stub_request(:post, "https://api.capgun.io/v1/orders.json").
         with(:body => '{"viewport":"1024x2048","packages":["images","viewport"],"url":"http://example.com/test"}',
-             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+             :headers => {'Accept'=>'application/json', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("order-with-options.json"), :headers => {})
 
       order = Capgun.capture("http://example.com/test", :viewport => "200x100") do |options|
@@ -129,7 +129,7 @@ describe Capgun::Client do
 
     specify "showing a capture order" do
       stub_request(:get, "https://api.capgun.io/v1/orders/4fd20a1288f560177600000a.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture("order.json"), :headers => {})
 
       order = Capgun.order("4fd20a1288f560177600000a")
@@ -139,7 +139,7 @@ describe Capgun::Client do
 
     specify "capture jobs have a status" do
       stub_request(:get, "https://api.capgun.io/v1/jobs/4fd20a1288f5601776000012.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture('job.json'), :headers => {})
 
 
@@ -150,7 +150,7 @@ describe Capgun::Client do
 
     specify "account can be retrieved" do
       stub_request(:get, "https://api.capgun.io/v1/account.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'test', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 200, :body => fixture('account.json'), :headers => {})
 
       account = Capgun.account

data/spec/capgun/config_spec.rb

@@ -24,7 +24,7 @@ describe Capgun::Config do
         :endpoint => "http://example.com/api",
         :gateway => nil,
         :proxy => nil,
-        :user_agent => "Capgun.io Ruby Gem 0.1.2"
+        :user_agent => "Capgun.io Ruby Gem 0.2.0"
       }
     end
   end

data/spec/capgun/version_spec.rb

@@ -4,7 +4,7 @@ describe "Capgun::Version" do
 
   describe '.to_s' do
     specify "represents current library version" do
-      Capgun::Version.to_s.should == "0.1.2"
+      Capgun::Version.to_s.should == "0.2.0"
     end
   end
 

data/spec/faraday/response_spec.rb

@@ -19,7 +19,7 @@ describe Faraday::Response do
       context "when HTTP status is #{status}" do
         before do
           stub_request(:get, "https://api.capgun.io/v1/jobs/abc123.json").
-            with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+            with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
             to_return(:status => status, :body => "", :headers => {})
         end
 
@@ -35,7 +35,7 @@ describe Faraday::Response do
           before do
             body_message = '{"'+body+'":"test"}' unless body.nil?
             stub_request(:get, "https://api.capgun.io/v1/jobs/abc123.json").
-              with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+              with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
               to_return(:status => status, :body => body_message, :headers => {})
           end
 
@@ -54,7 +54,7 @@ describe Faraday::Response do
     before do
 
       stub_request(:get, "https://api.capgun.io/v1/jobs/abc123.json").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.1.2'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'', 'User-Agent'=>'Capgun.io Ruby Gem 0.2.0'}).
         to_return(:status => 404, :body => fixture('notfound.json'), :headers => {})
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capgun
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Mondragon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,36 +16,16 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.9
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.9
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -62,16 +42,16 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement