shutl_resource 1.5.3 → 1.5.4

data/Gemfile

@@ -3,5 +3,9 @@ source 'https://rubygems.org'
 group :development do
   gem 'license_finder'
 end
+
+group :test do
+  gem 'pry'
+end
 # Specify your gem's dependencies in shutl_resource.gemspec
 gemspec

data/lib/shutl/resource/rest_class_methods.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 module Shutl::Resource
   module RestClassMethods
+
     def base_uri uri
       @base_uri = uri
     end
@@ -216,8 +217,11 @@ module Shutl::Resource
     end
 
 
-    private
+    def self.from_user= email
+      Thread.current[:user_email] = email
+    end
 
+    private
 
     def headers
       {
@@ -230,10 +234,14 @@ module Shutl::Resource
     def header_options params
       header_opts = params[:headers] || {}
       header_opts.merge!(authorization: "Bearer #{params[:auth]}") if params[:auth] 
-      header_opts.merge!(from: params[:from])                      if params[:from]
+      header_opts.merge!(from: current_user_email(params))         if current_user_email(params)
       header_opts
     end
 
+    def current_user_email params
+      params[:from] || Thread.current[:user_email]
+    end
+
 
     def generate_request_header header_options = {}
       header_options.inject(headers) do |h, (k,v)|

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.5.3'
+    VERSION = '1.5.4'
   end
 end

data/spec/rest_resource_spec.rb

@@ -376,6 +376,41 @@ describe Shutl::Resource::Rest do
         request.should have_been_requested
     end
 
+    context "send user email address for Audit" do
+      let(:user_email) { 'user@example.com' }
+
+      before do
+        Shutl::Resource::RestClassMethods.from_user = user_email
+      end
+
+      it "should override the email with 'from' option" do
+        request = stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'new@example.com')).to_return(:status => 200)
+        TestRest.create({}, from: 'new@example.com')     
+
+        request.should have_been_requested   
+      end
+
+      it "should be thread-safe" do
+        t1 = Thread.new do
+          sleep 0.5
+          Shutl::Resource::RestClassMethods.from_user = 'thread1 user'
+          stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'thread1 user')).to_return(:status => 200)
+          TestRest.create     
+        end
+
+        t2 = Thread.new do
+          Shutl::Resource::RestClassMethods.from_user = 'thread2 user'
+          sleep 1
+          stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'thread2 user')).to_return(:status => 200)
+          TestRest.create     
+        end
+
+        t1.join; t2.join
+
+        Thread.current[:user_email].should be user_email
+      end
+    end
+
   end
 
   describe '#destroy' do
@@ -472,6 +507,47 @@ describe Shutl::Resource::Rest do
 
       request.should have_been_requested
     end
+
+    context "send user email address for Audit" do
+      let(:user_email) { 'user@example.com' }
+
+      before do
+        Shutl::Resource::RestClassMethods.from_user = user_email
+      end
+
+      it "should override the email with 'from' option" do
+        request = stub_request(:put, 'http://host/test_rests/a').with(body: anything, headers: headers.merge(from: 'new@example.com')).to_return(:status => 200)
+
+        test_resource = TestRest.new
+        test_resource.update!({a: 'a', b: 'b'}, {from: 'new@example.com'})
+
+        request.should have_been_requested   
+      end
+
+      it "should be thread-safe" do
+        t1 = Thread.new do
+          sleep 0.5
+          Shutl::Resource::RestClassMethods.from_user = 'thread1 user'
+          stub_request(:put, 'http://host/test_rests/a').with(body: anything, headers: headers.merge(from: 'thread1 user')).to_return(:status => 200)
+
+          test_resource = TestRest.new
+          test_resource.update!(a: 'a', b: 'b')
+        end
+
+        t2 = Thread.new do
+          Shutl::Resource::RestClassMethods.from_user = 'thread2 user'
+          sleep 1
+          stub_request(:put, 'http://host/test_rests/a').with(body: anything, headers: headers.merge(from: 'thread2 user')).to_return(:status => 200)
+
+          test_resource = TestRest.new
+          test_resource.update!(a: 'a', b: 'b')
+        end
+
+        t1.join; t2.join
+
+        Thread.current[:user_email].should be user_email
+      end
+    end
   end
 
     describe '#respond_to?' do

data/spec/support/test_resource.rb

@@ -2,5 +2,4 @@ class TestRest
   include Shutl::Resource::Rest
   base_uri 'http://host'
   resource_id :a
-end
-
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
+  prerelease: 
 platform: ruby
 authors:
 - David Rouchy
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-18 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
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,6 +81,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday-conductivity
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,6 +89,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,6 +97,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -93,6 +105,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,6 +113,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,6 +121,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,6 +129,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -121,6 +137,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,6 +145,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,6 +153,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -184,26 +203,27 @@ 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Manage Shutl Rest resource. Parse/Serialize JSON
 test_files:
 - spec/configuration_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGEwZDkwNmM0YzExYmFjYTc1ZGFmMmE3Y2JhOWQzYzFkODk2MmYyMQ==
-  data.tar.gz: !binary |-
-    Zjg2NzY5YjU0NTYyMWRmZjM5YTg5MDQ1NTIxZWU5ZjVkNmNlNDljOQ==
-SHA512:
-  metadata.gz: !binary |-
-    MjY2ZTk3ZmY4NWJhYzk2YjE0NThiNzFiYTkyOTBmMTQ3ODk4YjBhYzcxYWFl
-    Yzk2MTJkNWVjYWE2YTM0N2FlMTkwYmUyZjMyODkwOWM2NzI5MWY2ZGY0N2Ri
-    ZjcxZGQ1ODFmNjU4Y2I5MDk5YzI5OTgwZjNhOGY3MTFiNGQ4MDM=
-  data.tar.gz: !binary |-
-    ZDNiYjg1YzM0ZTM5NDBjZTI0ODE5ZjIyZTU5NTFmZjgxMjFlMmJhYjM3MTY0
-    N2U2MjAwNTg4NjVkZTlkNzM0YzhkODg5MmFjMTVjZjg0YWIxOGIwZDNiMmJl
-    ZmFkMDNmZTQyNzBjMDllMDhiMjYzMDllZDdmNmNjZmEwODVjODQ=