railjet 2.0.pre → 2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64593e5bffd2ea6b843a49c9450aa1317e0441e
-  data.tar.gz: fae9a51b5b4a8570630914aa2eecd2f3fa6ac604
+  metadata.gz: 29a7d18d2b8bc0852295524995ff8780b7551a83
+  data.tar.gz: 965c764dff2977147ee038e380f8dbd79f471435
 SHA512:
-  metadata.gz: d62aa6add7ec2127851375f53d54532aa02e197fbf93704458ae248c663c5d328db6f1aab726584bbfdaa4a54272bc417a44f7975abf1fea3090c2725520a129
-  data.tar.gz: c7df7c2b072fb6aa20869d7f61d129d09bbffe428b776071338853f9ca3af1cf3afb7f0a6a06eb85e0385d8463b2deb79537e921ffffa3e6b3cb90322af202bd
+  metadata.gz: f19fdbd2153690f1293b155749107049c31d1a545a6c5b8a5888d8c184ed46a2fe0bf7d337eae123fdd4215ae39a1905d703e906a3d51649695320fb0ee0327d
+  data.tar.gz: aa2060950a39502cb65ef0adfb252931dacdf600a1604d25a0d89e90fcfa7da337cca615f00d27dbdafc4be6387d1c6982064da4d055c1667df42c7055665d88

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    railjet (2.0.pre)
-      activemodel (> 4)
-      activesupport (> 4)
+    railjet (2.0.pre1)
+      activemodel (< 5)
+      activesupport (< 5)
       validates_timeliness (~> 4.0.2)
       virtus (~> 1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.3)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -38,7 +40,8 @@ GEM
       netrc (>= 0.10.0, < 0.12.0.pre)
       thor (>= 0.14.0, < 1.0.0.pre)
     highline (1.7.8)
-    i18n (0.8.6)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     method_source (0.9.0)
     minitest (5.10.3)

data/VERSION

@@ -1 +1 @@
-2.0.pre
+2.0.pre1

data/lib/railjet/repository.rb

@@ -32,7 +32,7 @@ module Railjet
       ivar = "@#{repository.type}"
       dao  = kwargs[repository.type]
 
-      instance_variable_set(ivar, repository.new(registry, dao: dao))
+      instance_variable_set(ivar, repository.new(registry, :"#{repository.type}" => dao))
       self.class.send :attr_reader, repository.type
     end
   end

data/lib/railjet/repository/generic.rb

@@ -2,14 +2,14 @@ module Railjet
   module Repository
     class Generic < Module
       class << self
-        def [](dao)
+        def [](dao = nil)
           new(dao)
         end
 
         attr_accessor :type
       end
 
-      def initialize(dao)
+      def initialize(dao = nil)
         @dao  = dao
         @type = self.class.type
       end
@@ -18,34 +18,42 @@ module Railjet
         define_dao_accessor(@type, @dao)
         define_type_accessor(klass, @type)
         define_initializer(klass)
-
-        klass.send :include, self.class::RepositoryMethods
+        include_repository_methods(klass)
       end
 
       private
 
       def define_dao_accessor(type, dao)
         define_method type do
-          @dao ||= dao.constantize
+          instance_variable_get("@#{type}") || instance_variable_set("@#{type}", (dao.constantize if dao.respond_to?(:constantize)))
         end
       end
 
       def define_type_accessor(klass, type)
-        klass.define_singleton_method(:type) do
-          type
-        end
+        klass.define_singleton_method(:type) { type }
       end
 
       def define_initializer(klass)
         klass.class_eval do
           attr_reader :registry
 
-          def initialize(registry, dao: nil)
+          def initialize(registry, **kwargs)
             @registry = registry
-            @dao      = dao
+            instance_variable_set("@#{self.class.type}", kwargs.fetch(self.class.type, nil))
+
+            # Let's check if DAO was set through registry or set when including inner repo mixin
+            unless send(self.class.type)
+              raise ArgumentError, "Your repository #{self.class} need a DAO. It can be set with inner-repo mixin  or through registry with `#{self.class.type}:` option"
+            end
           end
         end
       end
+      
+      def include_repository_methods(klass)
+        if defined?(self.class::RepositoryMethods)
+          klass.send :include, self.class::RepositoryMethods
+        end
+      end
     end
   end
 end

data/lib/railjet/repository/registry.rb

@@ -1,6 +1,6 @@
 module Railjet
   module Repository
-    class Registry
+    class Registry      
       attr_reader :repositories, :initialized_repositories
       protected   :repositories, :initialized_repositories
       
@@ -9,8 +9,8 @@ module Railjet
         @initialized_repositories = {}
       end
 
-      def register(name, repository)
-        add_to_registry(name, repository)
+      def register(name, repository, **kwargs)
+        add_to_registry(name, repository, **kwargs)
         define_accessor(name)
       end
 
@@ -27,6 +27,19 @@ module Railjet
       end
 
       private
+      
+      class RegisteredRepository
+        attr_reader :repository, :additional_arguments
+        
+        def initialize(repository, **kwargs)
+          @repository           = repository
+          @additional_arguments = kwargs
+        end
+        
+        def initialize_repo(registry)
+          repository.new(registry, **additional_arguments)
+        end
+      end
 
       def initialize_copy(original)
         super
@@ -36,9 +49,9 @@ module Railjet
         @registry_module          = nil
       end
 
-      def add_to_registry(name, repository)
+      def add_to_registry(name, repository, **kwargs)
         initialized_repositories[name] = nil
-        repositories[name]             = repository
+        repositories[name]             = RegisteredRepository.new(repository, **kwargs)       
       end
 
       def get_from_registry(name)
@@ -46,7 +59,7 @@ module Railjet
       end
 
       def initialize_repo(name)
-        initialized_repositories[name] ||= get_from_registry(name).new(self)
+        initialized_repositories[name] ||= get_from_registry(name).initialize_repo(self)
       end
 
       def define_accessor(name)

data/lib/railjet/version.rb

@@ -1,3 +1,3 @@
 module Railjet
-  VERSION = "2.0.pre"
+  VERSION = "2.0.pre1"
 end

data/railjet.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "gemfury"
   spec.add_development_dependency "rake-version",         "~> 1.0"
 
-  spec.add_dependency             "activesupport",        '> 4'
-  spec.add_dependency             "activemodel",          '> 4'
+  spec.add_dependency             "activesupport",        '< 5'
+  spec.add_dependency             "activemodel",          '< 5'
   spec.add_dependency             "virtus",               "~> 1.0.2"
   spec.add_dependency             "validates_timeliness", "~> 4.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railjet
 version: !ruby/object:Gem::Version
-  version: 2.0.pre
+  version: 2.0.pre1
 platform: ruby
 authors:
 - Krzysztof Zalewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,30 +98,30 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement