shutl_resource 0.11.4 → 1.0.0

data/lib/shutl/resource/configuration.rb

@@ -28,11 +28,19 @@ module Shutl::Resource
 
   module Configuration
     class << self
-      attr_accessor :base_uri, :logger
+      attr_accessor :base_uri
 
       def configure
         yield self
       end
+
+      def logger
+        @logger ||= Logger.new($stdout)
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
     end
   end
 end

data/lib/shutl/resource/rest.rb

@@ -14,8 +14,14 @@ module Shutl::Resource
     attr_reader :response
 
     def self.included(base)
+      base.send :include, HTTParty
       base.send :extend,  Shutl::Resource::RestClassMethods
 
+      base.send :headers, {
+        'Accept'        => 'application/json',
+        'Content-Type'  => 'application/json'
+      }
+
       base.send :resource_name, base.name.split('::').last.underscore
       base.send :resource_id,   :id
     end

data/lib/shutl/resource/rest_class_methods.rb

@@ -1,33 +1,6 @@
 require 'open-uri'
 module Shutl::Resource
   module RestClassMethods
-    def base_uri uri
-      @base_uri = uri
-    end
-
-    def connection
-      @connection ||= Faraday.new(:url => @base_uri || Shutl::Resource.base_uri) do |faraday|
-        faraday.request :url_encoded # form-encode POST params
-        faraday.response :json
-
-        # faraday.ssl[:ca_file] = ENV["SSL_CERT_FILE"]
-
-        faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
-
-        if Shutl::Resource.logger
-          faraday.use :extended_logging, logger: Shutl::Resource.logger
-        end
-      end
-    end
-
-    def headers
-      {
-        'Accept'        => 'application/json',
-        'Content-Type'  => 'application/json',
-        'User-Agent'    => "Shutl Resource Gem v#{Shutl::Resource::VERSION}"
-      }
-    end
-
     def find(args = {}, params = {})
       params = args if @singular_resource
       auth_options = { auth: params.delete(:auth), from: params.delete(:from) }
@@ -42,13 +15,13 @@ module Shutl::Resource
         url = member_url args.dup, params
       end
 
-      response     = connection.get(url) do |req|
-        req.headers = headers_with_auth(auth_options)
-      end
+      response     = get url, headers_with_auth(auth_options)
 
       check_fail response, "Failed to find #{name}! args: #{args}, params: #{params}"
 
-      including_parent_attributes = response.body[@resource_name].merge args
+      parsed = response.parsed_response
+
+      including_parent_attributes = parsed[@resource_name].merge args
       new_object including_parent_attributes, response
     end
 
@@ -56,41 +29,40 @@ module Shutl::Resource
       url = generate_collection_url attributes
       attributes.delete "response"
 
-      response = connection.post(url) do |req|
-        req.headers = headers_with_auth(options)
-        req.body = { @resource_name => attributes }.to_json
-      end
+      response = post(
+        url,
+        { body: { @resource_name => attributes }.to_json }.merge(headers_with_auth(options))
+      )
 
       check_fail response, "Create failed"
 
-      parsed     = response.body || {}
+      parsed     = response.parsed_response || {}
       attributes = parsed[@resource_name] || {}
 
       new_object attributes, response
     end
 
     def destroy instance, options = {}
-      failure_message = "Failed to destroy #{name.downcase.pluralize}"
+      message = "Failed to destroy #{name.downcase.pluralize}"
 
       perform_action(
         instance,
         :delete,
-        {},
         headers_with_auth(options),
-        failure_message
+        message
       ).success?
     end
 
     def save instance, options = {}
+      #TODO: this is sometimes a hash and sometimes a Rest - need to rethink this
       attributes = instance.attributes rescue instance
 
-      body = { @resource_name => convert_new_id(attributes) }.to_json
+      payload = {
+        body: { @resource_name => convert_new_id(attributes) }.to_json
+      }
 
-      response = perform_action(instance,
-                                :put,
-                                body,
-                                headers_with_auth(options),
-                                "Save failed")
+      payload_with_headers = payload.merge(headers_with_auth options)
+      response             = perform_action(instance, :put, payload, "Save failed")
 
       response.success?
     end
@@ -108,13 +80,11 @@ module Shutl::Resource
       params   = partition.last.inject({}) { |h, pair| h[pair.first] = pair.last; h }
 
       url      = generate_collection_url url_args, params
-      response = connection.get(url) do |req|
-        req.headers = headers_with_auth(auth_options)
-      end
+      response = get url, headers_with_auth(auth_options)
 
       check_fail response, "Failed to find all #{name.downcase.pluralize}"
 
-      response_object = response.body[@resource_name.pluralize].map do |h|
+      response_object = response.parsed_response[@resource_name.pluralize].map do |h|
         new_object(args.merge(h), response)
       end
       if order_collection?
@@ -125,7 +95,7 @@ module Shutl::Resource
         end
       end
 
-      RestCollection.new(response_object, response.body['pagination'])
+      RestCollection.new(response_object, response.parsed_response['pagination'])
     end
 
     class RestCollection
@@ -235,17 +205,15 @@ module Shutl::Resource
         h['Authorization'] = "Bearer #{options[:auth]}" if options[:auth]
         h['From'] = "#{options[:from]}" if options[:from]
       end
+      { headers: headers }
     end
 
-    def perform_action instance, verb, body, headers, failure_message
+    def perform_action instance, verb, args, failure_message
       attributes = instance.is_a?(Hash) ? instance : instance.attributes
       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
-      end
+      response = send verb, url, args
 
       check_fail response, failure_message
 
@@ -256,7 +224,7 @@ module Shutl::Resource
       instance = new add_resource_id_to(args), response
 
       instance.tap do |i|
-        parsed_response = response.body
+        parsed_response = response.parsed_response
 
         if errors = (parsed_response and parsed_response["errors"])
           i.errors = errors
@@ -265,7 +233,8 @@ module Shutl::Resource
     end
 
     def check_fail response, message
-      failure_klass = case response.status
+      c             = response.code
+      failure_klass = case c
                       when 299
                         if Shutl::Resource.raise_exceptions_on_no_quotes_generated
                           Shutl::NoQuotesGenerated
@@ -296,7 +265,7 @@ module Shutl::Resource
 
 
       output = begin
-                 response.body["errors"]["base"]
+                 response.parsed_response["errors"]["base"]
                rescue
                  message
                end
@@ -309,6 +278,8 @@ module Shutl::Resource
     def generate_url!(url_pattern, args, params = {})
       url = url_pattern.dup
 
+      url = "#{Shutl::Resource.base_uri}#{url}" unless self.base_uri
+
       args, url = replace_args_from_pattern! args, url
 
       url = URI.escape url

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '0.11.4'
+    VERSION = '1.0.0'
   end
 end

data/lib/shutl_resource.rb

@@ -1,10 +1,6 @@
 module Shutl
 end
 
-require 'faraday'
-require 'faraday_middleware'
-require "faraday/conductivity"
-
 require 'shutl_auth'
 require 'shutl/resource/version'
 require 'shutl/resource/configuration'

data/shutl_resource.gemspec

@@ -21,9 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httparty', '~> 0.10.0'
   gem.add_dependency 'shutl_auth', '0.8.0'
   gem.add_dependency 'activemodel'
-  gem.add_dependency 'faraday'
-  gem.add_dependency 'faraday_middleware'
-  gem.add_dependency 'faraday-conductivity'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.11.0'

data/spec/configuration_spec.rb

@@ -2,6 +2,18 @@ require 'spec_helper'
 
 describe Shutl::Resource do
   describe '#configure' do
+    let(:logger) { Shutl::Resource.logger }
+
+    it 'should configure the logger' do
+      logger = stub('logger')
+
+      Shutl::Resource.configure do |config|
+        config.logger = logger
+      end
+
+      Shutl::Resource.logger.should == logger
+    end
+
     it "allows for configuration of the base uri" do
       Shutl::Resource.configure do |config|
         config.base_uri = 'base uri'

data/spec/remote_url_spec.rb

@@ -81,7 +81,7 @@ describe Shutl::Resource::Rest do
       end
 
       it 'should support the params with invalid uri name' do
-        request = stub_request(:get, 'http://host/nested/10/resources?arg1=val1&arg%2B2=val2').
+        request = stub_request(:get, 'http://host/nested/10/resources?arg1=val1&arg%202=val2').
           to_return(body: '{"nested_resources": []}', headers: headers)
 
         NestedResource.all(parent_id: 10, arg1: 'val1', :'arg 2' => 'val2')

data/spec/rest_resource_spec.rb

@@ -2,9 +2,14 @@ require 'spec_helper'
 
 describe Shutl::Resource::Rest do
   let(:headers) do
-    { 'Accept' => 'application/json',
-      'Content-Type' => 'application/json',
-      'User-Agent' => "Shutl Resource Gem v#{Shutl::Resource::VERSION}" }
+    { 'Accept' => 'application/json', 'Content-Type' => 'application/json' }
+  end
+
+  it 'should include the REST verb' do
+    TestRest.should respond_to :get
+    TestRest.should respond_to :post
+    TestRest.should respond_to :post
+    TestRest.should respond_to :delete
   end
 
   let(:resource) { TestRest.new(a: 'a', b: 2) }

data/spec/spec_helper.rb

@@ -5,3 +5,4 @@ require 'support/test_resource'
 require 'support/test_resource'
 require 'support/configured_base_uri_resource'
 require 'support/test_singular_resource'
+require 'support/double_logger'

data/spec/support/double_logger.rb

@@ -0,0 +1,14 @@
+
+module Shutl::Resource
+  class NoLogger
+    def debug(message) ; end
+    def info(message) ; end
+    def warn(message) ; end
+    def error(message) ; end
+    def fatal(message) ; end
+  end
+end
+
+Shutl::Resource.configure do |config|
+  config.logger = Shutl::Resource::NoLogger.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -61,54 +61,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday-conductivity
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +158,7 @@ files:
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configured_base_uri_resource.rb
+- spec/support/double_logger.rb
 - spec/support/test_resource.rb
 - spec/support/test_singular_resource.rb
 homepage: ''
@@ -222,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2169590113851625872
+      hash: 2862234294544768530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2169590113851625872
+      hash: 2862234294544768530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -246,5 +199,6 @@ test_files:
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configured_base_uri_resource.rb
+- spec/support/double_logger.rb
 - spec/support/test_resource.rb
 - spec/support/test_singular_resource.rb