middleman 2.0.14.pre-x86-mingw32 → 2.0.14-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. data/CHANGELOG +1 -5
  2. data/features/sprockets.feature +4 -24
  3. data/features/sprockets_gems.feature +3 -1
  4. data/fixtures/sprockets-app/config.rb +1 -2
  5. data/fixtures/sprockets-app/source/{library/javascripts/jquery_include.js → jquery_include.js} +0 -0
  6. data/lib/middleman/core_extensions/compass.rb +2 -13
  7. data/lib/middleman/core_extensions/routing.rb +1 -0
  8. data/lib/middleman/core_extensions/sprockets.rb +20 -29
  9. data/lib/middleman/renderers/sass.rb +23 -33
  10. data/lib/middleman/version.rb +1 -1
  11. data/middleman-x86-mingw32.gemspec +0 -2
  12. data/middleman.gemspec +0 -2
  13. metadata +96 -141
  14. data/fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss +0 -1
  15. data/fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss +0 -1
  16. data/fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss +0 -1
  17. data/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss +0 -1
  18. data/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss +0 -1
  19. data/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss +0 -1
data/CHANGELOG CHANGED
@@ -1,10 +1,6 @@
1
1
  2.0.14
2
2
  ====
3
- Finally support Compass in Sprockets! Thanks to @xdite and @petebrowne
4
-
5
- 2.0.13.1
6
- ====
7
- build --clean shouldn't remove dotfiles
3
+ Minor fix for i18n
8
4
 
9
5
  2.0.13
10
6
  ====
data/features/sprockets.feature CHANGED
@@ -1,16 +1,16 @@
1
1
  Feature: Sprockets
2
2
 
3
- Scenario: Sprockets JS require
3
+ Scenario: Sprockets require
4
4
  Given the Server is running at "test-app"
5
5
  When I go to "/javascripts/sprockets_base.js"
6
6
  Then I should see "sprockets_sub_function"
7
7
 
8
- Scenario: Sprockets JS require with custom :js_dir
8
+ Scenario: Sprockets require with custom :js_dir
9
9
  Given the Server is running at "sprockets-app"
10
10
  When I go to "/library/javascripts/sprockets_base.js"
11
11
  Then I should see "sprockets_sub_function"
12
12
 
13
- Scenario: Sprockets JS should have access to yaml data
13
+ Scenario: Sprockets should have access to yaml data
14
14
  Given the Server is running at "test-app"
15
15
  When I go to "/javascripts/multiple_engines.js"
16
16
  Then I should see "Hello One"
@@ -18,24 +18,4 @@ Feature: Sprockets
18
18
  Scenario: Multiple engine files should build correctly
19
19
  Given a built app at "test-app"
20
20
  Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
21
- And cleanup built app at "test-app"
22
-
23
- Scenario: Sprockets CSS require //require
24
- Given the Server is running at "test-app"
25
- When I go to "/stylesheets/sprockets_base1.css"
26
- Then I should see "hello"
27
-
28
- Scenario: Sprockets CSS require @import
29
- Given the Server is running at "test-app"
30
- When I go to "/stylesheets/sprockets_base2.css"
31
- Then I should see "hello"
32
-
33
- Scenario: Sprockets CSS require with custom :css_dir //require
34
- Given the Server is running at "sprockets-app"
35
- When I go to "/library/stylesheets/sprockets_base1.css"
36
- Then I should see "hello"
37
-
38
- Scenario: Sprockets CSS require with custom :css_dir @import
39
- Given the Server is running at "sprockets-app"
40
- When I go to "/library/stylesheets/sprockets_base2.css"
41
- Then I should see "hello"
21
+ And cleanup built app at "test-app"
data/features/sprockets_gems.feature CHANGED
@@ -1,5 +1,7 @@
1
+ @wip
1
2
  Feature: Sprockets Gems
3
+
2
4
  Scenario: Sprockets can pull jQuery from gem
3
5
  Given the Server is running at "sprockets-app"
