adsk_auth_service 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5ce71ed42e6704a80403654d3b6f9748d9488c
-  data.tar.gz: db1fbd30c00594ad1d285ca84f16e8744b61806f
+  metadata.gz: 3cb5e95ef1b397e51967320a3809d7ab3c3a6783
+  data.tar.gz: bb1e2dbbbbce8684d4c7d4bc5272038e2663728f
 SHA512:
-  metadata.gz: 173745f99944fd833e002e527100e39c545ec5d3110f9d28c9ca6039408f320c1143ef0e83f630d11092f9eac5d846cf452f75fa70e64dc127f8e6d9571879cd
-  data.tar.gz: c4bde4a2737f69f8fcb08dca49806ae5c0cf041828d6016153d1b8f86b9ee6b26bf65b33f3ddfb6d29a1fdbae90743a21062b8b080a35136c294700e30797653
+  metadata.gz: b12800b6e40701cd2c08c537b52b682be70ddadbcd0a4b7bb104bcc9b4d076ae2bc48218e6344c69bb32e3e42d957ef768f6ba79b50232b862d86dd322725728
+  data.tar.gz: d51e7e73505e28154ec20843349d04635260e61b8e93f706f471fd42e6d27986823647c28ec831e263fb78826497418a09043eb31708e33411e067ca962d3110

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rspec'
 gem 'logging'
-gem 'activesupport'
+gem 'activesupport'
+gem 'dalli'

data/adsk_auth_service.gemspec

@@ -1,15 +1,24 @@
 Gem::Specification.new do |s|
   s.name        = 'adsk_auth_service'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.summary     = "Autodesk second phase token retrieval"
   s.description = "A gem for Autodesk 2-phase authentication service."
   s.authors     = ['Linh Chau']
   s.email       = 'chauhonglinh@gmail.com'
   s.files       = [
-                    './Gemfile', './adsk_auth_service.gemspec', 'lib/adsk_auth_service.rb',
-                    'lib/services/auth_service.rb', 'lib/services/sdk_logger.rb', 'lib/utils/net_util.rb',
-                    'spec/services/auth_service_spec.rb', 'spec/rspec_helper.rb', 'conf/auth_keys.example.yml'
+                    './Gemfile', './adsk_auth_service.gemspec', 
+                    'lib/adsk_auth_service.rb',
+                    'lib/services/auth_service.rb', 'lib/services/config_service.rb', 
+                    'lib/services/sdk_logger.rb', 'lib/services/token_cache_service.rb',
+                    'lib/caches/mc_cache.rb',
+                    'lib/utils/net_util.rb',
+                    
                   ]
   s.homepage    = 'https://git.autodesk.com/t-chaul/adsk_auth_service.git'
   s.license     = 'MIT'
-end
+  s.add_runtime_dependency 'logging', '~> 0'
+  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'dalli', '~> 0'  
+
+  s.add_development_dependency 'rspec', '~> 3.1'
+end

data/lib/adsk_auth_service.rb

@@ -1,5 +1,13 @@
 require 'yaml'
+require_relative 'services/config_service'
 
-['services/auth_service', 'services/sdk_logger', 'utils/net_util'].each do |rb_file|
-  require rb_file 
+['caches', 'services', 'utils'].each do |sub_path|
+  rb_files =  Dir.glob("#{File.expand_path('.')}/lib/#{sub_path}/*.rb")
+
+  if rb_files.empty?
+    spec = Gem::Specification.find_by_name('adsk_auth_service')
+    rb_files =  Dir.glob("#{spec.gem_dir}/lib/#{sub_path}/*.rb")
+  end
+  
+  rb_files.each { |rb_file| require rb_file }
 end

data/lib/caches/mc_cache.rb

@@ -0,0 +1,42 @@
+require 'dalli'
+
+class McCache
+  class << self
+    def client
+      @@client
+    end
+
+    def initialize
+      @@env  = ConfigService.environment
+      config = ConfigService.load_config('memcached.yml')[@@env]
+      host = config['host']
+      options = config.dup
+      options.delete('host')
+      @@client = Dalli::Client.new(host, options)
+    end #initialize
+
+
+    # Cache API, mimics ActiveSupport::Cache::Store
+    # http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html
+
+    def read(key, options = {})
+      client.get(key, options)
+    end
+
+    def write(key, value, options = {})
+      client.set(key, value, options[:expires_in], options)
+    end
+
+    def delete(key, options = {})
+      deleted = read(key)
+      client.delete(key)
+      deleted
+    end
+
+    def token_key
+      "#{@@env}_token_data"
+    end
+  end #class methods
+
+  initialize
+end

data/lib/services/config_service.rb

@@ -0,0 +1,30 @@
+require 'active_support'
+require 'active_support/core_ext'
+
+class ConfigService
+  class << self
+    def load_config(config_file_name)
+      app_root = (defined? APP_ROOT)? APP_ROOT : File.expand_path('.')
+      
+      config_file = nil
+      ['conf', 'config'].each do |sub_path|
+        if File.exist?("#{app_root}/#{sub_path}/#{config_file_name}")
+          config_file = "#{app_root}/#{sub_path}/#{config_file_name}"
+          break
+        end
+      end
+      
+      raise("You must have the file #{config_file_name} in either 'conf' or 'config' directory of your application") unless config_file
+
+      YAML.load_file(config_file)
+    end
+
+    def environment
+      return Rails.env if defined? Rails
+      return ENV['RACK_ENV'] if ENV['RACK_ENV'].present?
+      'local'
+    rescue => error
+      'local'
+    end
+  end # class methods
+end

