api_client 0.1.2 → 0.1.3

data/lib/api_client/resource/scope.rb

@@ -16,19 +16,19 @@ module ApiClient
       end
 
       def find(id)
-        path = [@path, id].join('/')
-        path = append_format(path)
-        raw  = get(path)
+        path     = [@path, id].join('/')
+        path     = append_format(path)
+        response = get(path)
         scoped(self) do
-          @scopeable.build(raw)
+          raw? ? response : @scopeable.build(response)
         end
       end
 
       def find_all(params = {})
-        path = append_format(@path)
-        raw  = get(path, params)
+        path     = append_format(@path)
+        response = get(path, params)
         scoped(self) do
-          @scopeable.build(raw)
+          raw? ? response : @scopeable.build(response)
         end
       end
 
@@ -41,7 +41,7 @@ module ApiClient
         end
         response = post(path, hash)
         scoped(self) do
-          @scopeable.build(response)
+          raw? ? response : @scopeable.build(response)
         end
       end
 
@@ -55,7 +55,7 @@ module ApiClient
         end
         response = put(path, hash)
         scoped(self) do
-          @scopeable.build(response)
+          raw? ? response : @scopeable.build(response)
         end
       end
 

data/lib/api_client/scope.rb

@@ -29,6 +29,15 @@ module ApiClient
       @connection
     end
 
+    def raw
+      @raw = true
+      self
+    end
+
+    def raw?
+      !!@raw
+    end
+
     # 3 Pillars of scoping
     # options - passed on the the adapter
     # params  - converted to query or request body
@@ -63,7 +72,7 @@ module ApiClient
     # Low-level connection methods
 
     def request(method, path, options = {})
-      raw = options.delete(:raw)
+      raw = raw? || options.delete(:raw)
       params(options)
       response = connection.send method, path, @params, @headers
       raw ? response : @scopeable.parse(response)

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/api_client/resource/scope_spec.rb

@@ -27,6 +27,13 @@ describe ApiClient::Resource::Scope do
       result.id.should == 42
     end
 
+    it "performs a find to fetch one record in raw mode" do
+      response = { "restful" => { "id" => 42 }}
+      @instance.should_receive(:get).with('/restfuls/1.json').and_return(response)
+      result = @instance.raw.find(1)
+      result.should == response
+    end
+
     it "performs a find to fetch one record with a prefix if provided" do
       @instance  = ApiClient::Resource::Scope.new(Restful3)
       response = { "restful3" => { "id" => 42 }}
@@ -48,6 +55,13 @@ describe ApiClient::Resource::Scope do
       result.last.id.should == 112
     end
 
+    it "performs a find_all to fetch many records in raw mode" do
+      response = [{ "restful" => { "id" => 42 } }, { "restful" => { "id" => 112 } }]
+      @instance.should_receive(:get).with('/restfuls.json', {}).and_return(response)
+      result = @instance.raw.find_all
+      result.should == response
+    end
+
     it "performs a create to create a new record" do
       response = { "restful" => { "id" => 42, "name" => "Foo" }}
       @instance.should_receive(:post).with('/restfuls.json', {"restful" => {:name => "Foo"} }).and_return(response)
@@ -56,6 +70,13 @@ describe ApiClient::Resource::Scope do
       result.id.should == 42
     end
 
+    it "performs a create to create a new record in raw mode" do
+      response = { "restful" => { "id" => 42, "name" => "Foo" }}
+      @instance.should_receive(:post).with('/restfuls.json', {"restful" => {:name => "Foo"} }).and_return(response)
+      result = @instance.raw.create(:name => "Foo")
+      result.should == response
+    end
+
     it "performs a create to create a new record skipping the namespace if it is not present" do
       @instance  = ApiClient::Resource::Scope.new(Restful2)
       response = { "id" => 42, "name" => "Foo" }
@@ -73,6 +94,13 @@ describe ApiClient::Resource::Scope do
       result.id.should == 42
     end
 
+    it "performs a update to update an existing record in raw mode" do
+      response = { "restful" => { "id" => 42, "name" => "Foo" }}
+      @instance.should_receive(:put).with('/restfuls/42.json', {"restful" => {:name => "Foo"} }).and_return(response)
+      result = @instance.raw.update(42, :name => "Foo")
+      result.should == response
+    end
+
     it "performs a update to update an existing record skipping the namespace if it is not present" do
       @instance  = ApiClient::Resource::Scope.new(Restful2)
       response = { "id" => 42, "name" => "Foo" }
@@ -82,8 +110,6 @@ describe ApiClient::Resource::Scope do
       result.id.should == 42
     end
 
-
-
     it "performs a destroy to remove a record" do
       response = { "restful" => { "id" => 42, "name" => "Foo" }}
       @instance.should_receive(:delete).with('/restfuls/42.json').and_return(response)

data/spec/api_client/scope_spec.rb

@@ -103,9 +103,11 @@ describe ApiClient::Scope do
       instance = ApiClient::Scope.new(ApiClient::Base)
       instance.stub(:connection).and_return(connection)
       response = Faraday::Response.new(:body => '{"a": "1"}')
-      connection.should_receive(:get).with(@path, @params, @headers).and_return(response)
+      connection.should_receive(:get).twice.with(@path, @params, @headers).and_return(response)
       result = instance.params(@params).headers(@headers).request(:get, @path, :raw => true)
       result.should == response
+      result = instance.raw.params(@params).headers(@headers).request(:get, @path)
+      result.should == response
     end
 
     it "makes a GET request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70172817571020 !ruby/object:Gem::Requirement
+  requirement: &70184951743680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *70172817571020
+  version_requirements: *70184951743680
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70172817570180 !ruby/object:Gem::Requirement
+  requirement: &70184951743180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172817570180
+  version_requirements: *70184951743180
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70172817569560 !ruby/object:Gem::Requirement
+  requirement: &70184951742800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172817569560
+  version_requirements: *70184951742800
 description: API client builder
 email:
 - marcin@futuresimple.com