rapidash 0.1.2 → 0.2.0

data/lib/rapidash/response.rb

@@ -3,23 +3,24 @@ require 'hashie'
 
 module Rapidash
   class Response
-
     class << self
       def new(response)
         return nil unless response.body
+        return nil if response.body.empty?
+        return nil if response.body == "null"
         type = response.headers["content-type"]
-          body = JSON.parse(response.body)
-          if body.kind_of?(Hash)
-            return Hashie::Mash.new(body)
-          elsif body.kind_of?(Array)
-            output = []
-            body.each do |el|
-              output << Hashie::Mash.new(el)
-            end
-            return output
+        body = JSON.parse(response.body)
+        if body.kind_of?(Hash)
+          return Hashie::Mash.new(body)
+        elsif body.kind_of?(Array)
+          output = []
+          body.each do |el|
+            output << Hashie::Mash.new(el)
           end
+          return output
+        end
       rescue JSON::ParserError => e
-        raise ParseError.new("Failed to parse content for type: #{response.headers["content-type"]}")
+        raise ParseError.new("Failed to parse content for type: #{type}")
       end
     end
 

data/lib/rapidash/test_client.rb

@@ -1,6 +1,5 @@
 module Rapidash
   module TestClient
-
     attr_accessor :responses
 
     def initialize(options = {})

data/lib/rapidash/urlable.rb

@@ -1,6 +1,5 @@
 module Rapidash
   module Urlable
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -14,6 +13,5 @@ module Rapidash
         end
       end
     end
-
   end
 end

data/lib/rapidash/version.rb

@@ -1,3 +1,3 @@
 module Rapidash
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/rapidash.gemspec

@@ -21,10 +21,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.8"
+  spec.add_development_dependency "simplecov", "~> 0.7"
 
   spec.add_dependency 'json'
   spec.add_dependency 'faraday', '~> 0.8'
   spec.add_dependency "oauth2", "~>0.6"
   spec.add_dependency "hashie", "~>1.2"
+  spec.add_dependency "activesupport"
 
 end

data/spec/rapidash/base_spec.rb

@@ -26,11 +26,11 @@ describe Rapidash::Base do
   describe ".initialize" do
 
     it "should assume a default based on the class name" do
-      Base.new.instance_variable_get(:@url).should eql("base")
+      Base.new.instance_variable_get(:@url).should eql("bases")
     end
 
     it "should ignore any modules when infering the URL" do
-      Rapidash::Resource.new.instance_variable_get(:@url).should eql("resource")
+      Rapidash::Resource.new.instance_variable_get(:@url).should eql("resources")
     end
 
     it "should override the URL if set" do
@@ -60,7 +60,7 @@ describe Rapidash::Base do
       subject.create!(post)
       subject.instance_variable_get(:@options).should eql({
         :method => :post,
-        :body => post.to_json
+        :body => post
       })
     end
 
@@ -70,7 +70,7 @@ describe Rapidash::Base do
       subject.create!(no_root)
       subject.instance_variable_get(:@options).should eql({
         :method => :post,
-        :body => post.to_json
+        :body => post
       })
     end
   end
@@ -81,7 +81,7 @@ describe Rapidash::Base do
       subject.update!(post)
       subject.instance_variable_get(:@options).should eql({
         :method => :put,
-        :body => post.to_json
+        :body => post
       })
     end
 
@@ -91,7 +91,7 @@ describe Rapidash::Base do
       subject.update!(post)
       subject.instance_variable_get(:@options).should eql({
         :method => :patch,
-        :body => post.to_json
+        :body => post
       })
     end
 
@@ -101,7 +101,7 @@ describe Rapidash::Base do
       subject.update!(no_root)
       subject.instance_variable_get(:@options).should eql({
         :method => :patch,
-        :body => post.to_json
+        :body => post
       })
     end
   end
@@ -142,4 +142,16 @@ describe Rapidash::Base do
     end
   end
 
+  describe ".resource_url" do
+    it "should return the class name as a url if none is specified" do
+      subject.send(:resource_url).should eql("basetesters")
+    end
+
+    it "should return the previous url if set" do
+      subject.options = {:url => "people"}
+      subject.send(:resource_url).should eql("people")
+    end
+  end
+
+
 end

