s2container 0.8.0 → 0.9.0

data/ChangeLog

@@ -1 +1,8 @@
-under construction
+
+2009-04-26 s2container-0.9.0
+
+	* add: destroy method to Seasar::Container::S2Container, Seasar::Container::ComponentDef.
+
+2009-04-15 s2container-0.8.0
+
+	* info: s2container-0.8.0 first release from rubyforge.

data/ChangeLog.ja

@@ -1,5 +1,11 @@
 
+2009-04-15 s2container-0.8.0
+
+	* info: s2container-0.8.0 first release from rubyforge.
+	* info: 参照：ChangeLog.
+
 2009-04-11 s2container-0.8.0
+
 	* modify: Seasar::Util::ClassUtilで、attribute accessor methodの取得時に親クラスのメソッドは探索しないようにしました。
 	* modify: Seasar::Container::S2ApplicationContextをinstance化するように変更しました。
 	* add: Seasar::Container::S2ApplicationContextにsnapshotメソッドを追加しました。

data/Rakefile

@@ -1,4 +1,4 @@
-RUBY_S2CONTAINER_VERSION = '0.8.0'
+RUBY_S2CONTAINER_VERSION = '0.9.0'
 
 require 'rubygems'
 require 'rake'
@@ -18,7 +18,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 's2container'
-  s.date = '2009-04-01'
+  s.date = '2009-04-26'
   s.version = RUBY_S2CONTAINER_VERSION
   s.authors = ['klove']
   s.email = 'klovelion@gmail.com'

data/lib/seasar/container/assembler/abstract-assembler.rb

@@ -45,7 +45,6 @@ module Seasar
         def get_argument(component_key, is_array_acceptable = False)
           value = nil
           begin
-            s2logger.fatal(self){ 'aaa ' + component_key.to_s}
             value = @component_def.container.get_component(component_key)
           rescue Seasar::Container::Exception::TooManyRegistrationRuntimeException => e
             if is_array_acceptable

data/lib/seasar/container/assembler/manual-constructor-assembler.rb

@@ -45,8 +45,8 @@ module Seasar
           if @component_def.onetime_proc.is_a?(Proc)
             procedure = @component_def.onetime_proc
             @component_def.onetime_proc = nil
-          elsif @component_def.procedure.is_a?(Proc)
-            procedure = @component_def.procedure
+          elsif @component_def.constructor.is_a?(Proc)
+            procedure = @component_def.constructor
           end
           if procedure.nil?
             return @component_def.get_concreate_class.new(*args)

data/lib/seasar/container/component-def.rb

@@ -23,9 +23,9 @@ module Seasar
       # - args
       #   1. Class <em>component_class</em>
       #   2. String|Symbol <em>component_name</em>
-      #   3. Proc <em>procedure</em>
-      def initialize(component_class, component_name = nil, &procedure)
-        @procedure = procedure
+      #   3. Proc <em>block</em>
+      def initialize(component_class, component_name = nil, &block)
+        @constructor = block
         @onetime_proc = nil
         @container = nil
         @component_class = component_class
@@ -39,7 +39,53 @@ module Seasar
         @autobinding_def = Seasar::Container::Assembler::AutoBindingDefFactory.get_autobinding_def(AutoBindingDef::AUTO_NAME)
       end
       attr_accessor :container, :component_class, :component_name, :instance_def, :autobinding_def
-      attr_accessor :procedure, :onetime_proc
+      attr_accessor :constructor, :onetime_proc, :destructor
+
+      #
+      # - args
+      #   1. Proc|nil <em>block</em>
+      # - return
+      #   - Proc
+      #
+      def constructor(&block)
+        if block
+          @constructor = block
+        end
+        return @constructor
+      end
+
+      #
+      # - args
+      #   1. Proc|nil <em>block</em>
+      # - return
+      #   - Proc
+      #
+      def destructor(&block)
+        if block
+          @destructor = block
+        end
+        return @destructor
+      end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def init
+        return self.get_component_deployer.init
+      end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def destroy
+        return self.get_component_deployer.destroy
+      end
 
       #
       # - args

data/lib/seasar/container/component-info-def.rb

@@ -41,16 +41,43 @@ module Seasar
 
       # - args
       #   1. Hash <em>options</em>
