tzispa_data 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a167ebfaeb66387319ad08e3031931f13d585dbe
-  data.tar.gz: 8b0b7305323240dab7f2efb0e4243fe323a013d8
+SHA256:
+  metadata.gz: dcffc8be8acf0bee44e6f9ac69ddad7734ca600c14a5bcbda7e408f0dbdd4c79
+  data.tar.gz: 1563ef54f269562412bce9cf0cbb8ae2b9de758e11cdf02232595665e94280cd
 SHA512:
-  metadata.gz: 736fafd5d4d9286ecdbd1d9b16554fba70ae5ad7f2c2ad34367e2403f510c642d53d782363c7a66066b1e139765317c17c524c3b73704f706ac44a8fe72095c4
-  data.tar.gz: 248f53f9531f75f7cb35428ae7b71121a46fe4c98b133eb0c605be628cc62c94098108c5b29ff3eadd3a215214e8bce19dfb46d8f101d2c88ab6d92f054bef49
+  metadata.gz: 8ee5aaf97580453cb3be9c2d6f3e7e5c220d9af6ac4169922f862ebf5c04cd53ad77639347ab4482653c5b89d69fd4fbd18acb6db5854fa1ff49f1923b948c63
+  data.tar.gz: d8af5d02961f890ef79911c8e676d5dbf3e05bc1ac82a59bfe815c90669bdc104aeabfbe648c1b7f9c3f10e9f11a267f6676a5119a285457b36966c04e4d351c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 Tzispa Data
 
+## v0.6.0
+- repository configuration moved from tzispa gem
+- Repository is now a singletonn
+
 ## v0.4.4
 - fix missing block param at Transporter import method
 

data/lib/tzispa/data.rb

@@ -3,11 +3,11 @@
 module Tzispa
   module Data
 
-    require 'tzispa/data/adapter_pool'
-    require 'tzispa/data/repository'
-    require 'tzispa/data/transporter'
-    require 'tzispa/data/entity'
-    require 'tzispa/data/version'
+    autoload :Config,         'tzispa/data/config'
+    autoload :AdapterPool,    'tzispa/data/adapter_pool'
+    autoload :Repository,     'tzispa/data/repository'
+    autoload :TRansporter,    'tzispa/data/transporter'
+    autoload :Entity,         'tzispa/data/entity'
 
   end
 end

data/lib/tzispa/data/adapter_pool.rb

@@ -34,6 +34,10 @@ module Tzispa
         end
       end
 
+      def disconnect
+        @pool.each_value(&:disconnect)
+      end
+
       def connect(config)
         Sequel.connect("#{config.adapter}://#{config.database}").tap do |conn|
           if config.connection_validation

data/lib/tzispa/data/config.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'tzispa/config/yaml'
+
+module Tzispa
+  module Data
+
+    class Config
+      attr_reader :env, :config
+
+      CONFIG_FILENAME = 'database'
+
+      def initialize(env)
+        @cftime = nil
+        @env = env.to_sym
+      end
+
+      def to_h
+        load!
+        config.to_h[env]&.to_h
+      end
+
+      def load!
+        if @cftime.nil?
+          @cftime = File.ctime(filename)
+        elsif @cftime != File.ctime(filename)
+          @config = nil
+          @cftime = File.ctime(filename)
+        end
+        @config ||= Tzispa::Config::Yaml.load(filename)
+      end
+
+      def filename
+        Config.filename
+      end
+
+      class << self
+        def filename
+          @filename ||= "config/#{CONFIG_FILENAME}.yml"
+        end
+
+        def create_default(path)
+          hcfg = {}.tap do |cfg|
+            cfg['development'] = ''
+            cfg['deployment'] = ''
+            cfg['test'] = ''
+          end
+          Yaml.save(hcfg, File.join(path, filename))
+        end
+
+        def add_repository(name, adapter, dbconn)
+          hs = YAML.safe_load(File.open(filename))
+          hs.each_value do |v|
+            v[name] = {
+              'adapter' => adapter,
+              'database' => dbconn,
+              'connection_validation' => 'No',
+              'local' => 'Yes'
+            }
+          end
+          Yaml.save(hs, filename)
+        end
+      end
+    end
+
+  end
+end

data/lib/tzispa/data/repository.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'forwardable'
 require 'sequel'
 require 'tzispa_utils'
 require 'tzispa/data/adapter_pool'
+require 'tzispa/data/config'
 
 module Tzispa
   module Data
@@ -18,62 +20,70 @@ module Tzispa
     class UnknownModel < DataError; end
 
     class Repository
+      extend Forwardable
+      include Singleton
       using Tzispa::Utils::TzString
 
-      attr_reader :root, :adapters
+      attr_reader :adapters, :pool, :config
+      def_delegators :@adapters, :disconnect
 
-      def initialize(config, root = nil)
-        @config = config
-        @root = root || LOCAL_REPO_ROOT
+      def initialize
+        @config = Config.new(Tzispa::Environment.environment)&.to_h
         @pool = {}
         @adapters = AdapterPool.new config
       end
 
