smart_ioc 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0b7417468b3bf40350a297a885266b3067809f6ca074326614b8663ca762bb
-  data.tar.gz: 6508ed9fdee9191479459541718c63172bd7a9d47fa1de63bdd9ab883737927b
+  metadata.gz: 5e5c21e82ade291e0f2349e6d75807764104472899d1369275b8e43be1184f82
+  data.tar.gz: 233217c7f8049bfaf40359cc599fc6f944f4a8e773da8a2b2c6059224dd283e4
 SHA512:
-  metadata.gz: 2daa5061878b44419bbb0d3e4e2c5c7edcc526259b27e04f1600a3b2c994e06a03722c160e6b6c01a67a587cb99efa2dd385bbc215f275989ec0e622d78eb9a7
-  data.tar.gz: fb7fbdc1dc05f2462f5aaf399564423798129e9e6ed324dceaa8e47747707083c40857f6528047c0d703b2cad45889900cf60924e33d339e775ef31215c97f66
+  metadata.gz: 49f4a74095dc772d17f3e5f2b9f749465c6b58f9fbb60309f1a4a772ecdcd4211200879f4ca7bc169e3b40c5695519273b7b729bfab4683f1f96d920fe41e505
+  data.tar.gz: 3aafd25fb01683303a404692d92cf8becc533c1840ba1672eaac6329e0360a59bf44d1820eaab0517ef8c1f1326160f0e2ec000efb1b9933f48de8945ccf8eed

data/.github/workflows/rspec.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Rspec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1', '3.3']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec spec/

data/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.2

data/Gemfile

@@ -6,5 +6,6 @@ gemspec
 group :test do
   gem 'rspec'
   gem 'simplecov'
+  gem 'simplecov-html', '0.12.3'
   gem 'byebug'
 end

data/Gemfile.lock

@@ -1,31 +1,34 @@
 PATH
   remote: .
   specs:
