tzispa_data 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0b31e17474d750c87dbc7376adbe897d4399d9
-  data.tar.gz: 2447d842fc8016fc02ba8f5e0a3723953681218b
+  metadata.gz: f808bff654619a63929dffbfdfe1077e1719c22b
+  data.tar.gz: 0afaaf0f85f53846923f560e4cd303580ae0d3f4
 SHA512:
-  metadata.gz: '0278a8c635236652bb18ab761ba9d91a6bef1f1cb6871b4cf1857eb7a15c2770a3a42c1851ee728043eee6732d4d41cb05510581bfb0437b4687b6ea14861806'
-  data.tar.gz: 24d490046f5b820932ccd2a5fb2837cc2c66a3298088f34d8a486910e3f41ab2f00cd974a1850e2f1a4a5f0e2bacc1fb6831fc17ba5113186bdaf79d13c21dab
+  metadata.gz: 45fc47f896ae0048ba304f19ebc909f68ec45395dfea6953cb3e96cae7b1f5656fcc4e9180649ce0e927e5a8fbadf2ff784f22057c8f3263b4c329c7d841e2ab
+  data.tar.gz: efe05b00ac5a15a54d56fe667d2538eb54e40f0dcbd01ee78531c43ea6c79659074b709554722e4a112c5e30a445ef55a8dd721d516c34b6910329672b050ef2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 Tzispa Data
 
+## v0.4.2
+- new cache system use Dalli for model Sequel caching
+- independent caching per repository
+- bugs fix
+
 ## 0.4.1
 - use redis for model cache
 - adapter pool optimizations and bugs fixes

data/lib/tzispa/data/adapter_pool.rb

@@ -2,6 +2,7 @@
 
 require 'sequel'
 require 'forwardable'
+require 'dalli'
 
 module Tzispa
   module Data
@@ -11,16 +12,28 @@ module Tzispa
       extend Forwardable
 
       def_delegators :@pool, :has_key?, :keys
-      attr_reader :default_repo
+      attr_reader :default_repo, :config, :pool
 
       def initialize(config, default = nil)
         setup_sequel
         @default_repo = default || config.first[0]
-        @pool = {}.tap do |hsh|
+        @config = config
+        @pool ||= {}.tap do |hsh|
           config.each { |kid, vc| hsh[kid.to_sym] = connect(vc) }
         end
       end
 
+      def cache
+        @cache ||= {}.tap do |csh|
+          config.each do |kid, vc|
+            next unless vc.caching
+            csh[kid.to_sym] = Dalli::Client.new(vc.caching_server || DEFAULT_CACHING_SERVER,
+                                                namespace: kid.to_s,
+                                                compress: true)
+          end
+        end
+      end
+
       def connect(config)
         Sequel.connect("#{config.adapter}://#{config.database}").tap do |conn|
           if config.connection_validation
@@ -45,9 +58,12 @@ module Tzispa
         Sequel.extension :core_extensions
         Sequel.default_timezone = :utc
         Sequel.datetime_class = DateTime
+        Sequel.split_symbols = true
       end
 
       DEFAULT_TIMEOUT = 3600
+
+      DEFAULT_CACHING_SERVER = 'localhost:11211'
     end
 
   end

data/lib/tzispa/data/repository.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'sequel'
-require 'redis'
 require 'tzispa/utils/string'
 require 'tzispa/data/adapter_pool'
 
@@ -23,16 +22,6 @@ module Tzispa
 
       attr_reader :root, :adapters
 
-      LOCAL_REPO_ROOT = :repository
-
-      DEFAULT_CACHE_TTL = 900
-
-      class << self
-        def cache_client
-          @cache_client ||= Redis.new(host: 'localhost')
-        end
-      end
-
       def initialize(config, root = nil)
         @config = config
         @root = root || LOCAL_REPO_ROOT
@@ -60,7 +49,6 @@ module Tzispa
         @config.each do |id, cfg|
           Mutex.new.synchronize do
             pool[id] = {}
-            Sequel::Model.db = adapters[id]
             load_config_repo(id, cfg)
             domain.include module_const(id)
           end
@@ -69,12 +57,18 @@ module Tzispa
       end
 
       def register(model_id, model_class, repo_id, config)
-        model_class.db = @adapters[repo_id]
-        if config.caching
-          model_class.plugin :caching, self.class.cache_client,
-                             ttl: config.ttl || DEFAULT_CACHE_TTL
+        unless pool[repo_id][model_id.to_sym]
+          unless model_class.db == adapters[repo_id]
+            model_class.db = adapters[repo_id]
+            if config.caching
+              model_class.plugin :caching, adapters.cache[repo_id],
+                                 ttl: config.ttl || DEFAULT_CACHE_TTL,
+                                 ignore_exceptions: true
+            end
+          end
+          pool[repo_id][model_id.to_sym] = model_class
         end
-        @pool[repo_id][model_id.to_sym] = model_class
+        pool[repo_id][model_id.to_sym]
       end
 
       private
@@ -126,6 +120,10 @@ module Tzispa
           require "#{helpers_path}/#{helper_id}"
         end
       end
+
+      LOCAL_REPO_ROOT = :repository
+
+      DEFAULT_CACHE_TTL = 900
     end
 
   end

data/lib/tzispa/data/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Data
 
-    VERSION  = '0.4.1'
+    VERSION  = '0.4.2'
     NAME     = 'Tzispa Data'
     GEM_NAME = 'tzispa_data'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_data
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.31'
+        version: '4.44'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.31'
+        version: '4.44'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement