active_rest_client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a08be2e09a1d1735079f01e268c5ac7754ac833
-  data.tar.gz: ea067f45bc4cf459dfb48a149db5ef9c93e2b2b0
+  metadata.gz: 287ff0756e1a325c054bb32e601270ebe459b6c9
+  data.tar.gz: 28d6c1a06dde0da5872a96683731ad07741e0159
 SHA512:
-  metadata.gz: 816c956a1ccb86051b880b4e3896d189b3953a0d8de0ba35ab05278b783d57ef267a3cb9550f1fff319e5609169f446ce1ddadd0d1ce3c6664e5c9913f82c743
-  data.tar.gz: 13004f6d21ada93a9c0d3b1eaf57c69d16c08ef9aac1fc90eefc8feb54b04106537712c7a699ae5c3b1dd01bce6c1666cf7287c1154f9ac39079f81dfd6622cf
+  metadata.gz: 0081d8815d8bfa568980695683ae889afc68c6f782acfc6759b166f205d0b033c5788ee8973e6ac2e66abd42c9906affbe0913ec71064532009b1626427638f8
+  data.tar.gz: 518e02c69f5239f0528d57dfaba126224dc1e0a4b766d8920a6df50bdfecf3b15d05dd3e4c170c16b23ac70614db98573790a8790cff1c70f1cfd4477e477039

data/README.md

@@ -1,6 +1,9 @@
 # ActiveRestClient
 
-[![Build Status](https://travis-ci.org/whichdigital/active-rest-client.png?branch=master)](https://travis-ci.org/whichdigital/active-rest-client) [![Coverage Status](https://coveralls.io/repos/whichdigital/active-rest-client/badge.png)](https://coveralls.io/r/whichdigital/active-rest-client) [![Code Climate](https://codeclimate.com/github/whichdigital/active-rest-client.png)](https://codeclimate.com/github/whichdigital/active-rest-client) [![Gem Version](https://badge.fury.io/rb/active_rest_client.png)](http://badge.fury.io/rb/active_rest_client)
+[![Build Status](https://travis-ci.org/whichdigital/active-rest-client.svg?branch=master)](https://travis-ci.org/whichdigital/active-rest-client)
+[![Coverage Status](https://coveralls.io/repos/whichdigital/active-rest-client/badge.png)](https://coveralls.io/r/whichdigital/active-rest-client)
+[![Code Climate](https://codeclimate.com/github/whichdigital/active-rest-client.png)](https://codeclimate.com/github/whichdigital/active-rest-client)
+[![Gem Version](https://badge.fury.io/rb/active_rest_client.png)](http://badge.fury.io/rb/active_rest_client)
 
 This gem is for accessing REST services in an ActiveRecord style.  ActiveResource already exists for this, but it doesn't work where the resource naming doesn't follow Rails conventions, it doesn't have in-built caching and it's not as flexible in general.
 

data/lib/active_rest_client/request.rb

@@ -116,7 +116,7 @@ module ActiveRestClient
             etag = cached.etag
             response = do_request(etag)
             if response.status == 304
-              ActiveRestClient::Logger.debug "  \033[1;4;32m#{ActiveRestClient::NAME}\033[0m #{@instrumentation_name} - Response status 304. Copy is still fresh"
+              ActiveRestClient::Logger.debug "  \033[1;4;32m#{ActiveRestClient::NAME}\033[0m #{@instrumentation_name} - Etag copy is the same as the server"
               return handle_cached_response(cached)
             end
           end
@@ -132,9 +132,6 @@ module ActiveRestClient
           @object.record_response(self.url, response)
         end
         result = handle_response(response)
-        if result == :not_modified && cached
-          result = cached.result
-        end
         original_object_class.write_cached_response(self, response, result)
         result
       end
@@ -230,7 +227,7 @@ module ActiveRestClient
       if verbose?
         ActiveRestClient::Logger.debug "ActiveRestClient Verbose Log:"
         ActiveRestClient::Logger.debug "  Request"
-        ActiveRestClient::Logger.debug "  >> GET #{@url} HTTP/1.1"
+        ActiveRestClient::Logger.debug "  >> #{http_method.upcase} #{@url} HTTP/1.1"
         http_headers.each do |k,v|
           ActiveRestClient::Logger.debug "  >> #{k} : #{v}"
         end
@@ -280,10 +277,6 @@ module ActiveRestClient
       @response.status ||= 200
 
       if (200..399).include? @response.status
-        if response.status == 304
-          ActiveRestClient::Logger.debug "  \033[1;4;32m#{ActiveRestClient::NAME}\033[0m #{@instrumentation_name} - Etag copy is the same as the server"
-          return :not_modified
-        end
         if @method[:options][:plain]
           return @response = response.body
         elsif is_json_response?

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/lib/request_spec.rb

@@ -37,6 +37,7 @@ describe ActiveRestClient::Request do
       base_url "http://www.example.com"
       verbose!
       get :all, "/all"
+      post :create, "/create"
     end
 
     class FilteredBodyExampleClient < ExampleClient
@@ -164,7 +165,7 @@ describe ActiveRestClient::Request do
   it "should log faked responses" do
     ActiveRestClient::Logger.stub(:debug)
     ActiveRestClient::Logger.should_receive(:debug).with {|*args| args.first["Faked response found"]}
-    object = ExampleClient.fake id:1234, debug:true
+    ExampleClient.fake id:1234, debug:true
   end
 
   it "should parse an array within JSON to be a result iterator" do
@@ -208,7 +209,7 @@ describe ActiveRestClient::Request do
       with("/create", "first_name=John&should_disappear=true", an_instance_of(Hash)).
       and_return(OpenStruct.new(body:"{\"first_name\":\"John\", \"id\":1234}", headers:{}, status:200))
     ActiveRestClient::Logger.should_receive(:info).with {|*args| args.first[%r{Requesting http://www.example.com/create}]}
-    ActiveRestClient::Logger.should_receive(:debug).at_least(1).times.with {|*args| args.first[/Response received \d+ bytes/] || args.first["Reading from cache"]}
+    ActiveRestClient::Logger.should_receive(:debug).at_least(1).times.with {|*args| args.first[/Response received \d+ bytes/] || args.first["Trying to read from cache"]}
 
     object = ExampleClient.new(first_name:"John", should_disappear:true)
     object.create
@@ -222,12 +223,25 @@ describe ActiveRestClient::Request do
       with("/create", "first_name=John&should_disappear=true", an_instance_of(Hash)).
       and_return(OpenStruct.new(body:"{\"first_name\":\"John\", \"id\":1234}", headers:{}, status:200))
     ActiveRestClient::Logger.should_receive(:info).with {|*args| args.first[%r{Requesting http://www.example.com/create}]}
-    ActiveRestClient::Logger.should_receive(:debug).at_least(1).times.with {|*args| args.first[/Response received \d+ bytes/] || args.first["Reading from cache"]}
+    ActiveRestClient::Logger.should_receive(:debug).at_least(1).times.with {|*args| args.first[/Response received \d+ bytes/] || args.first["Trying to read from cache"]}
 
     object = ExampleClient.new(first_name:"John", should_disappear:true)
     object.create
   end
 
+  it "should verbose debug the with the right http verb" do
+    ActiveRestClient::Connection.
+      any_instance.
+      should_receive(:post).
+      with("/create", "first_name=John&should_disappear=true", an_instance_of(Hash)).
+      and_return(OpenStruct.new(body:"{\"first_name\":\"John\", \"id\":1234}", headers:{}, status:200))
+    ActiveRestClient::Logger.should_receive(:debug).with(/ POST /)
+    ActiveRestClient::Logger.stub(:debug).with(any_args)
+
+    object = VerboseExampleClient.new(first_name:"John", should_disappear:true)
+    object.create
+  end
+
   it "should verbose log if enabled" do
     connection = double(ActiveRestClient::Connection).as_null_object
     ActiveRestClient::ConnectionManager.should_receive(:get_connection).and_return(connection)
@@ -459,7 +473,7 @@ describe ActiveRestClient::Request do
       connection.
         should_receive(:get).
         with("/some/url", an_instance_of(Hash)).
-        and_return(OpenStruct.new(body:"", headers:{}, status:304))
+        and_return(OpenStruct.new(body:"{}", headers:{}, status:304))
       connection.
         stub(:base_url).
         and_return("http://other.example.com")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Which Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler