smart_ioc 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58c5f84034596665181c7a368aa35b2c9ed780e0dce715d538e4e142a921be4
-  data.tar.gz: 462be2bd543accc11130c90f86589247116a4d939c62aaca8e71f57db99cca5d
+  metadata.gz: 935f8126a232eeb46445b817709b70a45d99c2212cd81fbc81782a217fbe409b
+  data.tar.gz: 6f433ae8f0514505f08eeb3cadda7856b456f28ed4d61f774bb7fee327914ce3
 SHA512:
-  metadata.gz: 64c18ef92109604e6eef73fec45c2dd8c9b7c84b1e5472b5f3cdf5b3a800490fa7aec50b9de5a508c1c62abf9739f571cf7393a318eec2558d2b6fd1a978211a
-  data.tar.gz: 1705b4a8b407707aaf00016f79c941a68250f52a1ef4e8071ad55c7f4f0c0fee03d786b3acfc40b59d8f6c2635cd7df65c7cb69e2505b07a72f7aac87b8c2ad1
+  metadata.gz: 9d1c0b83f8b812e062332d65756e90a6566f3e9934086dce23c6c163b52fb9e002eabcd746b3a757012bb3ee172728ccc72d0698078ae4fcee7f9790a28f5245
+  data.tar.gz: 27c53e6c7d8772fba4e21281c6dd89d9bc3f22431e6740ab484f1af6f705e21db0d1b53fd6e890b66b5c037b66cbe64031b7fe62068df554660a294677901d3e

data/Gemfile.lock

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

data/lib/smart_ioc.rb

@@ -15,6 +15,7 @@ module SmartIoC
   autoload :InjectMetadata,         'smart_ioc/inject_metadata'
   autoload :Iocify,                 'smart_ioc/iocify'
   autoload :Scopes,                 'smart_ioc/scopes'
+  autoload :StringUtils,            'smart_ioc/string_utils'
 
   module Scopes
     autoload :Bean,      'smart_ioc/scopes/bean'

data/lib/smart_ioc/bean.rb

@@ -9,19 +9,45 @@ def bean(bean_name, &proc)
   klass.instance_variable_set(:@anonymous_bean, true)
   klass.instance_exec(&proc)
 
+  str       = SmartIoC::StringUtils
   file_path = caller[0].split(':').first
-  package   = SmartIoC::BeanLocations.get_bean_package(file_path)
+  package   = klass.instance_variable_get(:@package) || SmartIoC::BeanLocations.get_bean_package(file_path)
+  context   = klass.instance_variable_get(:@context) || :default
+
+  if package.nil?
+    raise ArgumentError, "package is not defined for bean :#{bean_name}"
+  end
+
+  package_mod = str.camelize(package)
+  context_mod = str.camelize(context || :default)
+
+  class_name = str.camelize(bean_name)
+  klass_name = "#{package_mod}::#{context_mod}::#{class_name}"
+
+  eval(
+    %Q(
+      module #{package_mod}
+        module #{context_mod}
+          if constants.include?(:"#{class_name}")
+            remove_const :"#{class_name}"
+          end
+        end
+      end
+        
+      #{klass_name} = klass
+    )
+  )
 
   klass.instance_exec do
     bean(
       bean_name,
       file_path:      file_path,
-      scope:          instance_variable_get(:@scope) || nil,
-      package:        instance_variable_get(:@package) || package,
+      scope:          instance_variable_get(:@scope),
+      package:        package,
       instance:       instance_variable_get(:@instance) || false,
-      factory_method: instance_variable_get(:@factory_method) || nil,
-      context:        instance_variable_get(:@context) || nil,
-      after_init:     instance_variable_get(:@after_init) || nil
+      factory_method: instance_variable_get(:@factory_method),
+      context:        context,
+      after_init:     instance_variable_get(:@after_init),
     )
   end
 

data/lib/smart_ioc/string_utils.rb

@@ -0,0 +1,13 @@
+module SmartIoC
+  class StringUtils
+    class << self
+      def camelize(term)
+        string = term.to_s
+        string = string.sub(/^[a-z\d]*/) { |match| match.capitalize }
+        string.gsub!(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }
+        string.gsub!("/".freeze, "::".freeze)
+        string
+      end
+    end
+  end
+end

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/smart_ioc/scopes/prototype.rb
 - lib/smart_ioc/scopes/request.rb
 - lib/smart_ioc/scopes/singleton.rb
+- lib/smart_ioc/string_utils.rb
 - lib/smart_ioc/version.rb
 - smart_ioc.gemspec
 - spec/smart_ioc/bean_definition_spec.rb