micon 0.1.5 → 0.1.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   :name => "micon",
-  :version => "0.1.5",
+  :version => "0.1.6",
   :summary => "Assembles and manages pieces of your application",
 
   :author => "Alexey Petrushin",

data/lib/micon/metadata.rb

@@ -96,22 +96,22 @@ module Micon
       end
     end
     
-    def call_before_scope key
+    def call_before_scope key, container
       if callbacks = @before_scope[key]
-        callbacks.each{|c| c.call}
+        callbacks.each{|c| c.call container}
       end
     end
     
-    def call_after_scope key
+    def call_after_scope key, container
       if callbacks = @after_scope[key]
-        callbacks.each{|c| c.call}
+        callbacks.each{|c| c.call container}
       end
     end
     
-    def with_scope_callbacks key, &block
-      call_before_scope key
+    def with_scope_callbacks key, container, &block
+      call_before_scope key, container
       result = block.call
-      call_after_scope key
+      call_after_scope key, container
       result
     end
     

data/lib/micon/micon.rb

@@ -30,14 +30,14 @@ module Micon
         begin
           outer_container_or_nil = Thread.current[scope_with_prefix]
           Thread.current[scope_with_prefix] = container
-          @metadata.with_scope_callbacks scope, &block
+          @metadata.with_scope_callbacks scope, container, &block
         ensure
           Thread.current[scope_with_prefix] = outer_container_or_nil
         end
       else        
         # not support nested scopes without block
         Thread.current[scope_with_prefix] = container
-        @metadata.call_before_scope scope
+        @metadata.call_before_scope scope, container
       end
     end
     
@@ -47,7 +47,7 @@ module Micon
       scope_with_prefix = add_prefix(scope)      
       raise_without_self "Scope '#{scope}' not active!" unless container = Thread.current[scope_with_prefix]
       
-      @metadata.call_after_scope scope
+      @metadata.call_after_scope scope, container
       Thread.current[scope_with_prefix] = nil
       container
     end

data/spec/callbacks_spec.rb

@@ -40,14 +40,14 @@ describe "Callbacks" do
   describe "custom scope callbacks" do
     it "scope :before and :after callbacks" do
       check = mock
-      check.should_receive(:before).ordered
+      check.should_receive(:before).with({}).ordered
       check.should_receive(:run).ordered
-      check.should_receive(:after).ordered
-      check.should_receive(:after2).ordered
+      check.should_receive(:after).with({}).ordered
+      check.should_receive(:after2).with({}).ordered
 
-      Micon.before_scope(:custom){check.before}
-      Micon.after_scope(:custom){check.after}
-      Micon.after_scope(:custom){check.after2}
+      Micon.before_scope(:custom){|container| check.before container}
+      Micon.after_scope(:custom){|container| check.after container}
+      Micon.after_scope(:custom){|container| check.after2 container}
 
       Micon.activate(:custom, {}){check.run}
     end    

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: micon
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +04:00
+date: 2010-10-22 00:00:00 +04:00
 default_executable: 
 dependencies: []