singly 0.1.0 → 0.1.1

data/spec/singly/error_spec.rb

@@ -11,30 +11,38 @@ describe Singly::Error do
   end
 end
 describe Singly::TimeoutError do
+  let(:response) { Typhoeus::Response.new({
+    return_code: :operation_timedout, 
+    total_time: 2.01,
+    effective_url: "http://www.example.com/timemeout"
+  }) }
   describe "#initialize" do
-    let(:response) { Typhoeus::Response.new({
-      return_code: :operation_timedout, 
-      total_time: 2.01,
-      effective_url: "http://www.example.com/timemeout"
-    }) }
-    it "should raise a timeout erro " do 
+    it "should raise a timeout error" do 
       expect{ 
         raise Singly::TimeoutError.new(response) 
-      }.to raise_error(Singly::TimeoutError, "Response timed out after 2.01 seconds. http://www.example.com/timemeout")
+      }.to raise_error(Singly::TimeoutError, "Timed out after 2.01 seconds")
     end
   end
+  describe "#response" do
+    subject { Singly::TimeoutError.new(response).response }
+    it { should == response }
+  end
 end
 describe Singly::ApiError do
+  let(:response) { Typhoeus::Response.new({
+    response_code: 400,
+    effective_url: "http://www.example.com/badresponse",
+    body: {"Timehop" => "BOOM"}.to_json
+  }) }
   describe "#initialize" do
-    let(:response) { Typhoeus::Response.new({
-      response_code: 400,
-      effective_url: "http://www.example.com/badresponse",
-      body: {timehop: :is_amazing}.to_json
-    }) }
     it "should raise an api error" do
       expect{ 
         raise Singly::ApiError.new(response) 
-      }.to raise_error(Singly::ApiError, "400 {\"timehop\":\"is_amazing\"} http://www.example.com/badresponse")
+      }.to raise_error(Singly::ApiError, "HTTP 400 {\"Timehop\":\"BOOM\"}")
     end
   end
+  describe "#response" do
+    subject { Singly::ApiError.new(response).response }
+    it { should == response }
+  end
 end

data/spec/singly/http_spec.rb

@@ -15,26 +15,39 @@ describe Singly::Http do
     end
   end
   describe ".fetch" do
+    context "with options" do
+      subject { http.fetch("/derp", options)}
+      let(:options) { {method: :post, params: {a: :b}, body: {c: "d"}, timeout: 3} }
+      let(:request) { double(:request, {
+        run: double(:response, {
+          body: "true",
+          timed_out?: false,
+          code: 200
+        }) 
+      }) }
+      before { Typhoeus::Request.should_receive(:new).with("https://api.singly.com/v0/derp", options).and_return(request) }
+      it { should == "true" }
+    end
     context "with timeout" do
-      let(:timed_out_response) { Typhoeus::Response.new(return_code: :operation_timedout) } # Yeah, this is kinda
-      before { Typhoeus::Request.stub(:send).with(any_args).and_return(timed_out_response)} # fragile, but how do
-      it "should raise timeout error" do                                                    # I otherwise enforce
-        expect{ http.fetch(:get, "/any_damn_thing") }.to raise_error(Singly::TimeoutError)  # a real timeout?
+      let(:timed_out_response) { Typhoeus::Response.new(return_code: :operation_timedout) }
+      before { Typhoeus::Request.stub_chain(:new, :run).with(any_args).and_return(timed_out_response)}
+      it "should raise timeout error" do
+        expect{ http.fetch("/any_damn_thing") }.to raise_error(Singly::TimeoutError)
       end
     end
     context "with api error" do
       it "should raise api error" do
         expect { 
-          VCR.use_cassette "http_fetch_with_api_error" do
-            http.fetch(:get, "/no_such_endpoint") 
+          vcr("singly/http_fetch_with_api_error") do
+            http.fetch("/no_such_endpoint", method: :post) 
           end
         }.to raise_error(Singly::ApiError)
       end
     end
     context "with json response" do
       subject {
-        VCR.use_cassette "http_fetch_with_json_response" do
-          http.fetch(:get, "/services")
+        vcr("singly/http_fetch_with_json_response") do
+          http.fetch("/services")
         end
       }
       let(:known_services) { ["fitbit", "gcontacts", "zeo", "foursquare", "meetup", "smugmug", "github", "dwolla", "yahoo", "runkeeper", "twitter", "google", "gdocs", "bodymedia", "dropbox", "37signals", "stocktwits", "yammer", "linkedin", "gplus", "picasa", "soundcloud", "gcal", "paypal", "tumblr", "rdio", "tout", "flickr", "youtube", "wordpress", "withings", "reddit", "imgur", "gmail", "instagram", "klout", "facebook", "shutterfly"] }
