adsk_auth_service 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3798a9499f9e8b9e9b490f0dbc5c39592e875597
-  data.tar.gz: 1ad642f3f9ab20ca02fa0b1213f3d55719c24499
+  metadata.gz: 6a0b1443ef86962b6f4c3aa002ca0e8ab35a104d
+  data.tar.gz: a839d68a677b9276ed0aff707ab94ea5b7c7172c
 SHA512:
-  metadata.gz: af138d66b7194d5dfccdf0dda8a348acf03a3934852997441b08c25b12357cb0ea92d240e0b4af74a038999fd266fc3699ed1118a20b686c0cbc9d334f91f5fd
-  data.tar.gz: aa6346981a7f5c507cf16e978712aaf9cdc2a6238178975f805249f78f144f184d40dfa89b19b61f4decb7d7d7b86d537438aab5a39125cf34e68d8c2f1df20b
+  metadata.gz: d728f3cbe5bae3506fc5c7f8f64da0080fb4740468004b757037865e89543f02a8e45e8fc46b44a4ced271a1c00b8556263b62be9f90b0561541865b23348289
+  data.tar.gz: 53b2aa27db058f53417c3d4cc37c3c56cd381d9f833b7b7ce3b561eebe3d5b486f074892e798ab827e9fd1e1502040e1398f8576802b9828e6db8dace3c22088

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rspec'
-gem 'logging'
-gem 'activesupport'
-gem 'dalli'
+gem 'cache_service'

data/adsk_auth_service.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'adsk_auth_service'
-  s.version     = '1.0.5'
+  s.version     = '1.0.6'
   s.summary     = "Autodesk second phase token retrieval"
   s.description = "A gem for Autodesk 2-phase authentication service."
   s.authors     = ['Linh Chau']
@@ -8,17 +8,13 @@ Gem::Specification.new do |s|
   s.files       = [
                     './Gemfile', './adsk_auth_service.gemspec', 
                     'lib/adsk_auth_service.rb',
-                    'lib/services/auth_service.rb', 'lib/services/config_service.rb', 'lib/services/cache_service.rb', 
-                    'lib/services/sdk_logger.rb', 'lib/services/token_cache_service.rb',
-                    'lib/caches/mc_cache.rb',
+                    'lib/services/auth_service.rb', 'lib/services/token_cache_service.rb',
                     'lib/utils/net_util.rb',
                     
                   ]
   s.homepage    = 'https://git.autodesk.com/t-chaul/adsk_auth_service.git'
   s.license     = 'MIT'
-  s.add_runtime_dependency 'logging', '~> 0'
-  s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'dalli', '~> 0'  
+  s.add_runtime_dependency 'cache_service', '~> 0'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 end

data/lib/adsk_auth_service.rb

@@ -1,13 +1,17 @@
 require 'yaml'
-require_relative 'services/config_service'
+require 'cache_service'
 
-['caches', 'services', 'utils'].each do |sub_path|
-  rb_files =  Dir.glob("#{File.expand_path('.')}/lib/#{sub_path}/*.rb")
+def load_gem_lib(sub_path)
+  spec = Gem::Specification.find_by_name('adsk_auth_service')
+  rb_files =  Dir.glob("#{spec.gem_dir}/lib/#{sub_path}/*.rb")
+  rb_files.each { |rb_file| require rb_file }
+rescue Exception => error
+  # Who cares?
+end
 
-  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
-  
+
+['services', 'utils'].each do |sub_path|
+  load_gem_lib(sub_path)
+  rb_files =  Dir.glob("#{File.expand_path('.')}/lib/#{sub_path}/*.rb")
   rb_files.each { |rb_file| require rb_file }
 end

data/lib/utils/net_util.rb

@@ -1,6 +1,5 @@
 require 'net/https'
 require 'active_support'
-require_relative '../services/sdk_logger'
 
 class NetUtil
   READ_TIMEOUT = 600 # 10 minutes

metadata

@@ -1,45 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: adsk_auth_service
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Linh Chau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 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
+  name: cache_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -75,11 +47,7 @@ files:
 - "./Gemfile"
 - "./adsk_auth_service.gemspec"
 - lib/adsk_auth_service.rb
-- lib/caches/mc_cache.rb
 - lib/services/auth_service.rb
-- lib/services/cache_service.rb
-- lib/services/config_service.rb
-- lib/services/sdk_logger.rb
 - lib/services/token_cache_service.rb
 - lib/utils/net_util.rb
 homepage: https://git.autodesk.com/t-chaul/adsk_auth_service.git

data/lib/caches/mc_cache.rb

@@ -1,36 +0,0 @@
-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
-  end #class methods
-
-  initialize
-end

data/lib/services/cache_service.rb

@@ -1,34 +0,0 @@
-require_relative './config_service'
-
-class CacheService
-  class << self
-    def cache
-      @@cache
-    end
-
-    def cache=(other_cache)
-      @@cache = other_cache
-    end
-
-    def initialize
-      config = ConfigService.load_config('cache_config.yml')[ConfigService.environment]
-      # Load all the existing caches in the system, outside of the gem
-      Dir.glob("#{File.expand_path('.')}/caches/*.rb").each { |rb_file| require rb_file }
-      @@cache = Object.const_get(config['cache'])
-    end
-
-    def read(key, options = {})
-      cache.read(key, options)
-    end
-
-    def write(key, value, options = {})
-      cache.write(key, value, options)
-    end
-
-    def delete(key, options = {})
-      cache.delete(key, options)
-    end
-  end #class methods
-
-  initialize
-end

data/lib/services/config_service.rb

@@ -1,30 +0,0 @@
-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/sdk_logger.rb

@@ -1,12 +0,0 @@
-class SdkLogger
-  @@logger = Logger.new(STDOUT)
-  class << self
-    def logger
-      @@logger
-    end
-
-    def logger=(other_logger)
-      @@logger = other_logger
-    end
-  end
-end