sprockets 2.4.1 → 2.4.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.

Potentially problematic release.

This version of sprockets might be problematic. Click here for more details.

Files changed (5) hide show
  1. data/README.md +4 -0
  2. data/lib/sprockets/manifest.rb +6 -8
  3. data/lib/sprockets/processing.rb +2 -2
  4. data/lib/sprockets/version.rb +1 -1
  5. metadata +190 -186
data/README.md CHANGED
@@ -361,6 +361,10 @@ submit a pull request.
361
361
 
362
362
  ## Version History ##
363
363
 
364
+ **2.4.2** (May 7, 2012)
365
+
366
+ * Fixed MultiJson feature detect
367
+
364
368
  **2.4.1** (April 26, 2012)
365
369
 
366
370
  * Fixed MultiJson API change
data/lib/sprockets/manifest.rb CHANGED
@@ -84,7 +84,7 @@ module Sprockets
84
84
  #
85
85
  def compile(*args)
86
86
  paths = environment.each_logical_path(*args).to_a +
87
- args.flatten.select { |fn| Pathname.new(fn).absolute? }
87
+ args.flatten.select { |fn| Pathname.new(fn).absolute? if fn.is_a?(String)}
88
88
 
89
89
  paths.each do |path|
90
90
  if asset = find_asset(path)
@@ -192,21 +192,19 @@ module Sprockets
192
192
 
193
193
  private
194
194
  # Feature detect newer MultiJson API
195
- if MultiJson.respond_to?(:load)
195
+ if MultiJson.respond_to?(:dump)
196
196
  def json_decode(obj)
197
197
  MultiJson.load(obj)
198
198
  end
199
- else
200
- def json_decode(obj)
201
- MultiJson.decode(obj)
202
- end
203
- end
204
199
 
205
- if MultiJson.respond_to?(:dump)
206
200
  def json_encode(obj)
207
201
  MultiJson.dump(obj)
208
202
  end
209
203
  else
204
+ def json_decode(obj)
205
+ MultiJson.decode(obj)
206
+ end
207
+
210
208
  def json_encode(obj)
211
209
  MultiJson.encode(obj)
212
210
  end
data/lib/sprockets/processing.rb CHANGED
@@ -65,7 +65,7 @@ module Sprockets
65
65
  #
66
66
  # A block can be passed for to create a shorthand processor.
67
67
  #
68
- # register_preprocessor :my_processor do |context, data|
68
+ # register_preprocessor 'text/css', :my_processor do |context, data|
69
69
  # data.gsub(...)
70
70
  # end
71
71
  #
@@ -87,7 +87,7 @@ module Sprockets
87
87
  #
88
88
  # A block can be passed for to create a shorthand processor.
89
89
  #
90
- # register_postprocessor :my_processor do |context, data|
90
+ # register_postprocessor 'text/css', :my_processor do |context, data|
91
91
  # data.gsub(...)
92
92
  # end
93
93
  #
data/lib/sprockets/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Sprockets
2
- VERSION = "2.4.1"
2
+ VERSION = "2.4.2"
3
3
  end
metadata CHANGED
@@ -1,241 +1,235 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: sprockets
3
- version: !ruby/object:Gem::Version
4
- version: 2.4.1
3
+ version: !ruby/object:Gem::Version
4
+ hash: 27
5
5
  prerelease:
6
+ segments:
7
+ - 2
8
+ - 4
9
+ - 2
10
+ version: 2.4.2
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Sam Stephenson
9
14
  - Joshua Peek
10
15
  autorequire:
11
16
  bindir: bin
12
17
  cert_chain: []
13
- date: 2012-04-26 00:00:00.000000000 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
18
+
19
+ date: 2012-05-07 00:00:00 Z
20
+ dependencies:
21
+ - !ruby/object:Gem::Dependency
16
22
  name: hike
17
- requirement: !ruby/object:Gem::Requirement
18
- none: false
19
- requirements:
20
- - - ~>
21
- - !ruby/object:Gem::Version
22
- version: '1.2'
23
- type: :runtime
24
23
  prerelease: false
25
- version_requirements: !ruby/object:Gem::Requirement
24
+ requirement: &id001 !ruby/object:Gem::Requirement
26
25
  none: false
27
- requirements:
26
+ requirements:
28
27
  - - ~>
