sass-rails 3.2.1 → 3.2.2

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -3,8 +3,8 @@ source "http://rubygems.org"
3
3
  # Specify your gem's dependencies in sass-rails.gemspec
4
4
  gemspec
5
5
 
6
- # Meanwhile we are depending on a non released rails version
7
- gem "rails", :git => 'git://github.com/rails/rails.git'
6
+ # Depend on the latest Rails 3.2
7
+ gem "rails", :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable'
8
8
 
9
9
  gem "sqlite3"
10
10
 
@@ -30,11 +30,11 @@ module Sass::Rails
30
30
  # to the rails generate command
31
31
  config.app_generators.stylesheet_engine config.sass.preferred_syntax
32
32
 
33
- config.before_initialize do
33
+ config.before_initialize do |app|
34
34
  require 'sass'
35
35
 
36
- # Assume dependency on sprockets, not on app.config.assets enabled.
37
- if defined?(Sprockets::Engines)
36
+ if app.config.assets.enabled
37
+ require 'sprockets'
38
38
  Sprockets::Engines #force autoloading
39
39
  Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
40
40
  Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
@@ -1,5 +1,5 @@
1
1
  module Sass
2
2
  module Rails
3
- VERSION = "3.2.1"
3
+ VERSION = "3.2.2"
4
4
  end
5
5
  end
@@ -1,7 +1,5 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- gem 'rails', "~> 3.1.0"
4
- gem 'sqlite3'
3
+ gemspec
5
4
 
6
- # Asset template engines
7
- gem 'sass-rails'
5
+ gem 'sass-rails', :path => File.expand_path('../../../..', __FILE__)
@@ -24,7 +24,7 @@ APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
24
24
  load 'rails/tasks/engine.rake'
25
25
 
26
26
 
27
- Bundler::GemHelper.install_tasks
27
+ Bundler::GemHelper.install_tasks :name => 'engine_project'
28
28
 
29
29
  require 'rake/testtask'
30
30
 
@@ -0,0 +1,7 @@
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)
@@ -0,0 +1,8 @@
1
+ Gem::Specification.new do |s|
2
+ s.name = 'engine_project'
3
+ s.version = '0.0.0'
4
+
5
+ s.add_dependency "rails", "~> 3.2.0.rc1"
6
+ s.add_dependency "sqlite3"
7
+ s.add_dependency "sass-rails", "~> 3.2.0"
8
+ end
@@ -0,0 +1,7 @@
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 +1,7 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- gem 'rails', "~> 3.1.0"
3
+ gem 'rails', "~> 3.2.0.rc1"
4
4
  gem 'sqlite3'
5
5
 
6
6
  # Asset template engines
7
- gem 'sass-rails'
7
+ gem 'sass-rails', :path => File.expand_path('../../../..', __FILE__)
@@ -1,7 +1,7 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- gem 'rails', "~> 3.1.0"
3
+ gem 'rails', "~> 3.2.0.rc1"
4
4
  gem 'sqlite3'
5
5
 
6
6
  # Asset template engines
7
- gem 'sass-rails'
7
+ gem 'sass-rails', :path => File.expand_path('../../../..', __FILE__)
@@ -8,7 +8,7 @@ class SassRailsTest < Sass::Rails::TestCase
8
8
  end
9
9
  test "scss files are generated during scaffold generation of scss projects" do
10
10
  within_rails_app "scss_project" do
11
- runcmd "rails generate scaffold foo"
11
+ generate_scaffold
12
12
  assert_file_exists "app/assets/stylesheets/foos.css.scss"
13
13
  assert_file_exists "app/assets/stylesheets/scaffolds.css.scss"
14
14
  assert_not_output(/conflict/)
@@ -16,7 +16,7 @@ class SassRailsTest < Sass::Rails::TestCase
16
16
  end
17
17
  test "sass files are generated during scaffold generation of sass projects" do
18
18
  within_rails_app "sass_project" do
19
- runcmd "rails generate scaffold foo"
19
+ generate_scaffold
20
20
  assert_file_exists "app/assets/stylesheets/foos.css.sass"
21
21
  assert_file_exists "app/assets/stylesheets/scaffolds.css.sass"
22
22
  assert_not_output(/conflict/)
@@ -24,7 +24,7 @@ class SassRailsTest < Sass::Rails::TestCase
24
24
  end
25
25
  test "scss files are generated during scaffold generation of a engine project" do
26
26
  within_rails_app "engine_project" do
27
- runcmd "rails generate scaffold foo"
27
+ generate_scaffold
28
28
  assert_file_exists "app/assets/stylesheets/engine_project/foos.css.scss"
