focus-utils 0.0.6 → 0.0.7

data/lib/ares/add_api_key.rb

@@ -7,11 +7,11 @@ module ActiveResource
  
       included do
         class << self
-          alias_method_chain :headers, :auth
+          alias_method_chain :headers, :auth         
         end
       end
       
-      module ClassMethods
+      module ClassMethods    
         def api_key
           # Not using superclass_delegating_reader. See +site+ for explanation
           if defined?(@api_key)
@@ -20,14 +20,32 @@ module ActiveResource
             superclass.api_key.dup.freeze
           end
         end
-
+        
         def api_key=(api_key)
           @api_key = api_key
-        end        
+        end
+        
+        def api_client
+          # Not using superclass_delegating_reader. See +site+ for explanation
+          if defined?(@api_client)
+            @api_client
+          elsif superclass != Object && superclass.api_client
+            superclass.api_client.dup.freeze
+          end
+        end
+        
+        def api_client=(api_client)
+          @api_client = api_client
+        end             
         
         def headers_with_auth
-          api_key.nil? ? headers_without_auth : headers_without_auth.merge({"Ft-Api-Key" => self.api_key})
+          if (api_key.nil? || api_client.nil?)
+            headers_without_auth
+          else
+            headers_without_auth.merge({"Ft-Api-Key" => self.api_key, "Ft-Client" => self.api_client})
+          end
         end
+        
       end
     end
   end  

data/lib/ares/threadsafe_authentication.rb

@@ -0,0 +1,28 @@
+require 'active_support/concern'
+
+module ActiveResource
+  module Extend
+    module ThreadsafeAuthentication
+      extend ActiveSupport::Concern
+ 
+      included do
+        class << self
+          # Overriding both methods to get/set inside of current thread.
+          # Necessary for multi-threaded env jruby to allow api_key and
+          # api client to be sent with every request without overriding
+          # it for other threads (users)
+          %w(api_key api_client).each do |attr|
+            define_method(attr) do
+              Thread.current["active_resource.#{attr}"]
+            end
+
+            define_method("#{attr}=") do |val|
+              Thread.current["active_resource.#{attr}"] = val
+            end
+          end  
+               
+        end
+      end
+    end
+  end  
+end

data/lib/focus-utils.rb

@@ -1,12 +1,16 @@
 require 'active_resource'
 require 'yaml'
+require 'ares/add_api_key'
 require 'ares/add_relative_prefix'
 require 'ares/remove_format_extension'
 require 'ares/add_custom_header'
 require 'ares/use_config_file'
+require 'ares/threadsafe_authentication'
 
 #ActiveResource::Base.include_format_in_path = false
+ActiveResource::Base.send(:include, ActiveResource::Extend::AuthWithApiKey)
 ActiveResource::Base.send(:include, ActiveResource::Extend::RemoveExtension)
 ActiveResource::Base.send(:include, ActiveResource::Extend::AddRelativePrefix)
 ActiveResource::Base.send(:include, ActiveResource::Extend::AddCustomHeaders)
+ActiveResource::Base.send(:include, ActiveResource::Extend::ThreadsafeAuthentication)
 ActiveResource::Base.establish_site_connection

metadata

@@ -1,67 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: focus-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  prerelease:
+  version: 0.0.7
 platform: ruby
 authors:
 - Spencer Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: Add-ons including API Key, remove format extensions (.json, .xml) for
-  requests, and configuration file (sites.yml) for each environment's default settings.
+  requirement: *2056
+  prerelease: false
+  type: :runtime
+description: Add-ons including API Key, remove format extensions (.json, .xml) for requests, and configuration file (sites.yml) for each environment's default settings.
 email: spencer.davis@bipt.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/focus-utils.rb
 - lib/ares/add_api_key.rb
 - lib/ares/add_custom_header.rb
 - lib/ares/add_relative_prefix.rb
 - lib/ares/remove_format_extension.rb
+- lib/ares/threadsafe_authentication.rb
 - lib/ares/use_config_file.rb
-- lib/focus-utils.rb
 homepage: https://github.com/spencerfdavis/ares-focus-extensions
 licenses: []
-post_install_message: 
+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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.15
+signing_key:
 specification_version: 3
 summary: Add-ons/patches for Focus Tech Projects.
 test_files: []
+...