s2container 0.9.1 → 0.9.2

data/ChangeLog

@@ -1,4 +1,11 @@
 
+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.

data/Rakefile

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

data/example/quickstart/quickstart1/quickstart.rb

@@ -6,5 +6,11 @@ class Action
   s2component
 end
 
+action = Action.instance
+p action
+
 action = s2app.get(Action)
 action = s2app[Action]
+p action
+
+

data/example/quickstart/quickstart3/quickstart.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File::expand_path(File::dirname(__FILE__)) + '/../../../lib')
+
 require 's2container'
 
 class Action
   s2comp :name => :act, :instance => :prototype
 end
 
+p Action.instance
 p s2app.get(:act)
 p s2app[:act]

data/example/quickstart/quickstart8/quickstart.rb

@@ -0,0 +1,44 @@
+$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 => DBI::DatabaseHandle, :name => :dbh, :autobinding => :none) { DBI.connect("dbi:SQLite3::memory:") }
+
+class Dao
+  s2comp
+  s2aspect :interceptor => :dbi_interceptor
+  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
+  def insert(id, name); 'insert into sample values(?, ?);' end
+  #def update_name(id, name); ['update sample set name = :name where id = :id;', :name => name, :id => id ] end
+  def update_name(id, name); [<<-EOSQL, :id => id, :name => name]
+    update sample
+      set name = :name
+      where id = :id;
+    EOSQL
+  end
+end
+
+class Service
+  s2comp
+  s2aspect :interceptor => :tx_interceptor
+  attr_accessor :dao
+  def run_in_tx
+    @dao.update_name(1, 'FOO')
+    @dao.insert(2, 'BAR')
+  end
+end
+
+dao = Dao.instance
+dao.create_table
+dao.insert_name('foo')
+dao.insert_name('bar')
+p dao.find_all
+
+Service.instance.run_in_tx rescue p $!.message
+p dao.find_all
+
+s2app.get(:dbh).disconnect

data/lib/s2container.rb

@@ -22,6 +22,7 @@ require 'seasar/aop'
 require 'seasar/util'
 require 'seasar/exception'
 require 'seasar/beans'
+require 'seasar/dbi'
 
 if RUBY_VERSION < '1.8.7'
   class Method

data/lib/seasar/aop/interceptor/trace-interceptor.rb

@@ -21,7 +21,7 @@ module Seasar
   module Aop
     module Interceptor
       class TraceInterceptor
-        s2component :name => 'trace', :namespace => 'interceptor', :default => true
+        #s2component :name => 'trace', :namespace => 'interceptor', :static => true
 
         #
         # - args

data/lib/seasar/aop.rb

@@ -16,8 +16,6 @@
 # | governing permissions and limitations under the License.             |
 # +----------------------------------------------------------------------+
 #++
-
-require 'seasar/aop/interceptor/trace-interceptor'
 module Seasar
   module Aop
     autoload :Aspect, 'seasar/aop/aspect'
@@ -28,6 +26,9 @@ module Seasar
     else
       autoload :S2AopFactory, 'seasar/aop/s2aop-factory186'
     end
+    module Interceptor
+      autoload :TraceInterceptor, 'seasar/aop/interceptor/trace-interceptor'
+    end
   end
 end
 

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

@@ -36,11 +36,6 @@ module Seasar
         # - return
         #   - none
         def assemble
-          args = []
-          for arg_def in @component_def.get_arg_defs
-            args << arg_def.value
-          end
-
           procedure = nil
           if @component_def.onetime_proc.is_a?(Proc)
             procedure = @component_def.onetime_proc
@@ -49,11 +44,12 @@ module Seasar
             procedure = @component_def.constructor
           end
           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
           else
-            component = procedure.call(*args)
+            component = procedure.call(@component_def)
             if component.is_a?(@component_def.component_class)
               return component
             else

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

@@ -74,6 +74,8 @@ module Seasar
       #   - none
       #
       def init
+        @concreate_class = nil
+        @onetime_proc = nil
         return self.get_component_deployer.init
       end
 
@@ -84,6 +86,8 @@ module Seasar
       #   - none
       #
       def destroy
+        @concreate_class = nil
+        @onetime_proc = nil
         return self.get_component_deployer.destroy
       end
 

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

@@ -37,7 +37,7 @@ module Seasar
         #   - Object
         def deploy
           if @instantiating
-            raise Seasar::Container::Exception::CyclicReferenceRuntimeException(@component_def.component_class)
+            raise Seasar::Container::Exception::CyclicReferenceRuntimeException.new(@component_def.component_class)
           end
           @instantiating = true
           component = @constructor_assembler.assemble

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

@@ -52,8 +52,9 @@ module Seasar
         # - args
         #   - none
         # - return
-        #   - none
+        #   - Object
         def init
+          @component = nil
           self.deploy
         end
 

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

@@ -26,9 +26,9 @@ module Seasar
     #
     class S2ApplicationContext
       @@static_component_infos = []
-      @@static_aspect_infos = []
+      @@static_aspect_infos    = []
       @@instance = nil
-      
+
       class << self
         #
         # - args
@@ -37,6 +37,14 @@ module Seasar
         #   - Seasar::Container::S2ApplicationContext
         #
         def instance
+          if Seasar::Container.use_thread_local?
+            require 'thread'
+            th = Thread.current
+            if th[:S2ApplicationContext].nil?
+              th[:S2ApplicationContext] = self.new
+            end
+            return th[:S2ApplicationContext]
+          end
           if @@instance.nil?
             @@instance = self.new
           end
@@ -45,11 +53,18 @@ module Seasar
 
         #
         # - args
-        #   1. Seasar::Container::S2ApplicationContext
+        #   1. Boolean
         # - return
         #   - nil
         #
-        def instance=(obj); @@instance = obj; end
+        def instance=(val)
+          if Seasar::Container.use_thread_local?
+            require 'thread'
+            Thread.current[:S2ApplicationContext] = val
+          else
+            @@instance = val
+          end
+        end
       end
 
       #
@@ -72,7 +87,7 @@ module Seasar
         if options[:force] == true
           @@static_component_infos = []
           @@static_aspect_infos    = []
-          @@instance = nil
+          Seasar::Beans::BeanDescFactory.init
         end
         @include_patterns = []
         @exclude_patterns = []
@@ -203,8 +218,7 @@ module Seasar
       #   - Object
       #
       def get_component(key, namespaces = [], &procedure)
-        namespace_key = self.create_singleton(namespaces)
-        return @singletons[namespace_key].get_component(key, &procedure)
+        return self.get_singleton_container(namespaces).get_component(key, &procedure)
       end
       alias component get_component
       alias get get_component
@@ -218,35 +232,36 @@ module Seasar
       #   - Boolean
       #
       def has_component_def(key, namespaces = [])
-        namespace_key = self.create_singleton(namespaces)
-        return @singletons[namespace_key].has_component_def(key)
+        return self.get_singleton_container(namespaces).has_component_def(key)
       end
       alias component_def? has_component_def
 
       #
       # - args
       #   1. Array <em>namespaces</em> String namespaces
+      #   2. Proc <em>procedure</em> component selector block
       # - return
       #   - String
       #
-      def create_singleton(namespaces)
-        namespaces = [namespaces] unless namespaces.is_a?(Array)
+      def create_singleton_container(namespaces = [], &procedure)
+        namespaces = [namespaces] if namespaces.is_a?(String)
         key = namespaces.sort
-        if not @singletons.key?(key)
-          @singletons[key] = self.create(namespaces)
+        unless @singletons.key?(key)
+          @singletons[key] = self.create(namespaces, &procedure)
         end
-        return key
+        return @singletons[key]
       end
+      alias get_singleton_container create_singleton_container
 
       #
       # - args
       #   1. Array <em>namespaces</em> String namespaces
-      #   2. Proc <em>procedure</em> constructor block
+      #   2. Proc <em>procedure</em> component selector block
       # - return
       #   - Seasar::Container::S2Container
       #
       def create(namespaces = [], &procedure)
-        namespaces = [namespaces] unless namespaces.is_a?(Array)
+        namespaces = [namespaces] if namespaces.is_a?(String)
         container = S2Container.new
         component_defs = []
         component_infos = self.get_component_infos(namespaces)

data/lib/seasar/container.rb

@@ -50,6 +50,22 @@ def s2component(option = {}, &procedure)
       raise TypeError.new("class not specified.")
     end
   end
+
+  option[:class].class_eval {
+    @s2component_key = option[:name].nil? ? option[:class] : option[:name]
+    @s2component_namespace = option[:namespace]
+    unless option[:class].respond_to?(:instance)
+      class << self
+        def instance
+          if @s2component_namespace.nil?
+            return s2app.get(@s2component_key)
+          else
+            return s2app.get(@s2component_namespace).get(@s2component_key)
+          end
+        end
+      end
+    end
+  }
   return s2app.register(option, &procedure)
 end
 alias s2comp s2component
