tzispa_data 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541b8583385fa3cd067dcd15d4600da2f0be5b55
-  data.tar.gz: f8ecf752ae8345dc0267975a73b644265053e8e5
+  metadata.gz: d93f8550dc521d79171ed9b7a38ea5b3cd130260
+  data.tar.gz: f984c6b25aa8f4dd2b6bc663a5099e98eaac68ef
 SHA512:
-  metadata.gz: 26e9037dd1d200fc2eaef19561dc355e8cb193f2c915ed001fc11b8886bff12987bf6f6c50aaeeba55ffbb4cf2b9ffc975bb6eda95b6d8c15e20e3d3fe6892a0
-  data.tar.gz: edca3ff381626055bbff6b841e0b0355b5b1c42fc5013e33bacd371d25b82f0a432dc64df7d954644e44dc3480a990c2ee9907cc8717c14ce50129aec1dcfb60
+  metadata.gz: 4ef78463937d73e27ddf3cfa42546d243f4833e572161c52c437867517ec128720451570aa1336f821ca3178cb5898a8ad24ecb277ae0bd2fd75e82003755def
+  data.tar.gz: af14bd698ae4086476728169758bc7a4627e4bbe488deced716c3adcfea43f3376446bd59f342c3457ac20251bcbf7e7560a52a95e1ea0dfaa5df8ed5f745587

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 Tzispa Data
 
+## v0.3.0
+- local repository helpers preloading
+- fix local repository loader
+- repositories module namespace get & simplifification
+
 ## v0.2.1
 - code fixes for replacing TzString with String refinement
 

data/lib/tzispa/data/repository.rb

@@ -29,21 +29,34 @@ module Tzispa
 
       def [](model, repo_id=nil)
         selected_repo = repo_id || @adapters.default
-        raise UnknownModel.new("The '#{model}' model does not exists in the adapter '#{selected_repo}'") unless @pool.has_key? self.class.key(model, selected_repo)
-        @pool[self.class.key(model.to_sym, selected_repo)]
+        raise UnknownModel.new("The '#{model}' model does not exists in the adapter '#{selected_repo}'") unless @pool.has_key?(selected_repo) && @pool[selected_repo].has_key?(model.to_sym)
+        @pool[selected_repo][model.to_sym]
       end
 
-      def load!
+      def models(repo_id=nil)
+        @pool[repo_id || @adapters.default].values
+      end
+
+      def module_const(repo_id=nil)
+        selected_repo = repo_id || @adapters.default
+        @pool[selected_repo][:'__repository_module'] ||= repository_module(selected_repo)
+      end
+
+      def load!(domain)
         @config.each { |id, cfg|
           Mutex.new.synchronize {
+            @pool[id] = Hash.new
             Sequel::Model.db = @adapters[id]
             if cfg.local
-              build_local_repo id, cfg
+              load_local_helpers id, cfg
+              load_local_models id, cfg
             else
               require cfg.gem
-              self.class.include "Repository::#{id.to_s.camelize}".constantize
+              repo_module = "#{id.to_s.camelize}".constantize
+              self.class.include repo_module
               self.class.send "load_#{id}", self, id, cfg
             end
+            domain.include module_const(id)
           }
         }
         self
@@ -54,26 +67,34 @@ module Tzispa
         config.extensions.split(',').each { |ext|
           model_class.db.extension ext.to_sym
         } if config.respond_to? :extensions
-        @pool[self.class.key(model_id, repo_id)] = model_class
+        @pool[repo_id][model_id.to_sym] = model_class
       end
 
       private
 
-      def build_local_repo(repo_id, config)
-        Dir["./#{root.to_s.downcase}/#{repo_id}/*.rb"].each { |file|
+      def repository_module(repo_id)
+        rm = @pool[repo_id].first[1].name.split('::')
+        rm.pop
+        rm.join('::').constantize
+      end
+
+      def load_local_models(repo_id, config)
+        models_path = "./#{root}/#{repo_id}/model"
+        repo_module = "#{repo_id.to_s.camelize}::Model".constantize
+        Dir["#{models_path}/*.rb"].each { |file|
           model_id = file.split('/').last.split('.').first
-          require local_model_source(model_id, repo_id)
-          model_class = "Repository::#{repo_id.camelize}::#{model_id.camelize}".constantize
+          require "#{models_path}/#{model_id}"
+          model_class = "#{repo_module}::#{model_id.camelize}".constantize
           register model_id, model_class, repo_id, config
         }
       end
 
-      def local_model_source(model, repo_id)
-        "./#{root.to_s.downcase}/#{repo_id}/#{model}"
-      end
-
-      def self.key(model_id, repo_id)
-        "#{model_id}@#{repo_id}".to_sym
+      def load_local_helpers(repo_id, config)
+        helpers_path = "./#{root}/#{repo_id}/helpers"
+        Dir["#{helpers_path}/*.rb"].each { |file|
+          helper_id = file.split('/').last.split('.').first
+          require "#{helpers_path}/#{helper_id}"
+        }
       end
 
     end

data/lib/tzispa/data/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Data
 
-    VERSION  = '0.2.1'
+    VERSION  = '0.3.0'
     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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 description: Data access layer for Tzispa
 email:
 - japinero@area-integral.com
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Data access for Tzispa framework