data/spec/rapidash/client_spec.rb

@@ -4,16 +4,103 @@ class Client < Rapidash::Client
   method :test
 end
 
+
+class OAuthClientTester < Rapidash::Client
+  method :oauth
+end
+
+class HTTPClientTester < Rapidash::Client
+  method :http
+end
+
+class HTTPClientPatchTester < HTTPClientTester
+  use_patch
+end
+
+class HTTPClientExtensionTester < HTTPClientTester
+  extension :js
+end
+
+class HTTPClientErrorTester < HTTPClientTester
+  raise_errors
+end
+
+class TestClientTester
+  method :test
+end
+
 describe Rapidash::Client do
 
   let!(:subject) { Client.new }
 
+  describe "#method" do
+    it "should include the HTTPClient" do
+      client = HTTPClientTester.new
+      client.class.ancestors.should include(Rapidash::HTTPClient)
+    end
+
+    it "should include the OAuthClient" do
+      client = OAuthClientTester.new({:uid => "foo", :secret => "bar", :site => "baz"})
+      client.class.ancestors.should include(Rapidash::OAuthClient)
+    end
+
+    it "should include the OAuthClient" do
+      client = TestClientTester.new
+      client.class.ancestors.should include(Rapidash::TestClient)
+    end
+
+    it "should raise an error on anything else" do
+      expect {
+        class InvalidClientTester < Rapidash::Client
+          method :invalid
+        end
+      }.to raise_error(Rapidash::ConfigurationError)
+    end
+  end
+
+  describe "#use_patch" do
+    it "should set the patch variable to true" do
+      HTTPClientPatchTester.new.class.instance_variable_get(:@patch).should eql(true)
+    end
+  end
+
+  describe "#extension" do
+    it "should set the url_extension variable" do
+      HTTPClientExtensionTester.new.class.instance_variable_get(:@extension).should eql(:js)
+    end
+  end
+
+  describe "#raise_errors" do
+    it "should set the raise_error variable" do
+      HTTPClientErrorTester.new.class.instance_variable_get(:@raise_error).should eql(true)
+    end
+  end
+
+
   it "should raise an error when instantiated" do
     expect {
      Rapidash::Client.new
     }.to raise_error(Rapidash::ConfigurationError)
   end
 
+  describe ".site=" do
+    it "should clear the connection variable after set new site" do
+      subject.instance_variable_get(:@connection).should eql(nil)
+      subject.site = "foo"
+      subject.instance_variable_set(:@connection, "Not nil")
+
+      subject.site = "bar"
+      subject.instance_variable_get(:@connection).should eql(nil)
+    end
+
+    it "should set the site variable" do
+      subject.instance_variable_get(:@site).should eql(nil)
+      subject.site = "foo"
+      subject.instance_variable_get(:@site).should eql("foo")
+    end
+  end
+
+
   describe ".get" do
     it "should call request" do
       subject.should_receive(:request).with(:get, "foo", {})
@@ -49,6 +136,18 @@ describe Rapidash::Client do
     end
   end
 
+  describe ".normalize_url" do
+    it "should use the instance extension if set" do
+      subject.extension = :json
+      subject.normalize_url("users").should eql("users.json")
+    end
 
+    it "should use the class extension if set" do
+      HTTPClientExtensionTester.new.normalize_url("users").should eql("users.js")
+    end
 
+    it "should return the url if no extension if set" do
+      subject.normalize_url("users").should eql("users")
+    end
+  end
 end

data/spec/rapidash/http_client_spec.rb

@@ -1,21 +1,16 @@
 require "spec_helper"
 
-class HTTPTester
+class HTTPTester < Rapidash::Client
   include Rapidash::HTTPClient
 end
 
 class HTTPSiteTester < HTTPTester
-  site "http://mysite.com/"
-end
-
-class HTTPExtensionTester < HTTPTester
-  site "http://mysite.com/"
-  def self.url_extension 
-    :json
+  class << self
+    attr_accessor :site
   end
 end
 