@@ -134,6 +150,16 @@ module Seasar
       autoload :IllegalInstanceDefRuntimeException, 'seasar/container/exception/illegal-instance-def-runtime-exception'
       autoload :TooManyRegistrationRuntimeException, 'seasar/container/exception/toomany-registration-runtime-exception'
     end
+
+    @use_thread_local = true
+    module_function
+    def use_thread_local?
+      return @use_thread_local
+    end
+    
+    def use_thread_local=(val)
+      @use_thread_local = val
+    end
   end
 end
 

data/lib/seasar/dbi/dbi-interceptor.rb

@@ -16,10 +16,11 @@
 # | governing permissions and limitations under the License.             |
 # +----------------------------------------------------------------------+
 #++
+require 'dbi'
 module Seasar
   module DBI
     class DBIInterceptor
-      s2comp :namespace => 'dbi', :name => 'interceptor', :default => true
+      #s2comp :namespace => 'dbi', :name => 'interceptor', :static => true
 
       # - args
       #   - none

data/lib/seasar/dbi/tx-interceptor.rb

@@ -16,10 +16,11 @@
 # | governing permissions and limitations under the License.             |
 # +----------------------------------------------------------------------+
 #++
+require 'dbi'
 module Seasar
   module DBI
     class TxInterceptor
-      s2comp :namespace => 'dbi', :name => 'tx', :default => true
+      #s2comp :namespace => 'dbi', :name => 'tx', :static => true
 
       # - args
       #   - none

data/lib/seasar/dbi.rb

@@ -17,11 +17,10 @@
 # +----------------------------------------------------------------------+
 #++
 
-require 'dbi'
-require 'seasar/dbi/dbi-interceptor'
-require 'seasar/dbi/tx-interceptor'
 module Seasar
   module DBI
     autoload :Paginate, 'seasar/dbi/paginate'
+    autoload :DBIInterceptor, 'seasar/dbi/dbi-interceptor'
+    autoload :TxInterceptor, 'seasar/dbi/tx-interceptor'
   end
 end

data/lib/seasar/log/factory/ruby-logger-factory.rb

@@ -24,6 +24,7 @@ module Seasar
       class RubyLoggerFactory
         @@logger = nil
         @@logdev = STDERR
+        @@level  = Logger::WARN
         class << self
 
           #
@@ -36,6 +37,7 @@ module Seasar
             if @@logger.nil?
               @@logger = Logger.new(@@logdev)
               @@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+              @@logger.level = @@level
             end
             return @@logger
           end
@@ -61,6 +63,17 @@ module Seasar
             @@logdev = logdev
             @@logger = nil
           end
+
+          #
+          # - args
+          #   1. Object <em>level</em>
+          # - return
+          #   - nil
+          #
+          def level=(level)
+            @@level = level
+            @@logger = nil
+          end
         end
       end
     end

data/lib/seasar/util/class-util.rb

@@ -42,13 +42,17 @@ module Seasar
 
         #
         # - args
-        #   1. Class <em>target</em>
+        #   1. Object <em>target</em>
         # - return
         #   - Array
         #
         def get_accessor_attributes(target)
           #method_names = (target.public_methods - Object.public_methods).map {|method_name| method_name.to_s}
           method_names = target.public_methods(false).map {|method_name| method_name.to_s}
