bootstrap-sass 3.3.7 → 3.4.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.7",
+  "version": "3.4.0",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
   "main": "assets/javascripts/bootstrap.js",
   "style": "assets/stylesheets/_bootstrap.scss",
@@ -33,9 +33,9 @@
     "url": "https://github.com/twbs/bootstrap-sass/issues"
   },
   "devDependencies": {
-    "node-sass": "^3.8.0",
+    "node-sass": "^4.9.3",
     "mincer": "~1.4.0",
-    "ejs": "~2.4.2"
+    "ejs": "~2.6.1"
   },
   "eyeglass": {
     "exports": "eyeglass-exports.js",

data/tasks/converter/less_conversion.rb

@@ -67,6 +67,7 @@ class Converter
         log_processing name
         # apply common conversions
         file = convert_less(file)
+        file = replace_all file, %r{// stylelint-disable.*?\n+}, '', optional: true
         if name.start_with?('mixins/')
           file = varargify_mixin_definitions(file, *VARARG_MIXINS)
           %w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
@@ -126,10 +127,7 @@ class Converter
           when 'thumbnails.less', 'labels.less', 'badges.less', 'buttons.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file = replace_rules(file, /\s*@font-face/) { |rule|
-              rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
-              replace_asset_url rule, :font
-            }
+            file = replace_rules(file, /\s*@font-face/) { |rule| replace_asset_url rule, :font }
           when 'type.less'
             file = apply_mixin_parent_selector(file, '\.(text|bg)-(success|primary|info|warning|danger)')
             # .bg-primary will not get patched automatically as it includes an additional rule. fudge for now
@@ -325,10 +323,10 @@ SASS
                 %Q(@import "#{target_path}\\1";)
     end
 
-    def replace_all(file, regex, replacement = nil, &block)
+    def replace_all(file, regex, replacement = nil, optional: false, &block)
       log_transform regex, replacement
       new_file = file.gsub(regex, replacement, &block)
-      raise "replace_all #{regex}, #{replacement} NO MATCH" if file == new_file
+      raise "replace_all #{regex}, #{replacement} NO MATCH" if !optional && file == new_file
       new_file
     end
 
@@ -465,7 +463,7 @@ SASS
     def replace_ms_filters(file)
       log_transform
       file.gsub(
-          /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)",argb\(([\-$\w]+)\),argb\(([\-$\w]+)\)\)\);/,
+          /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)", ?argb\(([\-$\w]+)\), ?argb\(([\-$\w]+)\)\)\);/,
           %Q(filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='\#{ie-hex-str(\\2)}', endColorstr='\#{ie-hex-str(\\3)}', GradientType=\\1);)
       )
     end
@@ -511,7 +509,8 @@ SASS
     def replace_escaping(less)
       less = less.gsub(/~"([^"]+)"/, '\1').gsub(/~'([^']+)'/, '\1') # Get rid of ~"" escape
       less.gsub!(/\$\{([^}]+)\}/, '$\1') # Get rid of @{} escape
-      less.gsub!(/"([^"\n]*)(\$[\w\-]+)([^"\n]*)"/, '"\1#{\2}\3"') # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}")
+      # interpolate variables in strings, e.g. url("$file-1x") => url("#{$file-1x}")
+      less.gsub!(/"[^"\n]*"/) { |str| str.gsub(/\$[^"\n$.\\]+/, '#{\0}') }
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape
     end
 

data/tasks/converter/network.rb

@@ -32,7 +32,7 @@ class Converter
       if File.directory?(full_path)
         files.each do |name|
           path = "#{full_path}/#{name}"
-          contents[name] = File.read(path, mode: 'rb') if File.exists?(path)
+          contents[name] = File.read(path, mode: 'rb') if File.exist?(path)
         end
       end
       contents
@@ -51,7 +51,7 @@ class Converter
       uri = URI(url)
       cache_path = "./#@cache_path#{uri.path}#{uri.query.tr('?&=', '-') if uri.query}"
       FileUtils.mkdir_p File.dirname(cache_path)
-      if File.exists?(cache_path)
+      if File.exist?(cache_path)
         log_http_get_file url, true
         File.read(cache_path, mode: 'rb')
       else

data/templates/project/_bootstrap-variables.sass

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.7):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.4.0):
 
 //
 // Variables
@@ -52,14 +52,14 @@
 
 // $font-size-base:          14px
 // $font-size-large:         ceil(($font-size-base * 1.25)) // ~18px
