api_resource 0.6.13 → 0.6.14

data/.rspec

@@ -6,4 +6,5 @@
 -X
 --order random
 --drb
-#--debugger
+--require spec_helper
+--debugger

data/Gemfile.lock

@@ -156,6 +156,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    yarjuf (1.0.5)
+      builder
+      rspec (>= 2.0)
 
 PLATFORMS
   ruby
@@ -177,3 +180,4 @@ DEPENDENCIES
   simplecov
   spork
   sqlite3
+  yarjuf

data/Rakefile

@@ -2,7 +2,9 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w[-f JUnit -o results.xml]
+end
 
 task :default => :spec
-task :ci => %w(rspec benchmark)
+task :ci => %w(rspec benchmark)

data/api_resource.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "spork" 
+  gem.add_development_dependency "yarjuf" 
   # this latest version of mocha is not compatible with the rails
   # 3.2.9
   gem.add_development_dependency "mocha", ["=0.12.7"]

data/lib/api_resource/connection.rb

@@ -11,7 +11,7 @@ module ApiResource
   # services.
   class Connection
 
-    HTTP_FORMAT_HEADER_NAMES = {  
+    HTTP_FORMAT_HEADER_NAMES = {
       :get => 'Accept',
       :put => 'Content-Type',
       :post => 'Content-Type',
@@ -52,7 +52,7 @@ module ApiResource
     end
 
      # make a put request
-     # @return [String] response.body raises an 
+     # @return [String] response.body raises an
      #   ApiResource::ConnectionError if we
      #   have a timeout, general exception, or
      #   if result.code is not within 200..399
@@ -65,43 +65,53 @@ module ApiResource
         format.decode(request(:get, path, headers))
       end
     end
-    
+
     def delete(path, headers = self.headers)
       request(:delete, path, build_request_headers(headers, :delete, self.site.merge(path)))
       return true
     end
-    
+
     def head(path, headers = self.headers)
       request(:head, path, build_request_headers(headers, :head, self.site.merge(path)))
     end
-    
+
     # make a put request
-    # @return [String] response.body raises an 
+    # @return [String] response.body raises an
     #   ApiResource::ConnectionError if we
     #   have a timeout, general exception, or
     #   if result.code is not within 200..399
     def put(path, body = {}, headers = self.headers)
-      format.decode(
-        request(
-          :put, 
-          path, 
-          body, 
-          build_request_headers(headers, :put, self.site.merge(path))
-        )
+      response = request(
+        :put,
+        path,
+        body,
+        build_request_headers(headers, :put, self.site.merge(path))
       )
+      # handle blank response and return true
+      if response.blank?
+        return {}
+      # we used to decode JSON in the response, but we don't want to
+      # do that anymore - we will issue a warning but keep the behavior
+      else
+        ApiResource.logger.warn(
+          "[DEPRECATION] Returning a response body from a PUT " +
+          "is deprecated. \n#{response.pretty_inspect} was returned."
+        )
+        return format.decode(response)
+      end
     end
-    
+
    # make a post request
-   # @return [String] response.body raises an 
+   # @return [String] response.body raises an
    #   ApiResource::ConnectionError if we
    #   have a timeout, general exception, or
    #   if result.code is not within 200..399
    def post(path, body = {}, headers = self.headers)
       format.decode(
         request(
-          :post, 
-          path, 
-          body, 
+          :post,
+          path,
+          body,
           build_request_headers(headers, :post, self.site.merge(path))
         )
       )
@@ -127,14 +137,14 @@ module ApiResource
 
     private
       # Makes a request to the remote service
-      # @return [String] response.body raises an 
+      # @return [String] response.body raises an
       #   ApiResource::ConnectionError if we
       #   have a timeout, general exception, or
       #   if result.code is not within 200..399
       def request(method, path, *arguments)
         handle_response(path) do
           ActiveSupport::Notifications.instrument("request.api_resource") do |payload|
-            
+
             # debug logging
             ApiResource.logger.info("#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}")
             payload[:method]      = method
@@ -161,7 +171,7 @@ module ApiResource
         end
         return propogate_response_or_error(result, result.code)
       end
-      
+
       def propogate_response_or_error(response, code)
         case code.to_i
           when 301,302
@@ -194,7 +204,7 @@ module ApiResource
             raise ApiResource::ConnectionError.new(response, :message => "Unknown response code: #{code}")
         end
       end
-      
+
       # Creates new Net::HTTP instance for communication with the
       # remote service and resources.
       def http(path)
@@ -203,11 +213,11 @@ module ApiResource
         end
         RestClient::Resource.new("#{site.scheme}://#{site.host}:#{site.port}#{path}", {:timeout => ApiResource::Base.timeout, :open_timeout => ApiResource::Base.open_timeout})
       end
-      
+
       def build_request_headers(headers, verb, uri)
         http_format_header(verb).update(headers)
       end
-      
+
       def http_format_header(verb)
         {}.tap do |ret|
           ret[HTTP_FORMAT_HEADER_NAMES[verb]] = format.mime_type

data/lib/api_resource/formats/json_format.rb

@@ -18,11 +18,7 @@ module ApiResource
       end
 
       def decode(json)
-        if json.strip.blank?
-          return {}
-        else
-          JSON.parse(json)
-        end
+        JSON.parse(json)
       end
     end
   end

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'spork'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
+require 'yarjuf'
 
 Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,6 +61,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yarjuf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement