shutl_resource 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTc0YmQyNmIzNmU0NmE2YTcwOTUxZGM5ZjJhOTNiYTFkNzU3ODVmMQ==
+  data.tar.gz: !binary |-
+    ZDJmNTdlNjFlYzE1YTNhZTk3MGE0Yzg5YjEzMTliNmUzNTAwZjFhNQ==
+SHA512:
+  metadata.gz: !binary |-
+    YWMzNGQ5MmVjODEzMWU5NzM3ODc2MTQzYmZjOTJkMmUxOWU3MGYyZjBkOWIw
+    ZTZjZTkyOGQwMWZhMTNmMGJiNTZiZWU5YTJlMjYzZjE0MmYyNTgyZWJkZmQ2
+    Njg4ZTA0YjkwOGYxZDQ3MzYzMTRjZTY5YTE0N2QyNmIyNzE5OTk=
+  data.tar.gz: !binary |-
+    NGJkYzk2NTU0OTRjZWZjYmFjYWYwNDdjN2ZlN2I1ZDdmZDY5YTE2N2EwZDEx
+    MWEzMjE0YTUxMTNhYTYyNjUyOTg5ZTAyODYzZDQyMTFlZjczMjA1ZTg2ZWJh
+    MmNlOGIxMjlmNTg3MGVmMDUxYWRiMzQ2NTMzYTJlZjUzOGZmMjk=

data/.travis.yml

@@ -1,15 +1,7 @@
 language: ruby
-
 rvm:
-  - 1.9.2
   - 1.9.3
-  - jruby-19mode
-
+  - jruby-19mode # JRuby in 1.9 mode
 jdk:
   - openjdk7
-  - oraclejdk7
-
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-
+  - oraclejdk7

data/lib/shutl/resource/rest.rb

@@ -36,10 +36,10 @@ module Shutl::Resource
       attrs.each { |a, v| instance_variable_set(:"@#{a}", v) }
     end
 
-    def update!(attrs)
+    def update!(attrs, headers = {})
       new_attributes = attributes.merge attrs
       update_attributes(self.class.add_resource_id_to new_attributes)
-      save
+      save(headers)
     end
 
     def save options={}

data/lib/shutl/resource/rest_class_methods.rb

@@ -19,17 +19,8 @@ module Shutl::Resource
       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) }
 
       if @singular_resource
         url    = singular_member_url params
@@ -42,7 +33,7 @@ module Shutl::Resource
       end
 
       response     = connection.get(url) do |req|
-        req.headers = headers_with_auth(auth_options)
+        req.headers = generate_request_header(header_options(params))
       end
 
       check_fail response, "Failed to find #{name}! args: #{args}, params: #{params}"
@@ -56,7 +47,7 @@ module Shutl::Resource
       attributes.delete "response"
 
       response = connection.post(url) do |req|
-        req.headers = headers_with_auth(options)
+        req.headers = generate_request_header(header_options(options))
         req.body = { @resource_name => attributes }.to_json
       end
 
@@ -75,7 +66,7 @@ module Shutl::Resource
         instance,
         :delete,
         {}.to_json,
-        headers_with_auth(options),
+        generate_request_header(header_options(options)),
         failure_message
       ).success?
     end
@@ -88,7 +79,7 @@ module Shutl::Resource
       response = perform_action(instance,
                                 :put,
                                 body,
-                                headers_with_auth(options),
+                                generate_request_header(header_options(options)),
                                 "Save failed")
 
       response.success?
@@ -100,7 +91,6 @@ module Shutl::Resource
 
 
     def all(args = {})
-      auth_options = { auth: args.delete(:auth), from: args.delete(:from) }
       partition    = args.partition { |key, value| !remote_collection_url.index(":#{key}").nil? }
 
       url_args = partition.first.inject({}) { |h, pair| h[pair.first] = pair.last; h }
@@ -108,7 +98,7 @@ module Shutl::Resource
 
       url      = generate_collection_url url_args, params
       response = connection.get(url) do |req|
-        req.headers = headers_with_auth(auth_options)
+        req.headers = generate_request_header(header_options(args))
       end
 
       check_fail response, "Failed to find all #{name.downcase.pluralize}"
@@ -229,10 +219,38 @@ module Shutl::Resource
 
     private
 
+
+    def headers
+      {
+        'Accept'        => 'application/json',
+        'Content-Type'  => 'application/json',
+        'User-Agent'    => "Shutl Resource Gem v#{Shutl::Resource::VERSION}"
+      }
+    end
+    
+    def header_options params
+      header_opts = params[:headers] || {}
+      header_opts.merge!(authorization: params[:auth]) if params[:auth] 
+      header_opts.merge!(from: params[:from])          if params[:from]
+      header_opts
+    end
+
+
+    def generate_request_header header_options = {}
+      header_options.inject(headers) do |h, (k,v)|
+        h[header_name(k.to_s)] = v if v
+        h
+      end
+    end
+
+    def header_name header_key 
+      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]
+        h['From']          = "#{options[:from]}" if options[:from]
       end
     end
 
@@ -313,6 +331,7 @@ module Shutl::Resource
       args, url = replace_args_from_pattern! args, url
 
       url = URI.escape url
+      params = params.except(:headers, :auth, :from)
       unless params.empty?
         url += '?' + params.entries.map do |key, value|
           URI::encode "#{key}=#{value}"

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

