twbs_sass_rails 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25a24072af409fadf1745a5166a8d4f8390a16b
-  data.tar.gz: 1c5cd00a2990fed263f3d6e20b92041a27296154
+  metadata.gz: fdcea46dbb9120b5ea5c59475e73da1514e1e797
+  data.tar.gz: fd3c7a598185d3413b4cd4f8ccf2424cab0f3c80
 SHA512:
-  metadata.gz: 40ad06ee87ff3160df7c4d849033ba7ef786b2987a180e30ff8d5d8fb505b4cab807c80c6cc550519cd7ac8b791ff21f8827187c23e551a64f1dd25eaa5d0573
-  data.tar.gz: e47d8dc544c844f5de73d3eef542f28a222c080e5d790226f034b820f3e9303982f574e3549f1d974b7e4d2e6c1a8136e5130a85173ef58833a9ccd09a95be13
+  metadata.gz: 97e7d80175c481cab1c6b43e092fe4490d8d96e978b9ed4ec944b364d4ff1e7c7bf58d7b4e9900973d71e780cc2f5c93b8769b007e4a8754f807c289fb42d36e
+  data.tar.gz: a7210015197dfe0c6beb9edcfde5c737211ca17a420f3e2e2bf45e5821f245e8fb72373cd5acdfa666a18a3da7b08e8ac62a66dfbdc92d024fb80267ebc19ceb

data/Appraisals

@@ -1,13 +1,20 @@
 appraise 'rails-4.0' do
   gem 'rails', '4.0.12'
   gem 'uglifier'
-  gem 'sass-rails', '~> 4.0.0'
-  gem 'minitest', '~> 4'
+  gem 'sass-rails', '~> 4.0.2'
+  gem 'minitest', '~> 4.0'
 end
 
 appraise 'rails-4.1' do
   gem 'rails', '4.1.8'
   gem 'uglifier'
-  gem 'sass-rails', '~> 4.0.0'
-  gem 'minitest', '~> 5'
+  gem 'sass-rails', '~> 4.0.3'
+  gem 'minitest', '~> 5.0'
+end
+
+appraise 'rails-4.2' do
+  gem 'rails', '4.2.0'
+  gem 'uglifier'
+  gem 'sass-rails', '~> 5.0'
+  gem 'minitest', '~> 5.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.0.0
+
+* Rails 4.2.0 compatibility
+* Removed deprecated .css.scss extension (possible breaking change)
+
 ## 2.0.2
 
 * Relaxed some dependencies, we will count on SemVer

data/gemfiles/rails_4.0.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "rails", "4.0.12"
 gem "uglifier"
-gem "sass-rails", "~> 4.0.0"
-gem "minitest", "~> 4"
+gem "sass-rails", "~> 4.0.2"
+gem "minitest", "~> 4.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "rails", "4.1.8"
 gem "uglifier"
-gem "sass-rails", "~> 4.0.0"
-gem "minitest", "~> 5"
+gem "sass-rails", "~> 4.0.3"
+gem "minitest", "~> 5.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.0"
+gem "uglifier"
+gem "sass-rails", "~> 5.0"
+gem "minitest", "~> 5.0"
+
+gemspec :path => "../"

data/lib/generators/twbs_sass_rails/install/install_generator.rb

@@ -23,8 +23,8 @@ module TwbsSassRails
 
       def copy_bootstrap
         copy_file 'twbs.js.coffee', 'app/assets/javascripts/twbs.js.coffee'
-        copy_file 'twbs-variables.css.scss', 'app/assets/stylesheets/twbs-variables.css.scss'
-        copy_file 'twbs.css.scss', 'app/assets/stylesheets/twbs.css.scss'
+        copy_file 'twbs-variables.scss', 'app/assets/stylesheets/twbs-variables.scss'
+        copy_file 'twbs.scss', 'app/assets/stylesheets/twbs.scss'
       end
     end
   end

data/lib/twbs_sass_rails/version.rb

@@ -1,3 +1,3 @@
 module TwbsSassRails
-  VERSION = "2.0.2"
+  VERSION = "3.0.0"
 end

data/test/dummy/config/environments/production.rb

@@ -20,7 +20,11 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  if Rails.version.start_with? '4.2'
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test/dummy/config/environments/test.rb

@@ -17,7 +17,11 @@ Dummy::Application.configure do
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  if Rails.version.start_with? '4.2'
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
@@ -31,6 +35,9 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/test/generators/install_generator_test.rb

@@ -9,12 +9,12 @@ class InstallGeneratorTest < ::Rails::Generators::TestCase
   test "Assert all files are properly created" do
     run_generator
     assert_file 'app/assets/stylesheets/application.css'
-    assert_file 'app/assets/stylesheets/twbs-variables.css.scss' do |file_content|
-      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss', File.dirname(__FILE__))
+    assert_file 'app/assets/stylesheets/twbs-variables.scss' do |file_content|
+      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.scss', File.dirname(__FILE__))
       assert_match file_content, File.read(template_file)
     end
-    assert_file 'app/assets/stylesheets/twbs.css.scss' do |file_content|
-      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.css.scss', File.dirname(__FILE__))
+    assert_file 'app/assets/stylesheets/twbs.scss' do |file_content|
+      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.scss', File.dirname(__FILE__))
       assert_match file_content, File.read(template_file)
     end
     assert_file 'app/assets/javascripts/application.js'

data/twbs_sass_rails.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'rails', '>= 4.0.0', '< 5.0.0'
-  s.add_runtime_dependency 'sass-rails', '~> 4.0'
+  s.add_runtime_dependency 'rails', '>= 4.0.12', '< 5.0.0'
+  s.add_runtime_dependency 'sass-rails', '>= 4.0.2', '< 6.0.0'
 
   s.add_development_dependency 'appraisal', '~> 1.0'
   s.add_development_dependency 'capybara', '~> 2.4'
   s.add_development_dependency 'coveralls', '~> 0.7.1'
-  s.add_development_dependency 'minitest', '>= 4.7.5', '< 5.5.0'
+  s.add_development_dependency 'minitest', '>= 4.7.5', '< 6.0.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'simplecov', '~> 0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twbs_sass_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - diowa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.12
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.12
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -34,16 +34,22 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +101,7 @@ dependencies:
         version: 4.7.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ dependencies:
         version: 4.7.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,12 +164,13 @@ files:
 - app/assets/fonts/glyphicons-halflings-regular.woff
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/generators/twbs_sass_rails/install/install_generator.rb
 - lib/generators/twbs_sass_rails/install/templates/application.css
 - lib/generators/twbs_sass_rails/install/templates/application.js
-- lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss
-- lib/generators/twbs_sass_rails/install/templates/twbs.css.scss
+- lib/generators/twbs_sass_rails/install/templates/twbs-variables.scss
 - lib/generators/twbs_sass_rails/install/templates/twbs.js.coffee
+- lib/generators/twbs_sass_rails/install/templates/twbs.scss
 - lib/tasks/twbs_sass_rails_tasks.rake
 - lib/twbs_sass_rails.rb
 - lib/twbs_sass_rails/engine.rb
@@ -173,11 +180,11 @@ files:
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/default-twbs.css.scss
-- test/dummy/app/assets/stylesheets/subfolder/subfolder.css.scss
-- test/dummy/app/assets/stylesheets/test.css.scss
-- test/dummy/app/assets/stylesheets/twbs-variables.css.scss
-- test/dummy/app/assets/stylesheets/twbs.css.scss
+- test/dummy/app/assets/stylesheets/default-twbs.scss
+- test/dummy/app/assets/stylesheets/subfolder/subfolder.scss
+- test/dummy/app/assets/stylesheets/test.scss
+- test/dummy/app/assets/stylesheets/twbs-variables.scss
+- test/dummy/app/assets/stylesheets/twbs.scss
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/concerns/.keep
 - test/dummy/app/helpers/application_helper.rb
@@ -335,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Bootstrap and FontAwesome assets in Rails applications
@@ -345,11 +352,11 @@ test_files:
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/default-twbs.css.scss
-- test/dummy/app/assets/stylesheets/subfolder/subfolder.css.scss
-- test/dummy/app/assets/stylesheets/test.css.scss
-- test/dummy/app/assets/stylesheets/twbs-variables.css.scss
-- test/dummy/app/assets/stylesheets/twbs.css.scss
+- test/dummy/app/assets/stylesheets/default-twbs.scss
+- test/dummy/app/assets/stylesheets/subfolder/subfolder.scss
+- test/dummy/app/assets/stylesheets/test.scss
+- test/dummy/app/assets/stylesheets/twbs-variables.scss
+- test/dummy/app/assets/stylesheets/twbs.scss
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/concerns/.keep
 - test/dummy/app/helpers/application_helper.rb