shutl_resource 1.6.0 → 1.7.0

data/lib/shutl/resource/rest_class_methods.rb

@@ -89,22 +89,37 @@ module Shutl::Resource
       save args, options
     end
 
+    def split_hash h
+      partitions = h.partition { |key, value| yield key, value }
+      [Hash[partitions.first], Hash[partitions.last]]
+    end
+
+    def split_url_args args
+      split_hash(args) do |key, value|
+        !remote_collection_url.index(":#{key}").nil?
+      end
+    end
+
+    def split_header_args args
+      split_hash(args) do |key, value|
+        %(auth headers from).include?(key.to_s)
+      end
+    end
 
     def all(args = {})
-      partition    = args.partition { |key, value| !remote_collection_url.index(":#{key}").nil? }
+      header_args, non_header_args = split_header_args args
+      url_args, params = split_url_args non_header_args
 
-      url_args = partition.first.inject({}) { |h, pair| h[pair.first] = pair.last; h }
-      params   = partition.last.inject({}) { |h, pair| h[pair.first] = pair.last; h }
+      url = generate_collection_url url_args, params
 
-      url      = generate_collection_url url_args, params
       response = connection.get(url) do |req|
-        req.headers = generate_request_header(header_options(args))
+        req.headers = generate_request_header(header_options(header_args))
       end
 
       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.body)
+        new_object(non_header_args.merge(h), response.body)
       end
       if order_collection?
         response_object.sort! do |a,b|

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

data/spec/request_headers_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Shutl::Resource::Rest do
   let(:expected_headers) do
     {
-      headers: 
+      headers:
         {
-          'Accept'                => 'application/json', 
-          'Accept-Encoding'       => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 
-          'Authorization'         => 'some auth', 
+          'Accept'                => 'application/json',
+          'Accept-Encoding'       => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Authorization'         => 'some auth',
           'Content-Type'          => 'application/json+consumer',
           'User-Agent'            => "Shutl Resource Gem v#{Shutl::Resource::VERSION}",
           'Consumer-Access-Token' => 'ConsumerAccessToken'
@@ -35,8 +35,8 @@ describe Shutl::Resource::Rest 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', 
+        '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}",
@@ -87,21 +87,21 @@ describe Shutl::Resource::Rest do
         post_headers = expected_headers[:headers].except("Accept-Encoding")
         @request = stub_request(:post, 'http://host/test_singular_resources')
                    .with(post_headers.merge(body: body))
-                   .to_return(:status  => 200, 
+                   .to_return(:status  => 200,
                               :headers => response_headers)
       end
-      
+
       it 'queries the endpoint' do
         TestSingularResource.create(attributes, headers: headers)
         @request.should have_been_requested
-      end 
-    end  
+      end
+    end
   end
 
   describe "#destroy" do
     let(:destroy_headers) { expected_headers[:headers].except("Accept-Encoding") }
-    
-    before do  
+
+    before do
       @request = stub_request(:delete, 'http://host/test_singular_resources/a')
                  .with(destroy_headers)
     end
@@ -109,12 +109,12 @@ describe Shutl::Resource::Rest do
     it 'queries the endpoint' do
         TestSingularResource.destroy(id: 'a')
         @request.should have_been_requested
-    end  
-  end 
+    end
+  end
 
   describe "#save" do
     let(:save_headers) { expected_headers[:headers].except("Accept-Encoding") }
-    before do  
+    before do
       @request = stub_request(:put, 'http://host/test_rests/a')
                  .with(save_headers)
     end
@@ -122,7 +122,7 @@ describe Shutl::Resource::Rest do
     it 'queries the endpoint' do
       resource.save
       @request.should have_been_requested
-    end 
+    end
   end
 
   describe '#update!' do
@@ -145,7 +145,7 @@ describe Shutl::Resource::Rest do
 
   describe '#all' do
     let(:body) { { test_rests: [{ a: "a", b: 2 }]}.to_json }
-      
+
     before do
       @request = stub_request(:get, 'http://host/test_rests')
                  .with(expected_headers)
@@ -156,6 +156,5 @@ describe Shutl::Resource::Rest do
       TestRest.all headers: headers
       @request.should have_been_requested
     end
-
   end
 end

data/spec/rest_resource_spec.rb

@@ -294,7 +294,6 @@ describe Shutl::Resource::Rest do
           to_return(:status => 403)
 
         lambda { TestRest.all }.should raise_error(Shutl::ForbiddenAccess)
-
       end
 
       context 'ordering the collection' do
@@ -331,6 +330,41 @@ describe Shutl::Resource::Rest do
         @request.should have_been_requested
       end
     end
+
+    describe 'response attributes' do
+      before do
+         stub_request(:get, "http://host/test_rests").
+         with(:headers => {
+           'Authorization'=>'Bearer TOKEN',
+           'Accept'=>'application/json',
+           'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+           'Content-Type'=>'application/json',
+           'User-Agent'=>"Shutl Resource Gem v#{Shutl::Resource::VERSION}"}).
+         to_return(:status => 200, :body => '{"test_rests": [{ "a": "a", "b": 2 }]}', :headers => {})
+      end
+
+      let(:result) do
+        TestRest.all(
+          auth: 'TOKEN', 'auth' => 'TOKEN',
+          headers: {some: 'headers'}, 'headers' => {some: 'headers'},
+          from: 'bob@example.com', 'from' => 'bob@example.com')
+      end
+
+      it 'should not have auth token' do
+        result.first.attributes.should_not have_key('auth')
+        result.first.attributes.should_not have_key(:auth)
+      end
+
+      it 'should not have headers' do
+        result.first.attributes.should_not have_key('headers')
+        result.first.attributes.should_not have_key(:headers)
+      end
+
+      it 'should not have from email' do
+        result.first.attributes.should_not have_key('from')
+        result.first.attributes.should_not have_key(:from)
+      end
+    end
   end
 
   describe '.create' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth
@@ -217,18 +217,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3278622488598740442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3278622488598740442
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23