ioc_rb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a891de10c310306a9305ca4ba8f763d76872af4d
-  data.tar.gz: ceb9706f9fce1c9db0cafe2f019fc0c2b4117541
+  metadata.gz: 85f0f26c7d82aeb28d8f04d99d0c52ebdeed61b5
+  data.tar.gz: 12d2af5706bf986c5c4b01c4fc6fd0a7c8910c9f
 SHA512:
-  metadata.gz: 6e5f79ac207477a266503a3c1bf063dddf45f9de8725a63377bfda7be83af093fddb6faf8b7e02b141b7f661c2b8719b714954fe2dc786ce287ef9122b76dc7c
-  data.tar.gz: 8c1b1645a3877073d7452b210d3e7fea1570b85fdf0c54cff369419027b7913a1cd2e1f5beac08af3abfd0413e991f9e074a04e03f6f1b2ae1b692ae9c0d9c2a
+  metadata.gz: e6ada01c013048e28219bcf6b2aa06adb2e9a31790263eced54e6b8a818fb3e74729df5553c7d2df2ab48408a7b0a55d325a67f783c674fda8bce5c6b279876d
+  data.tar.gz: 36cdcc328ddd3e1c34a8fd2e377ccef29696924df2436269b40849f5cae88dae80d4c5c50084813217db9478ed0cce39aa502a61648ec13e447c5c453326bb26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ioc_rb (0.2.1)
+    ioc_rb (0.3.0)
       activesupport
       request_store
 

data/lib/ioc_rb/bean_factory.rb

@@ -35,16 +35,7 @@ class IocRb::BeanFactory
   # @param [BeanMetadata] bean metadata
   # @return bean instance
   def get_bean_with_metadata(bean_metadata)
-    case bean_metadata.scope
-    when :singleton
-      @singleton_scope.get_bean(bean_metadata)
-    when :prototype
-      @prototype_scope.get_bean(bean_metadata)
-    when :request
-      @request_scope.get_bean(bean_metadata)
-    else
-      raise IocRb::Errors::UnsupportedScopeError, "Bean with name :#{bean_metadata.name} has unsupported scope :#{bean_metadata.scope}"
-    end
+    get_scope_by_metadata(bean_metadata).get_bean(bean_metadata)
   end
 
   # Create new bean instance according
@@ -73,6 +64,17 @@ class IocRb::BeanFactory
     bean
   end
 
+  # Delete bean from the container by it's +name+.
+  # @param [Symbol] bean name
+  # @raise MissingBeanError if bean with the specified name is not found
+  def delete_bean(name)
+    bean_metadata = @beans_metadata_storage.by_name(name)
+    unless bean_metadata
+      raise IocRb::Errors::MissingBeanError, "Bean with name :#{name} is not defined"
+    end
+    get_scope_by_metadata(bean_metadata).delete_bean(bean_metadata)
+  end
+
   private
 
   def set_bean_dependencies(bean, bean_metadata)
@@ -98,4 +100,17 @@ class IocRb::BeanFactory
     end
   end
 
+  def get_scope_by_metadata(bean_metadata)
+    case bean_metadata.scope
+    when :singleton
+      @singleton_scope
+    when :prototype
+      @prototype_scope
+    when :request
+      @request_scope
+    else
+      raise IocRb::Errors::UnsupportedScopeError, "Bean with name :#{bean_metadata.name} has unsupported scope :#{bean_metadata.scope}"
+    end
+  end
+
 end

data/lib/ioc_rb/container.rb

@@ -50,6 +50,19 @@ module IocRb
       @beans_metadata_storage.put(bean)
     end
 
+    # Registers new bean in container and replace existing instance if it's instantiated
+    # @param bean_name [Symbol] bean name
+    # @param options [Hash] includes bean class and bean scope
+    # @param &block [Proc] the block  which describes bean dependencies,
+    #                      see more in the BeanMetadata
+    def replace_bean(bean_name, options, &block)
+      bean(bean_name, options, &block)
+
+      if @bean_factory.get_bean(bean_name)
+        @bean_factory.delete_bean(bean_name)
+      end
+    end
+
     # Returns bean instance from the container
     # by the specified bean name
     # @param name [Symbol] bean name

data/lib/ioc_rb/scopes/prototype_scope.rb

@@ -14,4 +14,12 @@ class IocRb::Scopes::PrototypeScope
   def get_bean(bean_metadata)
     @bean_factory.create_bean_and_save(bean_metadata, {})
   end
+
+  # Delete bean from scope,
+  # because Prototype scope doesn't store bean
+  # then do nothing here
+  #
+  # @param bean_metadata [BeanMetadata] bean metadata
+  def delete_bean(bean_metadata)
+  end
 end

data/lib/ioc_rb/scopes/request_scope.rb

@@ -24,4 +24,10 @@ class IocRb::Scopes::RequestScope
      @bean_factory.create_bean_and_save(bean_metadata, RequestStore.store[:_iocrb_beans])
     end
   end
+
+  # Delete bean from scope
+  # @param bean_metadata [BeanMetadata] bean metadata
+  def delete_bean(bean_metadata)
+    RequestStore.store[:_iocrb_beans].delete(bean_metadata.name)
+  end
 end

data/lib/ioc_rb/scopes/singleton_scope.rb

@@ -20,4 +20,10 @@ class IocRb::Scopes::SingletonScope
       @bean_factory.create_bean_and_save(bean_metadata, @beans)
     end
   end
+
+  # Delete bean from scope
+  # @param bean_metadata [BeanMetadata] bean metadata
+  def delete_bean(bean_metadata)
+    @beans.delete(bean_metadata.name)
+  end
 end

data/lib/ioc_rb/version.rb

@@ -1,3 +1,3 @@
 module IocRb
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/ioc_rb/container_spec.rb

@@ -33,6 +33,17 @@ describe IocRb::Container do
     end
   end
 
+  describe "#replace_bean" do
+    it "should replace bean definition" do
+      container = IocRb::Container.new
+      container.bean(:appender, class: Appender)
+      container[:appender].should be_a(Appender)
+
+      container.replace_bean(:appender, class: Logger)
+      container[:appender].should be_a(Logger)
+    end
+  end
+
   describe "passing bean definitions to container constructor" do
     let(:resource) do
       Proc.new do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ioc_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Albert Gazizov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store