genki-merb_component 0.2.1 → 0.2.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_component"
-GEM_VERSION = "0.2.1"
+GEM_VERSION = "0.2.2"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"

data/lib/merb_component/controller_ext.rb

@@ -115,7 +115,6 @@ class Merb::Controller
       end
 
       @result = begin
-        Thread.critical = true
         aggregators = Thread::current[:aggregators] ||= {}
         (aggregators[controller] ||= []).push(self)
         if model_class.respond_to?(:with_scope)
@@ -125,7 +124,6 @@ class Merb::Controller
         end
       ensure
         aggregators[controller].pop
-        Thread.critical = false
       end
     end
 

data/lib/merb_component.rb

@@ -1,6 +1,17 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
 
+  load_dependency "merb-slices", :immediate => true
+  Merb::Slices::register(__FILE__)
+
+  module MerbComponent
+    def self.loaded
+      require 'merb_component/controller_ext'
+      require 'merb_component/resource_ext'
+      require 'merb_component/router_ext'
+    end
+  end
+
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in
   # your piece of it
   Merb::Plugins.config[:merb_component] = {
@@ -8,9 +19,6 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.before_app_loads do
     # require code that must be loaded before the application
-    require 'merb_component/controller_ext'
-    require 'merb_component/resource_ext'
-    require 'merb_component/router_ext'
   end
   
   Merb::BootLoader.after_app_loads do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 -08:00
+date: 2009-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb_full_url
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: