bootstrap-sass 3.3.0.1 → 3.4.1

data/test/dummy_rails/config/environments/development.rb

@@ -16,9 +16,6 @@ Dummy::Application.configure do
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
-
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.

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

@@ -20,7 +20,13 @@ 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 config.respond_to?(:serve_static_files)
+    # rails >= 4.2
+    config.serve_static_files = true
+  elsif config.respond_to?(:serve_static_assets)
+    # rails < 4.2
+    config.serve_static_assets = true
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test/dummy_rails/config/environments/test.rb

@@ -13,7 +13,13 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  if config.respond_to?(:serve_static_files)
+    # rails >= 4.2
+    config.serve_static_files = true
+  elsif config.respond_to?(:serve_static_assets)
+    # rails < 4.2
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.
@@ -26,5 +32,7 @@ Dummy::Application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  config.active_support.test_order = :random
+
   config.active_support.deprecation = :stderr
 end

data/test/dummy_sass_only/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'sass', '~> 3.2'
+gem 'sassc', '>= 2.0.0'
 gem 'bootstrap-sass', path: '../..'

data/test/dummy_sass_only/compile.rb

@@ -1,13 +1,20 @@
-require 'sass'
+# frozen_string_literal: true
+
+require 'sassc'
 require 'bootstrap-sass'
 require 'fileutils'
 
-scss_path = File.expand_path('./import_all.sass', File.dirname(__FILE__))
-css = Sass.compile File.read(scss_path), syntax: 'sass'
+load_path = ARGV[0]
+out_path = ARGV[1]
+
+output = SassC::Engine.new(
+  File.read(File.expand_path('./import_all.scss', __dir__)),
+  syntax: :scss, load_paths: ['.', load_path]
+).render
 
-if ARGV[0]
-  FileUtils.mkdir_p File.dirname(ARGV[0])
-  File.open(ARGV[0], 'w') { |f| f.write css }
+if out_path
+  FileUtils.mkdir_p(File.dirname(out_path))
+  File.write(out_path, output)
 else
-  puts css
+  puts output
 end

data/test/dummy_sass_only/import_all.scss

@@ -0,0 +1,2 @@
+@import 'bootstrap';
+@import 'bootstrap/theme';

data/test/gemfiles/default.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec path: '../../'

data/test/node_mincer_test.rb

@@ -22,15 +22,14 @@ class NodeMincerTest < Minitest::Test
 
   def setup
     tmp_dir = File.join GEM_PATH, 'tmp/node-mincer'
-    command = "node manifest.js #{tmp_dir}"
     success = Dir.chdir DUMMY_PATH do
       silence_stdout_if !ENV['VERBOSE'] do
-        system(command)
+        system 'node', 'manifest.js', tmp_dir
       end
     end
     assert success, 'Node.js Mincer compilation failed'
     manifest = JSON.parse(File.read("#{tmp_dir}/manifest.json"))
-    css_name = manifest["assets"]["application.css"]
+    css_name = manifest['assets']['application.css']
     @css = File.read("#{tmp_dir}/#{css_name}")
   end
 end

data/test/node_sass_compile_test.sh

@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Test compilation with node-sass binary
 
 mkdir -p tmp/node-sass
-node-sass assets/stylesheets/bootstrap -o tmp/node-sass/bootstrap.css && \
-node-sass assets/stylesheets/bootstrap/theme -o tmp/node-sass/bootstrap-theme.css || \
+node_modules/.bin/node-sass assets/stylesheets/_bootstrap.scss -o tmp/node-sass/bootstrap.css && \
+node_modules/.bin/node-sass --include-path=assets/stylesheets/ \
+  assets/stylesheets/bootstrap/_theme.scss -o tmp/node-sass/bootstrap-theme.css || \
 (echo "node-sass compilation failed" && exit 1)

data/test/sass_test.rb

@@ -1,23 +1,26 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'shellwords'
+require 'fileutils'
+require 'bootstrap-sass'
 
 class SassTest < Minitest::Test
   DUMMY_PATH = 'test/dummy_sass_only'
 
   def test_font_helper
