shutl_resource 1.3.0 → 1.3.1

data/lib/shutl/resource/rest.rb

@@ -1,4 +1,3 @@
-require 'httparty'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash'
 require 'active_support/inflector'
@@ -8,10 +7,9 @@ require 'active_model'
 
 module Shutl::Resource
   module Rest
-    extend HTTParty
     include ActiveModel::Serialization
 
-    attr_reader :response
+    attr_accessor :pagination, :errors
 
     def self.included(base)
       base.send :extend,  Shutl::Resource::RestClassMethods
@@ -20,9 +18,8 @@ module Shutl::Resource
       base.send :resource_id,   :id
     end
 
-    def initialize(args = {}, response=nil)
+    def initialize(args = {})
       update_attributes args
-      @response = response
     end
 
     def as_json(_)
@@ -64,28 +61,15 @@ module Shutl::Resource
       self.instance_variables.include?(:"@#{method}") ? true : super
     end
 
-    def parsed
-      @parsed ||= response.body.with_indifferent_access
-    end
-
-    def status
-      response.code
-    end
-
-    def pagination
-      parsed[:pagination]
-    end
 
     def next_resource
-      pagination[:next_resource] if pagination
+      pagination["next_resource"] if pagination
     end
 
     def previous_resource
-      pagination[:previous_resource] if pagination
+      pagination["previous_resource"] if pagination
     end
 
-    attr_accessor :errors
-
     def valid?
       errors.blank?
     end
@@ -95,17 +79,11 @@ module Shutl::Resource
     end
 
     def attributes
-      (instance_variables - [:@response]).inject({}.with_indifferent_access) do |h, var|
+      (instance_variables).inject({}.with_indifferent_access) do |h, var|
         h.merge( { var.to_s.gsub('@','').to_sym => instance_variable_get(var)})
       end
     end
 
-    private
-
-    def check_fail *args
-      self.class.send :check_fail, *args
-    end
-
     protected
 
     def prefix

data/lib/shutl/resource/rest_class_methods.rb

@@ -47,7 +47,7 @@ module Shutl::Resource
       check_fail response, "Failed to find #{name}! args: #{args}, params: #{params}"
 
       including_parent_attributes = response.body[@resource_name].merge args
-      new_object including_parent_attributes, response
+      new_object including_parent_attributes, response.body
     end
 
     def create attributes = {}, options = {}
@@ -61,10 +61,10 @@ module Shutl::Resource
 
       check_fail response, "Create failed"
 
-      parsed     = response.body || {}
-      attributes = parsed[@resource_name] || {}
+      body     = response.body || {}
+      attributes = body[@resource_name] || {}
 
-      new_object attributes, response
+      new_object attributes, body
     end
 
     def destroy instance, options = {}
@@ -113,7 +113,7 @@ module Shutl::Resource
       check_fail response, "Failed to find all #{name.downcase.pluralize}"
 
       response_object = response.body[@resource_name.pluralize].map do |h|
-        new_object(args.merge(h), response)
+        new_object(args.merge(h), response.body)
       end
       if order_collection?
         response_object.sort! do |a,b|
@@ -240,6 +240,7 @@ module Shutl::Resource
       attributes.delete "response" #used in debugging requests/responses
 
       url      = member_url attributes
+
       response = connection.send(verb, url) do |req|
         req.headers = headers
         req.body = body
@@ -250,57 +251,56 @@ module Shutl::Resource
       response
     end
 
-    def new_object(args={}, response=nil)
-      instance = new add_resource_id_to(args), response
+    def new_object(args={}, body)
+      instance = new add_resource_id_to(args)
 
       instance.tap do |i|
-        parsed_response = response.body
-
-        if errors = (parsed_response and parsed_response["errors"])
-          i.errors = errors
-        end
+        i.errors     = body["errors"]
+        i.pagination = body["pagination"]
       end
     end
 
     def check_fail response, message