4
- When I go to "/library/javascripts/jquery_include.js"
6
+ When I go to "/javascripts/jquery_include.js"
5
7
  Then I should see "var jQuery ="
data/fixtures/sprockets-app/config.rb CHANGED
@@ -1,2 +1 @@
1
- set :js_dir, "library/javascripts"
2
- set :css_dir, "library/stylesheets"
1
+ set :js_dir, "library/javascripts"
data/lib/middleman/core_extensions/compass.rb CHANGED
@@ -68,7 +68,7 @@ module Middleman::CoreExtensions::Compass
68
68
  config.asset_cache_buster :none
69
69
  config.output_style = :nested
70
70
 
71
- # config.add_import_path(config.sass_dir)
71
+ config.add_import_path(config.sass_dir)
72
72
  end
73
73
 
74
74
  # Required for relative paths
@@ -84,9 +84,8 @@ module Middleman::CoreExtensions::Compass
84
84
  end
85
85
 
86
86
  app.execute_after_compass_init!
87
- app.execute_after_compass_config!
88
87
 
89
- # app.set :sass, ::Compass.configuration.to_sass_engine_options
88
+ app.set :sass, ::Compass.configuration.to_sass_engine_options
90
89
  end
91
90
  end
92
91
  alias :included :registered
@@ -103,15 +102,5 @@ module Middleman::CoreExtensions::Compass
103
102
  @run_after_compass ||= []
104
103
  @run_after_compass.each { |block| block.call(::Compass.configuration) }
105
104
  end
106
-
107
- def after_compass_config(&block)
108
- @run_after_compass_config ||= []
109
- @run_after_compass_config << block
110
- end
111
-
112
- def execute_after_compass_config!
113
- @run_after_compass_config ||= []
114
- @run_after_compass_config.each { |block| block.call() }
115
- end
116
105
  end
117
106
  end
data/lib/middleman/core_extensions/routing.rb CHANGED
@@ -39,6 +39,7 @@ module Middleman::CoreExtensions::Routing
39
39
  def paths_for_url(url)
40
40
  url = url.gsub(%r{\/#{settings.index_file}$}, "")
41
41
  url = url.gsub(%r{(\/)$}, "") if url.length > 1
42
+ url = "/" if url.length == 0
42
43
 
43
44
  paths = [url]
44
45
  paths << "#{url}/" if url.length > 1 && url.split("/").last.split('.').length <= 1
data/lib/middleman/core_extensions/sprockets.rb CHANGED
@@ -33,20 +33,10 @@ module Middleman::CoreExtensions::Sprockets
33
33
  app.map "/#{app.js_dir}" do
34
34
  run js_env
35
35
  end
36
- end
37
-
38
- app.after_compass_config do
39
- css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
40
- css_dir = File.join("vendor", "assets", "stylesheets")
41
- gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
42
- ::Middleman.spec_has_file?(spec, css_dir)
43
- end.each do |spec|
44
- css_env.append_path File.join(spec.full_gem_path, css_dir)
45
- end
46
36
 
47
- app.map "/#{app.css_dir}" do
48
- run css_env
49
- end
37
+ # app.map "/#{app.css_dir}" do
38
+ # run Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
39
+ # end
50
40
  end
51
41
  end
52
42
  alias :included :registered
@@ -92,20 +82,21 @@ module Middleman::CoreExtensions::Sprockets
92
82
  end
93
83
  end
94
84
 
95
- class StylesheetEnvironment < MiddlemanEnvironment
96
- def initialize(app)
97
- super
98
-
99
- # Disable js
100
- unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
101
-
102
- # configure search paths
103
- append_path app.css_dir
104
- end
105
-
106
- def css_exception_response(exception)
107
- expire_index!
108
- super(exception)
109
- end
110
- end
85
+ # class StylesheetEnvironment < MiddlemanEnvironment
86
+ # def initialize(app)
87
+ # super
88
+ #
89
+ # # Disable js
90
+ # unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
91
+ #
92
+ # # configure search paths
93
+ # stylesheets_path = File.join(File.expand_path(app.views), app.css_dir)
94
+ # append_path stylesheets_path
95
+ # end
96
+ #
97
+ # def css_exception_response(exception)
98
+ # expire_index!
99
+ # super(exception)
100
+ # end
101
+ # end
111
102
  end
data/lib/middleman/renderers/sass.rb CHANGED
@@ -1,6 +1,5 @@
1
- require "sprockets"
2
- require "sprockets-sass"
3
1
  require "sass"
2
+ require "sass/plugin"
4
3
 
5
4
  module Middleman::Renderers::Sass
6
5
  class << self
@@ -10,50 +9,41 @@ module Middleman::Renderers::Sass
10
9
  end
11
10
  alias :included :registered
12
11
  end
13
-
14
- class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
15
- self.default_mime_type = "text/css"
12
+
13
+ class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
14
+ def sass_options_with_scope(scope)
15
+ return sass_options if basename.nil?
16
+
17
+ location_of_sass_file = if scope.build?
18
+ File.join(scope.root, scope.build_dir)
19
+ else
20
+ scope.views
21
+ end
16
22
 
17
- # Add exception messaging
18
- def evaluate(context, locals, &block)
23
+ parts = basename.split('.')
24
+ parts.pop
25
+ css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
26
+ sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
27
+ end
28
+
29
+ def evaluate(scope, locals, &block)
30
+ @engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
31
+
19
32
  begin
20
33
  super
21
34
  rescue Sass::SyntaxError => e
22
35
  Sass::SyntaxError.exception_to_css(e, :full_exception => true)
23
36
  end
24
37
  end
25
-
26
- protected
27
- def sass_options
28
- location_of_sass_file = if @context.build?
29
- File.expand_path(@context.build_dir, @context.root)
30
- else
31
- File.expand_path(@context.views, @context.root)
32
- end
33
-
34
- parts = basename.split('.')
35
- parts.pop
36
- css_filename = File.join(location_of_sass_file, @context.css_dir, parts.join("."))
37
-
38
- super.merge(
39
- :css_filename => css_filename
40
- )
41
- end
42
38
  end
43
- ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
44
39
  ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
45
40
  ::Tilt.prefer(SassPlusCSSFilenameTemplate)
46
-
41
+
47
42
  class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
48
- self.default_mime_type = "text/css"
49
-
50
- # Define the expected syntax for the template
51
- def syntax
52
- :scss
43
+ def sass_options_with_scope(scope)
44
+ super.merge(:syntax => :scss)
53
45
  end
54
46
  end
55
-
56
- ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
57
47
  ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
58
48
  ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
59
49
  end
data/lib/middleman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.14.pre"
2
+ VERSION = "2.0.14"
3
3
  end
data/middleman-x86-mingw32.gemspec CHANGED
@@ -51,7 +51,6 @@ eos
51
51
  s.add_dependency("compass", ["~> 0.11.3"])
52
52
  s.add_dependency("coffee-script", ["~> 2.2.0"])
53
53
  s.add_dependency("sprockets", ["~> 2.0.3"])
54
- s.add_dependency("sprockets-sass", ["~> 0.3.0"])
55
54
  s.add_dependency("padrino-core", ["~> 0.10.5"])
56
55
  s.add_dependency("padrino-helpers", ["~> 0.10.5"])
57
56
 
@@ -69,6 +68,5 @@ eos
69
68
  s.add_development_dependency("cucumber", ["~> 1.0.2"])
70
69
  s.add_development_dependency("rake", ["~> 0.9.2"])
71
70
  s.add_development_dependency("rspec", ["~> 2.6.0"])
72
- s.add_development_dependency("jquery-rails")
73
71
  end
74
72
 
data/middleman.gemspec CHANGED
@@ -53,7 +53,6 @@ eos
53
53
  s.add_dependency("coffee-script", ["~> 2.2.0"])
54
54
  s.add_dependency("execjs", ["~> 1.2.7"])
55
55
  s.add_dependency("sprockets", ["~> 2.0.3"])
56
- s.add_dependency("sprockets-sass", ["~> 0.3.0"])
57
56
  s.add_dependency("padrino-core", ["~> 0.10.5"])
58
57
  s.add_dependency("padrino-helpers", ["~> 0.10.5"])
59
58
 
@@ -66,6 +65,5 @@ eos
66
65
  s.add_development_dependency("cucumber", ["~> 1.0.2"])
67
66
  s.add_development_dependency("rake", ["~> 0.9.2"])
68
67
  s.add_development_dependency("rspec", ["~> 2.6.0"])
69
- s.add_development_dependency("jquery-rails")
70
68
  end
71
69
 
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
- hash: 961915996
5
- prerelease: 7
4
+ hash: 19
5
+ prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
9
  - 14
10
- - pre
11
- version: 2.0.14.pre
10
+ version: 2.0.14
12
11
  platform: x86-mingw32
13
12
  authors:
14
13
  - Thomas Reynolds
@@ -16,11 +15,10 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2011-10-19 00:00:00 -07:00
18
+ date: 2011-11-05 00:00:00 -07:00
20
19
  default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
23
- prerelease: false
24
22
  requirement: &id001 !ruby/object:Gem::Requirement
25
23
  none: false
26
24
  requirements:
@@ -32,11 +30,11 @@ dependencies:
32
30
  - 3
33
31
  - 5
34
32
  version: 1.3.5
35
- type: :runtime
36
- name: rack
37
33
  version_requirements: *id001
38
- - !ruby/object:Gem::Dependency
34
+ name: rack
39
35
  prerelease: false
36
+ type: :runtime
37
+ - !ruby/object:Gem::Dependency
40
38
  requirement: &id002 !ruby/object:Gem::Requirement
41
39
  none: false
42
40
  requirements:
@@ -48,11 +46,11 @@ dependencies:
48
46
  - 2
49
47
  - 11
50
48
  version: 1.2.11
51
- type: :runtime
52
- name: thin
53
49
  version_requirements: *id002
54
- - !ruby/object:Gem::Dependency
50
+ name: thin
55
51
  prerelease: false
52
+ type: :runtime
53
+ - !ruby/object:Gem::Dependency
56
54
  requirement: &id003 !ruby/object:Gem::Requirement
57
55
  none: false
58
56
  requirements:
@@ -64,11 +62,11 @@ dependencies:
64
62
  - 14
65
63
  - 0
66
64
  version: 0.14.0
67
- type: :runtime
68
- name: thor
69
65
  version_requirements: *id003
70
- - !ruby/object:Gem::Dependency
66
+ name: thor
71
67
  prerelease: false
68
+ type: :runtime
69
+ - !ruby/object:Gem::Dependency
72
70
  requirement: &id004 !ruby/object:Gem::Requirement
73
71
  none: false
74
72
  requirements:
@@ -80,11 +78,11 @@ dependencies:
80
78
  - 3
81
79
  - 1
82
80
  version: 1.3.1
83
- type: :runtime
84
- name: tilt
85
81
  version_requirements: *id004
86
- - !ruby/object:Gem::Dependency
82
+ name: tilt
87
83
  prerelease: false
84
+ type: :runtime
85
+ - !ruby/object:Gem::Dependency
88
86
  requirement: &id005 !ruby/object:Gem::Requirement
89
87
  none: false
90
88
  requirements:
@@ -96,11 +94,11 @@ dependencies:
96
94
  - 6
97
95
  - 0
98
96
  version: 0.6.0
99
- type: :runtime
100
- name: maruku
101
97
  version_requirements: *id005
102
- - !ruby/object:Gem::Dependency
98
+ name: maruku
103
99
  prerelease: false
100
+ type: :runtime
101
+ - !ruby/object:Gem::Dependency
104
102
  requirement: &id006 !ruby/object:Gem::Requirement
105
103
  none: false
106
104
  requirements:
@@ -112,11 +110,11 @@ dependencies:
112
110
  - 3
113
111
  - 1
114
112
  version: 1.3.1
115
- type: :runtime
116
- name: sinatra
117
113
  version_requirements: *id006
118
- - !ruby/object:Gem::Dependency
114
+ name: sinatra
119
115
  prerelease: false
116
+ type: :runtime
117
+ - !ruby/object:Gem::Dependency
120
118
  requirement: &id007 !ruby/object:Gem::Requirement
121
119
  none: false
122
120
  requirements:
@@ -128,11 +126,11 @@ dependencies:
128
126
  - 6
129
127
  - 1
130
128
  version: 0.6.1
131
- type: :runtime
132
- name: rack-test
133
129
  version_requirements: *id007
134
- - !ruby/object:Gem::Dependency
130
+ name: rack-test
135
131
  prerelease: false
132
+ type: :runtime
133
+ - !ruby/object:Gem::Dependency
136
134
  requirement: &id008 !ruby/object:Gem::Requirement
137
135
  none: false
138
136
  requirements:
@@ -144,11 +142,11 @@ dependencies:
144
142
  - 0
145
143
  - 0
146
144
  version: 1.0.0
147
- type: :runtime
148
- name: uglifier
149
145
  version_requirements: *id008
150
- - !ruby/object:Gem::Dependency
146
+ name: uglifier
151
147
  prerelease: false
148
+ type: :runtime
149
+ - !ruby/object:Gem::Dependency
152
150
  requirement: &id009 !ruby/object:Gem::Requirement
153
151
  none: false
154
152
  requirements:
@@ -160,11 +158,11 @@ dependencies:
160
158
  - 0
161
159
  - 2
162
160
  version: 1.0.2
163
- type: :runtime
164
- name: slim
165
161
  version_requirements: *id009
166
- - !ruby/object:Gem::Dependency
162
+ name: slim
167
163
  prerelease: false
164
+ type: :runtime
165
+ - !ruby/object:Gem::Dependency
168
166
  requirement: &id010 !ruby/object:Gem::Requirement
169
167
  none: false
170
168
  requirements:
@@ -176,11 +174,11 @@ dependencies:
176
174
  - 1
177
175
  - 0
178
176
  version: 3.1.0
179
- type: :runtime
180
- name: haml
181
177
  version_requirements: *id010
182
- - !ruby/object:Gem::Dependency
178
+ name: haml
183
179
  prerelease: false
180
+ type: :runtime
181
+ - !ruby/object:Gem::Dependency
184
182
  requirement: &id011 !ruby/object:Gem::Requirement
185
183
  none: false
186
184
  requirements:
@@ -192,11 +190,11 @@ dependencies:
192
190
  - 1
193
191
  - 7
194
192
  version: 3.1.7
195
- type: :runtime
196
- name: sass
197
193
  version_requirements: *id011
198
- - !ruby/object:Gem::Dependency
194
+ name: sass
199
195
  prerelease: false
196
+ type: :runtime
197
+ - !ruby/object:Gem::Dependency
200
198
  requirement: &id012 !ruby/object:Gem::Requirement
201
199
  none: false
202
200
  requirements:
@@ -208,11 +206,11 @@ dependencies:
208
206
  - 11
209
207
  - 3
210
208
  version: 0.11.3
211
- type: :runtime
212
- name: compass
213
209
  version_requirements: *id012
214
- - !ruby/object:Gem::Dependency
210
+ name: compass
215
211
  prerelease: false
212
+ type: :runtime
213
+ - !ruby/object:Gem::Dependency
216
214
  requirement: &id013 !ruby/object:Gem::Requirement
217
215
  none: false
218
216
  requirements:
@@ -224,11 +222,11 @@ dependencies:
224
222
  - 2
225
223
  - 0
226
224
  version: 2.2.0
227
- type: :runtime
228
- name: coffee-script
229
225
  version_requirements: *id013
230
- - !ruby/object:Gem::Dependency
226
+ name: coffee-script
231
227
  prerelease: false
228
+ type: :runtime
229
+ - !ruby/object:Gem::Dependency
232
230
  requirement: &id014 !ruby/object:Gem::Requirement
233
231
  none: false
234
232
  requirements:
@@ -240,28 +238,12 @@ dependencies:
240
238
  - 0
241
239
  - 3
242
240
  version: 2.0.3
243
- type: :runtime
244
- name: sprockets
245
241
  version_requirements: *id014
246
- - !ruby/object:Gem::Dependency
242
+ name: sprockets
247
243
  prerelease: false
248
- requirement: &id015 !ruby/object:Gem::Requirement
249
- none: false
250
- requirements:
251
- - - ~>
252
- - !ruby/object:Gem::Version
253
- hash: 19
254
- segments:
255
- - 0
256
- - 3
257
- - 0
258
- version: 0.3.0
259
244
  type: :runtime
260
- name: sprockets-sass
261
- version_requirements: *id015
262
245
  - !ruby/object:Gem::Dependency
263
- prerelease: false
264
- requirement: &id016 !ruby/object:Gem::Requirement
246
+ requirement: &id015 !ruby/object:Gem::Requirement
265
247
  none: false
266
248
  requirements:
267
249
  - - ~>
@@ -272,12 +254,12 @@ dependencies:
272
254
  - 10
273
255
  - 5
274
256
  version: 0.10.5
275
- type: :runtime
257
+ version_requirements: *id015
276
258
  name: padrino-core
277
- version_requirements: *id016
278
- - !ruby/object:Gem::Dependency
279
259
  prerelease: false
280
- requirement: &id017 !ruby/object:Gem::Requirement
260
+ type: :runtime
261
+ - !ruby/object:Gem::Dependency
262
+ requirement: &id016 !ruby/object:Gem::Requirement
281
263
  none: false
282
264
  requirements:
283
265
  - - ~>
@@ -288,12 +270,12 @@ dependencies:
288
270
  - 10
289
271
  - 5
290
272
  version: 0.10.5
291
- type: :runtime
273
+ version_requirements: *id016
292
274
  name: padrino-helpers
293
- version_requirements: *id017
294
- - !ruby/object:Gem::Dependency
295
275
  prerelease: false
296
- requirement: &id018 !ruby/object:Gem::Requirement
276
+ type: :runtime
277
+ - !ruby/object:Gem::Dependency
278
+ requirement: &id017 !ruby/object:Gem::Requirement
297
279
  none: false
298
280
  requirements:
299
281
  - - "="
@@ -306,12 +288,12 @@ dependencies:
306
288
  - beta
307
289
  - 3
308
290
  version: 1.0.0.beta.3
309
- type: :runtime
291
+ version_requirements: *id017
310
292
  name: eventmachine
311
- version_requirements: *id018
312
- - !ruby/object:Gem::Dependency
313
293
  prerelease: false
314
- requirement: &id019 !ruby/object:Gem::Requirement
294
+ type: :runtime
295
+ - !ruby/object:Gem::Dependency
296
+ requirement: &id018 !ruby/object:Gem::Requirement
315
297
  none: false
316
298
  requirements:
317
299
  - - ~>
@@ -322,12 +304,12 @@ dependencies:
322
304
  - 6
323
305
  - 5
324
306
  version: 0.6.5
325
- type: :runtime
307
+ version_requirements: *id018
326
308
  name: win32-process
327
- version_requirements: *id019
328
- - !ruby/object:Gem::Dependency
329
309
  prerelease: false
330
- requirement: &id020 !ruby/object:Gem::Requirement
310
+ type: :runtime
311
+ - !ruby/object:Gem::Dependency
312
+ requirement: &id019 !ruby/object:Gem::Requirement
331
313
  none: false
332
314
  requirements:
333
315
  - - ">="
@@ -336,12 +318,12 @@ dependencies:
336
318
  segments:
337
319
  - 0
338
320
  version: "0"
339
- type: :runtime
321
+ version_requirements: *id019
340
322
  name: rb-fchange
341
- version_requirements: *id020
342
- - !ruby/object:Gem::Dependency
343
323
  prerelease: false
344
- requirement: &id021 !ruby/object:Gem::Requirement
324
+ type: :runtime
325
+ - !ruby/object:Gem::Dependency
326
+ requirement: &id020 !ruby/object:Gem::Requirement
345
327
  none: false
346
328
  requirements:
347
329
  - - ~>
@@ -352,12 +334,12 @@ dependencies:
352
334
  - 6
353
335
  - 2
354
336
  version: 0.6.2
355
- type: :runtime
337
+ version_requirements: *id020
356
338
  name: guard
357
- version_requirements: *id021
358
- - !ruby/object:Gem::Dependency
359
339
  prerelease: false
360
- requirement: &id022 !ruby/object:Gem::Requirement
340
+ type: :runtime
341
+ - !ruby/object:Gem::Dependency
342
+ requirement: &id021 !ruby/object:Gem::Requirement
361
343
  none: false
362
344
  requirements:
363
345
  - - ~>
@@ -368,12 +350,12 @@ dependencies:
368
350
  - 2
369
351
  - 0
370
352
  version: 0.2.0
371
- type: :runtime
353
+ version_requirements: *id021
372
354
  name: middleman-livereload
373
- version_requirements: *id022
374
- - !ruby/object:Gem::Dependency
375
355
  prerelease: false
376
- requirement: &id023 !ruby/object:Gem::Requirement
356
+ type: :runtime
357
+ - !ruby/object:Gem::Dependency
358
+ requirement: &id022 !ruby/object:Gem::Requirement
377
359
  none: false
378
360
  requirements:
379
361
  - - ~>
@@ -384,12 +366,12 @@ dependencies:
384
366
  - 1
385
367
  - 1
386
368
  version: 0.1.1
387
- type: :development
369
+ version_requirements: *id022
388
370
  name: coffee-filter
389
- version_requirements: *id023
390
- - !ruby/object:Gem::Dependency
391
371
  prerelease: false
392
- requirement: &id024 !ruby/object:Gem::Requirement
372
+ type: :development
373
+ - !ruby/object:Gem::Dependency
374
+ requirement: &id023 !ruby/object:Gem::Requirement
393
375
  none: false
394
376
  requirements:
395
377
  - - ~>
@@ -400,12 +382,12 @@ dependencies:
400
382
  - 2
401
383
  - 0
402
384
  version: 2.2.0
403
- type: :development
385
+ version_requirements: *id023
404
386
  name: liquid
405
- version_requirements: *id024
406
- - !ruby/object:Gem::Dependency
407
387
  prerelease: false
408
- requirement: &id025 !ruby/object:Gem::Requirement
388
+ type: :development
389
+ - !ruby/object:Gem::Dependency
390
+ requirement: &id024 !ruby/object:Gem::Requirement
409
391
  none: false
410
392
  requirements:
411
393
  - - ~>
@@ -416,12 +398,12 @@ dependencies:
416
398
  - 0
417
399
  - 2
418
400
  version: 1.0.2
419
- type: :development
401
+ version_requirements: *id024
420
402
  name: cucumber
421
- version_requirements: *id025
422
- - !ruby/object:Gem::Dependency
423
403
  prerelease: false
424
- requirement: &id026 !ruby/object:Gem::Requirement
404
+ type: :development
405
+ - !ruby/object:Gem::Dependency
406
+ requirement: &id025 !ruby/object:Gem::Requirement
425
407
  none: false
426
408
  requirements:
427
409
  - - ~>
@@ -432,12 +414,12 @@ dependencies:
432
414
  - 9
433
415
  - 2
434
416
  version: 0.9.2
435
- type: :development
417
+ version_requirements: *id025
436
418
  name: rake
437
- version_requirements: *id026
438
- - !ruby/object:Gem::Dependency
439
419
  prerelease: false
440
- requirement: &id027 !ruby/object:Gem::Requirement
420
+ type: :development
421
+ - !ruby/object:Gem::Dependency
422
+ requirement: &id026 !ruby/object:Gem::Requirement
441
423
  none: false
442
424
  requirements:
443
425
  - - ~>
@@ -448,23 +430,10 @@ dependencies:
448
430
  - 6
449
431
  - 0
450
432
  version: 2.6.0
451
- type: :development
433
+ version_requirements: *id026
452
434
  name: rspec
453
- version_requirements: *id027
454
- - !ruby/object:Gem::Dependency
455
435
  prerelease: false
456
- requirement: &id028 !ruby/object:Gem::Requirement
457
- none: false
458
- requirements:
459
- - - ">="
460
- - !ruby/object:Gem::Version
461
- hash: 3
462
- segments:
463
- - 0
464
- version: "0"
465
436
  type: :development
466
- name: jquery-rails
467
- version_requirements: *id028
468
437
  description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
469
438
  email:
470
439
  - me@tdreyno.com
@@ -558,12 +527,9 @@ files:
558
527
  - fixtures/relative-app/source/images/blank.gif
559
528
  - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
560
529
  - fixtures/sprockets-app/config.rb
561
- - fixtures/sprockets-app/source/library/javascripts/jquery_include.js
530
+ - fixtures/sprockets-app/source/jquery_include.js
562
531
  - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
563
532
  - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
564
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
565
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
566
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
567
533
  - fixtures/test-app/config.rb
568
534
  - fixtures/test-app/data/test.yml
569
535
  - fixtures/test-app/data/test2.json
@@ -632,9 +598,6 @@ files:
632
598
  - fixtures/test-app/source/stylesheets/relative_assets.css.sass
633
599
  - fixtures/test-app/source/stylesheets/site.css.sass
634
600
  - fixtures/test-app/source/stylesheets/site_scss.css.scss
635
- - fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
636
- - fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
637
- - fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
638
601
  - fixtures/test-app/source/stylesheets/static.css
639
602
  - fixtures/test-app/source/sub1/page-classes.html.haml
640
603
  - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
@@ -813,14 +776,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
813
776
  required_rubygems_version: !ruby/object:Gem::Requirement
814
777
  none: false
815
778
  requirements:
816
- - - ">"
779
+ - - ">="
817
780
  - !ruby/object:Gem::Version
818
- hash: 25
781
+ hash: 3
819
782
  segments:
820
- - 1
821
- - 3
822
- - 1
823
- version: 1.3.1
783
+ - 0
784
+ version: "0"
824
785
  requirements: []
825
786
 
826
787
  rubyforge_project:
@@ -897,12 +858,9 @@ test_files:
897
858
  - fixtures/relative-app/source/images/blank.gif
898
859
  - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
899
860
  - fixtures/sprockets-app/config.rb
900
- - fixtures/sprockets-app/source/library/javascripts/jquery_include.js
861
+ - fixtures/sprockets-app/source/jquery_include.js
901
862
  - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
902
863
  - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
903
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
904
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
905
- - fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
906
864
  - fixtures/test-app/config.rb
907
865
  - fixtures/test-app/data/test.yml
908
866
  - fixtures/test-app/data/test2.json
@@ -971,9 +929,6 @@ test_files:
971
929
  - fixtures/test-app/source/stylesheets/relative_assets.css.sass
972
930
  - fixtures/test-app/source/stylesheets/site.css.sass
973
931
  - fixtures/test-app/source/stylesheets/site_scss.css.scss
974
- - fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
975
- - fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
976
- - fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
977
932
  - fixtures/test-app/source/stylesheets/static.css
978
933
  - fixtures/test-app/source/sub1/page-classes.html.haml
979
934
  - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
data/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss DELETED
@@ -1 +0,0 @@
1
- //= require "sprockets_sub"
data/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss DELETED
@@ -1 +0,0 @@
1
- @import "sprockets_sub";
data/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss DELETED
@@ -1 +0,0 @@
1
- hello { world: "hi"; }