twbs_sass_rails 2.0.2 → 3.0.0

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 (20) hide show
  1. checksums.yaml +4 -4
  2. data/Appraisals +11 -4
  3. data/CHANGELOG.md +5 -0
  4. data/gemfiles/rails_4.0.gemfile +2 -2
  5. data/gemfiles/rails_4.1.gemfile +2 -2
  6. data/gemfiles/rails_4.2.gemfile +10 -0
  7. data/lib/generators/twbs_sass_rails/install/install_generator.rb +2 -2
  8. data/lib/generators/twbs_sass_rails/install/templates/{twbs-variables.css.scss → twbs-variables.scss} +0 -0
  9. data/lib/generators/twbs_sass_rails/install/templates/{twbs.css.scss → twbs.scss} +0 -0
  10. data/lib/twbs_sass_rails/version.rb +1 -1
  11. data/test/dummy/app/assets/stylesheets/{default-twbs.css.scss → default-twbs.scss} +0 -0
  12. data/test/dummy/app/assets/stylesheets/subfolder/{subfolder.css.scss → subfolder.scss} +0 -0
  13. data/test/dummy/app/assets/stylesheets/{test.css.scss → test.scss} +0 -0
  14. data/test/dummy/app/assets/stylesheets/{twbs-variables.css.scss → twbs-variables.scss} +0 -0
  15. data/test/dummy/app/assets/stylesheets/{twbs.css.scss → twbs.scss} +0 -0
  16. data/test/dummy/config/environments/production.rb +5 -1
  17. data/test/dummy/config/environments/test.rb +8 -1
  18. data/test/generators/install_generator_test.rb +4 -4
  19. data/twbs_sass_rails.gemspec +3 -3
  20. metadata +30 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b25a24072af409fadf1745a5166a8d4f8390a16b
4
- data.tar.gz: 1c5cd00a2990fed263f3d6e20b92041a27296154
3
+ metadata.gz: fdcea46dbb9120b5ea5c59475e73da1514e1e797
4
+ data.tar.gz: fd3c7a598185d3413b4cd4f8ccf2424cab0f3c80
5
5
  SHA512:
6
- metadata.gz: 40ad06ee87ff3160df7c4d849033ba7ef786b2987a180e30ff8d5d8fb505b4cab807c80c6cc550519cd7ac8b791ff21f8827187c23e551a64f1dd25eaa5d0573
7
- data.tar.gz: e47d8dc544c844f5de73d3eef542f28a222c080e5d790226f034b820f3e9303982f574e3549f1d974b7e4d2e6c1a8136e5130a85173ef58833a9ccd09a95be13
6
+ metadata.gz: 97e7d80175c481cab1c6b43e092fe4490d8d96e978b9ed4ec944b364d4ff1e7c7bf58d7b4e9900973d71e780cc2f5c93b8769b007e4a8754f807c289fb42d36e
7
+ data.tar.gz: a7210015197dfe0c6beb9edcfde5c737211ca17a420f3e2e2bf45e5821f245e8fb72373cd5acdfa666a18a3da7b08e8ac62a66dfbdc92d024fb80267ebc19ceb
data/Appraisals CHANGED
@@ -1,13 +1,20 @@
1
1
  appraise 'rails-4.0' do
2
2
  gem 'rails', '4.0.12'
3
3
  gem 'uglifier'
4
- gem 'sass-rails', '~> 4.0.0'
5
- gem 'minitest', '~> 4'
4
+ gem 'sass-rails', '~> 4.0.2'
5
+ gem 'minitest', '~> 4.0'
6
6
  end
7
7
 
8
8
  appraise 'rails-4.1' do
9
9
  gem 'rails', '4.1.8'
10
10
  gem 'uglifier'
11
- gem 'sass-rails', '~> 4.0.0'
12
- gem 'minitest', '~> 5'
11
+ gem 'sass-rails', '~> 4.0.3'
12
+ gem 'minitest', '~> 5.0'
13
+ end
14
+
15
+ appraise 'rails-4.2' do
16
+ gem 'rails', '4.2.0'
17
+ gem 'uglifier'
18
+ gem 'sass-rails', '~> 5.0'
19
+ gem 'minitest', '~> 5.0'
13
20
  end
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ## 3.0.0
4
+
5
+ * Rails 4.2.0 compatibility
6
+ * Removed deprecated .css.scss extension (possible breaking change)
7
+
3
8
  ## 2.0.2
4
9
 
5
10
  * Relaxed some dependencies, we will count on SemVer
data/gemfiles/rails_4.0.gemfile CHANGED
@@ -4,7 +4,7 @@ source "https://rubygems.org"
4
4
 
5
5
  gem "rails", "4.0.12"
6
6
  gem "uglifier"
7
- gem "sass-rails", "~> 4.0.0"
8
- gem "minitest", "~> 4"
7
+ gem "sass-rails", "~> 4.0.2"
8
+ gem "minitest", "~> 4.0"
9
9
 
10
10
  gemspec :path => "../"
data/gemfiles/rails_4.1.gemfile CHANGED
@@ -4,7 +4,7 @@ source "https://rubygems.org"
4
4
 
5
5
  gem "rails", "4.1.8"
6
6
  gem "uglifier"
7
- gem "sass-rails", "~> 4.0.0"
8
- gem "minitest", "~> 5"
7
+ gem "sass-rails", "~> 4.0.3"
8
+ gem "minitest", "~> 5.0"
9
9
 
10
10
  gemspec :path => "../"
data/gemfiles/rails_4.2.gemfile ADDED
@@ -0,0 +1,10 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "rails", "4.2.0"
6
+ gem "uglifier"
7
+ gem "sass-rails", "~> 5.0"
8
+ gem "minitest", "~> 5.0"
9
+
10
+ gemspec :path => "../"
data/lib/generators/twbs_sass_rails/install/install_generator.rb CHANGED
@@ -23,8 +23,8 @@ module TwbsSassRails
23
23
 
24
24
  def copy_bootstrap
25
25
  copy_file 'twbs.js.coffee', 'app/assets/javascripts/twbs.js.coffee'
26
- copy_file 'twbs-variables.css.scss', 'app/assets/stylesheets/twbs-variables.css.scss'
27
- copy_file 'twbs.css.scss', 'app/assets/stylesheets/twbs.css.scss'
26
+ copy_file 'twbs-variables.scss', 'app/assets/stylesheets/twbs-variables.scss'
27
+ copy_file 'twbs.scss', 'app/assets/stylesheets/twbs.scss'
28
28
  end
29
29
  end
30
30
  end
data/lib/twbs_sass_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TwbsSassRails
2
- VERSION = "2.0.2"
2
+ VERSION = "3.0.0"
3
3
  end
data/test/dummy/config/environments/production.rb CHANGED
@@ -20,7 +20,11 @@ Dummy::Application.configure do
20
20
  # config.action_dispatch.rack_cache = true
21
21
 
22
22
  # Disable Rails's static asset server (Apache or nginx will already do this).
23
- config.serve_static_assets = false
23
+ if Rails.version.start_with? '4.2'
24
+ config.serve_static_files = false
25
+ else
26
+ config.serve_static_assets = false
27
+ end
24
28
 
25
29
  # Compress JavaScripts and CSS.
26
30
  config.assets.js_compressor = :uglifier
data/test/dummy/config/environments/test.rb CHANGED
@@ -17,7 +17,11 @@ Dummy::Application.configure do
17
17
  config.static_cache_control = "public, max-age=3600"
18
18
 
19
19
  # Show full error reports and disable caching.
20
- config.consider_all_requests_local = true
20
+ if Rails.version.start_with? '4.2'
21
+ config.serve_static_files = true
22
+ else
23
+ config.serve_static_assets = true
24
+ end
21
25
  config.action_controller.perform_caching = false
22
26
 
23
27
  # Raise exceptions instead of rendering exception templates.
