tml 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44adb9e80172d8023dcf8e7b3919a3be0ff499af
-  data.tar.gz: 08a06206541073c22a546ed0315cd4b4a54d0bc0
+  metadata.gz: 2e07af13388f61b41b40c25cea4be7bc7896430c
+  data.tar.gz: c9d05b304a9a4e48f79b38e4b9217ebabac954f0
 SHA512:
-  metadata.gz: 5208fe912e0d3b62291ae86b544f6048a096d8a681b3dc3ce33ae3dd074ba7bfd3dc9a3fcd5c02bb2cea4485a7864f26c3dc652bac00aef06ba64696d6e5df1f
-  data.tar.gz: d0f6454db79e4efa6bfa929698bdf93ceaa1ef5a80f65f67ac0b481380cc18c6718d36ed6346679ff4319ca3e916e98acc8aaf94f40a33b56d869f42470131b8
+  metadata.gz: 1369334f7c7f1bbfcb269f8af6e1f8325b37ce9c15d0ec2c97a5bf18b71c06011865e9a3fc777c8247c0752bd1ac534c38f87611f963afafa4493dded031d7b8
+  data.tar.gz: fc82f9eed90fd0ae94afea07651efd26c5ac8eee4feb017b95150b43ca0fc08d2503a324500dd78c2d3e160575a83bbc45d552bac25b25257b6e2dae3e412b0f

data/lib/tml/cache_adapters/memcache.rb

@@ -35,8 +35,9 @@ require 'dalli' if defined?(Dalli)
 class Tml::CacheAdapters::Memcache < Tml::Cache
 
   def initialize
-    options = { :namespace => Tml.config.cache[:namespace] || 'tml', :compress => Tml.config.cache[:compress].nil? ? true : Tml.config.cache[:compress]}
-    @cache = Dalli::Client.new(Tml.config.cache[:host], options)
+    config = Tml.config.cache
+    options = { :namespace => config[:namespace] || 'tml', :compress => config[:compress].nil? ? true : config[:compress] }
+    @cache = Dalli::Client.new(config[:host], options)
   end
 
   def cache_name

data/lib/tml/cache_adapters/redis.rb

@@ -38,16 +38,20 @@ class Tml::CacheAdapters::Redis < Tml::Cache
   def initialize
     config = Tml.config.cache
 
-    config[:host] ||= 'localhost'
-    config[:port] ||= 6379
+    if config.adapter_config
+      @cache = ::Redis.new(config.adapter_config)
+    else
+      config[:host] ||= 'localhost'
+      config[:port] ||= 6379
+
+      if config[:host].index(':')
+        parts = config[:host].split(':')
+        config[:host] = parts.first
+        config[:port] = parts.last
+      end
 
-    if config[:host].index(':')
-      parts = config[:host].split(':')
-      config[:host] = parts.first
-      config[:port] = parts.last
+      @cache = ::Redis.new(config)
     end
-
-    @cache = ::Redis.new(config)
   end
 
   def cache_name

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.4.3'
+  VERSION = '4.4.4'
 end

metadata

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