data/shutl_resource.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/shutl/resource/version', __FILE__)
 $platform ||= RUBY_PLATFORM[/java/] || 'ruby'
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["David Rouchy", "Volker Pacher", "Mark Burns"]
-  gem.email         = ["davidr@shutl.co.uk", "volker@shutl.com", "mark@shutl.com"]
+  gem.authors       = ["David Rouchy", "Volker Pacher", "Mark Burns", "Cosimo Ranieri"]
+  gem.email         = ["davidr@shutl.co.uk", "volker@shutl.com", "mark@shutl.com", "cosimo@shutl.com"]
   gem.description   = %q{Shutl Rest resource}
   gem.summary       = %q{Manage Shutl Rest resource. Parse/Serialize JSON}
   gem.homepage      = ""

data/spec/request_headers_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe Shutl::Resource::Rest do
+  let(:expected_headers) do
+    {
+      headers: 
+        {
+          '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'
+        }
+    }
+  end
+
+  let(:response_headers) do
+    { 'Accept'       => 'application/json',
+      'Content-Type' => 'application/json',
+      'User-Agent'   => "Shutl Resource Gem v#{Shutl::Resource::VERSION}" }
+  end
+
+  let(:resource) { TestRest.new(a: 'a', b: 2) }
+
+  let(:headers) {
+    {
+      authorization:         "some auth",
+      content_type:          "application/json+consumer",
+      consumer_access_token: "ConsumerAccessToken"
+    }
+  }
+
+  describe '#find' do
+    context "with a singular resource" do
+      let(:resource) { TestSingularResource.new }
+
+      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(headers: headers)
+        @request.should have_been_requested
+      end
+    end
+  end
+
+  describe ".create" do
+
+    context "With the setting to not raise exceptions" do
+      let(:resource) { TestSingularResource.new }
+      let(:attributes) { { :a => 1 } }
+      let(:body) { { test_singular_resource: { a: 1 } }.to_json }
+      before 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, 
+                              :headers => response_headers)
+      end
+      
+      it 'queries the endpoint' do
+        TestSingularResource.create(attributes, headers: headers)
+        @request.should have_been_requested
+      end 
+    end  
+  end
+
+  describe "#destroy" do
+    let(:destroy_headers) { expected_headers[:headers].except("Accept-Encoding") }
+    
+    before do  
+      @request = stub_request(:delete, 'http://host/test_singular_resources/a')
+                 .with(destroy_headers)
+    end
+
+    it 'queries the endpoint' do
+        TestSingularResource.destroy(id: 'a')
+        @request.should have_been_requested
+    end  
+  end 
+
+  describe "#save" do
+    let(:save_headers) { expected_headers[:headers].except("Accept-Encoding") }
+    before do  
+      @request = stub_request(:put, 'http://host/test_rests/a')
+                 .with(save_headers)
+    end
+
+    it 'queries the endpoint' do
+      resource.save
+      @request.should have_been_requested
+    end 
+  end
+
+  describe '#update!' do
+    let(:update_headers) { expected_headers[:headers].except("Accept-Encoding") }
+    let(:attributes) { { a: 'a', b: 'b' } }
+    let(:body) { { test_rest: { a: "a", b: "b", id: "a" } }.to_json }
+
+    before do
+      @request = stub_request(:put, "http://host/test_rests/a").
+        with(:body    => body,
+             :headers => update_headers).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    it 'queries the endpoint' do
+      resource.update!(attributes, headers: headers)
+      @request.should have_been_requested
+    end
+  end
+
+  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)
+                 .to_return(:status => 200, body: body,:headers => headers)
+    end
+
+    it 'queries the endpoint' do
+      TestRest.all headers: headers
+      @request.should have_been_requested
+    end
+
+  end
+end

data/spec/rest_resource_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Shutl::Resource::Rest do
   let(:headers) do
-    { 'Accept' => 'application/json',
+    { 'Accept'       => 'application/json',
       'Content-Type' => 'application/json',
-      'User-Agent' => "Shutl Resource Gem v#{Shutl::Resource::VERSION}" }
+      'User-Agent'   => "Shutl Resource Gem v#{Shutl::Resource::VERSION}" }
   end
 
   let(:resource) { TestRest.new(a: 'a', b: 2) }
@@ -12,9 +12,6 @@ describe Shutl::Resource::Rest do
   describe '#find' do
     context "with a singular resource" do
       let(:resource) { TestSingularResource.new }
-      let(:headers_with_auth) do
-        headers.merge("Authorization" => "Bearer some auth")
-      end
 
       before do
         @request = stub_request(:get, 'http://host/test_singular_resource').
@@ -25,7 +22,6 @@ describe Shutl::Resource::Rest do
 
       it 'queries the endpoint' do
         TestSingularResource.find(auth: "some auth")
-
         @request.should have_been_requested
       end
 

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - David Rouchy
 - Volker Pacher
 - Mark Burns
+- Cosimo Ranieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-11-05 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
@@ -24,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -32,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +51,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday-conductivity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +93,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -120,7 +107,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -128,7 +114,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,7 +121,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,7 +128,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,7 +135,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -162,6 +144,7 @@ email:
 - davidr@shutl.co.uk
 - volker@shutl.com
 - mark@shutl.com
+- cosimo@shutl.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -193,6 +176,7 @@ files:
 - spec/dynamic_resource_spec.rb
 - spec/error_spec.rb
 - spec/remote_url_spec.rb
+- spec/request_headers_spec.rb
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configured_base_uri_resource.rb
@@ -200,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: -4184138435452899409
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4184138435452899409
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage Shutl Rest resource. Parse/Serialize JSON
 test_files:
 - spec/configuration_spec.rb
@@ -234,6 +211,7 @@ test_files:
 - spec/dynamic_resource_spec.rb
 - spec/error_spec.rb
 - spec/remote_url_spec.rb
+- spec/request_headers_spec.rb
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configured_base_uri_resource.rb