naranya_ecm-sdk 0.0.46 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778b8cdbd9878e681728270609039e52ce0c97e4
-  data.tar.gz: 8098d4252fb1405d72fbbdc1955360cf88829cfe
+  metadata.gz: d1fdfd9d7e794c81243641e7cf901d3c9a86aec9
+  data.tar.gz: 6d90eac23cf83104b82814ef0c149df363c76637
 SHA512:
-  metadata.gz: ad066a7ee48138ccfdc9bbd1dc1f2eeac9231f84980b7258bdc01c5e83689fb493c46a3654f5c63fc2ca6358e0c1900c18f6b038217854dd873d0699182d39b9
-  data.tar.gz: 38cad328fcd9f70f7662576320869171788b909e739156e8b6178cc8e557ef51dba61d4615cd2056fc4f8371e089487deaed64ccfd46a5b9ede9315cc2d603fa
+  metadata.gz: 13b46c12c27bd140428638b2e68460124cb301e8022313347689ced1ae266df8522a1bfc5fb6c3c47195ad5997b0b4afcb43bf5b4099524d906c72e1b1fa88f2
+  data.tar.gz: fa2732f9f39e7a59f61c80ec9fe1e8fc969281a39c035d29f088422a7d8d3830cf0e0d081de5862ebd8f9d67b56f5cd05fa0127174ca6acd2bb49b038c6e3838

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem 'redis-activesupport'
 gem 'pry', require: 'pry'
 gem 'byebug'
-gem "patron"
+gem 'patron'

data/dev/thread-safety-tests.rb

@@ -1,12 +1,19 @@
 NContent::SDK.logger.level = Logger::INFO
+
+NContent::SDK::RESTClient.oauth_token
+
 # Launch n threads:
-10.times.map do |i|
-  sleep 0.3
+20.times.map do |i|
+  sleep 0.2
 
   Thread.new do
 
     10.times.map do |reqno|
-      a = NaranyaEcm::Category.find "53367aa33535660003000000"
+      begin
+        a = NaranyaEcm::Category.find "53367aa33535660003000000"
+      rescue => e
+        puts "!!!!!!!!!!!! #{e.inspect} !!!!!!!!!!!!!!!!!!"
+      end
       sleep 5
     end
 

data/lib/naranya_ecm-sdk/version.rb

@@ -1,3 +1,3 @@
 module NaranyaEcm
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

data/lib/ncontent/sdk/config.rb

@@ -10,6 +10,10 @@ module NContent
 
       include ActiveSupport::Configurable
 
+      config_accessor :api_adapter do
+        ENV.fetch 'NCONTENT_API_ADAPTER', 'net_http'
+      end
+
       config_accessor :api_host do
         ENV['NCONTENT_API_HOST'] || ENV['NARANYA_ECM_SITE'] || 'http://proy-cms-1.herokuapp.com'
       end

data/lib/ncontent/sdk/railtie.rb

@@ -32,27 +32,21 @@ module NContent
 
       end
 
-      #initializer "cequel.add_new_relic" do
-      #  if configuration.fetch(:newrelic_enabled, true)
-      #    begin
-      #      require 'new_relic/agent/method_tracer'
-      #    rescue LoadError => e
-      #      Rails.logger.debug(
-      #        "New Relic not installed; skipping New Relic integration")
-      #    else
-      #      require 'cequel/metal/new_relic_instrumentation'
-      #    end
-      #  end
-      #end
-
-      #rake_tasks do
-      #  require "cequel/record/tasks"
-      #end
-
-      #generators do
-      #  require 'cequel/record/configuration_generator'
-      #  require 'cequel/record/record_generator'
-      #end
+      config.after_initialize do
+        # Try to initialize a token (from cache or from nContent), just in case
+        # all threads start to go medieval asking for tokens at nContent:
+        begin
+          NContent::SDK::RESTClient.oauth_token
+        rescue => e
+          Rails.logger.warn "NContent SDK OAuth token test failed on app after_initialize"
+        end
+      end
+
+      rake_tasks do
+      end
+
+      generators do
+      end
 
     end
   end

data/lib/ncontent/sdk/rest_client.rb

@@ -8,48 +8,10 @@ module NContent
 
     class RESTClient
 
-      include Singleton
-
       CLIENT_TOKEN_CACHE_KEY = "ncontent/api_client/client_token".freeze
 
-      delegate :config, :logger, :cache, to: NContent::SDK
-
-      def initialize
-        @client = OAuth2::Client.new(config.api_key, config.api_secret, site: config.api_host) do |faraday|
-          ### Oauth2 Client (Faraday) builder:
-
-          faraday.request :url_encoded # them posts...
-
-          faraday.response :logger, logger
-
-          faraday.use NContent::SDK::FaradayMiddleware::RESTAPICallBenchmark
-
-          faraday.use NContent::SDK::FaradayMiddleware::ResponseParser
-
-          if defined?(Patron)
-            faraday.adapter :patron # Prefer patron if exists
-          else
-            faraday.adapter Faraday.default_adapter  # make requests with Net::HTTP
-          end
-        end
-        @client_token = get_token
-        @mutex  = Mutex.new
-      end
-
-      def reset_client_token!
-        with_mutex do
-          if cached = cache.read(CLIENT_TOKEN_CACHE_KEY) and cached['access_token'] == @client_token.token
-            logger.debug "Deleting cache key #{CLIENT_TOKEN_CACHE_KEY}"
-            cache.delete CLIENT_TOKEN_CACHE_KEY
-          else
-            logger.debug "Not deleting cache key #{CLIENT_TOKEN_CACHE_KEY}"
-          end
-          @client_token = get_token
-        end
-      end
-
-      def client_token
-        with_mutex { @client_token }
+      class << self
+        delegate :config, :logger, :cache, to: NContent::SDK
       end
 
       # Make a request to the API:
