merb_app_config 1.0.3 → 1.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/lib/application_config/view_helpers.rb +8 -8
- metadata +2 -2
data/Rakefile
CHANGED
|
@@ -17,10 +17,10 @@ module ApplicationConfig
|
|
|
17
17
|
args = args.map{|s| s.gsub("javascripts/", AppConfig.javascript_path)} if AppConfig.javascript_path
|
|
18
18
|
if defined?(Merb)
|
|
19
19
|
args << options.merge(:bundle => key.to_sym)
|
|
20
|
-
html << js_include_tag(*args)
|
|
20
|
+
html << js_include_tag(*args).to_s
|
|
21
21
|
elsif defined?(Rails)
|
|
22
22
|
args << options.merge(:cache => key.to_s)
|
|
23
|
-
html << javascript_include_tag(*args)
|
|
23
|
+
html << javascript_include_tag(*args).to_s
|
|
24
24
|
end
|
|
25
25
|
html << "\n"
|
|
26
26
|
end
|
|
@@ -29,9 +29,9 @@ module ApplicationConfig
|
|
|
29
29
|
args = args.map{|s| s.gsub("javascripts/", AppConfig.javascript_path)} if AppConfig.javascript_path
|
|
30
30
|
args << options
|
|
31
31
|
if defined?(Merb)
|
|
32
|
-
html << js_include_tag(*args)
|
|
32
|
+
html << js_include_tag(*args).to_s
|
|
33
33
|
elsif defined?(Rails)
|
|
34
|
-
html << javascript_include_tag(*args)
|
|
34
|
+
html << javascript_include_tag(*args).to_s
|
|
35
35
|
end
|
|
36
36
|
end
|
|
37
37
|
end
|
|
@@ -56,10 +56,10 @@ module ApplicationConfig
|
|
|
56
56
|
args = args.map{|s| s.gsub("stylesheets/", AppConfig.stylesheet_path)} if AppConfig.stylesheet_path
|
|
57
57
|
if defined?(Merb)
|
|
58
58
|
args << options.merge(:bundle => key.to_sym)
|
|
59
|
-
html << css_include_tag(*args)
|
|
59
|
+
html << css_include_tag(*args).to_s
|
|
60
60
|
elsif defined?(Rails)
|
|
61
61
|
args << options.merge(:cache => key.to_s)
|
|
62
|
-
html << stylesheet_link_tag(*args)
|
|
62
|
+
html << stylesheet_link_tag(*args).to_s
|
|
63
63
|
end
|
|
64
64
|
end
|
|
65
65
|
else
|
|
@@ -67,9 +67,9 @@ module ApplicationConfig
|
|
|
67
67
|
args = args.map{|s| s.gsub("stylesheets/", AppConfig.stylesheet_path)} if AppConfig.stylesheet_path
|
|
68
68
|
args << options
|
|
69
69
|
if defined?(Merb)
|
|
70
|
-
html << css_include_tag(*args)
|
|
70
|
+
html << css_include_tag(*args).to_s
|
|
71
71
|
elsif defined?(Rails)
|
|
72
|
-
html << stylesheet_link_tag(*args)
|
|
72
|
+
html << stylesheet_link_tag(*args).to_s
|
|
73
73
|
end
|
|
74
74
|
end
|
|
75
75
|
html << "\n"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merb_app_config
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jacques Crocker
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2009-
|
|
12
|
+
date: 2009-04-06 00:00:00 -07:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|