@@ -31,6 +35,9 @@ Dummy::Application.configure do
31
35
  # ActionMailer::Base.deliveries array.
32
36
  config.action_mailer.delivery_method = :test
33
37
 
38
+ # Randomize the order test cases are executed
39
+ config.active_support.test_order = :random
40
+
34
41
  # Print deprecation notices to the stderr.
35
42
  config.active_support.deprecation = :stderr
36
43
  end
data/test/generators/install_generator_test.rb CHANGED
@@ -9,12 +9,12 @@ class InstallGeneratorTest < ::Rails::Generators::TestCase
9
9
  test "Assert all files are properly created" do
10
10
  run_generator
11
11
  assert_file 'app/assets/stylesheets/application.css'
12
- assert_file 'app/assets/stylesheets/twbs-variables.css.scss' do |file_content|
13
- template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss', File.dirname(__FILE__))
12
+ assert_file 'app/assets/stylesheets/twbs-variables.scss' do |file_content|
13
+ template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.scss', File.dirname(__FILE__))
14
14
  assert_match file_content, File.read(template_file)
15
15
  end
16
- assert_file 'app/assets/stylesheets/twbs.css.scss' do |file_content|
17
- template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.css.scss', File.dirname(__FILE__))
16
+ assert_file 'app/assets/stylesheets/twbs.scss' do |file_content|
17
+ template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.scss', File.dirname(__FILE__))
18
18
  assert_match file_content, File.read(template_file)
19
19
  end
20
20
  assert_file 'app/assets/javascripts/application.js'
data/twbs_sass_rails.gemspec CHANGED
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
19
19
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
20
  s.require_paths = ['lib']
21
21
 
22
- s.add_runtime_dependency 'rails', '>= 4.0.0', '< 5.0.0'
23
- s.add_runtime_dependency 'sass-rails', '~> 4.0'
22
+ s.add_runtime_dependency 'rails', '>= 4.0.12', '< 5.0.0'
23
+ s.add_runtime_dependency 'sass-rails', '>= 4.0.2', '< 6.0.0'
24
24
 
25
25
  s.add_development_dependency 'appraisal', '~> 1.0'
26
26
  s.add_development_dependency 'capybara', '~> 2.4'
27
27
  s.add_development_dependency 'coveralls', '~> 0.7.1'
28
- s.add_development_dependency 'minitest', '>= 4.7.5', '< 5.5.0'
28
+ s.add_development_dependency 'minitest', '>= 4.7.5', '< 6.0.0'
29
29
  s.add_development_dependency 'rake', '~> 10.4'
30
30
  s.add_development_dependency 'simplecov', '~> 0.9.1'
31
31
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twbs_sass_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - diowa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-26 00:00:00.000000000 Z
11
+ date: 2014-12-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.0
19
+ version: 4.0.12
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: 5.0.0
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 4.0.0
29
+ version: 4.0.12
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: 5.0.0
@@ -34,16 +34,22 @@ dependencies:
34
34
  name: sass-rails
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: 4.0.2
40
+ - - "<"
38
41
  - !ruby/object:Gem::Version
39
- version: '4.0'
42
+ version: 6.0.0
40
43
  type: :runtime
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
43
46
  requirements:
44
- - - "~>"
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: 4.0.2
50
+ - - "<"
45
51
  - !ruby/object:Gem::Version
46
- version: '4.0'
52
+ version: 6.0.0
47
53
  - !ruby/object:Gem::Dependency
48
54
  name: appraisal
49
55
  requirement: !ruby/object:Gem::Requirement
@@ -95,7 +101,7 @@ dependencies:
95
101
  version: 4.7.5
96
102
  - - "<"
97
103
  - !ruby/object:Gem::Version
98
- version: 5.5.0
104
+ version: 6.0.0
99
105
  type: :development
100
106
  prerelease: false
101
107
  version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ dependencies:
105
111
  version: 4.7.5
106
112
  - - "<"
107
113
  - !ruby/object:Gem::Version
108
- version: 5.5.0
114
+ version: 6.0.0
109
115
  - !ruby/object:Gem::Dependency