29
- - !ruby/object:Gem::Version
30
- version: '1.2'
31
- - !ruby/object:Gem::Dependency
32
- name: multi_json
33
- requirement: !ruby/object:Gem::Requirement
34
- none: false
35
- requirements:
36
- - - ~>
37
- - !ruby/object:Gem::Version
38
- version: '1.0'
28
+ - !ruby/object:Gem::Version
29
+ hash: 11
30
+ segments:
31
+ - 1
32
+ - 2
33
+ version: "1.2"
39
34
  type: :runtime
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
37
+ name: multi_json
40
38
  prerelease: false
41
- version_requirements: !ruby/object:Gem::Requirement
39
+ requirement: &id002 !ruby/object:Gem::Requirement
42
40
  none: false
43
- requirements:
41
+ requirements:
44
42
  - - ~>
45
- - !ruby/object:Gem::Version
46
- version: '1.0'
47
- - !ruby/object:Gem::Dependency
48
- name: rack
49
- requirement: !ruby/object:Gem::Requirement
50
- none: false
51
- requirements:
52
- - - ~>
53
- - !ruby/object:Gem::Version
54
- version: '1.0'
43
+ - !ruby/object:Gem::Version
44
+ hash: 15
45
+ segments:
46
+ - 1
47
+ - 0
48
+ version: "1.0"
55
49
  type: :runtime
50
+ version_requirements: *id002
51
+ - !ruby/object:Gem::Dependency
52
+ name: rack
56
53
  prerelease: false
57
- version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
- requirements:
60
- - - ~>
61
- - !ruby/object:Gem::Version
62
- version: '1.0'
63
- - !ruby/object:Gem::Dependency
64
- name: tilt
65
- requirement: !ruby/object:Gem::Requirement
54
+ requirement: &id003 !ruby/object:Gem::Requirement
66
55
  none: false
67
- requirements:
56
+ requirements:
68
57
  - - ~>
69
- - !ruby/object:Gem::Version
70
- version: '1.1'
71
- - - ! '!='
72
- - !ruby/object:Gem::Version
73
- version: 1.3.0
58
+ - !ruby/object:Gem::Version
59
+ hash: 15
60
+ segments:
61
+ - 1
62
+ - 0
63
+ version: "1.0"
74
64
  type: :runtime
65
+ version_requirements: *id003
66
+ - !ruby/object:Gem::Dependency
67
+ name: tilt
75
68
  prerelease: false
76
- version_requirements: !ruby/object:Gem::Requirement
69
+ requirement: &id004 !ruby/object:Gem::Requirement
77
70
  none: false
78
- requirements:
71
+ requirements:
79
72
  - - ~>
80
- - !ruby/object:Gem::Version
81
- version: '1.1'
82
- - - ! '!='
83
- - !ruby/object:Gem::Version
73
+ - !ruby/object:Gem::Version
74
+ hash: 13
75
+ segments:
76
+ - 1
77
+ - 1
78
+ version: "1.1"
79
+ - - "!="
80
+ - !ruby/object:Gem::Version
81
+ hash: 27
82
+ segments:
83
+ - 1
84
+ - 3
85
+ - 0
84
86
  version: 1.3.0
85
- - !ruby/object:Gem::Dependency
87
+ type: :runtime
88
+ version_requirements: *id004
89
+ - !ruby/object:Gem::Dependency
86
90
  name: coffee-script
87
- requirement: !ruby/object:Gem::Requirement
88
- none: false
89
- requirements:
90
- - - ~>
91
- - !ruby/object:Gem::Version
92
- version: '2.0'
93
- type: :development
94
91
  prerelease: false
95
- version_requirements: !ruby/object:Gem::Requirement
92
+ requirement: &id005 !ruby/object:Gem::Requirement
96
93
  none: false
97
- requirements:
94
+ requirements:
98
95
  - - ~>
99
- - !ruby/object:Gem::Version
100
- version: '2.0'
101
- - !ruby/object:Gem::Dependency
102
- name: coffee-script-source
103
- requirement: !ruby/object:Gem::Requirement
104
- none: false
105
- requirements:
106
- - - ~>
107
- - !ruby/object:Gem::Version
108
- version: 1.2.0
96
+ - !ruby/object:Gem::Version
97
+ hash: 3
98
+ segments:
99
+ - 2
100
+ - 0
101
+ version: "2.0"
109
102
  type: :development
103
+ version_requirements: *id005
104
+ - !ruby/object:Gem::Dependency
105
+ name: coffee-script-source
110
106
  prerelease: false
111
- version_requirements: !ruby/object:Gem::Requirement
107
+ requirement: &id006 !ruby/object:Gem::Requirement
112
108
  none: false
113
- requirements:
109
+ requirements:
114
110
  - - ~>
115
- - !ruby/object:Gem::Version
111
+ - !ruby/object:Gem::Version
112
+ hash: 31
113
+ segments:
114
+ - 1
115
+ - 2
116
+ - 0
116
117
  version: 1.2.0
117
- - !ruby/object:Gem::Dependency
118
- name: eco
119
- requirement: !ruby/object:Gem::Requirement
120
- none: false
121
- requirements:
122
- - - ~>
123
- - !ruby/object:Gem::Version
124
- version: '1.0'
125
118
  type: :development
119
+ version_requirements: *id006
120
+ - !ruby/object:Gem::Dependency
121
+ name: eco
126
122
  prerelease: false
127
- version_requirements: !ruby/object:Gem::Requirement
123
+ requirement: &id007 !ruby/object:Gem::Requirement
128
124
  none: false
129
- requirements:
125
+ requirements:
130
126
  - - ~>
131
- - !ruby/object:Gem::Version
132
- version: '1.0'
133
- - !ruby/object:Gem::Dependency
134
- name: ejs
135
- requirement: !ruby/object:Gem::Requirement
136
- none: false
137
- requirements:
138
- - - ~>
139
- - !ruby/object:Gem::Version
140
- version: '1.0'
127
+ - !ruby/object:Gem::Version
128
+ hash: 15
129
+ segments:
130
+ - 1
131
+ - 0
132
+ version: "1.0"
141
133
  type: :development
134
+ version_requirements: *id007
135
+ - !ruby/object:Gem::Dependency
136
+ name: ejs
142
137
  prerelease: false
143
- version_requirements: !ruby/object:Gem::Requirement
138
+ requirement: &id008 !ruby/object:Gem::Requirement
144
139
  none: false
145
- requirements:
140
+ requirements:
146
141
  - - ~>
147
- - !ruby/object:Gem::Version
148
- version: '1.0'
149
- - !ruby/object:Gem::Dependency
150
- name: execjs
151
- requirement: !ruby/object:Gem::Requirement
152
- none: false
153
- requirements:
154
- - - ~>
155
- - !ruby/object:Gem::Version
156
- version: '1.0'
142
+ - !ruby/object:Gem::Version
143
+ hash: 15
144
+ segments:
145
+ - 1
146
+ - 0
147
+ version: "1.0"
157
148
  type: :development
149
+ version_requirements: *id008
150
+ - !ruby/object:Gem::Dependency
151
+ name: execjs
158
152
  prerelease: false
159
- version_requirements: !ruby/object:Gem::Requirement
153
+ requirement: &id009 !ruby/object:Gem::Requirement
160
154
  none: false
161
- requirements:
155
+ requirements:
162
156
  - - ~>
163
- - !ruby/object:Gem::Version
164
- version: '1.0'
165
- - !ruby/object:Gem::Dependency
166
- name: json
167
- requirement: !ruby/object:Gem::Requirement
168
- none: false
169
- requirements:
170
- - - ! '>='
171
- - !ruby/object:Gem::Version
172
- version: '0'
157
+ - !ruby/object:Gem::Version
158
+ hash: 15
159
+ segments:
160
+ - 1
161
+ - 0
162
+ version: "1.0"
173
163
  type: :development
164
+ version_requirements: *id009
165
+ - !ruby/object:Gem::Dependency
166
+ name: json
174
167
  prerelease: false
175
- version_requirements: !ruby/object:Gem::Requirement
176
- none: false
177
- requirements:
178
- - - ! '>='
179
- - !ruby/object:Gem::Version
180
- version: '0'
181
- - !ruby/object:Gem::Dependency
182
- name: rack-test
183
- requirement: !ruby/object:Gem::Requirement
168
+ requirement: &id010 !ruby/object:Gem::Requirement
184
169
  none: false
185
- requirements:
186
- - - ! '>='
187
- - !ruby/object:Gem::Version
188
- version: '0'
170
+ requirements:
171
+ - - ">="
172
+ - !ruby/object:Gem::Version
173
+ hash: 3
174
+ segments:
175
+ - 0
176
+ version: "0"
189
177
  type: :development