29
29
  assert_file_exists "app/assets/stylesheets/scaffolds.css.scss"
30
30
  assert_not_output(/conflict/)
@@ -32,7 +32,7 @@ class SassRailsTest < Sass::Rails::TestCase
32
32
  end
33
33
  test "sass files are generated during scaffold generation of a engine project, if is called with --stylesheet-engine=sass" do
34
34
  within_rails_app "engine_project" do
35
- runcmd "rails generate scaffold foo --stylesheet-engine=sass"
35
+ generate_scaffold "--stylesheet-engine=sass"
36
36
  assert_file_exists "app/assets/stylesheets/engine_project/foos.css.sass"
37
37
  assert_file_exists "app/assets/stylesheets/scaffolds.css.sass"
38
38
  assert_not_output(/conflict/)
@@ -103,4 +103,8 @@ div {
103
103
  }
104
104
  CSS
105
105
  end
106
+
107
+ def generate_scaffold(args = nil)
108
+ runcmd "bundle exec rails generate scaffold foo #{args}"
109
+ end
106
110
  end
@@ -68,6 +68,7 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
68
68
  without_gems.each {|name| remove_gem name}
69
69
  FileUtils.rm("Gemfile.lock") if File.exist?("Gemfile.lock")
70
70
  runcmd "bundle install --verbose"
71
+ runcmd "bundle exec rake db:create --trace"
71
72
  yield tmpdir
72
73
  end
73
74
  end
@@ -1,6 +1,9 @@
1
1
  # Configure Rails Envinronment
2
2
  ENV["RAILS_ENV"] = "test"
3
3
 
4
+ require 'rubygems'
5
+ require 'bundler/setup'
6
+
4
7
  require 'rails'
5
8
  require "rails/test_help"
6
9
  require 'sass/rails'
metadata CHANGED
@@ -1,58 +1,83 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: sass-rails
3
- version: !ruby/object:Gem::Version
4
- version: 3.2.1
5
- prerelease:
3
+ version: !ruby/object:Gem::Version
4
+ hash: 11
5
+ prerelease: false
6
+ segments:
7
+ - 3
8
+ - 2
9
+ - 2
10
+ version: 3.2.2
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - wycats
9
14
  - chriseppstein
10
15
  autorequire:
11
16
  bindir: bin
12
17
  cert_chain: []
13
- date: 2011-12-20 00:00:00.000000000 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
18
+
19
+ date: 2011-12-22 00:00:00 -02:00
20
+ default_executable:
21
+ dependencies:
22
+ - !ruby/object:Gem::Dependency
16
23
  name: sass
17
- requirement: &2168607320 !ruby/object:Gem::Requirement
24
+ prerelease: false
25
+ requirement: &id001 !ruby/object:Gem::Requirement
18
26
  none: false
19
- requirements:
20
- - - ! '>='
21
- - !ruby/object:Gem::Version
27
+ requirements:
28
+ - - ">="
29
+ - !ruby/object:Gem::Version
30
+ hash: 23
31
+ segments:
32
+ - 3
33
+ - 1
34
+ - 10
22
35
  version: 3.1.10
23
36
  type: :runtime
24
- prerelease: false
25
- version_requirements: *2168607320
26
- - !ruby/object:Gem::Dependency
37
+ version_requirements: *id001
38
+ - !ruby/object:Gem::Dependency
27
39
  name: railties
28
- requirement: &2168606380 !ruby/object:Gem::Requirement
40
+ prerelease: false
41
+ requirement: &id002 !ruby/object:Gem::Requirement
29
42
  none: false
30
- requirements:
43
+ requirements:
31
44
  - - ~>
32
- - !ruby/object:Gem::Version
45
+ - !ruby/object:Gem::Version
46
+ hash: 31098209
47
+ segments:
48
+ - 3
49
+ - 2
50
+ - 0
51
+ - beta
33
52
  version: 3.2.0.beta
34
53
  type: :runtime
35
- prerelease: false
36
- version_requirements: *2168606380
37
- - !ruby/object:Gem::Dependency
54
+ version_requirements: *id002
55
+ - !ruby/object:Gem::Dependency
38
56
  name: tilt
39
- requirement: &2168605260 !ruby/object:Gem::Requirement
57
+ prerelease: false
58
+ requirement: &id003 !ruby/object:Gem::Requirement
40
59
  none: false
41
- requirements:
60
+ requirements:
42
61
  - - ~>
43
- - !ruby/object:Gem::Version
44
- version: '1.3'
62
+ - !ruby/object:Gem::Version
63
+ hash: 9
64
+ segments:
65
+ - 1
66
+ - 3
67
+ version: "1.3"
45
68
  type: :runtime
