roda-cj 1.0.3 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 3718202aa5175a67126539e0d6f4ff22eff2a194
4
+ data.tar.gz: d2aa31f52413970c3c9442ca77c75cba0ec9f9f2
5
+ SHA512:
6
+ metadata.gz: bde6d4389d7c8c98626512de3e497f9df24d185ecea0c26e6cb3d49934758296730254461fb473b2e795415d119fc31c6d9cf44a6efc136da1151f72b29cf176
7
+ data.tar.gz: e45591c85df7a82cb5a6ad487bbf75fce44f124e423b2a301f7a9ff9796e8eeb67085261829e5983be5e6e491858ec8a76be28ff016ec31e5faec6f250538fbd
@@ -126,7 +126,14 @@ class Roda
126
126
  : assets_opts[:"#{folder[0]}"][:"#{folder[1]}"]
127
127
 
128
128
  # Create a tag for each individual file
129
- if !assets_opts[:concat]
129
+ if assets_opts[:compiled] || assets_opts[:concat]
130
+ name = assets_opts[:compiled] ? assets_opts[:compiled_name] : assets_opts[:concat_name]
131
+ name = "#{name}/#{folder.join('-')}"
132
+ # Generate unique url so middleware knows to check for # compile/concat
133
+ attrs.unshift("#{attr}=\"/#{path}/#{name}/#{assets_unique_id(type)}.#{type}\"")
134
+ # Return tag string
135
+ send("#{type}_assets_tag", attrs.join(' '))
136
+ else
130
137
  files.each do |file|
131
138
  # This allows you to do things like:
132
139
  # assets_opts[:css] = ['app', './bower/jquery/jquery-min.js']
@@ -139,13 +146,6 @@ class Roda
139
146
  end
140
147
  # Return tags as string
141
148
  tags.join "\n"
142
- else
143
- name = assets_opts[:compiled] ? assets_opts[:compiled_name] : assets_opts[:concat_name]
144
- name = "#{name}/#{folder.join('-')}"
145
- # Generate unique url so middleware knows to check for # compile/concat
146
- attrs.unshift("#{attr}=\"/#{path}/#{name}/#{assets_unique_id(type)}.#{type}\"")
147
- # Return tag string
148
- send("#{type}_assets_tag", attrs.join(' '))
149
149
  end
150
150
  end
151
151
 
data/lib/roda/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Roda
2
- RodaVersion = '1.0.3'.freeze
2
+ RodaVersion = '1.0.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roda-cj
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
5
- prerelease:
4
+ version: 1.0.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Jeremy Evans
@@ -14,97 +13,85 @@ dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rack
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - ">="
20
18
  - !ruby/object:Gem::Version
21
19
  version: '0'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '0'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rspec
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: tilt
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - ">="
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: erubis
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - ">="
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - ">="
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: rack_csrf
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - ">="
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - ">="
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: yuicompressor
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
- - - ! '>='
87
+ - - ">="
100
88
  - !ruby/object:Gem::Version
101
89
  version: '0'
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
- - - ! '>='
94
+ - - ">="
108
95
  - !ruby/object:Gem::Version
109
96
  version: '0'
110
97
  description: Routing tree web framework, inspired by Sinatra and Cuba
@@ -118,109 +105,109 @@ extra_rdoc_files:
118
105
  - CHANGELOG
119
106
  - doc/release_notes/1.0.0.txt
120
107
  files:
121
- - README.rdoc
122
- - MIT-LICENSE
123
108
  - CHANGELOG
109
+ - MIT-LICENSE
110
+ - README.rdoc
124
111
  - Rakefile
125
112
  - doc/release_notes/1.0.0.txt
126
113
  - lib/roda.rb
127
- - lib/roda/plugins/render.rb
128
- - lib/roda/plugins/streaming.rb
129
- - lib/roda/plugins/not_allowed.rb
130
- - lib/roda/plugins/hooks.rb
131
- - lib/roda/plugins/h.rb
132
- - lib/roda/plugins/middleware.rb
133
114
  - lib/roda/plugins/_erubis_escaping.rb
134
- - lib/roda/plugins/csrf.rb
135
- - lib/roda/plugins/multi_route.rb
136
- - lib/roda/plugins/render_each.rb
137
- - lib/roda/plugins/symbol_views.rb
138
115
  - lib/roda/plugins/all_verbs.rb
139
- - lib/roda/plugins/symbol_matchers.rb
140
- - lib/roda/plugins/head.rb
141
- - lib/roda/plugins/view_subdirs.rb
142
- - lib/roda/plugins/header_matchers.rb
143
- - lib/roda/plugins/path.rb
144
- - lib/roda/plugins/per_thread_caching.rb
145
- - lib/roda/plugins/default_headers.rb
116
+ - lib/roda/plugins/assets.rb
146
117
  - lib/roda/plugins/backtracking_array.rb
118
+ - lib/roda/plugins/content_for.rb
119
+ - lib/roda/plugins/csrf.rb
120
+ - lib/roda/plugins/default_headers.rb
121
+ - lib/roda/plugins/error_email.rb
122
+ - lib/roda/plugins/error_handler.rb
123
+ - lib/roda/plugins/flash.rb
124
+ - lib/roda/plugins/h.rb
147
125
  - lib/roda/plugins/halt.rb
148
- - lib/roda/plugins/json.rb
126
+ - lib/roda/plugins/head.rb
127
+ - lib/roda/plugins/header_matchers.rb
128
+ - lib/roda/plugins/hooks.rb
149
129
  - lib/roda/plugins/indifferent_params.rb
130
+ - lib/roda/plugins/json.rb
131
+ - lib/roda/plugins/middleware.rb
132
+ - lib/roda/plugins/multi_route.rb
133
+ - lib/roda/plugins/not_allowed.rb
150
134
  - lib/roda/plugins/not_found.rb
151
- - lib/roda/plugins/error_email.rb
152
135
  - lib/roda/plugins/pass.rb
153
- - lib/roda/plugins/error_handler.rb
154
- - lib/roda/plugins/flash.rb
155
- - lib/roda/plugins/assets.rb
156
- - lib/roda/plugins/content_for.rb
136
+ - lib/roda/plugins/path.rb
137
+ - lib/roda/plugins/per_thread_caching.rb
138
+ - lib/roda/plugins/render.rb
139
+ - lib/roda/plugins/render_each.rb
140
+ - lib/roda/plugins/streaming.rb
141
+ - lib/roda/plugins/symbol_matchers.rb
142
+ - lib/roda/plugins/symbol_views.rb
143
+ - lib/roda/plugins/view_subdirs.rb
157
144
  - lib/roda/version.rb
158
- - spec/request_spec.rb
159
- - spec/session_spec.rb
160
- - spec/version_spec.rb
161
- - spec/plugin_spec.rb
162
- - spec/integration_spec.rb
163
- - spec/opts_spec.rb
164
- - spec/redirect_spec.rb
165
- - spec/module_spec.rb
166
- - spec/response_spec.rb
167
- - spec/spec_helper.rb
168
145
  - spec/composition_spec.rb
169
- - spec/matchers_spec.rb
170
146
  - spec/env_spec.rb
171
- - spec/plugin/json_spec.rb
147
+ - spec/integration_spec.rb
148
+ - spec/matchers_spec.rb
149
+ - spec/module_spec.rb
150
+ - spec/opts_spec.rb
172
151
  - spec/plugin/_erubis_escaping_spec.rb
173
- - spec/plugin/symbol_views_spec.rb
174
- - spec/plugin/indifferent_params_spec.rb
175
- - spec/plugin/middleware_spec.rb
176
- - spec/plugin/content_for_spec.rb
152
+ - spec/plugin/all_verbs_spec.rb
177
153
  - spec/plugin/assets_spec.rb