+          if target.class.name.match(/EnhancedByS2Aop/)
+             method_names += target.class.superclass.public_instance_methods(false).map {|method_name| method_name.to_s}
+             method_names.uniq!
+          end
           attributes = []
           method_names.each {|name|
             next if name.match(/^==+$/)

data/test/seasar/container/assembler/test_proc_constructor_assembler.rb

@@ -33,8 +33,8 @@ module Seasar
 
         def test_proc_args
           container = S2Container.new
-          cd = Seasar::Container::ComponentDef.new(C, 'c') {|val1, val2|
-                 C.new(val1, val2)
+          cd = Seasar::Container::ComponentDef.new(C, 'c') {|cd|
+                 cd.get_concreate_class.new(*cd.get_arg_defs.map {|arg_def| arg_def.value})
                }
          cd.add_arg_def(Seasar::Container::ArgDef.new(100))
          cd.add_arg_def(Seasar::Container::ArgDef.new(200))

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

@@ -41,7 +41,7 @@ module Seasar
 
       def test_onetime_proc
         cd = Seasar::Container::ComponentDef.new(B, "b")
-        cd.onetime_proc = lambda {
+        cd.onetime_proc = lambda {|cd|
           b = B.new
           b.name = "abc"
           b

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

@@ -185,10 +185,10 @@ module Seasar
         assert(2, s2app.select_component_info_by_namespace(infos, %w[a.e x.y]).size)
       end
 
-      def test_create_singleton
+      def test_create_singleton_container
         s2app.init
-        c1 = s2app.create_singleton(%w[a.b a.c])
-        c2 = s2app.create_singleton(%w[a.c a.b])
+        c1 = s2app.create_singleton_container(%w[a.b a.c])
+        c2 = s2app.create_singleton_container(%w[a.c a.b])
         assert(c1 == c2)
       end
 

data/test/seasar/container/test_s2component.rb

@@ -0,0 +1,78 @@
+module Seasar
+  module Container
+    class TC_S2Component < Test::Unit::TestCase
+      def setup
+        s2app.init
+      end
+
+      def teardown
+      end
+
+      def test_instance
+        b = B.instance
+        assert(b.is_a?(B))
+        assert(b.c.is_a?(C))
+      end
+
+      def test_instance_exist
+        a = A.instance
+        assert(a == 1000)
+      end
+
+      def test_instance_method
+        d = D.instance
+        assert(d.is_a?(D))
+      end
+
+      def test_namespaced
+        e = E.instance
+        assert(e.is_a?(E))
+      end
+
+      def test_inherit
+        g = G.instance
+        assert(g.is_a?(G))
+      end
+
+      class A
+        s2comp
+        class << self
+          def instance
+            return 1000
+          end
+        end
+      end
+
+      class B
+        s2comp
+        def initialize
+          @c = :di, Seasar::Container::TC_S2Component::C
+        end
+        attr_reader :c
+      end
+
+      class C
+        s2comp
+      end
+
+      class D
+        s2comp
+        def instance
+          return 1000
+        end
+      end
+
+      class E
+        s2comp :namespace => 'xxx', :name => 'TC_S2Component'
+      end
+
+      class F
+        s2comp
+      end
+      
+      class G < F
+        s2comp
+      end
+    end
+  end
+end

data/test/seasar/test_log.rb

@@ -11,10 +11,10 @@ module Seasar
 
       def test_logging
         return if defined? JRUBY_VERSION
-        #logger = s2logger('/tmp/a.log')
         logger = s2logger
-        logger.level = Logger::DEBUG
+        #logger.level = Logger::DEBUG
         s2logger.debug(self) {"debug level logging"}
+        #logger.level = Logger::WARN
       end
 
       def test_jlogger

data/test/seasar/test_util.rb

@@ -24,6 +24,12 @@ module Seasar
         assert_equal('Seasar::Util::TC_ClassUtil', Seasar::Util::ClassUtil.module_name(A))
       end
 
+      def test_aspect
+        s2app.init
+        b = s2app.get(B)
+        assert_equal(5 * 2, b.calc(2, 3))
+      end
+
       class A
         def initialize
           @a = "abc"
@@ -41,6 +47,21 @@ module Seasar
       class AbcDef_; end
       class ABCde; end
       class ABCdeFG; end
+
+      class B
+        s2comp
+        s2aspect(:pointcut => 'calc') {|invoker| invoker.proceed * 2}
+        attr_accessor :tc_class_util_c
+        def calc(a, b)
+          @tc_class_util_c.calc(a, b)
+        end
+      end
+      class C
+        s2comp :name => :tc_class_util_c
+        def calc(a, b)
+          return a + b
+        end
+      end
     end
   end
 end

data/test/test-suite.rb

@@ -2,6 +2,6 @@ $LOAD_PATH.unshift(File::expand_path(File::dirname(__FILE__)) + '/../lib')
 
 require 'test/unit'
 require 's2container'
-
+Seasar::Log::Factory::RubyLoggerFactory.level = Logger::DEBUG
 Test::Unit::AutoRunner.run(true, File::expand_path(File::dirname(__FILE__)))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s2container
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - klove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 +09:00
+date: 2009-07-04 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -95,6 +95,7 @@ files:
 - lib/s2container.rb
 - test/test-suite.rb
 - test/seasar/container/test_component-info-def.rb
+- test/seasar/container/test_s2component.rb
 - test/seasar/container/test_arg-def.rb
 - test/seasar/container/s2app_load_sample.rb
 - test/seasar/container/deployer/test_instance_def_factory.rb
@@ -171,6 +172,8 @@ files:
 - example/quickstart/quickstart3/quickstart.rb
 - example/quickstart/quickstart5
 - example/quickstart/quickstart5/quickstart.rb
+- example/quickstart/quickstart8
+- example/quickstart/quickstart8/quickstart.rb
 - example/quickstart/quickstart7
 - example/quickstart/quickstart7/quickstart.rb
 - example/quickstart/quickstart1