-// $font-size-small:         ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-small:         ceil(($font-size-base * .85)) // ~12px
 
 // $font-size-h1:            floor(($font-size-base * 2.6)) // ~36px
 // $font-size-h2:            floor(($font-size-base * 2.15)) // ~30px
 // $font-size-h3:            ceil(($font-size-base * 1.7)) // ~24px
 // $font-size-h4:            ceil(($font-size-base * 1.25)) // ~18px
 // $font-size-h5:            $font-size-base
-// $font-size-h6:            ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-h6:            ceil(($font-size-base * .85)) // ~12px
 
 //** Unit-less `line-height` for use in components like buttons.
 // $line-height-base:        1.428571429 // 20/14
@@ -240,7 +240,7 @@
 //** Background for the dropdown menu.
 // $dropdown-bg:                    #fff
 //** Dropdown menu `border-color`.
-// $dropdown-border:                rgba(0,0,0,.15)
+// $dropdown-border:                rgba(0, 0, 0, .15)
 //** Dropdown menu `border-color` **for IE8**.
 // $dropdown-fallback-border:       #ccc
 //** Divider color for between dropdown items.
@@ -546,7 +546,7 @@
 //** Popover maximum width
 // $popover-max-width:                   276px
 //** Popover border color
-// $popover-border-color:                rgba(0,0,0,.2)
+// $popover-border-color:                rgba(0, 0, 0, .2)
 //** Popover fallback border color
 // $popover-fallback-border-color:       #ccc
 
@@ -604,7 +604,7 @@
 //** Background color of modal content area
 // $modal-content-bg:                             #fff
 //** Modal content border color
-// $modal-content-border-color:                   rgba(0,0,0,.2)
+// $modal-content-border-color:                   rgba(0, 0, 0, .2)
 //** Modal content border color **for IE8**
 // $modal-content-fallback-border-color:          #999
 
@@ -809,7 +809,7 @@
 //
 //##
 
-// $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6)
+// $carousel-text-shadow:                        0 1px 2px rgba(0, 0, 0, .6)
 
 // $carousel-control-color:                      #fff
 // $carousel-control-width:                      15%

data/test/compilation_test.rb

@@ -1,18 +1,30 @@
 require 'test_helper'
 require 'fileutils'
-require 'sass'
+require 'sassc'
 
 class CompilationTest < Minitest::Test
-  def test_compilation
-    path = 'assets/stylesheets'
-    %w(_bootstrap bootstrap/_theme).each do |file|
-      FileUtils.rm_rf('.sass-cache', secure: true)
-      engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
-      FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
-      File.open("tmp/#{file}.css", 'w') { |f|
-        f.write engine.render
-      }
-      assert true # nothing was raised
-    end
+  def test_compilation_bootstrap
+    compile 'bootstrap'
+    assert true # nothing was raised
+  end
+
+  def test_compilation_bootstrap_theme
+    compile 'bootstrap/theme'
+    assert true # nothing was raised
+  end
+
+  private
+
+  def compile(file)
+    path = File.expand_path('../assets/stylesheets', __dir__)
+    FileUtils.rm_rf('.sass-cache', secure: true)
+    engine = SassC::Engine.new(
+      %Q{@import "#{path}/#{file}"},
+      syntax: :scss, load_paths: ['.']
+    )
+    FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
+    File.open("tmp/#{file}.css", 'w') { |f|
+      f.write engine.render
+    }
   end
 end

data/test/dummy_rails/config/application.rb

@@ -12,6 +12,7 @@ end
 
 require 'slim-rails'
 require 'jquery-rails'
+require 'sassc-rails'
 require 'bootstrap-sass'
 require 'uglifier'
 

data/test/dummy_rails/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy_sass_only/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'sass', '~> 3.3'
+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_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.scss -o tmp/node-sass/bootstrap.css && \
-node-sass assets/stylesheets/bootstrap/_theme.scss -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|woff2?|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/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,6 +26,7 @@ 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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.0
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2018-12-14 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.3.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +336,7 @@ files:
 - lib/bootstrap-sass.rb
 - lib/bootstrap-sass/engine.rb
 - lib/bootstrap-sass/version.rb
+- package-lock.json
 - package.json
 - sache.json
 - tasks/bower.rake
@@ -335,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
@@ -370,11 +384,8 @@ files:
 - test/dummy_rails/log/.keep
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
-- test/dummy_sass_only/import_all.sass
-- test/gemfiles/rails_head.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
@@ -404,13 +415,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 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
@@ -445,11 +455,8 @@ test_files:
 - test/dummy_rails/log/.keep
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
-- test/dummy_sass_only/import_all.sass
-- test/gemfiles/rails_head.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