-    smart_ioc (0.4.0)
+    smart_ioc (0.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.3)
-    codecov (0.6.0)
-      simplecov (>= 0.15, < 0.22)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    coderay (1.1.3)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    method_source (1.1.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    simplecov (0.21.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -34,15 +37,17 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-23
 
 DEPENDENCIES
   bundler
   byebug
-  codecov
+  pry
   rake
   rspec
   simplecov
+  simplecov-html (= 0.12.3)
   smart_ioc!
 
 BUNDLED WITH
-   2.1.4
+   2.5.14

data/README.md

@@ -1,8 +1,6 @@
 # SmartIoC
-[![Build Status](https://travis-ci.org/ddd-ruby/smart_ioc.png)](https://travis-ci.org/ddd-ruby/smart_ioc)
-[![Code Climate](https://codeclimate.com/github/ddd-ruby/smart_ioc/badges/gpa.svg)](https://codeclimate.com/github/ddd-ruby/smart_ioc)
-[![codecov](https://codecov.io/gh/ddd-ruby/smart_ioc/branch/master/graph/badge.svg)](https://codecov.io/gh/ddd-ruby/smart_ioc)
-[![Dependency Status](https://gemnasium.com/ddd-ruby/smart_ioc.png)](https://gemnasium.com/ddd-ruby/smart_ioc)
+[![Rspec](https://github.com/droidlabs/smart_ioc/workflows/Rspec/badge.svg)](https://github.com/droidlabs/smart_ioc/actions?query=workflow%3ARspec)
+[![Code Climate](https://codeclimate.com/github/ddd-ruby/smart_ioc/badges/gpa.svg)](https://codeclimate.com/github/ddd-ruby/smart_ioc) 
 
 
 SmartIoC is a smart and really simple IoC container for Ruby applications.
@@ -10,6 +8,15 @@ SmartIoC is a smart and really simple IoC container for Ruby applications.
 ## Installation
 `gem install smart_ioc`
 
+## Ruby versions
+
+Please install specific smart_ioc version, depending on Ruby version.
+
+| Ruby Version | SmartIoC Version |
+| ------------ | ------------ |
+| < 3.0  | 0.3.2 |
+| >= 3.0 | 0.4.0 |
+
 ## Setup
    Set package name and source package folder with beans. SmartIoC will parse source files and detect bean definitions automatically for you.
 

data/docs/index.md

@@ -1,9 +1,6 @@
 # SmartIoC
-[![Build Status](https://travis-ci.org/ddd-ruby/smart_ioc.png)](https://travis-ci.org/ddd-ruby/smart_ioc)
-[![Code Climate](https://codeclimate.com/github/ddd-ruby/smart_ioc/badges/gpa.svg)](https://codeclimate.com/github/ddd-ruby/smart_ioc)
-[![codecov](https://codecov.io/gh/ddd-ruby/smart_ioc/branch/master/graph/badge.svg)](https://codecov.io/gh/ddd-ruby/smart_ioc)
-[![Dependency Status](https://gemnasium.com/ddd-ruby/smart_ioc.png)](https://gemnasium.com/ddd-ruby/smart_ioc)
-
+[![Rspec](https://github.com/droidlabs/smart_ioc/workflows/Rspec/badge.svg)](https://github.com/droidlabs/smart_ioc/actions?query=workflow%3ARspec)
+[![Code Climate](https://codeclimate.com/github/ddd-ruby/smart_ioc/badges/gpa.svg)](https://codeclimate.com/github/ddd-ruby/smart_ioc) 
 
 SmartIoC is a smart and really simple IoC container for Ruby applications.
 

data/lib/smart_ioc/bean.rb

@@ -0,0 +1,59 @@
+def bean(bean_name, &proc)
+  raise ArgumentError, "name should be a Symbol" if !bean_name.is_a?(Symbol)
+  raise ArgumentError, "proc should be provided" if !block_given?
+
+  klass = Class.new do
+    include SmartIoC::Iocify
+  end
+
+  klass.instance_variable_set(:@anonymous_bean, true)
+  klass.instance_exec(&proc)
+
+  str       = SmartIoC::StringUtils
+  file_path = caller[0].split(':').first
+  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),
+      package:        package,
+      instance:       instance_variable_get(:@instance) || false,
+      factory_method: instance_variable_get(:@factory_method),
+      context:        context,
+      after_init:     instance_variable_get(:@after_init),
+    )
+  end
+
+  (klass.instance_variable_get(:@injects) || []).each do |inject|
+    klass.register_inject(inject[:bean_name], ref: inject[:ref], from: inject[:from])
+  end
+
+  klass
+end

data/lib/smart_ioc/bean_definition.rb

@@ -47,7 +47,7 @@ class SmartIoC::BeanDefinition
   end
 
   def ==(bean_definition)
-    bean_definition.klass == @klass
+    bean_definition.name == @name && bean_definition.package == @package && bean_definition.context == @context
   end
 
   def singleton?
@@ -56,7 +56,6 @@ class SmartIoC::BeanDefinition
 
   def inspect
     str = []
-    str << "class:          #{@klass}"
     str << "name:           :#{@name}"
     str << "package:        :#{@package}"
     str << "context:        :#{@context}"
@@ -65,4 +64,17 @@ class SmartIoC::BeanDefinition
     str << "factory_method: #{@factory_method}"
     str.join("\n")
   end
+
+  def preload
+    @dependencies.each do |dep|
+      bd = SmartIoC.get_bean_definition(
+        dep.ref,
+        package: dep.package,
+        parent_bean_definition: self,
+        parent_bean_name: name,
+      )
+
+      bd.preload
+    end
+  end
 end

data/lib/smart_ioc/bean_definitions_storage.rb

@@ -20,15 +20,18 @@ class SmartIoC::BeanDefinitionsStorage
     end
 
     if existing_bd
-      error_msg =
-%Q(Not able to add bean to definitions storage.
-Bean definition already exists.
-New bean details:
-  #{bean_definition.inspect}
-Existing bean details:
-  #{existing_bd.inspect})
-
-      raise ArgumentError, error_msg
+      @collection.reject! { |bd| bd == existing_bd }
+
+      message = <<~EOF
+        \nReplacing bean definition...
+          - New bean details:
+        #{bean_definition.inspect}
+          - Existing bean details:
+        #{existing_bd.inspect})
+
+      EOF
+
+      puts message
     end
 
     @collection.push(bean_definition)
@@ -43,11 +46,13 @@ Existing bean details:
     end
   end
 
-  # @param klass [Class] bean class
+  # Returns bean definition for specific class
+  # @param bean_name [Symbol]
+  # @param package [Symbol]
+  # @param context [Symbol]
   # @return bean definition [BeanDefinition] or nil
-  def find_by_class(klass)
-    klass_str = klass.to_s
-    @collection.detect {|bd| bd.klass.to_s == klass_str}
+  def find_bean(bean_name, package, context)
+    @collection.detect {|bd| bd.name == bean_name && bd.package == package && bd.context == context}
   end
 
   def filter_by(bean_name, package = nil, context = nil)

data/lib/smart_ioc/bean_factory.rb

@@ -31,17 +31,8 @@ class SmartIoC::BeanFactory
   # @return bean instance
   # @raise [ArgumentError] if bean is not found
   # @raise [ArgumentError] if ambiguous bean definition was found
-  def get_bean(bean_name, package: nil, parent_bean_definition: nil, context: nil)
-    check_arg(bean_name, :bean_name, Symbol)
-    check_arg(package, :package, Symbol) if package
-    check_arg(parent_bean_definition, :parent_bean_definition, SmartIoC::BeanDefinition) if parent_bean_definition
-    check_arg(context, :context, Symbol) if context
-
-    @bean_file_loader.require_bean(bean_name)
-
-    parent_package_name = parent_bean_definition ? parent_bean_definition.package : nil
-    context = autodetect_context(bean_name, package, parent_package_name, context)
-    bean_definition = @bean_definitions_storage.find(bean_name, package, context, parent_package_name)
+  def get_bean(bean_name, package: nil, parent_bean_definition: nil, context: nil, parent_bean_name: nil)
+    bean_definition = get_bean_definition(bean_name, package:, parent_bean_definition:, context:, parent_bean_name:)
     scope = get_scope(bean_definition)
     bean = scope.get_bean(bean_definition.klass)
 
@@ -56,6 +47,19 @@ class SmartIoC::BeanFactory
     raise e
   end
 
+  def get_bean_definition(bean_name, package: nil, context: nil, parent_bean_definition: nil, parent_bean_name: nil)
+    check_arg(bean_name, :bean_name, Symbol)
+    check_arg(package, :package, Symbol) if package
+    check_arg(parent_bean_definition, :parent_bean_definition, SmartIoC::BeanDefinition) if parent_bean_definition
+    check_arg(context, :context, Symbol) if context
+
+    @bean_file_loader.require_bean(bean_name)
+
+    parent_package_name = parent_bean_definition ? parent_bean_definition.package : nil
+    context = autodetect_context(bean_name, package, parent_package_name, context, parent_bean_name)
+    bean_definition = @bean_definitions_storage.find(bean_name, package, context, parent_package_name)
+  end
+
   private
 
   def init_bean(bean_definition)
@@ -76,18 +80,18 @@ class SmartIoC::BeanFactory
     bean
   end
 
-  def autodetect_context(bean_name, package, parent_bean_package, context)
+  def autodetect_context(bean_name, package, parent_bean_package, context, parent_bean_name)
     return context if context
 
     if package
       @extra_package_contexts.get_context(package)
     else
-      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package)
+      bean_definition = autodetect_bean_definition(bean_name, package, parent_bean_package, parent_bean_name)
       @extra_package_contexts.get_context(bean_definition.package)
     end
   end
 
-  def autodetect_bean_definition(bean, package, parent_bean_package)
+  def autodetect_bean_definition(bean, package, parent_bean_package, parent_bean_name)
     if package
       bean_context = @extra_package_contexts.get_context(package)
       bds = @bean_definitions_storage.filter_by_with_drop_to_default_context(bean, package, bean_context)
@@ -121,7 +125,7 @@ class SmartIoC::BeanFactory
 
     if smart_bds.size > 1
       raise ArgumentError.new(
-%Q(Unable to autodetect bean :#{bean}.
+%Q(Unable to autodetect bean :#{bean}#{parent_bean_name ? " for bean :#{parent_bean_name}" : ''}.
 Several definitions were found:\n
 #{smart_bds.map(&:inspect).join("\n\n")}.
 Set package directly for injected dependency

data/lib/smart_ioc/bean_locations.rb

@@ -34,7 +34,7 @@ class SmartIoC::BeanLocations
 
     # @return names of all found beans
     def all_bean_names
-      @data.keys
+      @data.values.flat_map(&:keys)
     end
 
     def get_bean_by_path(path)

data/lib/smart_ioc/container.rb

@@ -57,8 +57,6 @@ module SmartIoC
         raise ArgumentError, "bean scope should be one of #{allowed_scopes.inspect}"
       end
 
-      package_name ||= SmartIoC::BeanLocations.get_bean_package(path)
-
       if !package_name
         raise ArgumentError, %Q(
           Package name should be given for bean :#{bean_name}.
@@ -88,10 +86,16 @@ module SmartIoC
     end
 
     # Returns bean definition for specific class
-    # @param klass [Class] class name
+    # @param bean_name [Symbol]
+    # @param package [Symbol]
+    # @param context [Symbol]
     # return [BeanDefinition]
-    def get_bean_definition_by_class(klass)
-      bean_definitions_storage.find_by_class(klass)
+    def find_bean_definition(bean_name, package, context)
+      bean_definitions_storage.find_bean(bean_name, package, context)
+    end
+
+    def get_bean_definition(...)
+      bean_factory.get_bean_definition(...)
     end
 
     # Sets new load proc
@@ -117,12 +121,13 @@ module SmartIoC
     # @param optional parent_bean_definition [SmartIoc::BeanDefinition] bean definition of parent bean
     # @param optional context [Symbol] package context
     # @return bean instance from container
-    def get_bean(bean_name, package: nil, context: nil, parent_bean_definition: nil)
+    def get_bean(bean_name, package: nil, context: nil, parent_bean_definition: nil, parent_bean_name: nil)
       bean_factory.get_bean(
         bean_name,
         package: package,
         parent_bean_definition: parent_bean_definition,
         context: context,
+        parent_bean_name: parent_bean_name,
       )
     end
 

data/lib/smart_ioc/iocify.rb

@@ -2,6 +2,9 @@
 # Example of usage:
 # class Bar
 #   bean :bar
+#
+#   def call
+#   end
 # end
 #
 # class Foo
@@ -12,6 +15,7 @@
 #   inject :some_bar, ref: bar, from: :repository
 #
 #   def hello_world
+#     some_bar.call
 #     puts 'Hello world'
 #   end
 # end
@@ -23,6 +27,35 @@ module SmartIoC::Iocify
   end
 
   module ClassMethods
+    def package(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @package = name
+    end
+
+    def context(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @context = name
+    end
+
+    def factory_method(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @factory_method = name
+    end
+
+    def scope(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @scope = name
+    end
+
+    def instance
+      @instance = true
+    end
+
+    def after_init(name)
+      raise ArgumentError, "name should be a Symbol" if !name.is_a?(Symbol)
+      @after_init = name
+    end
+
     # @param bean_name [Symbol] bean name
     # @param scope [Symbol] bean scope (defaults to :singleton)
     # @param package [nil or Symbol]
@@ -31,10 +64,11 @@ 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
-
-      bean_definition = SmartIoC.get_bean_definition_by_class(self)
+    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.find_bean_definition(bean_name, package, context)
 
       if bean_definition
         if bean_definition.path == file_path
@@ -68,9 +102,20 @@ module SmartIoC::Iocify
         )
       end
 
+      self.instance_variable_set(:@bean_definition, bean_definition)
+
       nil
     end
 
+    def inject(bean_name, ref: nil, from: nil)
+      if @anonymous_bean
+        @injects ||= []
+        @injects.push({bean_name: bean_name, ref: ref, from: from})
+      else
+        register_inject(bean_name, ref: ref, from: from)
+      end
+    end
+
     # @param bean_name [Symbol] injected bean name
     # @param ref [Symbol] refferece bean to be sef as bean_name
     # @param from [Symbol] package name
@@ -79,14 +124,14 @@ module SmartIoC::Iocify
     # @raise [ArgumentError] if ref provided and ref is not a Symbol
     # @raise [ArgumentError] if from provided and from is not a Symbol
     # @raise [ArgumentError] if bean with same name was injected before
-    def inject(bean_name, ref: nil, from: nil)
-      bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(self)
-
-      if bean_definition.nil?
+    def register_inject(bean_name, ref: nil, from: nil)
+      if !@bean_definition
         raise ArgumentError, "#{self.to_s} is not registered as bean. Add `bean :bean_name` declaration"
       end
 
-      bean_definition.add_dependency(
+      bd = @bean_definition
+
+      bd.add_dependency(
         bean_name: bean_name,
         ref:       ref,
         package:   from
@@ -97,18 +142,18 @@ module SmartIoC::Iocify
         return bean if bean
 
         klass = self.is_a?(Class) ? self : self.class
-        bean_definition = SmartIoC::Container.get_instance.get_bean_definition_by_class(klass)
 
         bean = SmartIoC::Container.get_instance.get_bean(
           ref || bean_name,
           package: from,
-          parent_bean_definition: bean_definition
+          parent_bean_definition: bd,
+          parent_bean_name: bd.name,
         )
 
         instance_variable_set(:"@#{bean_name}", bean)
       end
 
-      if bean_definition.is_instance?
+      if bd.is_instance?
         define_method bean_name, &bean_method
         private bean_name
       else

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.4.0"
+  VERSION = "0.5.1"
 end

data/lib/smart_ioc.rb

@@ -16,6 +16,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'
@@ -78,7 +79,8 @@ module SmartIoC
 
     container_methods = [
       :register_bean,
-      :get_bean_definition_by_class,
+      :get_bean_definition,
+      :find_bean_definition,
       :set_extra_context_for_package,
       :get_bean,
       :clear_scopes,
@@ -89,3 +91,5 @@ module SmartIoC
     def_delegators :container, *container_methods
   end
 end
+
+require 'smart_ioc/bean'

data/smart_ioc.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency "codecov"
+  spec.add_development_dependency "pry"
 end

data/spec/smart_ioc/bean_definition_spec.rb

@@ -16,8 +16,7 @@ describe SmartIoC::BeanDefinition do
       )
 
       str =
-"class:          Object
-name:           :test_bean
+"name:           :test_bean
 package:        :test_package
 context:        :default
 path:           current_dir

data/spec/smart_ioc/bean_factory_spec.rb

@@ -4,27 +4,42 @@ describe SmartIoC::BeanFactory do
   before :all do
     SmartIoC.clear
 
-    class Repo
-      include SmartIoC::Iocify
-      bean :repo, context: :default, package: :bean_factory
+    bean :repo do
+      context :default
+      package :bean_factory
+
+      def call
+        'default'
+      end
     end
 
-    class TestRepo
-      include SmartIoC::Iocify
-      bean :repo, context: :test, package: :bean_factory
+    bean :repo do
+      context :test
+      package :bean_factory
+
+      inject :dao
+
+      def call
+        dao.call
+        'test'
+      end
     end
 
-    class DAO
-      include SmartIoC::Iocify
-      bean :dao, context: :default, package: :bean_factory
+    bean :dao do
+      context :default
+      package :bean_factory
+      
+      def call
+        'dao'
+      end
     end
 
     class TestObject
     end
 
-    class Factory
-      include SmartIoC::Iocify
-      bean :factory, factory_method: :build_bean, package: :bean_factory
+    bean :factory do
+      factory_method :build_bean
+      package        :bean_factory
 
       def build_bean
         TestObject.new
@@ -56,17 +71,17 @@ describe SmartIoC::BeanFactory do
 
   it 'returns proper bean for test context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC.get_bean(:repo)).to be_a(TestRepo)
+    expect(SmartIoC.get_bean(:repo).call).to eq('test')
   end
 
   it 'returns proper bean for default context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :default)
-    expect(SmartIoC.get_bean(:repo)).to be_a(Repo)
+    expect(SmartIoC.get_bean(:repo).call).to eq('default')
   end
 
   it 'returns proper bean for test context with fallback to default context' do
     SmartIoC.set_extra_context_for_package(:bean_factory, :test)
-    expect(SmartIoC.get_bean(:dao)).to be_a(DAO)
+    expect(SmartIoC.get_bean(:dao).call).to eq('dao')
   end
 
   it 'updates dependencies' do
@@ -154,7 +169,7 @@ describe SmartIoC::BeanFactory do
     end
 
     it 'injects prototype beans with different object id' do
-      prototype_bean = SmartIoC.get_bean(:prototype_bean)
+      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
       repo1_object_id = prototype_bean.prototype_service1.prototype_repo.object_id
       repo2_object_id = prototype_bean.prototype_service2.prototype_repo.object_id
 
@@ -162,7 +177,7 @@ describe SmartIoC::BeanFactory do
     end
 
     it 'injects singleton beans with same object id' do
-      prototype_bean = SmartIoC.get_bean(:prototype_bean)
+      prototype_bean = SmartIoC.get_bean(:prototype_bean, package: :prototype)
       repo1_object_id = prototype_bean.prototype_service1.singleton_repo.object_id
       repo2_object_id = prototype_bean.prototype_service2.singleton_repo.object_id
 

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

data/spec/smart_ioc/object_spec.rb

@@ -32,7 +32,7 @@ describe Object do
                        factory_method: :my_method, context: :test
       end
 
-      @bean_definition = SmartIoC.get_bean_definition_by_class(BeanClass)
+      @bean_definition = SmartIoC.find_bean_definition(:my_bean, :my_package, :test)
     end
 
     it { expect(@bean_definition.name).to eq(:my_bean) }

data/spec/smart_ioc/recursive_spec.rb

@@ -18,7 +18,7 @@ describe SmartIoC::Container do
 
   it 'loads recursive beans' do
     users_creator = @container.get_bean(:users_creator)
-    uc2 = users_creator.send(:repository).users_creator
+    uc2 = users_creator.send(:repository).send(:users_creator)
     expect(users_creator).to eq(uc2)
   end
 end

data/spec/smart_ioc/smart_ioc_spec.rb

@@ -27,14 +27,16 @@ describe SmartIoC do
     repository = @container.get_bean(:repository, package: :admins)
 
     expect(repository.get(1)).to be_a(User)
-    expect(users_creator.send(:repository)).to be_a(AdminsRepository)
+    expect(users_creator.send(:repository)).to be_a(Class)
+    expect(users_creator.send(:repository).methods).to include(:put)
+    expect(users_creator.send(:repository).methods).to include(:get)
     expect(users_creator.send(:logger)).to be_a(LoggerFactory::SmartIoCLogger)
   end
 
   it 'sets beans with extra package context' do
     SmartIoC.set_extra_context_for_package(:admins, :test)
     SmartIoC.force_clear_scopes
-    
+
     users_creator = @container.get_bean(:users_creator)
     users_creator.create(1, 'test@test.com')
 

data/spec/spec_helper.rb

@@ -1,18 +1,13 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'simplecov'
+require 'pry'
 
 SimpleCov.start do
   add_filter "/spec/"
   add_filter "/.direnv/"
 end
 
-if ENV['CI']=='true'
-  require 'codecov'
-
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
-
 require 'smart_ioc'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - ".yardops"
 - Gemfile
 - Gemfile.lock
@@ -73,6 +73,7 @@ files:
 - docs/index.md
 - lib/smart_ioc.rb
 - lib/smart_ioc/args.rb
+- lib/smart_ioc/bean.rb
 - lib/smart_ioc/bean_definition.rb
 - lib/smart_ioc/bean_definitions_storage.rb
 - lib/smart_ioc/bean_dependency.rb
@@ -90,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
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Inversion of Control Container

data/.travis.yml

@@ -1,7 +0,0 @@
-rvm:
-- 2.2.0
-- 2.3.0
-- 2.4.0
-script:
-- "gem install bundler"
-- "bundle exec rspec spec/"