genki-merb_component 0.2.1 → 0.2.2
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/controller_ext.rb +0 -2
- data/lib/merb_component.rb +11 -3
- metadata +4 -2
data/Rakefile
CHANGED
|
@@ -115,7 +115,6 @@ class Merb::Controller
|
|
|
115
115
|
end
|
|
116
116
|
|
|
117
117
|
@result = begin
|
|
118
|
-
Thread.critical = true
|
|
119
118
|
aggregators = Thread::current[:aggregators] ||= {}
|
|
120
119
|
(aggregators[controller] ||= []).push(self)
|
|
121
120
|
if model_class.respond_to?(:with_scope)
|
|
@@ -125,7 +124,6 @@ class Merb::Controller
|
|
|
125
124
|
end
|
|
126
125
|
ensure
|
|
127
126
|
aggregators[controller].pop
|
|
128
|
-
Thread.critical = false
|
|
129
127
|
end
|
|
130
128
|
end
|
|
131
129
|
|
data/lib/merb_component.rb
CHANGED
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
# make sure we're running inside Merb
|
|
2
2
|
if defined?(Merb::Plugins)
|
|
3
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
|
+
|
|
4
15
|
# Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in
|
|
5
16
|
# your piece of it
|
|
6
17
|
Merb::Plugins.config[:merb_component] = {
|
|
@@ -8,9 +19,6 @@ if defined?(Merb::Plugins)
|
|
|
8
19
|
|
|
9
20
|
Merb::BootLoader.before_app_loads do
|
|
10
21
|
# require code that must be loaded before the application
|
|
11
|
-
require 'merb_component/controller_ext'
|
|
12
|
-
require 'merb_component/resource_ext'
|
|
13
|
-
require 'merb_component/router_ext'
|
|
14
22
|
end
|
|
15
23
|
|
|
16
24
|
Merb::BootLoader.after_app_loads do
|
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.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Genki Takiuchi
|
|
@@ -9,11 +9,12 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2009-
|
|
12
|
+
date: 2009-02-22 00:00:00 -08:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: merb
|
|
17
|
+
type: :runtime
|
|
17
18
|
version_requirement:
|
|
18
19
|
version_requirements: !ruby/object:Gem::Requirement
|
|
19
20
|
requirements:
|
|
@@ -23,6 +24,7 @@ dependencies:
|
|
|
23
24
|
version:
|
|
24
25
|
- !ruby/object:Gem::Dependency
|
|
25
26
|
name: merb_full_url
|
|
27
|
+
type: :development
|
|
26
28
|
version_requirement:
|
|
27
29
|
version_requirements: !ruby/object:Gem::Requirement
|
|
28
30
|
requirements:
|