-class HTTPErrorTester < HTTPTester
+class HTTPErrorTester < HTTPSiteTester
   def self.raise_error
     true
   end
@@ -25,41 +20,51 @@ describe Rapidash::HTTPClient do
 
   let!(:subject) { HTTPTester.new }
 
-  describe ".site=" do
-    it "should clear the connection variable" do
-      subject.instance_variable_get(:@connection).should eql(nil)
-      subject.connection
-      subject.instance_variable_get(:@connection).class.should eql(Faraday::Connection)
-      subject.site = "foo"
-      subject.instance_variable_get(:@connection).should eql(nil)
-    end
-
-    it "should set the site variable" do
-      subject.instance_variable_get(:@site).should eql(nil)
-      subject.site = "foo"
-      subject.instance_variable_get(:@site).should eql("foo")
-    end
-  end
-
   describe ".connection" do
     it "should create a Faraday object" do
+      subject.site = "http://example.com/"
       subject.connection.class.should eql(Faraday::Connection)
     end
 
+    it "should raise Configuration error if site nil" do
+      expect {
+        subject.connection
+      }.to raise_error(Rapidash::ConfigurationError)
+    end
+
     it "should use the site variable if set" do
       Faraday.should_receive(:new).with("http://example.com/")
       subject.site = "http://example.com/"
       subject.connection
     end
+  end
 
-    it "should use the class URL if one is defined" do
-      subject = HTTPSiteTester.new
-      Faraday.should_receive(:new).with("http://mysite.com/")
-      subject.connection
+  describe ".request" do
+
+    before(:each) do
+      subject.site = "http://example.com"
+    end
+
+    describe "authorization" do
+      let!(:options) { { :login => "login", :password => "password" } }
+      let!(:subject) { HTTPTester.new(options) }
+
+      it "should authorize with login and password" do
+        subject.should_receive(:process_response).with("response", :get, {})
+        subject.connection.should_receive(:basic_auth).with(options[:login], options[:password])
+        subject.connection.stub_chain('app.call').and_return("response")
+        subject.request(:get, "foo")
+      end
+    end
+
+    it "should call response" do
+        subject.should_receive(:process_response).with("response", :get, {})
+      subject.connection.should_receive(:run_request).with(:get, "http://example.com/foo", nil, nil).and_return("response")
+        subject.request(:get, "foo")
     end
   end
 
-  describe ".request" do
+  describe ".process_response" do
 
     let!(:valid_response) { OpenStruct.new(:status => "200")}
     let!(:redirect_response) { OpenStruct.new(:status => "301", :headers => {"location" => "http://example.com/redirect"})}
@@ -70,52 +75,32 @@ describe Rapidash::HTTPClient do
     end
 
     describe "valid response" do
-
       before(:each) do
         Rapidash::Response.should_receive(:new).and_return("response")
       end
         
-      it "should add an extension if one is set" do
-        subject.extension = :json
-        subject.connection.should_receive(:run_request).with(:get, "http://example.com/foo.json", nil, nil).and_return(valid_response)
-        subject.request(:get, "foo")
-      end
-
-      it "should use the class extension if one is set" do
-        subject = HTTPExtensionTester.new
-        subject.connection.should_receive(:run_request).with(:get, "http://mysite.com/foo.json", nil, nil).and_return(valid_response)
-        subject.request(:get, "foo")
-      end
-
-
       it "should return a response object" do
-        subject.connection.should_receive(:run_request).with(:get, "http://example.com/foo", nil, nil).and_return(valid_response)
-        response = subject.request(:get, "foo")
+        response = subject.process_response(valid_response, :get, {})
         response.should eql("response")
       end
 
       it "should perform a redirect" do
-        subject.connection.should_receive(:run_request).with(:get, "http://example.com/foo", nil, nil).and_return(redirect_response)
-        subject.connection.should_receive(:run_request).with(:get, "http://example.com/redirect", nil, nil).and_return(valid_response)
-        response = subject.request(:get, "foo")
+        subject.should_receive(:request).with(:get, "http://example.com/redirect", anything).and_return(subject.process_response(valid_response, :get, {}))
+        response = subject.process_response(redirect_response, :get, {})
         response.should eql("response")
       end
