tml 4.3.9 → 4.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a766ff87d61d364fb1f5296ee8db8a7bee43a07c
-  data.tar.gz: 526bc06c8fc67615ea4367a2a8c271f4fe18d246
+  metadata.gz: dd726ec4d8e669b5260eeef038dc0329e6806bd9
+  data.tar.gz: fbf200f5e07562a46cf3430f0b88776beef69d19
 SHA512:
-  metadata.gz: bf6b37af75c30ca3e074ff60184df0fb187cbaa4bf65c5833c7fa8115b8ecdb66782e404cb82c96feb1eec464ae59f317f4f97242df42dc8d6fde09d499d7fa2
-  data.tar.gz: f66818fce6aea3bea1791ca49834202dedbc3520abfafbc98f581b89d6a3d3e58f7486907ffd96a718d53725a597c7800cde1ed7c88af5894150433defc3bba6
+  metadata.gz: 6af904753661a742074b7a0a0e8965029a259c4544d6c7dc7e92d1f916e99ca897672b3b311ec3216a4f6cfc38fabf9b94c27819540a019bf2068e6d270f5d38
+  data.tar.gz: c0cb5917de547073873dd50e78360c660face599c1ff19aeb6de362e44edd7c427d62f9580a0da5492795e9c47df32c24dc04eabbcb0dba4eb22e23612d437d0

data/lib/tml/application.rb

@@ -46,7 +46,13 @@ class Tml::Application < Tml::Base
 
   def fetch
     data = api_client.get('applications/current', {:definition => true}, {:cache_key => self.class.cache_key})
-    update_attributes(data) if data
+    if data
+      update_attributes(data)
+    else
+      Tml.logger.debug('Cache enabled but no data is provided.')
+    end
+
+    self
   rescue Tml::Exception => ex
     Tml.logger.error("Failed to load application: #{ex}")
     self

data/lib/tml/session.rb

@@ -37,18 +37,9 @@ module Tml
   end
 
   class Session
-    # Session Attributes - Move to Session
     attr_accessor :application, :current_user, :current_locale, :current_language, :current_translator,
                   :current_source, :current_component, :block_options, :cookie_params, :access_token, :tools_enabled
 
-    def self.access_token
-      @access_token
-    end
-
-    def self.access_token=(token)
-      @access_token = token
-    end
-
     def cookie_name
       "trex_#{self.application.key}"
     end
@@ -58,18 +49,9 @@ module Tml
 
       host = opts[:host] || Tml.config.application[:host]
 
-      Tml::Session.access_token ||= begin
-        self.access_token = opts[:token] || Tml.config.application[:token]
-        self.access_token ||= opts[:access_token] || Tml.config.application[:access_token]
-      end
-
       Tml.cache.reset_version
 
-      self.application = Tml::Application.new(:host => host, :access_token => Tml::Session.access_token).fetch
-
-      if Tml.cache.read_only?
-        self.class.access_token = self.application.access_token
-      end
+      self.application = Tml::Application.new(:host => host).fetch
 
       # Tml.logger.info(self.cookie_params.inspect)
 

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.3.9'
+  VERSION = '4.3.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.3.9
+  version: 4.3.10
 platform: ruby
 authors:
 - Michael Berkovich