sass-rails 4.0.0.rc1 → 4.0.0.rc2

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.
Files changed (81) hide show
  1. checksums.yaml +7 -0
  2. data/.travis.yml +1 -0
  3. data/CHANGELOG.md +25 -15
  4. data/Gemfile +0 -2
  5. data/{README.markdown → README.md} +26 -19
  6. data/Rakefile +1 -1
  7. data/lib/sass/rails.rb +1 -2
  8. data/lib/sass/rails/importer.rb +45 -15
  9. data/lib/sass/rails/railtie.rb +3 -9
  10. data/lib/sass/rails/version.rb +1 -1
  11. data/sass-rails.gemspec +5 -6
  12. data/sass-rails.gemspec.erb +3 -4
  13. data/test/fixtures/alternate_config_project/Gemfile +2 -2
  14. data/test/fixtures/alternate_config_project/config/environments/development.rb +0 -1
  15. data/test/fixtures/alternate_config_project/config/environments/production.rb +2 -1
  16. data/test/fixtures/alternate_config_project/config/environments/test.rb +0 -4
  17. data/test/fixtures/engine_project/.gitignore +3 -1
  18. data/test/fixtures/engine_project/Gemfile +11 -2
  19. data/test/fixtures/engine_project/MIT-LICENSE +20 -0
  20. data/test/fixtures/engine_project/Rakefile +5 -10
  21. data/test/fixtures/engine_project/app/assets/images/engine_project/{.gitkeep → .keep} +0 -0
  22. data/test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js +11 -4
  23. data/test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css +11 -5
  24. data/test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb +1 -1
  25. data/test/fixtures/engine_project/engine_project.gemspec +20 -5
  26. data/test/fixtures/engine_project/lib/engine_project/engine.rb +1 -1
  27. data/test/fixtures/engine_project/script/rails +5 -3
  28. data/test/fixtures/engine_project/test/dummy/README.rdoc +28 -0
  29. data/test/fixtures/engine_project/test/dummy/Rakefile +0 -1
  30. data/test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js +11 -4
  31. data/test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css +11 -5
  32. data/test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb +3 -1
  33. data/test/fixtures/engine_project/test/dummy/app/{mailers/.gitkeep → controllers/concerns/.keep} +0 -0
  34. data/test/fixtures/engine_project/test/dummy/app/{models/.gitkeep → mailers/.keep} +0 -0
  35. data/test/fixtures/engine_project/test/dummy/{lib/assets/.gitkeep → app/models/.keep} +0 -0
  36. data/test/fixtures/engine_project/test/dummy/{log/.gitkeep → app/models/concerns/.keep} +0 -0
  37. data/test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb +2 -2
  38. data/test/fixtures/engine_project/test/dummy/bin/bundle +3 -0
  39. data/test/fixtures/engine_project/test/dummy/bin/rails +4 -0
  40. data/test/fixtures/engine_project/test/dummy/bin/rake +4 -0
  41. data/test/fixtures/engine_project/test/dummy/config/application.rb +1 -20
  42. data/test/fixtures/engine_project/test/dummy/config/boot.rb +0 -1
  43. data/test/fixtures/engine_project/test/dummy/config/environment.rb +2 -2
  44. data/test/fixtures/engine_project/test/dummy/config/environments/development.rb +12 -9
  45. data/test/fixtures/engine_project/test/dummy/config/environments/production.rb +49 -20
  46. data/test/fixtures/engine_project/test/dummy/config/environments/test.rb +14 -14
  47. data/test/fixtures/engine_project/test/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  48. data/test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb +9 -3
  49. data/test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb +6 -1
  50. data/test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb +1 -6
  51. data/test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb +8 -6
  52. data/test/fixtures/engine_project/test/dummy/config/locales/en.yml +20 -2
  53. data/test/fixtures/engine_project/test/dummy/lib/assets/.keep +0 -0
  54. data/test/fixtures/engine_project/test/dummy/log/.keep +0 -0
  55. data/test/fixtures/engine_project/test/dummy/public/404.html +2 -1
  56. data/test/fixtures/engine_project/test/dummy/public/422.html +1 -1
  57. data/test/fixtures/engine_project/test/dummy/public/500.html +2 -2
  58. data/test/fixtures/sass_project/Gemfile +3 -3
  59. data/test/fixtures/sass_project/config/environments/development.rb +0 -3
  60. data/test/fixtures/sass_project/config/environments/production.rb +0 -3
  61. data/test/fixtures/scss_project/Gemfile +3 -3
  62. data/test/fixtures/scss_project/app/assets/stylesheets/application.css.scss +5 -0
  63. data/test/fixtures/scss_project/app/assets/stylesheets/css_erb_handler.css.erb +3 -0
  64. data/test/fixtures/scss_project/app/assets/stylesheets/css_sass_erb_handler.css.sass.erb +2 -0
  65. data/test/fixtures/scss_project/app/assets/stylesheets/css_scss_erb_handler.css.scss.erb +3 -0
  66. data/test/fixtures/scss_project/app/assets/stylesheets/sass_erb_handler.sass.erb +2 -0
  67. data/test/fixtures/scss_project/app/assets/stylesheets/scss_erb_handler.scss.erb +3 -0
  68. data/test/fixtures/scss_project/app/assets/stylesheets/subfolder/_defaults.css.scss +3 -0
  69. data/test/fixtures/scss_project/app/assets/stylesheets/subfolder/second_level.css.scss +2 -1
  70. data/test/fixtures/scss_project/config/environments/development.rb +0 -3
  71. data/test/fixtures/scss_project/config/environments/production.rb +2 -3
  72. data/test/fixtures/scss_project/config/environments/test.rb +2 -0
  73. data/test/sass_rails_generators_test.rb +62 -0
  74. data/test/sass_rails_logger_test.rb +1 -1
  75. data/test/sass_rails_test.rb +61 -121
  76. data/test/test_helper.rb +2 -5
  77. metadata +54 -58
  78. data/lib/sass/rails/compressor.rb +0 -23
  79. data/test/fixtures/engine_project/db/seeds.rb +0 -7
  80. data/test/fixtures/engine_project/test/dummy/db/seeds.rb +0 -7
  81. data/test/fixtures/engine_project/test/dummy/script/rails +0 -6
@@ -1,13 +1,10 @@
1
1
  # Configure Rails Envinronment
2
2
  ENV["RAILS_ENV"] = "test"
3
3
 
4
- require 'rubygems'
5
4
  require 'bundler/setup'
6
-
7
5
  require 'rails'
8
- require "rails/test_help"
6
+ require 'rails/test_help'
9
7
  require 'sass/rails'
10
- require 'sfl'
11
8
 
12
9
  Rails.backtrace_cleaner.remove_silencers!
13
10
 
@@ -18,7 +15,7 @@ possible_dev_dependencies = %w(sass-rails sass rails actionpack railties sprocke
18
15
  Bundler.load.specs.each do |s|
19
16
  if possible_dev_dependencies.include?(s.name)
20
17
  gem_path = s.full_gem_path
21
- gem_options = {:version => s.version}
18
+ gem_options = { version: s.version}
22
19
  gem_options[:path] = gem_path if File.exists?("#{gem_path}/#{s.name}.gemspec")
23
20
  $gem_options[s.name] = gem_options
24
21
  end
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.rc1
5
- prerelease: 6
4
+ version: 4.0.0.rc2
6
5
  platform: ruby
7
6
  authors:
8
7
  - wycats
@@ -10,30 +9,27 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2013-04-18 00:00:00.000000000 Z
12
+ date: 2013-06-11 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: sass
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
- - - ! '>='
18
+ - - '>='
21
19
  - !ruby/object:Gem::Version
22
20
  version: 3.1.10
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
- - - ! '>='
25
+ - - '>='
29
26
  - !ruby/object:Gem::Version
30
27
  version: 3.1.10
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: railties
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
- - - ! '>='
32
+ - - '>='
37
33
  - !ruby/object:Gem::Version
38
34
  version: 4.0.0.beta
39
35
  - - <
@@ -42,46 +38,27 @@ dependencies:
42
38
  type: :runtime
43
39
  prerelease: false
44
40
  version_requirements: !ruby/object:Gem::Requirement
45
- none: false
46
41
  requirements:
47
- - - ! '>='
42
+ - - '>='
48
43
  - !ruby/object:Gem::Version
49
44
  version: 4.0.0.beta
50
45
  - - <
51
46
  - !ruby/object:Gem::Version
52
47
  version: '5.0'
53
- - !ruby/object:Gem::Dependency
54
- name: tilt
55
- requirement: !ruby/object:Gem::Requirement
56
- none: false
57
- requirements:
58
- - - ~>
59
- - !ruby/object:Gem::Version
60
- version: '1.3'
61
- type: :runtime
62
- prerelease: false
63
- version_requirements: !ruby/object:Gem::Requirement
64
- none: false
65
- requirements:
66
- - - ~>
67
- - !ruby/object:Gem::Version
68
- version: '1.3'
69
48
  - !ruby/object:Gem::Dependency
70
49
  name: sprockets-rails
71
50
  requirement: !ruby/object:Gem::Requirement
72
- none: false
73
51
  requirements:
74
52
  - - ~>
75
53
  - !ruby/object:Gem::Version
76
- version: 2.0.0.rc0
54
+ version: 2.0.0
77
55
  type: :runtime
78
56
  prerelease: false
79
57
  version_requirements: !ruby/object:Gem::Requirement
80
- none: false
81
58
  requirements:
82
59
  - - ~>
83
60
  - !ruby/object:Gem::Version
84
- version: 2.0.0.rc0
61
+ version: 2.0.0
85
62
  description: Sass adapter for the Rails asset pipeline.
86
63
  email:
87
64
  - wycats@gmail.com
@@ -95,7 +72,7 @@ files:
95
72
  - CHANGELOG.md
96
73
  - Gemfile
97
74
  - MIT-LICENSE
98
- - README.markdown
75
+ - README.md
99
76
  - Rakefile
100
77
  - lib/rails/generators/sass/assets/assets_generator.rb
101
78
  - lib/rails/generators/sass/assets/templates/stylesheet.css.sass
@@ -106,7 +83,6 @@ files:
106
83
  - lib/rails/generators/scss/scaffold/scaffold_generator.rb
107
84
  - lib/sass-rails.rb
108
85
  - lib/sass/rails.rb
109
- - lib/sass/rails/compressor.rb
110
86
  - lib/sass/rails/helpers.rb
111
87
  - lib/sass/rails/importer.rb
112
88
  - lib/sass/rails/logger.rb
@@ -171,30 +147,36 @@ files:
171
147
  - test/fixtures/alternate_config_project/vendor/plugins/.gitkeep
172
148
  - test/fixtures/engine_project/.gitignore
173
149
  - test/fixtures/engine_project/Gemfile
150
+ - test/fixtures/engine_project/MIT-LICENSE
174
151
  - test/fixtures/engine_project/README.rdoc
175
152
  - test/fixtures/engine_project/Rakefile
176
- - test/fixtures/engine_project/app/assets/images/engine_project/.gitkeep
153
+ - test/fixtures/engine_project/app/assets/images/engine_project/.keep
177
154
  - test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js
178
155
  - test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css
179
156
  - test/fixtures/engine_project/app/controllers/engine_project/application_controller.rb
180
157
  - test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
181
158
  - test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
182
159
  - test/fixtures/engine_project/config/routes.rb
183
- - test/fixtures/engine_project/db/seeds.rb
184
160
  - test/fixtures/engine_project/engine_project.gemspec
185
161
  - test/fixtures/engine_project/lib/engine_project.rb
186
162
  - test/fixtures/engine_project/lib/engine_project/engine.rb
187
163
  - test/fixtures/engine_project/lib/engine_project/version.rb
188
164
  - test/fixtures/engine_project/lib/tasks/engine_project_tasks.rake
189
165
  - test/fixtures/engine_project/script/rails
166
+ - test/fixtures/engine_project/test/dummy/README.rdoc
190
167
  - test/fixtures/engine_project/test/dummy/Rakefile
191
168
  - test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js
192
169
  - test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css
193
170
  - test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb
171
+ - test/fixtures/engine_project/test/dummy/app/controllers/concerns/.keep
194
172
  - test/fixtures/engine_project/test/dummy/app/helpers/application_helper.rb
195
- - test/fixtures/engine_project/test/dummy/app/mailers/.gitkeep
196
- - test/fixtures/engine_project/test/dummy/app/models/.gitkeep
173
+ - test/fixtures/engine_project/test/dummy/app/mailers/.keep
174
+ - test/fixtures/engine_project/test/dummy/app/models/.keep
175
+ - test/fixtures/engine_project/test/dummy/app/models/concerns/.keep
197
176
  - test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb
177
+ - test/fixtures/engine_project/test/dummy/bin/bundle
178
+ - test/fixtures/engine_project/test/dummy/bin/rails
179
+ - test/fixtures/engine_project/test/dummy/bin/rake
198
180
  - test/fixtures/engine_project/test/dummy/config.ru
199
181
  - test/fixtures/engine_project/test/dummy/config/application.rb
200
182
  - test/fixtures/engine_project/test/dummy/config/boot.rb
@@ -204,6 +186,7 @@ files:
204
186
  - test/fixtures/engine_project/test/dummy/config/environments/production.rb
205
187
  - test/fixtures/engine_project/test/dummy/config/environments/test.rb
206
188
  - test/fixtures/engine_project/test/dummy/config/initializers/backtrace_silencers.rb
189
+ - test/fixtures/engine_project/test/dummy/config/initializers/filter_parameter_logging.rb
207
190
  - test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb
208
191
  - test/fixtures/engine_project/test/dummy/config/initializers/mime_types.rb
209
192
  - test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb
@@ -211,14 +194,12 @@ files:
211
194
  - test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
212
195
  - test/fixtures/engine_project/test/dummy/config/locales/en.yml
213
196
  - test/fixtures/engine_project/test/dummy/config/routes.rb
214
- - test/fixtures/engine_project/test/dummy/db/seeds.rb
215
- - test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
216
- - test/fixtures/engine_project/test/dummy/log/.gitkeep
197
+ - test/fixtures/engine_project/test/dummy/lib/assets/.keep
198
+ - test/fixtures/engine_project/test/dummy/log/.keep
217
199
  - test/fixtures/engine_project/test/dummy/public/404.html
218
200
  - test/fixtures/engine_project/test/dummy/public/422.html
219
201
  - test/fixtures/engine_project/test/dummy/public/500.html
220
202
  - test/fixtures/engine_project/test/dummy/public/favicon.ico
221
- - test/fixtures/engine_project/test/dummy/script/rails
222
203
  - test/fixtures/sass_project/.gitignore
223
204
  - test/fixtures/sass_project/Gemfile
224
205
  - test/fixtures/sass_project/README
@@ -270,6 +251,9 @@ files:
270
251
  - test/fixtures/scss_project/app/assets/stylesheets/_top_level_partial.css.scss
271
252
  - test/fixtures/scss_project/app/assets/stylesheets/application.css.scss
272
253
  - test/fixtures/scss_project/app/assets/stylesheets/css_application.css
254
+ - test/fixtures/scss_project/app/assets/stylesheets/css_erb_handler.css.erb
255
+ - test/fixtures/scss_project/app/assets/stylesheets/css_sass_erb_handler.css.sass.erb
256
+ - test/fixtures/scss_project/app/assets/stylesheets/css_scss_erb_handler.css.scss.erb
273
257
  - test/fixtures/scss_project/app/assets/stylesheets/globbed/globbed.css.scss
274
258
  - test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
275
259
  - test/fixtures/scss_project/app/assets/stylesheets/partials/_sass_import.css.sass
@@ -278,6 +262,9 @@ files:
278
262
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass
279
263
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss
280
264
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss
265
+ - test/fixtures/scss_project/app/assets/stylesheets/sass_erb_handler.sass.erb
266
+ - test/fixtures/scss_project/app/assets/stylesheets/scss_erb_handler.scss.erb
267
+ - test/fixtures/scss_project/app/assets/stylesheets/subfolder/_defaults.css.scss
281
268
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/another_plain.css
282
269
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/plain.css
283
270
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/second_level.css.scss
@@ -315,6 +302,7 @@ files:
315
302
  - test/fixtures/scss_project/script/rails
316
303
  - test/fixtures/scss_project/vendor/assets/stylesheets/.gitkeep
317
304
  - test/fixtures/scss_project/vendor/plugins/.gitkeep
305
+ - test/sass_rails_generators_test.rb
318
306
  - test/sass_rails_logger_test.rb
319
307
  - test/sass_rails_test.rb
320
308
  - test/support/sass_rails_test_case.rb
@@ -322,30 +310,26 @@ files:
322
310
  homepage: https://github.com/rails/sass-rails
323
311
  licenses:
324
312
  - MIT
313
+ metadata: {}
325
314
  post_install_message:
326
315
  rdoc_options: []
327
316
  require_paths:
328
317
  - lib
329
318
  required_ruby_version: !ruby/object:Gem::Requirement
330
- none: false
331
319
  requirements:
332
- - - ! '>='
320
+ - - '>='
333
321
  - !ruby/object:Gem::Version
334
322
  version: '0'
335
- segments:
336
- - 0
337
- hash: -2466256364887514452
338
323
  required_rubygems_version: !ruby/object:Gem::Requirement
339
- none: false
340
324
  requirements:
341
- - - ! '>'
325
+ - - '>'
342
326
  - !ruby/object:Gem::Version
343
327
  version: 1.3.1
344
328
  requirements: []
345
329
  rubyforge_project: sass-rails
346
- rubygems_version: 1.8.23
330
+ rubygems_version: 2.0.2
347
331
  signing_key:
348
- specification_version: 3
332
+ specification_version: 4
349
333
  summary: Sass adapter for the Rails asset pipeline.
350
334
  test_files:
351
335
  - test/fixtures/alternate_config_project/.gitignore
@@ -405,30 +389,36 @@ test_files:
405
389
  - test/fixtures/alternate_config_project/vendor/plugins/.gitkeep
406
390
  - test/fixtures/engine_project/.gitignore
407
391
  - test/fixtures/engine_project/Gemfile
392
+ - test/fixtures/engine_project/MIT-LICENSE
408
393
  - test/fixtures/engine_project/README.rdoc
409
394
  - test/fixtures/engine_project/Rakefile
410
- - test/fixtures/engine_project/app/assets/images/engine_project/.gitkeep
395
+ - test/fixtures/engine_project/app/assets/images/engine_project/.keep
411
396
  - test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js
412
397
  - test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css
413
398
  - test/fixtures/engine_project/app/controllers/engine_project/application_controller.rb
414
399
  - test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
415
400
  - test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
416
401
  - test/fixtures/engine_project/config/routes.rb
417
- - test/fixtures/engine_project/db/seeds.rb
418
402
  - test/fixtures/engine_project/engine_project.gemspec
419
403
  - test/fixtures/engine_project/lib/engine_project.rb
420
404
  - test/fixtures/engine_project/lib/engine_project/engine.rb
421
405
  - test/fixtures/engine_project/lib/engine_project/version.rb
422
406
  - test/fixtures/engine_project/lib/tasks/engine_project_tasks.rake
423
407
  - test/fixtures/engine_project/script/rails
408
+ - test/fixtures/engine_project/test/dummy/README.rdoc
424
409
  - test/fixtures/engine_project/test/dummy/Rakefile
425
410
  - test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js
426
411
  - test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css
427
412
  - test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb
413
+ - test/fixtures/engine_project/test/dummy/app/controllers/concerns/.keep
428
414
  - test/fixtures/engine_project/test/dummy/app/helpers/application_helper.rb
429
- - test/fixtures/engine_project/test/dummy/app/mailers/.gitkeep
430
- - test/fixtures/engine_project/test/dummy/app/models/.gitkeep
415
+ - test/fixtures/engine_project/test/dummy/app/mailers/.keep
416
+ - test/fixtures/engine_project/test/dummy/app/models/.keep
417
+ - test/fixtures/engine_project/test/dummy/app/models/concerns/.keep
431
418
  - test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb
419
+ - test/fixtures/engine_project/test/dummy/bin/bundle
420
+ - test/fixtures/engine_project/test/dummy/bin/rails
421
+ - test/fixtures/engine_project/test/dummy/bin/rake
432
422
  - test/fixtures/engine_project/test/dummy/config.ru
433
423
  - test/fixtures/engine_project/test/dummy/config/application.rb
434
424
  - test/fixtures/engine_project/test/dummy/config/boot.rb
@@ -438,6 +428,7 @@ test_files:
438
428
  - test/fixtures/engine_project/test/dummy/config/environments/production.rb
439
429
  - test/fixtures/engine_project/test/dummy/config/environments/test.rb
440
430
  - test/fixtures/engine_project/test/dummy/config/initializers/backtrace_silencers.rb
431
+ - test/fixtures/engine_project/test/dummy/config/initializers/filter_parameter_logging.rb
441
432
  - test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb
442
433
  - test/fixtures/engine_project/test/dummy/config/initializers/mime_types.rb
443
434
  - test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb
@@ -445,14 +436,12 @@ test_files:
445
436
  - test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
446
437
  - test/fixtures/engine_project/test/dummy/config/locales/en.yml
447
438
  - test/fixtures/engine_project/test/dummy/config/routes.rb
448
- - test/fixtures/engine_project/test/dummy/db/seeds.rb
449
- - test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
450
- - test/fixtures/engine_project/test/dummy/log/.gitkeep
439
+ - test/fixtures/engine_project/test/dummy/lib/assets/.keep
440
+ - test/fixtures/engine_project/test/dummy/log/.keep
451
441
  - test/fixtures/engine_project/test/dummy/public/404.html
452
442
  - test/fixtures/engine_project/test/dummy/public/422.html
453
443
  - test/fixtures/engine_project/test/dummy/public/500.html
454
444
  - test/fixtures/engine_project/test/dummy/public/favicon.ico
455
- - test/fixtures/engine_project/test/dummy/script/rails
456
445
  - test/fixtures/sass_project/.gitignore
457
446
  - test/fixtures/sass_project/Gemfile
458
447
  - test/fixtures/sass_project/README
@@ -504,6 +493,9 @@ test_files:
504
493
  - test/fixtures/scss_project/app/assets/stylesheets/_top_level_partial.css.scss
505
494
  - test/fixtures/scss_project/app/assets/stylesheets/application.css.scss
506
495
  - test/fixtures/scss_project/app/assets/stylesheets/css_application.css
496
+ - test/fixtures/scss_project/app/assets/stylesheets/css_erb_handler.css.erb
497
+ - test/fixtures/scss_project/app/assets/stylesheets/css_sass_erb_handler.css.sass.erb
498
+ - test/fixtures/scss_project/app/assets/stylesheets/css_scss_erb_handler.css.scss.erb
507
499
  - test/fixtures/scss_project/app/assets/stylesheets/globbed/globbed.css.scss
508
500
  - test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
509
501
  - test/fixtures/scss_project/app/assets/stylesheets/partials/_sass_import.css.sass
@@ -512,6 +504,9 @@ test_files:
512
504
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass
513
505
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss
514
506
  - test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss
507
+ - test/fixtures/scss_project/app/assets/stylesheets/sass_erb_handler.sass.erb
508
+ - test/fixtures/scss_project/app/assets/stylesheets/scss_erb_handler.scss.erb
509
+ - test/fixtures/scss_project/app/assets/stylesheets/subfolder/_defaults.css.scss
515
510
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/another_plain.css
516
511
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/plain.css
517
512
  - test/fixtures/scss_project/app/assets/stylesheets/subfolder/second_level.css.scss
@@ -549,6 +544,7 @@ test_files:
549
544
  - test/fixtures/scss_project/script/rails
550
545
  - test/fixtures/scss_project/vendor/assets/stylesheets/.gitkeep
551
546
  - test/fixtures/scss_project/vendor/plugins/.gitkeep
547
+ - test/sass_rails_generators_test.rb
552
548
  - test/sass_rails_logger_test.rb
553
549
  - test/sass_rails_test.rb
554
550
  - test/support/sass_rails_test_case.rb
@@ -1,23 +0,0 @@
1
- require 'sass'
2
-
3
- module Sass
4
- module Rails
5
- class CssCompressor
6
- def initialize(options={})
7
- @options = {:style => :compressed}.merge(options)
8
- end
9
-
10
- def compress(css)
11
- if css.count("\n") > 2
12
- Sass::Engine.new(css,
13
- :syntax => :scss,
14
- :cache => false,
15
- :read_cache => false,
16
- :style => @options[:style]).render # note: style is set by railtie or by config
17
- else
18
- css
19
- end
20
- end
21
- end
22
- end
23
- end
@@ -1,7 +0,0 @@
1
- # This file should contain all the record creation needed to seed the database with its default values.
2
- # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
3
- #
4
- # Examples:
5
- #
6
- # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
7
- # Mayor.create(name: 'Emanuel', city: cities.first)
@@ -1,7 +0,0 @@
1
- # This file should contain all the record creation needed to seed the database with its default values.
2
- # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
3
- #
4
- # Examples:
5
- #
6
- # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
7
- # Mayor.create(name: 'Emanuel', city: cities.first)
@@ -1,6 +0,0 @@
1
- #!/usr/bin/env ruby
2
- # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
3
-
4
- APP_PATH = File.expand_path('../../config/application', __FILE__)
5
- require File.expand_path('../../config/boot', __FILE__)
6
- require 'rails/commands'