-      #   1. Proc <em>procedure</em>
-      def initialize(options, &procedure)
+      #   1. Proc <em>block</em>
+      def initialize(options, &block)
         @component_class = options[:class]
         @component_name  =  options[:name]
         @instance    = options[:instance]
         @autobinding = options[:autobinding]
         @namespace   = options[:namespace]
-        @procedure   = procedure
+        @constructor   = block
+      end
+      attr_accessor :component_class, :component_name, :instance, :autobinding, :namespace
+      attr_accessor :constructor, :destructor
+
+      #
+      # - args
+      #   1. Proc|nil <em>block</em>
+      # - return
+      #   - Proc
+      #
+      def constructor(&block)
+        if block
+          @constructor = block
+        end
+        return @constructor
+      end
+
+      #
+      # - args
+      #   1. Proc|nil <em>block</em>
+      # - return
+      #   - Proc
+      #
+      def destructor(&block)
+        if block
+          @destructor = block
+        end
+        return @destructor
       end
-      attr_accessor :component_class, :component_name, :instance, :autobinding, :namespace, :procedure
 
       #
       # - args
@@ -104,14 +131,6 @@ module Seasar
         end
       end
 
-      def ==(other)
-        @component_class == other.component_class &&
-        @component_name  == other.component_name &&
-        @instance == other.instance &&
-        @autobinding == other.autobinding &&
-        self.namespace() == other.namespace() &&
-        @procedure == other.procedure
-      end
     end
   end
 end

data/lib/seasar/container/deployer/abstract-component-deployer.rb

@@ -41,6 +41,20 @@ module Seasar
           @constructor_assembler = @component_def.autobinding_def.create_constructor_assembler(@component_def)
           @property_assembler    = @component_def.autobinding_def.create_property_assembler(@component_def)
         end
+
+        # - args
+        #   - none
+        # - return
+        #   - none
+        def init
+        end
+
+        # - args
+        #   - none
+        # - return
+        #   - none
+        def destroy
+        end
       end
     end
   end

data/lib/seasar/container/deployer/prototype-component-deployer.rb

@@ -41,8 +41,8 @@ module Seasar
           end
           @instantiating = true
           component = @constructor_assembler.assemble
-          @property_assembler.assemble(component)
           @instantiating = false
+          @property_assembler.assemble(component)
           return component
         end
       end

data/lib/seasar/container/deployer/singleton-component-deployer.rb

@@ -48,6 +48,26 @@ module Seasar
           end
           return @component
         end
+
+        # - args
+        #   - none
+        # - return
+        #   - none
+        def init
+          self.deploy
+        end
+
+        # - args
+        #   - none
+        # - return
+        #   - none
+        def destroy
+          return if @component.nil?
+          if @component_def.destructor
+            @component_def.destructor.call(@component)
+          end
+          @component = nil
+        end
       end
     end
   end

data/lib/seasar/container/s2application-context.rb

@@ -168,6 +168,7 @@ module Seasar
         else
           @component_infos << info
         end
+        return info
       end
 
       #
@@ -189,6 +190,7 @@ module Seasar
         else
           @aspect_infos << info
         end
+        return info
       end
       alias aspect register_aspect
 