-    assert_match %r(url\(['"]?.*eot['"]?\)), @css
+    assert_match %r{url\(['"]?.*eot['"]?\)}, @css
   end
 
   def setup
-    Dir.chdir DUMMY_PATH do
-      %x[rm -rf .sass-cache/]
-      %x[bundle]
-    end
+    FileUtils.rm_rf(File.join(DUMMY_PATH, '.sass-cache'), secure: true)
     css_path = File.join GEM_PATH, 'tmp/bootstrap-sass-only.css'
-    command  = "bundle exec ruby compile.rb #{Shellwords.escape css_path}"
     success  = Dir.chdir DUMMY_PATH do
       silence_stdout_if !ENV['VERBOSE'] do
-        system(command)
+        Bundler.with_original_env do
+          system('bundle') && system('bundle', 'exec', 'ruby', 'compile.rb',
+                                     Bootstrap.stylesheets_path, css_path)
+        end
       end
     end
     assert success, 'Sass-only compilation failed'

data/test/sprockets_rails_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'fileutils'
 require 'find'
@@ -6,22 +8,24 @@ require 'shellwords'
 class SprocketsRailsTest < Minitest::Test
 
   def test_sprockets_digest_asset_refs
-    root     = 'test/dummy_rails'
-    command  = "bundle exec rake assets:precompile GEMFILE=#{GEM_PATH}/Gemfile RAILS_ENV=production"
+    root = 'test/dummy_rails'
     compiled = Dir.chdir root do
       silence_stderr_if !ENV['VERBOSE'] do
-        system(command)
+        Bundler.with_original_env do
+          system({ 'BUNDLE_GEMFILE' => File.join(GEM_PATH, 'Gemfile'),
+                   'RAILS_ENV' => 'production' },
+                 'bundle && bundle exec rake assets:precompile')
+        end
       end
     end
     assert compiled, 'Could not precompile assets'
     Dir.glob(File.join(root, 'public', 'assets', 'app*.{css,js}')) do |path|
-      File.open(path, 'r') do |f|
-        f.read.scan /url\("?[^"]+\.(?:jpg|png|eot|woff|ttf|svg)[^"]*"?\)/ do |m|
-          assert_match /-[0-9a-f]{12,}\./, m
-        end
+      File.read(path)
+          .scan(/url\("?[^"]+\.(?:jpg|png|eot|woff2?|ttf|svg)[^"]*"?\)/) do |m|
+        assert_match(/-[0-9a-f]{12,}\./, m)
       end
     end
   ensure
-    FileUtils.rm_rf %W(#{root}/public/assets/ #{root}/tmp/cache/), secure: true
+    FileUtils.rm_rf %W[#{root}/public/assets/ #{root}/tmp/cache/], secure: true
   end
 end

data/test/support/dummy_rails_integration.rb

@@ -1,4 +1,4 @@
-require 'capybara'
+require 'capybara/dsl'
 require 'fileutils'
 module DummyRailsIntegration
   include Capybara::DSL

data/test/support/reporting.rb

@@ -14,4 +14,14 @@ module Kernel
       run.call
     end
   end
+
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(File::NULL)
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end unless method_defined?(:silence_stream)
 end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ Dir['test/support/**/*.rb'].each do |file|
   require_relative File.join('.', file)
 end
 
-GEM_PATH = File.expand_path('../', File.dirname(__FILE__))
+GEM_PATH = File.expand_path('../', __dir__)
 
 #= Capybara + Poltergeist
 require 'capybara/poltergeist'
@@ -26,10 +26,11 @@ Capybara.register_driver :poltergeist do |app|
 end
 
 Capybara.configure do |config|
+  config.server = :webrick
   config.app_host = 'http://localhost:7000'
   config.default_driver    = :poltergeist
   config.javascript_driver = :poltergeist
   config.server_port       = 7000
-  config.default_wait_time = 10
+  config.default_max_wait_time = 10
 end
 

metadata

@@ -1,59 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.3.0.1
+  version: 3.4.1
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: autoprefixer-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -224,9 +238,11 @@ files:
 - assets/fonts/bootstrap/glyphicons-halflings-regular.svg
 - assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
 - assets/fonts/bootstrap/glyphicons-halflings-regular.woff
+- assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
 - assets/images/.keep
 - assets/javascripts/bootstrap-sprockets.js
 - assets/javascripts/bootstrap.js
+- assets/javascripts/bootstrap.min.js
 - assets/javascripts/bootstrap/affix.js
 - assets/javascripts/bootstrap/alert.js
 - assets/javascripts/bootstrap/button.js
@@ -304,6 +320,7 @@ files:
 - assets/stylesheets/bootstrap/mixins/_panels.scss
 - assets/stylesheets/bootstrap/mixins/_progress-bar.scss
 - assets/stylesheets/bootstrap/mixins/_reset-filter.scss
+- assets/stylesheets/bootstrap/mixins/_reset-text.scss
 - assets/stylesheets/bootstrap/mixins/_resize.scss
 - assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
 - assets/stylesheets/bootstrap/mixins/_size.scss
@@ -315,9 +332,11 @@ files:
 - bootstrap-sass.gemspec
 - bower.json
 - composer.json
+- eyeglass-exports.js
 - lib/bootstrap-sass.rb
 - lib/bootstrap-sass/engine.rb
 - lib/bootstrap-sass/version.rb
+- package-lock.json
 - package.json
 - sache.json
 - tasks/bower.rake
@@ -331,7 +350,6 @@ files:
 - templates/project/_bootstrap-variables.sass
 - templates/project/manifest.rb
 - templates/project/styles.sass
-- test/compass_test.rb
 - test/compilation_test.rb
 - test/dummy_node_mincer/apple-touch-icon-144-precomposed.png
 - test/dummy_node_mincer/application.css.ejs.scss
@@ -340,7 +358,7 @@ files:
 - test/dummy_rails/Rakefile
 - test/dummy_rails/app/assets/images/.keep
 - test/dummy_rails/app/assets/javascripts/application.js
-- test/dummy_rails/app/assets/stylesheets/application.css.sass
+- test/dummy_rails/app/assets/stylesheets/application.sass
 - test/dummy_rails/app/controllers/application_controller.rb
 - test/dummy_rails/app/controllers/pages_controller.rb
 - test/dummy_rails/app/helpers/application_helper.rb
@@ -364,14 +382,10 @@ files:
 - test/dummy_rails/config/locales/es.yml
 - test/dummy_rails/config/routes.rb
 - test/dummy_rails/log/.keep
-- test/dummy_rails/log/development.log
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
-- test/dummy_sass_only/import_all.sass
-- test/gemfiles/sass_3_2.gemfile
-- test/gemfiles/sass_3_3.gemfile
-- test/gemfiles/sass_3_4.gemfile
-- test/gemfiles/sass_head.gemfile
+- test/dummy_sass_only/import_all.scss
+- test/gemfiles/default.gemfile
 - test/node_mincer_test.rb
 - test/node_sass_compile_test.sh
 - test/pages_test.rb
@@ -401,12 +415,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
+summary: bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right
+  into your Sass powered applications.
 test_files:
-- test/compass_test.rb
 - test/compilation_test.rb
 - test/dummy_node_mincer/apple-touch-icon-144-precomposed.png
 - test/dummy_node_mincer/application.css.ejs.scss
@@ -415,7 +429,7 @@ test_files:
 - test/dummy_rails/Rakefile
 - test/dummy_rails/app/assets/images/.keep
 - test/dummy_rails/app/assets/javascripts/application.js
-- test/dummy_rails/app/assets/stylesheets/application.css.sass
+- test/dummy_rails/app/assets/stylesheets/application.sass
 - test/dummy_rails/app/controllers/application_controller.rb
 - test/dummy_rails/app/controllers/pages_controller.rb
 - test/dummy_rails/app/helpers/application_helper.rb
@@ -439,14 +453,10 @@ test_files:
 - test/dummy_rails/config/locales/es.yml
 - test/dummy_rails/config/routes.rb
 - test/dummy_rails/log/.keep
-- test/dummy_rails/log/development.log
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
-- test/dummy_sass_only/import_all.sass
-- test/gemfiles/sass_3_2.gemfile
-- test/gemfiles/sass_3_3.gemfile
-- test/gemfiles/sass_3_4.gemfile
-- test/gemfiles/sass_head.gemfile
+- test/dummy_sass_only/import_all.scss
+- test/gemfiles/default.gemfile
 - test/node_mincer_test.rb
 - test/node_sass_compile_test.sh
 - test/pages_test.rb

data/test/compass_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class CompassTest < Minitest::Test
-  def test_create_project
-    command = 'rm -rf tmp/new-compass-project; bundle exec compass create tmp/new-compass-project -r bootstrap-sass --using bootstrap --trace --force'
-    success = silence_stdout_if(!ENV['VERBOSE']) { system(command) }
-    assert success, 'Compass project creation failed!'
-  end
-end

data/test/dummy_sass_only/import_all.sass

@@ -1,2 +0,0 @@
-@import 'bootstrap'
-@import 'bootstrap/theme'

data/test/gemfiles/sass_3_2.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'sass', '~> 3.2.0'
-gem 'compass', require: false
-
-gemspec path: '../../'

data/test/gemfiles/sass_3_3.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'sass', '~> 3.3.14'
-gem 'compass', '~> 1.0.1', require: false
-
-gemspec path: '../../'

data/test/gemfiles/sass_3_4.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem 'sass', '~> 3.4.1'
-gem 'compass', '~> 1.0.1', require: false
-
-gemspec path: '../../'
-

data/test/gemfiles/sass_head.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'sass', git: 'https://github.com/nex3/sass', branch: 'stable' # master is not compatible with Compass master
-gem 'compass', git: 'https://github.com/chriseppstein/compass', branch: 'master', require: false
-
-gemspec path: '../../'