-
     end
 
     describe "error response" do
-      
       it "should not raise an error by default" do
-          subject.connection.should_receive(:run_request).with(:get, "http://example.com/error", nil, nil).and_return(error_response)
-          response = subject.request(:get, "error")
-          response.should be_nil
+        response = subject.process_response(error_response, :get, {})
+        response.should be_nil
       end
 
       it "should raise an error if the option is set" do
           subject = HTTPErrorTester.new
-          subject.connection.should_receive(:run_request).with(:get, anything, nil, nil).and_return(error_response)
           expect {
-            response = subject.request(:get, "error")
+            response = subject.process_response(error_response, :get, {})
           }.to raise_error(Rapidash::ResponseError)
       end
 

data/spec/rapidash/integration/test_client_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 module Integration
 
-  class Repos < Rapidash::Base
+  class Repo < Rapidash::Base
   end
 
-  class Users < Rapidash::Base
+  class User < Rapidash::Base
     url "members"
     resource :repos
   end

data/spec/rapidash/oauth_client_spec.rb

@@ -4,12 +4,6 @@ class OAuthTester
   include Rapidash::OAuthClient
 end
 
-class OAuthExtensionTester < OAuthTester
-  def self.url_extension 
-    :json
-  end
-end
-
 class OAuthErrorTester < OAuthTester
   def self.raise_error
     true
@@ -31,16 +25,25 @@ describe Rapidash::OAuthClient do
     }
   }
 
- let(:subject) { OAuthTester.new(options) }
+  let(:subject) { OAuthTester.new(options) }
 
+  describe ".initialize" do
 
-  describe ".site" do
-    it "should be example.com" do
-      subject.site.should eql("http://example.com")
+    it "should not raise an error with the correct options" do
+      expect {
+        OAuthTester.new(options)
+      }.to_not raise_error(Rapidash::ConfigurationError)
+    end
+
+    it "should raise an error if the correct options are not set" do
+      expect {
+        OAuthTester.new({})
+      }.to raise_error(Rapidash::ConfigurationError)
     end
   end
 
-  describe ".access_token_from_code" do
+
+ describe ".access_token_from_code" do
     it "should call localhost for the access token" do
       auth_code = mock
       client = mock
@@ -70,25 +73,11 @@ describe Rapidash::OAuthClient do
     describe "object returned from API call" do
 
       before(:each) do
-        subject.extension = :json
         subject.stub(:oauth_access_token).and_return(request)
+        subject.stub(:normalize_url).with("me").and_return("me")
         request.stub(:get)
       end
 
-      it "should add an extension to the url if one is set" do
-        request.should_receive(:get).with("http://example.com/me.json", anything)
-        subject.request(:get, "me")
-      end
-
-      it "should use the class extension if one is set" do
-        subject = OAuthExtensionTester.new(options)
-        subject.stub(:oauth_access_token).and_return(request)
-        request.stub(:get)
-        request.should_receive(:get).with("http://example.com/me.json", anything)
-        subject.request(:get, "me")
-      end
-
-
       it "should return a Hashie::Mash" do
         subject.request(:get, "me").class.should eql(Hashie::Mash)
       end
@@ -98,14 +87,25 @@ describe Rapidash::OAuthClient do
     describe "when errors are set" do
       it "should call oauth_access_token.send with errors set" do
         subject = OAuthErrorTester.new(options)
+        subject.stub(:normalize_url).and_return("error")
         subject.stub(:oauth_access_token).and_return(request)
         request.should_receive(:send).with(:get, "http://example.com/error", {:raise_errors => true})
         subject.request(:get, "error")
       end
       
     end
-  end
+
+    describe "when a body is set" do
+      it "should call oauth_access_token.send with errors set" do
+        subject.stub(:normalize_url).and_return("users")
+        subject.stub(:oauth_access_token).and_return(request)
+        request.should_receive(:send).with(:get, "http://example.com/users", {:body => {"foo" => "bar"}.to_json, :raise_errors => false})
+        subject.request(:get, "error", :body => {"foo" => "bar"})
+      end
+      
+    end
 
 
+  end
 end