-      failure_klass = case response.status
-                      when 299
-                        if Shutl::Resource.raise_exceptions_on_no_quotes_generated
-                          Shutl::NoQuotesGenerated
-                        else
-                          nil
-                        end
-
-                      when 400 then Shutl::BadRequest
-                      when 401 then Shutl::UnauthorizedAccess
-                      when 403 then Shutl::ForbiddenAccess
-                      when 404 then Shutl::ResourceNotFound
-                      when 409 then Shutl::ResourceConflict
-                      when 410 then Shutl::ResourceGone
-                      when 422
-                        if Shutl::Resource.raise_exceptions_on_validation
-                          Shutl::ResourceInvalid
-                        else
-                          nil #handled as validation failure
-                        end
-
-                      when 411..499
-                        Shutl::BadRequest
-                      when 500 then Shutl::ServerError
-                      when 503 then Shutl::ServiceUnavailable
-                      when 501..Float::INFINITY
-                        Shutl::ServerError
-                      end
-
-      if failure_klass
-        body = if response.headers["content-type"] == "application/json"
+      if klass = failure_klass(response.status)
+        body = if response.headers["content-type"] =~ %r{application/json}
                  response.body
                else
                  {debug_info: response.body}
                end
 
 
-        raise failure_klass.new body, response.status
+        raise klass.new body, response.status
+      end
+    end
+
+    def failure_klass(status)
+      case status
+      when 299
+        if Shutl::Resource.raise_exceptions_on_no_quotes_generated
+          Shutl::NoQuotesGenerated
+        else
+          nil
+        end
+
+      when 400 then Shutl::BadRequest
+      when 401 then Shutl::UnauthorizedAccess
+      when 403 then Shutl::ForbiddenAccess
+      when 404 then Shutl::ResourceNotFound
+      when 409 then Shutl::ResourceConflict
+      when 410 then Shutl::ResourceGone
+      when 422
+        if Shutl::Resource.raise_exceptions_on_validation
+          Shutl::ResourceInvalid
+        else
+          nil #handled as validation failure
+        end
+
+      when 411..499
+        Shutl::BadRequest
+      when 500 then Shutl::ServerError
+      when 503 then Shutl::ServiceUnavailable
+      when 501..Float::INFINITY
+        Shutl::ServerError
       end
     end
 

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/shutl_resource.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Shutl::Resource::VERSION
 
-  gem.add_dependency 'httparty', '~> 0.10.0'
   gem.add_dependency 'shutl_auth', '0.8.0'
   gem.add_dependency 'activemodel'
   gem.add_dependency 'faraday'

data/spec/rest_resource_spec.rb

@@ -55,7 +55,7 @@ describe Shutl::Resource::Rest do
 
       before do
         @request = stub_request(:get, 'http://host/test_rests/a').
-          to_return(:status => 200, :body => body, :headers => headers)
+          to_return(status: 200, body: body, headers: headers)
       end
 
       context 'both present' do
@@ -311,6 +311,7 @@ describe Shutl::Resource::Rest do
       after do
         Shutl::Resource.raise_exceptions_on_validation = true
       end
+
       specify do
         errors = { "base" => "invalid", "some_field" => "some field is invalid" }
         body   = { "errors" => errors }.to_json
@@ -337,7 +338,7 @@ describe Shutl::Resource::Rest do
 
     def stub_post status
       stub_request(:post, 'http://host/test_rests').
-        to_return(:status => status, :body => '', :headers => headers)
+        to_return(:status => status, :body => '{}', :headers => headers)
     end
 
     it 'should raise error if the remote server returns an error' do
@@ -350,7 +351,7 @@ describe Shutl::Resource::Rest do
 
     it 'should post the header content-type: json' do
       request = stub_request(:post, 'http://host/test_rests').
-        with(:body => "{\"test_rest\":{}}", :headers => headers)
+        with(:body => '{"test_rest":{}}', :headers => headers)
 
       TestRest.create
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,22 +13,6 @@ bindir: bin
 cert_chain: []
 date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: shutl_auth
   requirement: !ruby/object:Gem::Requirement