s2container 0.9.2 → 0.9.3

data/ChangeLog

@@ -1,29 +1,36 @@
-
-2009-07-04 s2container-0.9.2
-	* fix: manual-constructor-assembler.
-	* fix: init method of S2ApplicationContext class.
-	* fix: init method of S2ApplicationContext class.
-	* modify: The instance method of S2ApplicationContext (use thread local).
-	* modify: The s2component method. (for define instance class method).
-
-2009-06-20 s2container-0.9.1
-
-	* modify: for JRuby.
-	* info: s2container-0.9.1 release.
-
-2009-06-04 s2container-0.9.1
-
-	* add: add Seasar::DBI::TxInterceptor.
-
-2009-05-06 s2container-0.9.1
-
-	* fix: s2aspect method.
-
-2009-04-26 s2container-0.9.0
-
-	* add: destroy method to Seasar::Container::S2Container, Seasar::Container::ComponentDef.
-	* info: s2container-0.9.0 release.
-
-2009-04-15 s2container-0.8.0
-
-	* info: s2container-0.8.0 first release from rubyforge.
+
+2009-11-13 s2container-0.9.3
+	* modify: for JRuby-1.4.0
+
+2009-09-23 s2container-0.9.3
+	* add: S2ApplicationContext.destroy_singleton_containers method.
+
+2009-07-04 s2container-0.9.2
+	* fix: manual-constructor-assembler.
+	* fix: init method of S2ApplicationContext class.
+	* fix: init method of S2ApplicationContext class.
+	* modify: The instance method of S2ApplicationContext (use thread local).
+	* modify: The s2component method. (for define instance class method).
+	* info: s2container-0.9.2 release.
+
+2009-06-20 s2container-0.9.1
+
+	* modify: for JRuby.
+	* info: s2container-0.9.1 release.
+
+2009-06-04 s2container-0.9.1
+
+	* add: add Seasar::DBI::TxInterceptor.
+
+2009-05-06 s2container-0.9.1
+
+	* fix: s2aspect method.
+
+2009-04-26 s2container-0.9.0
+
+	* add: destroy method to Seasar::Container::S2Container, Seasar::Container::ComponentDef.
+	* info: s2container-0.9.0 release.
+
+2009-04-15 s2container-0.8.0
+
+	* info: s2container-0.8.0 first release from rubyforge.

data/Rakefile

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

data/example/quickstart/quickstart8/quickstart.rb

@@ -2,13 +2,13 @@ $LOAD_PATH.unshift(File::expand_path(File::dirname(__FILE__)) + '/../../../lib')
 require 'rubygems'
 require 's2container'
 
-s2comp(:class => Seasar::DBI::DBIInterceptor, :name => :dbi_interceptor)
-s2comp(:class => Seasar::DBI::TxInterceptor,  :name => :tx_interceptor)
+s2comp(:class => Seasar::DBI::DBIInterceptor)
+s2comp(:class => Seasar::DBI::TxInterceptor)
 s2comp(:class => DBI::DatabaseHandle, :name => :dbh, :autobinding => :none) { DBI.connect("dbi:SQLite3::memory:") }
 
 class Dao
   s2comp
-  s2aspect :interceptor => :dbi_interceptor
+  s2aspect :interceptor => :dbiinterceptor
   def create_table; 'create table sample(id integer primary key, name text);' end
   def find_all; 'select * from sample;' end
   def insert_name(val); 'insert into sample(name) values(?);' end

data/lib/seasar/aop.rb

@@ -21,10 +21,14 @@ module Seasar
     autoload :Aspect, 'seasar/aop/aspect'
     autoload :MethodInvocation, 'seasar/aop/method-invocation'
     autoload :Pointcut, 'seasar/aop/pointcut'
-    if '1.8.6' < RUBY_VERSION
-      autoload :S2AopFactory, 'seasar/aop/s2aop-factory'
-    else
+    if defined? JRUBY_VERSION
       autoload :S2AopFactory, 'seasar/aop/s2aop-factory186'
+    else
+      if '1.8.6' < RUBY_VERSION
+        autoload :S2AopFactory, 'seasar/aop/s2aop-factory'
+      else
+        autoload :S2AopFactory, 'seasar/aop/s2aop-factory186'
+      end
     end
     module Interceptor
       autoload :TraceInterceptor, 'seasar/aop/interceptor/trace-interceptor'

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

@@ -46,8 +46,8 @@ module Seasar
           if procedure.nil?
             args = @component_def.get_arg_defs.map {|arg_def| arg_def.value}
             return @component_def.get_concreate_class.new(*args)
-          elsif @component_def.component_class == Proc
-            return procedure
+#          elsif @component_def.component_class == Proc
+#            return procedure
           else
             component = procedure.call(@component_def)
             if component.is_a?(@component_def.component_class)

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

@@ -253,6 +253,22 @@ module Seasar
       end
       alias get_singleton_container create_singleton_container
 
+      #
+      # - args
+      #   1. Array|nil <em>namespaces</em> String namespaces
+      # - return
+      #   - nil
+      #
+      def destroy_singleton_containers(namespaces = nil)
+        namespaces = [namespaces] if namespaces.is_a?(String)
+        key = namespaces.sort unless namespaces.nil?
+        if namespaces.nil?
+          @singletons.each {|key, container| container.destroy}
+        elsif @singletons.key?(key)
+          @singletons[key].destroy
+        end
+      end
+
       #
       # - args
       #   1. Array <em>namespaces</em> String namespaces

data/lib/seasar/container/s2container.rb

@@ -177,27 +177,28 @@ module Seasar
       # - args
       #   1. String|Symbol <em>key</em>
       #   2. Boolean <em>search_parent</em>
-      #   3. Array <em>ignore_children</em>
+      #   3. Array <em>searched_as_parent</em>
       # - return
       #   - Seasar::Container::ComponentDef
       #
-      def get_component_def_internal(key, search_parent = true, ignore_children = [])
+      def get_component_def_internal(key, search_parent = true, searched_as_parent = [], searched_as_child = [])
         if @component_def_map.key?(key)
           return @component_def_map[key]
         elsif key.is_a?(String) && key.match(/\./)
           component_def = self.get_component_def_with_namespace(key)
           return component_def unless component_def.nil?
         else
-          component_def = self.get_component_def_from_children(key, ignore_children)
+          component_def = self.get_component_def_from_children(key, searched_as_parent, searched_as_child)
           return component_def unless component_def.nil?
         end
         return nil unless search_parent
 
-        ignore_children << self
+        searched_as_parent << self
         return nil if @parents.size == 0
         @parents.each {|parent|
-          next if parent.parents.size == 0 && ignore_children.member?(parent)
-          component_def = parent.get_component_def_internal(key, true, ignore_children)
+          next if searched_as_parent.member?(parent)
+          #s2logger.debug(self.class.name){'search parent container : ' + parent.namespace.to_s}
+          component_def = parent.get_component_def_internal(key, true, searched_as_parent, searched_as_child)
           return component_def unless component_def.nil?
         }
         return nil
@@ -227,11 +228,14 @@ module Seasar
       # - return
       #   - Seasar::Container::ComponentDef
       #
-      def get_component_def_from_children(key, ignore_children = [])
+      def get_component_def_from_children(key, searched_as_parent = [], searched_as_child = [])
         @children.each {|child_container|
-          next if ignore_children.member?(child_container)
-          component_def = child_container.get_component_def_internal(key, false)
+          next if searched_as_parent.member?(child_container)
+          next if searched_as_child.member?(child_container)
+          #s2logger.debug(self.class.name){'search child  container : ' + child_container.namespace.to_s}
+          component_def = child_container.get_component_def_internal(key, false, searched_as_parent, searched_as_child)
           return component_def unless component_def.nil?
+          searched_as_child << child_container
         }
         return nil
       end

data/test/seasar/aop/test_s2aop_factory.rb

@@ -16,7 +16,7 @@ module Seasar
       end
 
       def test_procedure_arg
-        return if RUBY_VERSION < '1.8.7'
+        return if RUBY_VERSION < '1.8.7' || defined? JRUBY_VERSION
         aspect_def = Seasar::Container::AspectDef.new(/^hoge$/) {|invocation|
             result = invocation.proceed
             next result * 10

data/test/seasar/container/test_component-def.rb

@@ -52,7 +52,7 @@ module Seasar
 
       def test_proc_block
         cd = Seasar::Container::ComponentDef.new(Proc, "b") {
-          next A.new
+          proc { A.new }
         }
         component = cd.get_component
         assert(component.instance_of?(Proc))

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

@@ -192,6 +192,16 @@ module Seasar
         assert(c1 == c2)
       end
 
+      def test_destroy_singleton_containers
+        s2app.init
+        c1 = s2app.create_singleton_container(%w[a.b a.c])
+        s2app.destroy_singleton_containers
+
+        s2app.init
+        c1 = s2app.create_singleton_container(%w[a.b a.c])
+        s2app.destroy_singleton_containers(%w[a.b a.c])
+      end
+
       def test_snapshot
         s2app.init
         assert(!s2app.snapshot?)

data/test/seasar/container/test_s2container.rb

@@ -212,12 +212,15 @@ module Seasar
         assert(g.has_component_def(C))
 
         assert_equal(x, f.root)
+        #puts '-----------------------'
         assert(g.has_component_def(X))
+        #puts '-----------------------'
         assert(!g.has_component_def('qqq'))
         assert(g.has_component_def('a.b.d.g'))
         assert(g.has_component_def('a.c.e.g'))
         assert(g.has_component_def('x.y.f.g'))
         assert(g.has_component_def('x.y.f.g.Gg'))
+        assert(b.has_component_def(F))
       end
 
       def test_init_destroy

data/test/seasar/test_log.rb

@@ -19,7 +19,7 @@ module Seasar
 
       def test_jlogger
         return unless defined? JRUBY_VERSION
-        require 'lib/seasar/log/jlogger.rb'
+        require 'seasar/log/jlogger.rb'
         require "java"
         import 'java.util.logging.Level'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s2container
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - klove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 00:00:00 +09:00
+date: 2009-11-13 00:00:00 +09:00
 default_executable: 
 dependencies: []