genki-merb_component 0.2.2 → 0.2.3

data/Rakefile

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

data/lib/merb_component.rb

@@ -1,17 +1,5 @@
 # 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] = {
@@ -19,6 +7,9 @@ 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

data/lib/merb_component/controller_ext.rb

@@ -108,8 +108,9 @@ class Merb::Controller
       @object = @context.instance_variable_get("@#{@agg_name}")
       @scope = {}
 
-      if @object
-        relationship = model_class.relationships[@agg_name]
+      relationship = model_class.relationships[@agg_name]
+      if @object && relationship
+        Merb.logger.debug [model_class, @agg_name].inspect
         key_names = relationship.child_key.map{|i| i.name}
         @scope = Hash[key_names.zip(@object.key)] if @object
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_component
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 -08:00
+date: 2009-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency