shutl_resource 1.4.2 → 1.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmRlNDY2N2JlODI4YmZhYzdmZWJkOGVjOGFhOWFkMTQ1NGZlYmIxZg==
+  data.tar.gz: !binary |-
+    Yzg2NTQ4YjZmNzg3MTI4MTNmYmVhYjQ0MTQxYTU4MjVlZDNjYWUxMA==
+SHA512:
+  metadata.gz: !binary |-
+    ODlhY2MyYWE2ZjM1YTNkNjYyYjA0NzFjZTBkZjU2MmMzZDAyMzA1OWI1MTQ1
+    ZThmZDdmOWJkZjg5ZGQ1Nzk3YWZlYjljMzViNTkyMmY3MDkzMThhZTIyYTJk
+    Y2E3Mjc0Y2RkMWMyNDVlN2I0ZTg0YTNkMDdhMzBmZmE4NjU4NjA=
+  data.tar.gz: !binary |-
+    ODJlMzU5ZTM5MzRhZjkxODBlMmVlMjdlMWFhZWFjZDBkOWE0YTEzNzRjN2Qw
+    ZmFmZDJjNTRiYTNjNDZhNDRjZWNmYWMzMjlkMTkxMTFlZjc1OTY2MDJiODg4
+    MWFjY2I5ZWIyNjRmOWZjZDM5ZjI1N2VkMjE3ODBlYmM4NjQwMjU=

data/lib/shutl/resource/rest.rb

@@ -33,7 +33,12 @@ module Shutl::Resource
     end
 
     def update_attributes(attrs)
-      attrs.each { |a, v| instance_variable_set(:"@#{a}", v) }
+      attrs.each do |a, v|
+        unless String(a) == 'id' && attributes.include?('id')
+          a = 'id' if String(a) == 'new_id'
+          attributes.update String(a) => v
+        end
+      end
     end
 
     def update!(attrs, headers = {})
@@ -51,14 +56,12 @@ module Shutl::Resource
     end
 
     def method_missing(method, *args, &block)
-      if self.instance_variables.include?(:"@#{method}")
-        return self.instance_variable_get(:"@#{method}")
-      end
-      super
+        return attributes[String(args.first)] if method.to_s == '[]'
+        attributes.fetch(String(method)) { super }
     end
 
     def respond_to? method
-      self.instance_variables.include?(:"@#{method}") ? true : super
+      attributes.has_key?(method) ? true : super
     end
 
 
@@ -79,9 +82,7 @@ module Shutl::Resource
     end
 
     def attributes
-      (instance_variables- [:@errors, :@pagination]).inject({}.with_indifferent_access) do |h, var|
-        h.merge( { var.to_s.gsub('@','').to_sym => instance_variable_get(var)})
-      end
+      @attributes ||= {}
     end
 
     protected

data/lib/shutl/resource/rest_class_methods.rb

@@ -31,7 +31,6 @@ module Shutl::Resource
       else
         url = member_url args.dup, params
       end
-
       response     = connection.get(url) do |req|
         req.headers = generate_request_header(header_options(params))
       end
@@ -247,13 +246,6 @@ module Shutl::Resource
       header_key.split(%r{\_|\-}).map {|e| e.capitalize }.join("-")
     end
 
-    def headers_with_auth options = {}
-      headers.tap do |h|
-        h['Authorization'] = "Bearer #{options[:auth]}" if options[:auth]
-        h['From']          = "#{options[:from]}" if options[:from]
-      end
-    end
-
     def perform_action instance, verb, body, headers, failure_message
       attributes = instance.is_a?(Hash) ? instance : instance.attributes
       attributes.delete "response" #used in debugging requests/responses

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.4.2'
+    VERSION = '1.5.0'
   end
 end

data/spec/dynamic_resource_spec.rb

@@ -15,8 +15,8 @@ describe Shutl::Resource::Rest do
 
   describe '#initalize' do
     it 'should assign the instance variable value for the entries in the hash' do
-      resource.instance_variable_get(:@a).should == 'a'
-      resource.instance_variable_get(:@b).should == 'b'
+      resource.attributes['a'].should == 'a'
+      resource.attributes['b'].should == 'b'
     end
 
     it 'should create a attribute reader' do
@@ -55,8 +55,7 @@ describe Shutl::Resource::Rest do
     it 'should replace the attributes' do
       resource.update_attributes(a: 'c')
 
-      resource.instance_variable_get(:@a).should == 'c'
-
+      resource['a'].should == 'c'
     end
   end
 end

data/spec/request_headers_spec.rb

@@ -31,6 +31,32 @@ describe Shutl::Resource::Rest do
     }
   }
 
+  describe 'prepends Bearer if auth is passed in for authorization' do
+    let(:resource) { TestSingularResource.new }
+    let(:expected_headers) {
+      {
+        'Accept'                => 'application/json', 
+        'Accept-Encoding'       => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 
+        'Authorization'         => 'Bearer some_auth',
+        'Content-Type'          => 'application/json',
+        'User-Agent'            => "Shutl Resource Gem v#{Shutl::Resource::VERSION}",
+      }
+    }
+    before do
+      @request = stub_request(:get, 'http://host/test_singular_resource')
+                 .with(expected_headers)
+                 .to_return(:status  => 200,
+                            :body    => '{"test_singular_resource": { "a": "a", "b": 2 }}',
+                            :headers => response_headers)
+    end
+    it 'queries the endpoint' do
+      TestSingularResource.find(auth: "some_auth")
+      @request.should have_been_requested
+    end
+
+  end
+
+
   describe '#find' do
     context "with a singular resource" do
       let(:resource) { TestSingularResource.new }

data/spec/rest_resource_spec.rb

@@ -114,8 +114,8 @@ describe Shutl::Resource::Rest do
       it 'should assign the attributes based on the json returned' do
         resource = TestRest.find('a', auth: "some auth")
 
-        resource.instance_variable_get('@a').should == 'a'
-        resource.instance_variable_get('@b').should == 2
+        resource.attributes['a'].should == 'a'
+        resource.attributes['b'].should == 2
       end
 
       context "299" do
@@ -182,7 +182,7 @@ describe Shutl::Resource::Rest do
       it 'should add a id based on the resource id' do
         resource = TestRest.find('a')
 
-        resource.instance_variable_get('@id').should == 'a'
+        resource.attributes['id'].should == 'a'
       end
     end
 
@@ -241,8 +241,8 @@ describe Shutl::Resource::Rest do
       it 'should assign the attributes based on the json returned' do
         resource = TestRest.all
 
-        resource.first.instance_variable_get('@a').should == 'a'
-        resource.first.instance_variable_get('@b').should == 2
+        resource.first.attributes['a'].should == 'a'
+        resource.first.attributes['b'].should == 2
       end
 
       it 'should provide accessor to pagination' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - David Rouchy
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday-conductivity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -89,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -113,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,7 +107,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -129,7 +114,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -137,7 +121,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,7 +128,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,7 +135,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -203,33 +184,26 @@ files:
 - spec/support/test_singular_resource.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3229729289856773227
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3229729289856773227
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage Shutl Rest resource. Parse/Serialize JSON
 test_files:
 - spec/configuration_spec.rb