154
+ - spec/plugin/backtracking_array_spec.rb
155
+ - spec/plugin/content_for_spec.rb
178
156
  - spec/plugin/csrf_spec.rb
179
- - spec/plugin/not_allowed_spec.rb
180
- - spec/plugin/header_matchers_spec.rb
181
- - spec/plugin/per_thread_caching_spec.rb
182
- - spec/plugin/streaming_spec.rb
183
- - spec/plugin/hooks_spec.rb
184
- - spec/plugin/h_spec.rb
185
- - spec/plugin/halt_spec.rb
186
- - spec/plugin/view_subdirs_spec.rb
187
- - spec/plugin/all_verbs_spec.rb
188
- - spec/plugin/path_spec.rb
189
- - spec/plugin/render_spec.rb
190
- - spec/plugin/flash_spec.rb
157
+ - spec/plugin/default_headers_spec.rb
191
158
  - spec/plugin/error_email_spec.rb
192
159
  - spec/plugin/error_handler_spec.rb
160
+ - spec/plugin/flash_spec.rb
161
+ - spec/plugin/h_spec.rb
162
+ - spec/plugin/halt_spec.rb
163
+ - spec/plugin/head_spec.rb
164
+ - spec/plugin/header_matchers_spec.rb
165
+ - spec/plugin/hooks_spec.rb
166
+ - spec/plugin/indifferent_params_spec.rb
167
+ - spec/plugin/json_spec.rb
168
+ - spec/plugin/middleware_spec.rb
193
169
  - spec/plugin/multi_route_spec.rb
194
- - spec/plugin/default_headers_spec.rb
195
- - spec/plugin/render_each_spec.rb
170
+ - spec/plugin/not_allowed_spec.rb
196
171
  - spec/plugin/not_found_spec.rb
197
- - spec/plugin/symbol_matchers_spec.rb
198
- - spec/plugin/backtracking_array_spec.rb
199
- - spec/plugin/head_spec.rb
200
172
  - spec/plugin/pass_spec.rb
173
+ - spec/plugin/path_spec.rb
174
+ - spec/plugin/per_thread_caching_spec.rb
175
+ - spec/plugin/render_each_spec.rb
176
+ - spec/plugin/render_spec.rb
177
+ - spec/plugin/streaming_spec.rb
178
+ - spec/plugin/symbol_matchers_spec.rb
179
+ - spec/plugin/symbol_views_spec.rb
180
+ - spec/plugin/view_subdirs_spec.rb
181
+ - spec/plugin_spec.rb
182
+ - spec/redirect_spec.rb
183
+ - spec/request_spec.rb
184
+ - spec/response_spec.rb
185
+ - spec/session_spec.rb
186
+ - spec/spec_helper.rb
187
+ - spec/version_spec.rb
201
188
  homepage: https://github.com/jeremyevans/roda
202
189
  licenses:
203
190
  - MIT
191
+ metadata: {}
204
192
  post_install_message:
205
193
  rdoc_options: []
206
194
  require_paths:
207
195
  - lib
208
196
  required_ruby_version: !ruby/object:Gem::Requirement
209
- none: false
210
197
  requirements:
211
- - - ! '>='
198
+ - - ">="
212
199
  - !ruby/object:Gem::Version
213
200
  version: '0'
214
201
  required_rubygems_version: !ruby/object:Gem::Requirement
215
- none: false
216
202
  requirements:
217
- - - ! '>='
203
+ - - ">="
218
204
  - !ruby/object:Gem::Version
219
205
  version: '0'
220
206
  requirements: []
221
207
  rubyforge_project:
222
- rubygems_version: 1.8.23
208
+ rubygems_version: 2.2.2
223
209
  signing_key:
224
- specification_version: 3
210
+ specification_version: 4
225
211
  summary: Routing tree web framework
226
212
  test_files: []
213
+ has_rdoc: