merlin 0.0.2 → 0.0.4
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/lib/merlin/engine.rb +4 -2
- data/lib/merlin/version.rb +1 -1
- data/lib/merlin.rb +3 -0
- data/lib/tasks/merlin_tasks.rake +1 -1
- metadata +2 -2
data/lib/merlin/engine.rb
CHANGED
|
@@ -16,8 +16,10 @@ module Merlin
|
|
|
16
16
|
g.helper false
|
|
17
17
|
end
|
|
18
18
|
|
|
19
|
-
initializer 'merlin.load_config' do |app|
|
|
20
|
-
|
|
19
|
+
initializer 'merlin.load_config', :before => :load_config_initializers do |app|
|
|
20
|
+
Merlin.instance_eval do
|
|
21
|
+
@configuration = Merlin::Configuration.new(File.join(::Rails.root, 'config', 'merlin.yml'))
|
|
22
|
+
end
|
|
21
23
|
end
|
|
22
24
|
end
|
|
23
25
|
end
|
data/lib/merlin/version.rb
CHANGED
data/lib/merlin.rb
CHANGED
data/lib/tasks/merlin_tasks.rake
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merlin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.4
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-09-
|
|
12
|
+
date: 2012-09-24 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|