@@ -42,11 +55,11 @@ describe Singly::Http do
     end
     context "with non-json response" do
       subject {
-        VCR.use_cassette "http_fetch_with_non_json_response" do
-          http.fetch(:get, "/enoch") # /enoch is the endpoint used internally at singly to check
-        end                    # service health. It is not documented and likely to change.
-      }                        # But for the purposes of testing non-json responses without
-      it { should == "true" }  # having to supply auth params, it's perfect.
+        vcr("singly/http_fetch_with_non_json_response") do
+          http.fetch("/enoch") # /enoch is the endpoint used internally at singly to check
+        end                          # service health. It is not documented and likely to change.
+      }                              # But for the purposes of testing non-json responses without
+      it { should == "true" }        # having to supply auth params, it's perfect.
     end
   end
 end

data/spec/singly_spec.rb

@@ -47,7 +47,7 @@ describe Singly do
     context "should provide a new multi endpoint" do
       subject { Singly.multi(["services/facebook", "auth/instagram/apply"]) }
       it { subject.class.should == Singly::Multi }
-      it { subject.query_params[:urls].should == "services/facebook,auth/instagram/apply" }
+      it { subject.options[:params][:urls].should == "services/facebook,auth/instagram/apply" }
     end
   end
 end

data/spec/spec_helper.rb

@@ -24,4 +24,10 @@ VCR.configure do |config|
   config.cassette_library_dir = 'spec/vcr_cassettes'
   config.hook_into :typhoeus
   # config.allow_http_connections_when_no_cassette = true
+end
+
+def vcr(cassette)
+  VCR.use_cassette(cassette) do
+    yield
+  end
 end

data/spec/vcr_cassettes/{http_fetch_with_api_error.yml → singly/http_fetch_with_api_error.yml}

@@ -1,7 +1,7 @@
 ---
 http_interactions:
 - request:
-    method: get
+    method: post
     uri: https://api.singly.com/v0/no_such_endpoint
     body:
       encoding: US-ASCII
@@ -24,7 +24,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 17 Feb 2013 03:22:16 GMT
+      - Sat, 23 Feb 2013 23:38:27 GMT
       X-Powered-By:
       - Express
       Content-Length:
@@ -35,5 +35,5 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{"error":"This request requires a valid access_token."}'
     http_version: '1.1'
-  recorded_at: Sun, 17 Feb 2013 03:22:15 GMT
+  recorded_at: Sat, 23 Feb 2013 23:38:33 GMT
 recorded_with: VCR 2.4.0

data/spec/vcr_cassettes/{http_fetch_with_json_response.yml → singly/http_fetch_with_json_response.yml}

@@ -24,7 +24,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 17 Feb 2013 03:22:16 GMT
+      - Sat, 23 Feb 2013 23:39:11 GMT
       ETag:
       - ! '"235545938"'
       X-Powered-By:
@@ -98,5 +98,5 @@ http_interactions:
         stream_likes page_likes"},{"name":"pages","frequency":86400,"class":"personal"}],"hasTestKeys":true},"shutterfly":{"name":"Shutterfly","desc":"Authentication
         only","key":"Application Id","secret":"Shared Secret","icons":[{"height":16,"width":16,"source":"http://assets.singly.com/service-icons/16px/shutterfly.png"},{"height":24,"width":24,"source":"http://assets.singly.com/service-icons/24px/shutterfly.png"},{"height":32,"width":32,"source":"http://assets.singly.com/service-icons/32px/shutterfly.png"},{"height":48,"width":48,"source":"http://assets.singly.com/service-icons/48px/shutterfly.png"},{"height":64,"width":64,"source":"http://assets.singly.com/service-icons/64px/shutterfly.png"},{"height":128,"width":128,"source":"http://assets.singly.com/service-icons/128px/shutterfly.png"},{"height":256,"width":256,"source":"http://assets.singly.com/service-icons/256px/shutterfly.png"},{"height":512,"width":512,"source":"http://assets.singly.com/service-icons/512px/shutterfly.png"},{"height":1024,"width":1024,"source":"http://assets.singly.com/service-icons/1024px/shutterfly.png"}],"synclets":[{"name":"self","frequency":86400,"class":"core"},{"name":"photos","frequency":86400,"class":"personal"},{"name":"albums","frequency":86400,"class":"personal"}],"hasTestKeys":true}}'
     http_version: '1.1'
-  recorded_at: Sun, 17 Feb 2013 03:22:15 GMT
+  recorded_at: Sat, 23 Feb 2013 23:39:16 GMT
 recorded_with: VCR 2.4.0