data/lib/services/token_cache_service.rb

@@ -0,0 +1,44 @@
+require 'adsk_auth_service'
+
+require_relative './config_service'
+
+class TokenCacheService
+  class << self
+    def cache
+      # The cache supports the following API functions:
+      #   - read(key, options = {})
+      #   - write(key, value, options = {})
+      #   - delete(key, options = {})
+      #   - token_key
+      @@cache
+    end
+
+    def cache=(other_cache)
+      @@cache = other_cache
+    end
+
+    def initialize
+      @@env  = ConfigService.environment
+      config = ConfigService.load_config('cache_config.yml')[@@env]
+
+      @@cache = Object.const_get(config['cache'])
+      
+    end #initialize
+
+     def get_token
+      token_data = cache.read(cache.token_key)
+      if token_data.nil?
+        token_data = AuthService.oauth_token
+        set_token(token_data)
+      end
+      token_data
+    end
+
+    def set_token(token_data)
+      cache.write(cache.token_key, token_data, { expires_in: token_data['expires_in'].to_i })
+    end
+   
+  end #class methods
+
+  initialize
+end

data/lib/utils/net_util.rb

@@ -82,9 +82,7 @@ class NetUtil
   end
 
   def NetUtil.set_ssl(request, url)
-    SdkLogger.logger.debug("URL is #{url}")
     if url.start_with? 'https'
-      SdkLogger.logger.debug("Use https - URL is #{url}")
       request.use_ssl = true 
       request.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adsk_auth_service
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Linh Chau
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-11-16 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: A gem for Autodesk 2-phase authentication service.
 email: chauhonglinh@gmail.com
 executables: []
@@ -18,13 +74,13 @@ extra_rdoc_files: []
 files:
 - "./Gemfile"
 - "./adsk_auth_service.gemspec"
-- conf/auth_keys.example.yml
 - lib/adsk_auth_service.rb
+- lib/caches/mc_cache.rb
 - lib/services/auth_service.rb
+- lib/services/config_service.rb
 - lib/services/sdk_logger.rb
+- lib/services/token_cache_service.rb
 - lib/utils/net_util.rb
-- spec/rspec_helper.rb
-- spec/services/auth_service_spec.rb
 homepage: https://git.autodesk.com/t-chaul/adsk_auth_service.git
 licenses:
 - MIT

data/conf/auth_keys.example.yml

@@ -1,25 +0,0 @@
-local:
-  consumer_key: YOUR_CONSUMER_KEY
-  consumer_secret: YOUR_CONSUMER_SECRET
-  url: https://developer-dev.api.autodesk.com/authentication/v1/authenticate
-
-development:
-  consumer_key: YOUR_CONSUMER_KEY
-  consumer_secret: YOUR_CONSUMER_SECRET
-  url: https://developer-dev.api.autodesk.com/authentication/v1/authenticate
-
-test:
-  consumer_key: YOUR_CONSUMER_KEY
-  consumer_secret: YOUR_CONSUMER_SECRET
-  url: https://developer-dev.api.autodesk.com/authentication/v1/authenticate
-
-stage:
-  consumer_key: YOUR_CONSUMER_KEY
-  consumer_secret: YOUR_CONSUMER_SECRET
-  url: https://developer-stg.api.autodesk.com/authentication/v1/authenticate
-
-production:
-  consumer_key: YOUR_CONSUMER_KEY
-  consumer_secret: YOUR_CONSUMER_SECRET
-  url: https://developer.api.autodesk.com/authentication/v1/authenticate
-

data/spec/rspec_helper.rb

@@ -1,6 +0,0 @@
-require 'rspec'
-require 'yaml'
-
-['lib/services', 'lib/utils'].each do |sub_path|
-  Dir.glob("#{File.expand_path('.')}/#{sub_path}/*.rb").each { |rb_file| require rb_file }
-end

data/spec/services/auth_service_spec.rb

@@ -1,26 +0,0 @@
-require_relative('../rspec_helper')
-
-describe AuthService do
-  context 'load_config' do
-    it 'load config from YAML file' do
-      config = AuthService.load_config
-      expect(config).not_to be_nil
-      expect(config.is_a? Hash).to eql(true)
-    end
-  end
-
-  context 'oauth_token' do
-    it 'returns auth token' do
-      token_data = AuthService.oauth_token
-      puts("Token #{token_data}")
-
-      # token_data['access_token'] is the real token
-      expect(token_data).not_to be_nil
-      expect(token_data.is_a? Hash).to eql(true)
-      expect(token_data['token_type']).not_to be_nil
-      expect(token_data['expires_in']).not_to be_nil
-      expect(token_data['access_token']).not_to be_nil
-    end
-  end
-
-end