bitly-oauth 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,32 +1,36 @@
 PATH
   remote: .
   specs:
-    bitly-oauth (0.2.1)
+    bitly-oauth (0.2.2)
+      httparty
       httparty
       oauth2
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
     fakeweb (1.3.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
-    httparty (0.8.1)
-      multi_json
+    httparty (0.8.3)
+      multi_json (~> 1.0)
       multi_xml
+    httpauth (0.1)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    multi_xml (0.4.1)
-    multipart-post (1.1.4)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
+    multipart-post (1.1.5)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-    rack (1.4.0)
+      rack (~> 1.2)
+    rack (1.4.1)
     rake (0.9.2.2)
     shoulda (2.11.3)
 

data/lib/bitly_oauth/access_token.rb

@@ -17,7 +17,7 @@ module BitlyOAuth
 
     private
     def request(verb, method, options={})
-      response = access_token.send(verb, method, :params => params(options), :parse => :json)
+      response = access_token.send(verb, method.to_s, :params => params(options), :parse => :json)
       response = BitlyOAuth::Response.new(response)
       if response.success?
         response.body

data/lib/bitly_oauth/client.rb

@@ -1,7 +1,7 @@
 module BitlyOAuth
   class Client
-    extend Forwardable
-    delegate [ :get, :post ] => :access_token
+    include HTTParty
+    base_uri 'https://api-ssl.bit.ly/v3/'
 
     BASE_URL = 'https://api-ssl.bit.ly/v3/'
 
@@ -151,5 +151,19 @@ module BitlyOAuth
     def key_for(input)
       input.match(/^http:\/\//) ? :shortUrl : :hash
     end
+
+    def get(path, params = {})
+      response = self.class.get("/#{path}", query(params))
+      response = BitlyOAuth::Response.new(response)
+      if response.success?
+        response.body
+      else
+        raise BitlyOAuth::Error.new(response)
+      end
+    end
+
+    def query(params)
+      { :query => { :access_token => access_token.token }.merge(params).to_query }
+    end
   end
 end

data/lib/bitly_oauth/lib/core_ext/hash.rb

@@ -1,6 +1,15 @@
 class Hash
   def to_query
-    map {|k, v|"#{k}=#{v}"}.sort * '&'
+    map do |key, value|
+      case value
+      when Array
+        value.map do |v|
+          "#{key}=#{CGI.escape(v.to_s)}"
+        end.join('&')
+      else
+        "#{key}=#{CGI.escape(value.to_s)}"
+      end
+    end.sort * '&'
   end
 
   def stringify_keys!

data/lib/bitly_oauth/version.rb

@@ -1,3 +1,3 @@
 module BitlyOAuth
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/fixtures/referring_domains.json

@@ -0,0 +1 @@
+{"status_code": 200, "data": { "referring_domains": [ { "domain": "direct", "clicks": 700} ] }, "status_txt": "OK"}

data/test/unit/test_client.rb

@@ -48,10 +48,8 @@ class TestClient < Test::Unit::TestCase
     end
     context "requests to the bitly api" do
       setup do
-        token = stub(:get => { 'bitly_pro_domain' => true },
-                     :token   => 'token' )
-        BitlyOAuth::AccessToken.stubs(:new => token)
         @client.set_access_token_from_token('token')
+        stub_get('https://api-ssl.bit.ly/v3/bitly_pro_domain?access_token=token&domain=http%3A%2F%2Fpro.domain%2F', 'bitly_pro_domain.json')
       end
       context "bitly_pro_domain" do
         should 'return true when it is a bitly pro domain' do
@@ -67,10 +65,9 @@ class TestClient < Test::Unit::TestCase
   end
   context "#referring_domains" do
     setup do
-      token = stub(:get => { "referring_domains" => [ {'domain' => 'direct', 'clicks' => 700} ] } )
-      BitlyOAuth::AccessToken.stubs(:new => token)
       @client = BitlyOAuth::Client.new('id', 'secret')
       @client.set_access_token_from_token('token')
+      stub_get('https://api-ssl.bit.ly/v3/link/referring_domains?access_token=token&link=http%3A%2F%2Fbit.ly%2Fsomelink%2F', 'referring_domains.json')
     end
     should "return an array" do
       assert @client.referring_domains('http://bit.ly/somelink/').is_a?(Array)

data/test/unit/test_response.rb

@@ -22,7 +22,7 @@ class TestResponse < Test::Unit::TestCase
     end
     should "return the status code" do
       response = BitlyOAuth::Response.new(stub('oauth', :parsed => {'status_code' => 'some status code'}))
-      assert_equal 'some status code', response.status,
+      assert_equal 'some status code', response.status
     end
     should "return the response body" do
       response = BitlyOAuth::Response.new(stub('oauth', :parsed => { 'data' => {} } ))
@@ -60,7 +60,7 @@ class TestResponse < Test::Unit::TestCase
     end
     should "return the status code" do
       response = BitlyOAuth::Response.new(stub(:parsed_response => { 'status_code' => 'some status code' }))
-      assert_equal 'some status code', response.status,
+      assert_equal 'some status code', response.status
     end
     should "return the response body" do
       response = BitlyOAuth::Response.new(stub(:parsed_response => { 'data' => {} } ))

data/test/unit/test_url.rb

@@ -141,7 +141,7 @@ class TestUrl < Test::Unit::TestCase
       context "getting clicks by minute" do
         setup do
           @short_url = "http://j.mp/9DguyN"
-          stub_get("https://api-ssl.bit.ly/v3/clicks_by_minute?shortUrl=#{CGI.escape(@short_url)}&access_token=token", ['clicks_by_minute1_url.json', 'clicks_by_minute2_url.json'])
+          stub_get("https://api-ssl.bit.ly/v3/clicks_by_minute?access_token=token&shortUrl=#{CGI.escape(@short_url)}", ['clicks_by_minute1_url.json', 'clicks_by_minute2_url.json'])
           @url = BitlyOAuth::Url.new(@client, 'short_url' => @short_url)
         end
         should 'get clicks_by_minute when called' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitly-oauth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70117703752660 !ruby/object:Gem::Requirement
+  requirement: &70326365070320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117703752660
+  version_requirements: *70326365070320
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70117703752200 !ruby/object:Gem::Requirement
+  requirement: &70326365068700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117703752200
+  version_requirements: *70326365068700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70117703751720 !ruby/object:Gem::Requirement
+  requirement: &70326365067000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117703751720
+  version_requirements: *70326365067000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70117703751300 !ruby/object:Gem::Requirement
+  requirement: &70326365081660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117703751300
+  version_requirements: *70326365081660
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70117703750860 !ruby/object:Gem::Requirement
+  requirement: &70326365080680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117703750860
+  version_requirements: *70326365080680
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70117703750400 !ruby/object:Gem::Requirement
+  requirement: &70326365079840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117703750400
+  version_requirements: *70326365079840
 description: ! 'A ruby wrapper for version 3 of the bit.ly API
 
   Supports OAuth authentication
@@ -155,6 +155,7 @@ files:
 - test/fixtures/referrer_hash.json
 - test/fixtures/referrer_hash2.json
 - test/fixtures/referrer_url.json
+- test/fixtures/referring_domains.json
 - test/fixtures/success.json
 - test/fixtures/url_info.json
 - test/fixtures/user_clicks.json
@@ -192,18 +193,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3882379535477319837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3882379535477319837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -252,6 +247,7 @@ test_files:
 - test/fixtures/referrer_hash.json
 - test/fixtures/referrer_hash2.json
 - test/fixtures/referrer_url.json
+- test/fixtures/referring_domains.json
 - test/fixtures/success.json
 - test/fixtures/url_info.json
 - test/fixtures/user_clicks.json