data/spec/vcr_cassettes/{http_fetch_with_non_json_response.yml → singly/http_fetch_with_non_json_response.yml}

@@ -24,7 +24,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 17 Feb 2013 03:22:16 GMT
+      - Sat, 23 Feb 2013 23:39:27 GMT
       X-Powered-By:
       - Express
       Content-Length:
@@ -35,5 +35,5 @@ http_interactions:
       encoding: US-ASCII
       string: 'true'
     http_version: '1.1'
-  recorded_at: Sun, 17 Feb 2013 03:22:16 GMT
+  recorded_at: Sat, 23 Feb 2013 23:39:32 GMT
 recorded_with: VCR 2.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singly
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -165,18 +165,27 @@ files:
 - lib/singly/logger.rb
 - lib/version.rb
 - singly.gemspec
-- spec/integration/auth_spec.rb
+- spec/integration/account/apply_spec.rb
+- spec/integration/account/delete_spec.rb
+- spec/integration/account/friends_spec.rb
+- spec/integration/account/id_spec.rb
+- spec/integration/account/merge_spec.rb
+- spec/integration/account/profile_spec.rb
+- spec/integration/account/profiles_spec.rb
+- spec/integration/account/proxy_spec.rb
+- spec/integration/account/services_spec.rb
+- spec/integration/account/types_spec.rb
+- spec/integration/api_spec.rb
 - spec/singly/account_spec.rb
-- spec/singly/api/auth_spec.rb
 - spec/singly/endpoint_spec.rb
 - spec/singly/error_spec.rb
 - spec/singly/http_spec.rb
 - spec/singly/logger_spec.rb
 - spec/singly_spec.rb
 - spec/spec_helper.rb
-- spec/vcr_cassettes/http_fetch_with_api_error.yml
-- spec/vcr_cassettes/http_fetch_with_json_response.yml
-- spec/vcr_cassettes/http_fetch_with_non_json_response.yml
+- spec/vcr_cassettes/singly/http_fetch_with_api_error.yml
+- spec/vcr_cassettes/singly/http_fetch_with_json_response.yml
+- spec/vcr_cassettes/singly/http_fetch_with_non_json_response.yml
 homepage: ''
 licenses: []
 post_install_message: 
@@ -202,15 +211,24 @@ signing_key:
 specification_version: 3
 summary: See documentation at TBD
 test_files:
-- spec/integration/auth_spec.rb
+- spec/integration/account/apply_spec.rb
+- spec/integration/account/delete_spec.rb
+- spec/integration/account/friends_spec.rb
+- spec/integration/account/id_spec.rb
+- spec/integration/account/merge_spec.rb
+- spec/integration/account/profile_spec.rb
+- spec/integration/account/profiles_spec.rb
+- spec/integration/account/proxy_spec.rb
+- spec/integration/account/services_spec.rb
+- spec/integration/account/types_spec.rb
+- spec/integration/api_spec.rb
 - spec/singly/account_spec.rb
-- spec/singly/api/auth_spec.rb
 - spec/singly/endpoint_spec.rb
 - spec/singly/error_spec.rb
 - spec/singly/http_spec.rb
 - spec/singly/logger_spec.rb
 - spec/singly_spec.rb
 - spec/spec_helper.rb
-- spec/vcr_cassettes/http_fetch_with_api_error.yml
-- spec/vcr_cassettes/http_fetch_with_json_response.yml
-- spec/vcr_cassettes/http_fetch_with_non_json_response.yml
+- spec/vcr_cassettes/singly/http_fetch_with_api_error.yml
+- spec/vcr_cassettes/singly/http_fetch_with_json_response.yml
+- spec/vcr_cassettes/singly/http_fetch_with_non_json_response.yml

data/spec/integration/auth_spec.rb

@@ -1,14 +0,0 @@
-require 'singly'
-require 'yaml'
-
-describe "Auth Integration" do
-  if ENV["CONFIG"]
-    config = YAML::load_file( ENV["CONFIG"] )
-    Singly.client_id = config[:singly][:client_id]
-    Singly.client_secret = config[:singly][:client_secret]
-
-    params = {token: config[:facebook][:token]}
-    r = Singly.auth.facebook.apply(params).fetch
-    puts r
-  end
-end

data/spec/singly/api/auth_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe Singly::Auth do
-  describe "#merge" do
-    subject { Singly::Auth.new.merge(source: "abc", dest: "123").url }
-    it { should == "https://api.singly.com/v0/auth/merge?dest=123&source=abc" }
-  end
-end