@@ -250,18 +252,18 @@ module Seasar
         component_infos = self.get_component_infos(namespaces)
         component_infos = self.select_component_infos(component_infos, &procedure)
         component_infos.each {|component_info|
-          if component_info.procedure.nil?
-            cd = ComponentDef.new(component_info.component_class, component_info.component_name)
-          else
-            procedure = component_info.procedure
-            cd = ComponentDef.new(component_info.component_class, component_info.component_name, &procedure)
-          end
+          cd = ComponentDef.new(component_info.component_class, component_info.component_name)
+          cd.constructor = component_info.constructor
+          cd.destructor  = component_info.destructor
+
           if not component_info.instance.nil?
             cd.instance_def = Seasar::Container::Deployer::InstanceDefFactory.get_instance_def(component_info.instance)
           end
+
           if not component_info.autobinding.nil?
             cd.autobinding_def = Seasar::Container::Assembler::AutoBindingDefFactory.get_autobinding_def(component_info.autobinding)
           end
+
           component_defs << cd
           if component_info.namespace.nil?
             container.register(cd)

data/lib/seasar/container/s2container-component-def.rb

@@ -36,6 +36,26 @@ module Seasar
       def get_container
         return @component
       end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def init
+        return self.get_container.init
+      end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def destroy
+        return self.get_container.destroy
+      end
     end
   end
 end

data/lib/seasar/container/s2container.rb

@@ -34,8 +34,36 @@ module Seasar
         @parents  = []
         @children = []
         @namespace = nil
+        @inited = false;
+      end
+      attr_accessor :root, :parents, :namespace, :inited
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - Boolean
+      #
+      def init
+        return if @inited
+        @children.each {|child| child.init}
+        @component_def_list.each {|component_def| component_def.init}
+        @inited = true
+        return @inited
+      end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - Boolean
+      #
+      def destroy
+        @component_def_list.reverse.each {|component_def| component_def.destroy}
+        @children.reverse.each {|child| child.destroy}
+        @inited = false
+        return @inited
       end
-      attr_accessor :root, :parents, :namespace
 
       #
       # - args
@@ -148,6 +176,8 @@ module Seasar
       #
       # - args
       #   1. String|Symbol <em>key</em>
+      #   2. Boolean <em>search_parent</em>
+      #   3. Array <em>ignore_children</em>
       # - return
       #   - Seasar::Container::ComponentDef
       #

data/lib/seasar/container/simple-component-def.rb

@@ -40,6 +40,24 @@ module Seasar
       alias get get_component
       alias component get_component
       alias [] get_component
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def init
+      end
+
+      #
+      # - args
+      #   - none
+      # - return
+      #   - none
+      #
+      def destroy
+      end
     end
   end
 end

data/lib/seasar/container.rb

@@ -50,7 +50,7 @@ def s2component(option = {}, &procedure)
       raise TypeError.new("class not specified.")
     end
   end
-  s2app.register(option, &procedure)
+  return s2app.register(option, &procedure)
 end
 alias s2comp s2component
 
@@ -80,7 +80,7 @@ def s2aspect(option = {}, &procedure)
       option[:pattern] = self.name
     end
   end
-  s2app.aspect(option, &procedure)
+  return s2app.aspect(option, &procedure)
 end
 
 #

data/test/seasar/container/deployer/test_singleton-component-deployer.rb

@@ -16,7 +16,23 @@ module Seasar
           a1 = deployer.deploy
           assert_equal(a, a1)
         end
+
+        def test_destructor
+          cd = Seasar::Container::ComponentDef.new(A, "a")
+          cd.destructor {|component|
+            s2logger.debug(self.class){'destroy called. ' + component.to_s}
+          }
+          deployer = SingletonComponentDeployer.new(cd)
+          deployer.destroy
+
+          deployer.init
+          deployer.destroy
+        end
+
         class A
+          def to_s
+            return 'This is Class A.'
+          end
         end
       end
     end

data/test/seasar/container/test_s2application-context.rb

@@ -63,7 +63,7 @@ module Seasar
         assert_equal(s2app.get(E).b, B)
       end
 
-      def test_zzznamespaced_component
+      def test_namespaced_component
         s2app.init
         assert_equal(F, s2app.get(F).class)
         assert_equal(F, s2app.get(F, 'namespace_f').class)

data/test/seasar/container/test_s2container.rb

@@ -146,7 +146,7 @@ module Seasar
       #    d e f
       #      g
       #
-      def test_zzznamespace
+      def test_namespace
         a = S2Container.new
         a.namespace = 'a'
         cd = ComponentDef.new(A)
@@ -220,6 +220,34 @@ module Seasar
         assert(g.has_component_def('x.y.f.g.Gg'))
       end
 
+      def test_init_destroy
+        parent = S2Container.new
+        cd = ComponentDef.new(A)
+        cd.constructor {
+          s2logger.debug(self.class){'parent a inited.'}
+          A.new
+        }
+        cd.destructor {|component|
+          s2logger.debug(self.class){'parent a destoryed.'}
+        }
+        parent.register(cd)
+
+        child  = S2Container.new
+        parent.include(child)
+        cd = ComponentDef.new(B)
+        cd.constructor {
+          s2logger.debug(self.class){'child b inited.'}
+          B.new
+        }
+        cd.destructor {|component|
+          s2logger.debug(self.class){'child b destoryed.'}
+        }
+        child.register(cd)
+
+        parent.init
+        parent.destroy
+      end
+
       class A
         def foo
           puts "foo called."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s2container
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - klove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 +09:00
+date: 2009-04-26 00:00:00 +09:00
 default_executable: 
 dependencies: []