178
+ version_requirements: *id010
179
+ - !ruby/object:Gem::Dependency
180
+ name: rack-test
190
181
  prerelease: false
191
- version_requirements: !ruby/object:Gem::Requirement
192
- none: false
193
- requirements:
194
- - - ! '>='
195
- - !ruby/object:Gem::Version
196
- version: '0'
197
- - !ruby/object:Gem::Dependency
198
- name: rake
199
- requirement: !ruby/object:Gem::Requirement
182
+ requirement: &id011 !ruby/object:Gem::Requirement
200
183
  none: false
201
- requirements:
202
- - - ! '>='
203
- - !ruby/object:Gem::Version
204
- version: '0'
184
+ requirements:
185
+ - - ">="
186
+ - !ruby/object:Gem::Version
187
+ hash: 3
188
+ segments:
189
+ - 0
190
+ version: "0"
205
191
  type: :development
192
+ version_requirements: *id011
193
+ - !ruby/object:Gem::Dependency
194
+ name: rake
206
195
  prerelease: false
207
- version_requirements: !ruby/object:Gem::Requirement
208
- none: false
209
- requirements:
210
- - - ! '>='
211
- - !ruby/object:Gem::Version
212
- version: '0'
213
- - !ruby/object:Gem::Dependency
214
- name: sass
215
- requirement: !ruby/object:Gem::Requirement
196
+ requirement: &id012 !ruby/object:Gem::Requirement
216
197
  none: false
217
- requirements:
218
- - - ~>
219
- - !ruby/object:Gem::Version
220
- version: '3.1'
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ hash: 3
202
+ segments:
203
+ - 0
204
+ version: "0"
221
205
  type: :development
206
+ version_requirements: *id012
207
+ - !ruby/object:Gem::Dependency
208
+ name: sass
222
209
  prerelease: false
223
- version_requirements: !ruby/object:Gem::Requirement
210
+ requirement: &id013 !ruby/object:Gem::Requirement
224
211
  none: false
225
- requirements:
212
+ requirements:
226
213
  - - ~>
227
- - !ruby/object:Gem::Version
228
- version: '3.1'
229
- description: Sprockets is a Rack-based asset packaging system that concatenates and
230
- serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
231
- email:
214
+ - !ruby/object:Gem::Version
215
+ hash: 5
216
+ segments:
217
+ - 3
218
+ - 1
219
+ version: "3.1"
220
+ type: :development
221
+ version_requirements: *id013
222
+ description: Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
223
+ email:
232
224
  - sstephenson@gmail.com
233
225
  - josh@joshpeek.com
234
- executables:
226
+ executables:
235
227
  - sprockets
236
228
  extensions: []
229
+
237
230
  extra_rdoc_files: []
238
- files:
231
+
232
+ files:
239
233
  - README.md
240
234
  - LICENSE
241
235
  - lib/rake/sprocketstask.rb
@@ -274,26 +268,36 @@ files:
274
268
  - bin/sprockets
275
269
  homepage: http://getsprockets.org/
276
270
  licenses: []
271
+
277
272
  post_install_message:
278
273
  rdoc_options: []
279
- require_paths:
274
+
275
+ require_paths:
280
276
  - lib
281
- required_ruby_version: !ruby/object:Gem::Requirement
277
+ required_ruby_version: !ruby/object:Gem::Requirement
282
278
  none: false
283
- requirements:
284
- - - ! '>='
285
- - !ruby/object:Gem::Version
286
- version: '0'
287
- required_rubygems_version: !ruby/object:Gem::Requirement
279
+ requirements:
280
+ - - ">="
281
+ - !ruby/object:Gem::Version
282
+ hash: 3
283
+ segments:
284
+ - 0
285
+ version: "0"
286
+ required_rubygems_version: !ruby/object:Gem::Requirement
288
287
  none: false
289
- requirements:
290
- - - ! '>='
291
- - !ruby/object:Gem::Version
292
- version: '0'
288
+ requirements:
289
+ - - ">="
290
+ - !ruby/object:Gem::Version
291
+ hash: 3
292
+ segments:
293
+ - 0
294
+ version: "0"
293
295
  requirements: []
296
+
294
297
  rubyforge_project: sprockets
295
- rubygems_version: 1.8.23
298
+ rubygems_version: 1.8.15
296
299
  signing_key:
297
300
  specification_version: 3
298
301
  summary: Rack-based asset packaging system
299
302
  test_files: []
303
+