110
116
  name: rake
111
117
  requirement: !ruby/object:Gem::Requirement
@@ -158,12 +164,13 @@ files:
158
164
  - app/assets/fonts/glyphicons-halflings-regular.woff
159
165
  - gemfiles/rails_4.0.gemfile
160
166
  - gemfiles/rails_4.1.gemfile
167
+ - gemfiles/rails_4.2.gemfile
161
168
  - lib/generators/twbs_sass_rails/install/install_generator.rb
162
169
  - lib/generators/twbs_sass_rails/install/templates/application.css
163
170
  - lib/generators/twbs_sass_rails/install/templates/application.js
164
- - lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss
165
- - lib/generators/twbs_sass_rails/install/templates/twbs.css.scss
171
+ - lib/generators/twbs_sass_rails/install/templates/twbs-variables.scss
166
172
  - lib/generators/twbs_sass_rails/install/templates/twbs.js.coffee
173
+ - lib/generators/twbs_sass_rails/install/templates/twbs.scss
167
174
  - lib/tasks/twbs_sass_rails_tasks.rake
168
175
  - lib/twbs_sass_rails.rb
169
176
  - lib/twbs_sass_rails/engine.rb
@@ -173,11 +180,11 @@ files:
173
180
  - test/dummy/app/assets/images/.keep
174
181
  - test/dummy/app/assets/javascripts/application.js
175
182
  - test/dummy/app/assets/stylesheets/application.css
176
- - test/dummy/app/assets/stylesheets/default-twbs.css.scss
177
- - test/dummy/app/assets/stylesheets/subfolder/subfolder.css.scss
178
- - test/dummy/app/assets/stylesheets/test.css.scss
179
- - test/dummy/app/assets/stylesheets/twbs-variables.css.scss
180
- - test/dummy/app/assets/stylesheets/twbs.css.scss
183
+ - test/dummy/app/assets/stylesheets/default-twbs.scss
184
+ - test/dummy/app/assets/stylesheets/subfolder/subfolder.scss
185
+ - test/dummy/app/assets/stylesheets/test.scss
186
+ - test/dummy/app/assets/stylesheets/twbs-variables.scss
187
+ - test/dummy/app/assets/stylesheets/twbs.scss
181
188
  - test/dummy/app/controllers/application_controller.rb
182
189
  - test/dummy/app/controllers/concerns/.keep
183
190
  - test/dummy/app/helpers/application_helper.rb
@@ -335,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
335
342
  version: '0'
336
343
  requirements: []
337
344
  rubyforge_project:
338
- rubygems_version: 2.4.2
345
+ rubygems_version: 2.4.3
339
346
  signing_key:
340
347
  specification_version: 4
341
348
  summary: Bootstrap and FontAwesome assets in Rails applications
@@ -345,11 +352,11 @@ test_files:
345
352
  - test/dummy/app/assets/images/.keep
346
353
  - test/dummy/app/assets/javascripts/application.js
347
354
  - test/dummy/app/assets/stylesheets/application.css
348
- - test/dummy/app/assets/stylesheets/default-twbs.css.scss
349
- - test/dummy/app/assets/stylesheets/subfolder/subfolder.css.scss
350
- - test/dummy/app/assets/stylesheets/test.css.scss
351
- - test/dummy/app/assets/stylesheets/twbs-variables.css.scss
352
- - test/dummy/app/assets/stylesheets/twbs.css.scss
355
+ - test/dummy/app/assets/stylesheets/default-twbs.scss
356
+ - test/dummy/app/assets/stylesheets/subfolder/subfolder.scss
357
+ - test/dummy/app/assets/stylesheets/test.scss
358
+ - test/dummy/app/assets/stylesheets/twbs-variables.scss
359
+ - test/dummy/app/assets/stylesheets/twbs.scss
353
360
  - test/dummy/app/controllers/application_controller.rb
354
361
  - test/dummy/app/controllers/concerns/.keep
355
362
  - test/dummy/app/helpers/application_helper.rb