46
- prerelease: false
47
- version_requirements: *2168605260
69
+ version_requirements: *id003
48
70
  description: Sass adapter for the Rails asset pipeline.
49
- email:
71
+ email:
50
72
  - wycats@gmail.com
51
73
  - chris@eppsteins.net
52
74
  executables: []
75
+
53
76
  extensions: []
77
+
54
78
  extra_rdoc_files: []
55
- files:
79
+
80
+ files:
56
81
  - .gitignore
57
82
  - .travis.yml
58
83
  - CHANGELOG.md
@@ -88,6 +113,8 @@ files:
88
113
  - test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
89
114
  - test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
90
115
  - test/fixtures/engine_project/config/routes.rb
116
+ - test/fixtures/engine_project/db/seeds.rb
117
+ - test/fixtures/engine_project/engine_project.gemspec
91
118
  - test/fixtures/engine_project/lib/engine_project.rb
92
119
  - test/fixtures/engine_project/lib/engine_project/engine.rb
93
120
  - test/fixtures/engine_project/lib/engine_project/version.rb
@@ -117,6 +144,7 @@ files:
117
144
  - test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
118
145
  - test/fixtures/engine_project/test/dummy/config/locales/en.yml
119
146
  - test/fixtures/engine_project/test/dummy/config/routes.rb
147
+ - test/fixtures/engine_project/test/dummy/db/seeds.rb
120
148
  - test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
121
149
  - test/fixtures/engine_project/test/dummy/log/.gitkeep
122
150
  - test/fixtures/engine_project/test/dummy/public/404.html
@@ -224,31 +252,41 @@ files:
224
252
  - test/sass_rails_test.rb
225
253
  - test/support/sass_rails_test_case.rb
226
254
  - test/test_helper.rb
227
- homepage: ''
255
+ has_rdoc: true
256
+ homepage: ""
228
257
  licenses: []
258
+
229
259
  post_install_message:
230
260
  rdoc_options: []
231
- require_paths:
261
+
262
+ require_paths:
232
263
  - lib
233
- required_ruby_version: !ruby/object:Gem::Requirement
264
+ required_ruby_version: !ruby/object:Gem::Requirement
234
265
  none: false
235
- requirements:
236
- - - ! '>='
237
- - !ruby/object:Gem::Version
238
- version: '0'
239
- required_rubygems_version: !ruby/object:Gem::Requirement
266
+ requirements:
267
+ - - ">="
268
+ - !ruby/object:Gem::Version
269
+ hash: 3
270
+ segments:
271
+ - 0
272
+ version: "0"
273
+ required_rubygems_version: !ruby/object:Gem::Requirement
240
274
  none: false
241
- requirements:
242
- - - ! '>='
243
- - !ruby/object:Gem::Version
244
- version: '0'
275
+ requirements:
276
+ - - ">="
277
+ - !ruby/object:Gem::Version
278
+ hash: 3
279
+ segments:
280
+ - 0
281
+ version: "0"
245
282
  requirements: []
283
+
246
284
  rubyforge_project: sass-rails
247
- rubygems_version: 1.8.10
285
+ rubygems_version: 1.3.7
248
286
  signing_key:
249
287
  specification_version: 3
250
288
  summary: Sass adapter for the Rails asset pipeline.
251
- test_files:
289
+ test_files:
252
290
  - test/fixtures/engine_project/.gitignore
253
291
  - test/fixtures/engine_project/Gemfile
254
292
  - test/fixtures/engine_project/README.rdoc
@@ -260,6 +298,8 @@ test_files:
260
298
  - test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
261
299
  - test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
262
300
  - test/fixtures/engine_project/config/routes.rb
301
+ - test/fixtures/engine_project/db/seeds.rb
302
+ - test/fixtures/engine_project/engine_project.gemspec
263
303
  - test/fixtures/engine_project/lib/engine_project.rb
264
304
  - test/fixtures/engine_project/lib/engine_project/engine.rb
265
305
  - test/fixtures/engine_project/lib/engine_project/version.rb
@@ -289,6 +329,7 @@ test_files:
289
329
  - test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
290
330
  - test/fixtures/engine_project/test/dummy/config/locales/en.yml
291
331
  - test/fixtures/engine_project/test/dummy/config/routes.rb
332
+ - test/fixtures/engine_project/test/dummy/db/seeds.rb
292
333
  - test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
293
334
  - test/fixtures/engine_project/test/dummy/log/.gitkeep
294
335
  - test/fixtures/engine_project/test/dummy/public/404.html