-      def [](model, repo_id = nil)
-        selected_repo = repo_id || adapters.default_repo
-        raise UnknownModel.new(model, selected_repo) unless pool.key?(selected_repo) &&
-                                                            pool[selected_repo].key?(model.to_sym)
-        pool[selected_repo][model.to_sym]
-      end
+      class << self
+        def [](model, repo_id = nil)
+          repo = active_repo(repo_id)
+          raise UnknownModel.new(model, repo) unless known?(model, repo)
+          instance.pool[repo][model.to_sym]
+        end
 
-      def models(repo_id = nil)
-        pool[repo_id || adapters.default_repo].values
-      end
+        def disconnect
+          instance.disconnect
+        end
 
-      def module_const(repo_id = nil)
-        selected_repo = repo_id || adapters.default_repo
-        pool[selected_repo][:__repository_module] ||= repository_module(selected_repo)
-      end
+        def active_repo(repo_id = nil)
+          repo_id || instance.adapters.default_repo
+        end
+
+        def known?(model, repo)
+          instance.pool.key?(repo) && instance.pool[repo].key?(model.to_sym)
+        end
+
+        def models(repo_id = nil)
+          instance.pool[active_repo(repo_id)].values
+        end
+
+        def module_const(repo_id = nil)
+          repo = active_repo(repo_id)
+          instance.pool[repo][:__repository_module] ||= instance.repository_module(repo)
+        end
 
-      def load!(domain)
-        @config.each do |id, cfg|
-          Mutex.new.synchronize do
-            pool[id] = {}
-            load_config_repo(id, cfg)
+        def load!(domain)
+          instance.config.each do |id, cfg|
+            instance.pool[id] = {}
+            instance.load_config_repo(id, cfg)
             domain.include module_const(id)
           end
         end
-        self
-      end
 
-      def register(model_id, model_class, repo_id, config)
-        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
+        def register(model_id, model_class, repo_id, config)
+          return if known?(model_id, repo_id)
+          instance.setup_model(model_class, repo_id, config)
+          instance.pool[repo_id][model_id.to_sym] = model_class
         end
-        pool[repo_id][model_id.to_sym]
       end
 
-      private
-
-      attr_reader :pool
+      def setup_model(model_class, repo_id, config)
+        return if model_class.db == adapters[repo_id]
+        model_class.db = adapters[repo_id]
+        return unless config.caching
+        model_class.plugin :caching, adapters.cache[repo_id],
+                           ttl: config.ttl || DEFAULT_CACHE_TTL,
+                           ignore_exceptions: true
+      end
 
       def repository_module(repo_id)
         rm = @pool[repo_id].first[1].name.split('::')
@@ -83,29 +93,40 @@ module Tzispa
 
       def load_config_repo(id, cfg)
         if cfg.local
-          load_local_helpers id
-          load_local_models id, cfg
-          load_local_entities id
+          local_local(id, cfg)
         else
           require cfg.gem
           repo_module = id.to_s.camelize.constantize
           self.class.include repo_module
-          self.class.send "load_#{id}", self, id, cfg
+          self.class.send "load_#{id}", id, cfg
         end
       end
 
-      def load_local_models(repo_id, config)
+      private
+
+      def root(cfg)
+        cfg.root || LOCAL_REPO_ROOT
+      end
+
+      def local_local(id, cfg)
+        local_root = root(cfg)
+        load_local_helpers id, local_root
+        load_local_models id, cfg, local_root
+        load_local_entities id, local_root
+      end
+
+      def load_local_models(repo_id, cfg, root)
         models_path = "./#{root}/#{repo_id}/model"
         repo_module = "#{repo_id.to_s.camelize}::Model".constantize
         Dir["#{models_path}/*.rb"].each do |file|
           model_id = file.split('/').last.split('.').first
           require "#{models_path}/#{model_id}"
           model_class = "#{repo_module}::#{model_id.camelize}".constantize
-          register model_id, model_class, repo_id, config
+          register model_id, model_class, repo_id, cfg
         end
       end
 
-      def load_local_entities(repo_id)
+      def load_local_entities(repo_id, root)
         entities_path = "./#{root}/#{repo_id}/entity"
         Dir["#{entities_path}/*.rb"].each do |file|
           entity_id = file.split('/').last.split('.').first
@@ -113,7 +134,7 @@ module Tzispa
         end
       end
 
-      def load_local_helpers(repo_id)
+      def load_local_helpers(repo_id, root)
         helpers_path = "./#{root}/#{repo_id}/helpers"
         Dir["#{helpers_path}/*.rb"].each do |file|
           helper_id = file.split('/').last.split('.').first

data/lib/tzispa/data/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Data
 
-    VERSION  = '0.5.0'
+    VERSION  = '0.6.0'
     NAME     = 'Tzispa Data'
     GEM_NAME = 'tzispa_data'
 

data/lib/tzispa_data.rb

@@ -3,6 +3,7 @@
 module Tzispa
   module Data
 
+    require 'tzispa/data/version'
     require 'tzispa/data'
 
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_data
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: tzispa_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +77,7 @@ files:
 - README.md
 - lib/tzispa/data.rb
 - lib/tzispa/data/adapter_pool.rb
+- lib/tzispa/data/config.rb
 - lib/tzispa/data/entity.rb
 - lib/tzispa/data/repository.rb
 - lib/tzispa/data/transporter.rb
@@ -88,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Data access for Tzispa framework