adsk_auth_service 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a55ab83859f06356d1b19a5e2ac19b3aede8746
-  data.tar.gz: 923e0a23ad353028b393b633174676acfc121be2
+  metadata.gz: 3798a9499f9e8b9e9b490f0dbc5c39592e875597
+  data.tar.gz: 1ad642f3f9ab20ca02fa0b1213f3d55719c24499
 SHA512:
-  metadata.gz: c8d2a579842c7b4b40ed03466535c543ab6d09cc2a7236b75d8f2beb2e18dca4d4ba982e4404a0d29d3ccdc883b1841c3fc086cc246a15cb453d168080fb7382
-  data.tar.gz: f0996543cf958428bde18989e72fd395d301025b6e00bfc6d5e8d9091b6c1476ff0eeec6b03c61422fbefebf79f1f80cdb2a441f84882f0abdcb855fce378ed1
+  metadata.gz: af138d66b7194d5dfccdf0dda8a348acf03a3934852997441b08c25b12357cb0ea92d240e0b4af74a038999fd266fc3699ed1118a20b686c0cbc9d334f91f5fd
+  data.tar.gz: aa6346981a7f5c507cf16e978712aaf9cdc2a6238178975f805249f78f144f184d40dfa89b19b61f4decb7d7d7b86d537438aab5a39125cf34e68d8c2f1df20b

data/adsk_auth_service.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'adsk_auth_service'
-  s.version     = '1.0.4'
+  s.version     = '1.0.5'
   s.summary     = "Autodesk second phase token retrieval"
   s.description = "A gem for Autodesk 2-phase authentication service."
   s.authors     = ['Linh Chau']
@@ -8,7 +8,7 @@ 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/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/utils/net_util.rb',

data/lib/caches/mc_cache.rb

@@ -15,10 +15,8 @@ class McCache
       @@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
@@ -32,10 +30,6 @@ class McCache
       client.delete(key)
       deleted
     end
-
-    def token_key
-      "#{@@env}_token_data"
-    end
   end #class methods
 
   initialize

data/lib/services/cache_service.rb

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

@@ -1,35 +1,7 @@
-require 'adsk_auth_service'
-
-require_relative './config_service'
-
-class TokenCacheService
+class TokenCacheService < CacheService
   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]
-
-      # 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 #initialize
-
      def get_token
-      token_data = cache.read(cache.token_key)
+      token_data = read(token_key)
       if token_data.nil?
         token_data = AuthService.oauth_token
         set_token(token_data)
@@ -38,7 +10,11 @@ class TokenCacheService
     end
 
     def set_token(token_data)
-      cache.write(cache.token_key, token_data, { expires_in: token_data['expires_in'].to_i })
+      write(token_key, token_data, { expires_in: token_data['expires_in'].to_i })
+    end
+
+    def token_key
+      "#{ConfigService.environment}_token_key"
     end
    
   end #class methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adsk_auth_service
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Linh Chau
@@ -77,6 +77,7 @@ files:
 - 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