@@ -57,7 +19,7 @@ module NContent
       # @param [Symbol] verb the HTTP request method
       # @param [String] path the HTTP URL path of the request
       # @param [Hash] opts the options to make the request with
-      def request(verb, path=nil, opts = {}, &block)
+      def self.request(verb, path=nil, opts = {}, &block)
 
         retrying = false
 
@@ -65,72 +27,91 @@ module NContent
 
           # If we beforehand know that the current token expired then the client
           # token should be re-generated.
-          reset_client_token! if client_token.expired?
+          reset_oauth_token! if oauth_token.expired?
 
-          client_token.request(verb, path, opts) do |req|
+          oauth_token.request(verb, path, opts) do |req|
             req.options.timeout = config.api_call_timeout
             req.options.open_timeout = config.api_call_open_timeout
             yield req if block_given?
           end
 
         rescue OAuth2::Error => error
-
           if error.response.status == 401 && !retrying
-            reset_client_token!
+            reset_oauth_token!
             retrying = true
             logger.info "Retrying response #{verb.upcase} #{path} with a fresh nContent token."
             retry
           else
+            logger.warn "Not retrying response #{verb.upcase} #{path}."
             NaranyaEcm::Rest::RestError.raise_by_failed_response(error.response)
           end
         end
       end
 
-      def get(path=nil, opts = {}, &block)
+      def self.get(path=nil, opts = {}, &block)
         request(:get, path, opts, &block)
       end
 
-      def post(path=nil, opts = {}, &block)
+      def self.post(path=nil, opts = {}, &block)
         request(:post, path, opts, &block)
       end
 
-      def put(path=nil, opts = {}, &block)
+      def self.put(path=nil, opts = {}, &block)
         request(:put, path, opts, &block)
       end
 
-      def patch(path=nil, opts = {}, &block)
+      def self.patch(path=nil, opts = {}, &block)
         request(:patch, path, opts, &block)
       end
 
-      def delete(path=nil, opts = {}, &block)
+      def self.delete(path=nil, opts = {}, &block)
         request(:delete, path, opts, &block)
       end
 
-      class << self
-        delegate :client_token, :reset_client_token!, :request, :get, :post,
-                 :put, :patch, :delete, to: :instance
-      end
-
       private
 
-        def get_token
-          cached = cache.read CLIENT_TOKEN_CACHE_KEY
+        # The oauth client is accessed as a class method, but will exist one instance
+        # per thread (hence the @ instead of @@ and using ||= without remorse)
+        def self.oauth_client
+          @oauth_client ||= OAuth2::Client.new(config.api_key, config.api_secret, site: config.api_host) do |faraday|
+            ### Oauth2 Client (Faraday) builder:
+
+            faraday.request :url_encoded # them posts...
+
+            faraday.response :logger, logger
+
+            faraday.use NContent::SDK::FaradayMiddleware::RESTAPICallBenchmark
+
+            faraday.use NContent::SDK::FaradayMiddleware::ResponseParser
+
+            faraday.adapter config.api_adapter.to_sym
+          end
+        end
 
-          returned_token = if cached.present?
-            logger.debug "Generating client token from cached data: #{cached.inspect}"
-            OAuth2::AccessToken.from_hash @client, cached
+        def self.oauth_token(overwrite_cache = false)
+          @oauth_token ||= if !overwrite_cache && (cached_data = cache.read CLIENT_TOKEN_CACHE_KEY)
+            logger.debug "Generating client token from cached data: #{cached_data.inspect}"
+            OAuth2::AccessToken.from_hash oauth_client, cached_data
           else
             logger.info "Requesting new client token from nContent server"
-            new_token = @client.client_credentials.get_token
+            new_token = oauth_client.client_credentials.get_token
             cache.write CLIENT_TOKEN_CACHE_KEY, new_token.to_hash.with_indifferent_access
-            logger.debug "Data #{new_token.token.inspect} written to cache key #{CLIENT_TOKEN_CACHE_KEY}."
             new_token
           end
-          returned_token
         end
 
-        def with_mutex
-          @mutex.synchronize { yield }
+        def self.reset_oauth_token!
+          # if (cached_data = cache.read CLIENT_TOKEN_CACHE_KEY) && (cached_data['access_token'] == oauth_token.token)
+            # The cached data matches the current oauth_token.
+            # We'll unset @oauth_token, and call 'oauth_token' with 'true' to
+            # force a cache overwrite:
+            @oauth_token = nil
+            oauth_token(true)
+          # else
+          #   # The cached data does not match with the current oauth_token.
+          #   # Maybe the cached data was updated by another thread or process.
+          #   @oauth_token = OAuth2::AccessToken.from_hash oauth_client, cached_data
+          # end
         end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naranya_ecm-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport