genki-merb_component 0.2.2 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +1 -1
- data/lib/merb_component.rb +3 -12
- data/lib/merb_component/controller_ext.rb +3 -2
- metadata +2 -2
data/Rakefile
CHANGED
data/lib/merb_component.rb
CHANGED
|
@@ -1,17 +1,5 @@
|
|
|
1
1
|
# make sure we're running inside Merb
|
|
2
2
|
if defined?(Merb::Plugins)
|
|
3
|
-
|
|
4
|
-
load_dependency "merb-slices", :immediate => true
|
|
5
|
-
Merb::Slices::register(__FILE__)
|
|
6
|
-
|
|
7
|
-
module MerbComponent
|
|
8
|
-
def self.loaded
|
|
9
|
-
require 'merb_component/controller_ext'
|
|
10
|
-
require 'merb_component/resource_ext'
|
|
11
|
-
require 'merb_component/router_ext'
|
|
12
|
-
end
|
|
13
|
-
end
|
|
14
|
-
|
|
15
3
|
# Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in
|
|
16
4
|
# your piece of it
|
|
17
5
|
Merb::Plugins.config[:merb_component] = {
|
|
@@ -19,6 +7,9 @@ if defined?(Merb::Plugins)
|
|
|
19
7
|
|
|
20
8
|
Merb::BootLoader.before_app_loads do
|
|
21
9
|
# require code that must be loaded before the application
|
|
10
|
+
require 'merb_component/controller_ext'
|
|
11
|
+
require 'merb_component/resource_ext'
|
|
12
|
+
require 'merb_component/router_ext'
|
|
22
13
|
end
|
|
23
14
|
|
|
24
15
|
Merb::BootLoader.after_app_loads do
|
|
@@ -108,8 +108,9 @@ class Merb::Controller
|
|
|
108
108
|
@object = @context.instance_variable_get("@#{@agg_name}")
|
|
109
109
|
@scope = {}
|
|
110
110
|
|
|
111
|
-
|
|
112
|
-
|
|
111
|
+
relationship = model_class.relationships[@agg_name]
|
|
112
|
+
if @object && relationship
|
|
113
|
+
Merb.logger.debug [model_class, @agg_name].inspect
|
|
113
114
|
key_names = relationship.child_key.map{|i| i.name}
|
|
114
115
|
@scope = Hash[key_names.zip(@object.key)] if @object
|
|
115
116
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: genki-merb_component
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Genki Takiuchi
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2009-02-
|
|
12
|
+
date: 2009-02-24 00:00:00 -08:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|