smart_ioc 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de564b00fb136146fd0f4d4182fe58f7cd9f1bd56c01a23ccc7aca185befc7e8
-  data.tar.gz: d9cb0e43111c988b77d8454fc3b7f45cf4aa2109a76839f2da17135eaef57e52
+  metadata.gz: 01e3fac1f32289e170915d3251e88d937f970f6396ef7d6a8c7b2163696001f2
+  data.tar.gz: 15f36e9c706c0cfdb59c86e8f40cf1106361346b0f0def709f9618b3821cc865
 SHA512:
-  metadata.gz: 4a5a9d63019c4a0fabda18691014bbaf510ef703e1592a00a97bae1a582f523cfa8328c826a331764602664346771033ef3bf2d49bb3b27a98d9830e2f465f98
-  data.tar.gz: 9ae3b6e48602c173ca5ef0544c587c156d10e89616bbcdfb53ae293c98a4b6d047a3d2e01712b072ecfdc6bd519391735b20b12425ce513c9ebd6abb8d87d118
+  metadata.gz: 11fae8af77f705ecdbd3a6039dd5c148abd28fc5ef8e584644179f76f23f1c061f4dc4c049a593f308037ef0e1f033c0cd6641e3d761447e51a97c6ea3699efd
+  data.tar.gz: 82ea8d86866fe7eace9a1db47da5fd87457cd499425387aa977d086ac514525463902e8f4f8261ae91c4ba9e35ddc0b4f25761303552e35c63c05edd34d2ba7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.3.5)
+    smart_ioc (0.3.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/smart_ioc/bean.rb

@@ -9,11 +9,15 @@ def bean(bean_name, &proc)
   klass.instance_variable_set(:@anonymous_bean, true)
   klass.instance_exec(&proc)
 
+  file_path = caller[0].split(':').first
+  package   = SmartIoC::BeanLocations.get_bean_package(file_path)
+
   klass.instance_exec do
     bean(
       bean_name,
+      file_path:      file_path,
       scope:          instance_variable_get(:@scope) || nil,
-      package:        instance_variable_get(:@package) || nil,
+      package:        instance_variable_get(:@package) || package,
       instance:       instance_variable_get(:@instance) || false,
       factory_method: instance_variable_get(:@factory_method) || nil,
       context:        instance_variable_get(:@context) || nil,

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -21,12 +21,14 @@ class SmartIoC::BeanDefinitionsStorage
 
     if existing_bd
       error_msg =
-%Q(Not able to add bean to definitions storage.
+%Q(Unable to add bean to definitions storage.
 Bean definition already exists.
+
 New bean details:
-  #{bean_definition.inspect}
+#{bean_definition.inspect}
+
 Existing bean details:
-  #{existing_bd.inspect})
+#{existing_bd.inspect})
 
       raise ArgumentError, error_msg
     end

data/lib/smart_ioc/bean_factory.rb

@@ -120,8 +120,6 @@ class SmartIoC::BeanFactory
     end
 
     if smart_bds.size > 1
-      require 'byebug'
-      debugger
       raise ArgumentError.new(
 %Q(Unable to autodetect bean :#{bean}#{parent_bean_name ? " for bean :#{parent_bean_name}" : ''}.
 Several definitions were found:\n

data/lib/smart_ioc/iocify.rb

@@ -64,8 +64,8 @@ module SmartIoC::Iocify
     # @param context [Symbol] set bean context (ex: :test)
     # @param after_init [Symbol] name of bean method that will be called after bean initialization (ex: :test)
     # @return nil
-    def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil, after_init: nil)
-      file_path = caller[0].split(':').first
+    def bean(bean_name, scope: nil, package: nil, instance: true, factory_method: nil, context: nil, after_init: nil, file_path: nil)
+      file_path ||= caller[0].split(':').first
       package ||= SmartIoC::BeanLocations.get_bean_package(file_path)
       context ||= SmartIoC::Container::DEFAULT_CONTEXT
       bean_definition = SmartIoC.get_bean_definition(bean_name, package, context)

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/smart_ioc/example/admins/repository/admins_dao.rb

@@ -1,7 +1,5 @@
-class AdminsDAO
-  include SmartIoC::Iocify
-
-  bean :dao, instance: false, after_init: :setup
+bean :dao do
+  after_init :setup
 
   inject :config
 

data/spec/smart_ioc/example/admins/repository/admins_repository.rb

@@ -1,13 +1,7 @@
-class AdminsRepository
-  include SmartIoC::Iocify
-
-  bean :repository
-
+bean :repository do
   inject :dao
   inject :users_creator
 
-  public :users_creator
-
   def put(user)
     dao.insert(user)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler