bootstrap-sass 3.1.1.1 → 3.2.0.4

data/bootstrap-sass.gemspec

@@ -13,16 +13,21 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'sass', '~> 3.2'
 
+  # Testing dependencies
+  s.add_development_dependency 'minitest', '~> 5.4.0'
+  s.add_development_dependency 'minitest-reporters', '~> 1.0.5'
+  # Integration testing
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'poltergeist'
   # Dummy Rails app dependencies
-  s.add_development_dependency 'sprockets-rails', '>= 2.0.1'
+  s.add_development_dependency 'actionpack', '>= 4.1.5'
+  s.add_development_dependency 'activesupport', '>= 4.1.5'
+  s.add_development_dependency 'json', '>= 1.8.1'
+  s.add_development_dependency 'sprockets-rails', '>= 2.1.3'
+  s.add_development_dependency 'autoprefixer-rails', '~> 1.1'
   s.add_development_dependency 'jquery-rails', '>= 3.1.0'
   s.add_development_dependency 'slim-rails'
   s.add_development_dependency 'uglifier'
-  # Compass dummy app
-  s.add_development_dependency 'compass'
-  # Integration testing
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'poltergeist'
   # Converter
   s.add_development_dependency 'term-ansicolor'
 

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "homepage": "https://github.com/twbs/bootstrap-sass",
   "authors": [
     "Thomas McDonald",
@@ -10,94 +10,23 @@
   ],
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
   "main": [
-    "vendor/assets/stylesheets/_bootstrap-mincer.scss",
-    "vendor/assets/stylesheets/bootstrap/_alerts.scss",
-    "vendor/assets/stylesheets/bootstrap/_badges.scss",
-    "vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss",
-    "vendor/assets/stylesheets/bootstrap/_button-groups.scss",
-    "vendor/assets/stylesheets/bootstrap/_buttons.scss",
-    "vendor/assets/stylesheets/bootstrap/_carousel.scss",
-    "vendor/assets/stylesheets/bootstrap/_close.scss",
-    "vendor/assets/stylesheets/bootstrap/_code.scss",
-    "vendor/assets/stylesheets/bootstrap/_component-animations.scss",
-    "vendor/assets/stylesheets/bootstrap/_dropdowns.scss",
-    "vendor/assets/stylesheets/bootstrap/_forms.scss",
-    "vendor/assets/stylesheets/bootstrap/_glyphicons.scss",
-    "vendor/assets/stylesheets/bootstrap/_grid.scss",
-    "vendor/assets/stylesheets/bootstrap/_input-groups.scss",
-    "vendor/assets/stylesheets/bootstrap/_jumbotron.scss",
-    "vendor/assets/stylesheets/bootstrap/_labels.scss",
-    "vendor/assets/stylesheets/bootstrap/_list-group.scss",
-    "vendor/assets/stylesheets/bootstrap/_media.scss",
-    "vendor/assets/stylesheets/bootstrap/_mixins.scss",
-    "vendor/assets/stylesheets/bootstrap/_modals.scss",
-    "vendor/assets/stylesheets/bootstrap/_navbar.scss",
-    "vendor/assets/stylesheets/bootstrap/_navs.scss",
-    "vendor/assets/stylesheets/bootstrap/_normalize.scss",
-    "vendor/assets/stylesheets/bootstrap/_pager.scss",
-    "vendor/assets/stylesheets/bootstrap/_pagination.scss",
-    "vendor/assets/stylesheets/bootstrap/_panels.scss",
-    "vendor/assets/stylesheets/bootstrap/_popovers.scss",
-    "vendor/assets/stylesheets/bootstrap/_print.scss",
-    "vendor/assets/stylesheets/bootstrap/_progress-bars.scss",
-    "vendor/assets/stylesheets/bootstrap/_responsive-embed.scss",
-    "vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss",
-    "vendor/assets/stylesheets/bootstrap/_scaffolding.scss",
-    "vendor/assets/stylesheets/bootstrap/_tables.scss",
-    "vendor/assets/stylesheets/bootstrap/_theme.scss",
-    "vendor/assets/stylesheets/bootstrap/_thumbnails.scss",
-    "vendor/assets/stylesheets/bootstrap/_tooltip.scss",
-    "vendor/assets/stylesheets/bootstrap/_type.scss",
-    "vendor/assets/stylesheets/bootstrap/_utilities.scss",
-    "vendor/assets/stylesheets/bootstrap/_variables.scss",
-    "vendor/assets/stylesheets/bootstrap/_wells.scss",
-    "vendor/assets/stylesheets/bootstrap/bootstrap.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_alerts.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_background-variant.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_border-radius.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_center-block.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_clearfix.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_forms.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_gradients.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_grid-framework.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_grid.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_hide-text.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_image.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_labels.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_list-group.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_nav-divider.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_opacity.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_pagination.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_panels.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_progress-bar.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_reset-filter.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_resize.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_size.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_tab-focus.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_text-overflow.scss",
-    "vendor/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss",
-    "vendor/assets/stylesheets/bootstrap.scss",
-    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
-    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
-    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
-    "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
-    "vendor/assets/javascripts/bootstrap/affix.js",
-    "vendor/assets/javascripts/bootstrap/alert.js",
-    "vendor/assets/javascripts/bootstrap/button.js",
-    "vendor/assets/javascripts/bootstrap/carousel.js",
-    "vendor/assets/javascripts/bootstrap/collapse.js",
-    "vendor/assets/javascripts/bootstrap/dropdown.js",
-    "vendor/assets/javascripts/bootstrap/tab.js",
-    "vendor/assets/javascripts/bootstrap/transition.js",
-    "vendor/assets/javascripts/bootstrap/scrollspy.js",
-    "vendor/assets/javascripts/bootstrap/modal.js",
-    "vendor/assets/javascripts/bootstrap/tooltip.js",
-    "vendor/assets/javascripts/bootstrap/popover.js"
+    "assets/stylesheets/_bootstrap.scss",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
+    "assets/javascripts/bootstrap/affix.js",
+    "assets/javascripts/bootstrap/alert.js",
+    "assets/javascripts/bootstrap/button.js",
+    "assets/javascripts/bootstrap/carousel.js",
+    "assets/javascripts/bootstrap/collapse.js",
+    "assets/javascripts/bootstrap/dropdown.js",
+    "assets/javascripts/bootstrap/tab.js",
+    "assets/javascripts/bootstrap/transition.js",
+    "assets/javascripts/bootstrap/scrollspy.js",
+    "assets/javascripts/bootstrap/modal.js",
+    "assets/javascripts/bootstrap/tooltip.js",
+    "assets/javascripts/bootstrap/popover.js"
   ],
   "keywords": [
     "twbs",
@@ -114,5 +43,8 @@
     "*.gemspec",
     "Rakefile",
     "Gemfile"
-  ]
+  ],
+  "dependencies": {
+    "jquery": ">= 1.9.0"
+  }
 }

data/composer.json

@@ -29,7 +29,7 @@
     "license": "MIT",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.2.x-dev"
         }
     }
 }

data/lib/bootstrap-sass.rb

@@ -2,7 +2,6 @@ module Bootstrap
   class << self
     # Inspired by Kaminari
     def load!
-      require 'bootstrap-sass/sass_functions'
       register_compass_extension if compass?
 
       if rails?
@@ -30,7 +29,7 @@ module Bootstrap
     end
 
     def assets_path
-      @assets_path ||= File.join gem_path, 'vendor', 'assets'
+      @assets_path ||= File.join gem_path, 'assets'
     end
 
     # Environment detection helpers
@@ -49,6 +48,8 @@ module Bootstrap
     private
 
     def configure_sass
+      require 'sass'
+
       ::Sass.load_paths << stylesheets_path
 
       # bootstrap requires minimum precision of 10, see https://github.com/twbs/bootstrap-sass/issues/409

data/lib/bootstrap-sass/engine.rb

@@ -1,7 +1,10 @@
 module Bootstrap
   module Rails
     class Engine < ::Rails::Engine
-      initializer "bootstrap-sass.assets.precompile" do |app|
+      initializer 'bootstrap-sass.assets.precompile' do |app|
+        %w(stylesheets javascripts fonts images).each do |sub|
+          app.config.assets.paths << root.join('assets', sub)
+        end
         app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
       end
     end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.1.1.1'
-  BOOTSTRAP_SHA = '573ad10a9dba52e4a6f059e63b667f4034ad2b39'
+  VERSION = '3.2.0.4'
+  BOOTSTRAP_SHA = 'c068162161154a4b85110ea1e7dd3d7897ce2b72'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
   "main": "index.js",
   "repository": {
@@ -21,5 +21,10 @@
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/twbs/bootstrap-sass/issues"
+  },
+  "devDependencies": {
+    "node-sass": "*",
+    "mincer": "*",
+    "ejs": "*"
   }
 }

data/sache.json

@@ -0,0 +1,5 @@
+{
+    "name": "bootstrap-sass",
+    "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications",
+    "tags": ["bootstrap", "grid", "typography", "buttons", "ui", "responsive-web-design"]
+}

data/tasks/bower.rake

@@ -1,5 +1,4 @@
 require 'find'
-require 'bootstrap-sass'
 require 'json'
 require 'pathname'
 
@@ -12,14 +11,16 @@ namespace :bower do
   }
 
   desc 'update main and version in bower.json'
-  task :spec do
+  task :generate do
+    require 'bootstrap-sass'
     Dir.chdir Bootstrap.gem_path do
       spec       = JSON.parse(File.read 'bower.json')
-      js_paths   = File.read(File.join Bootstrap.javascripts_path, 'bootstrap.js').lines.map do |line|
-        line.strip if line.sub!(%r(//\s*=\s*require\s*(.*)\s*), 'vendor/assets/javascripts/\1.js')
+      js_paths   = File.read(File.join Bootstrap.javascripts_path, 'bootstrap-sprockets.js').lines.map do |line|
+        line.strip if line.sub!(%r(//\s*=\s*require\s*(?:./)?(.*)\s*), 'assets/javascripts/\1.js')
       end.compact
 
-      spec['main'] = find_files.(Bootstrap.stylesheets_path) +
+      spec['main'] =
+          find_files.(File.join(Bootstrap.stylesheets_path, '_bootstrap.scss')) +
           find_files.(Bootstrap.fonts_path) +
           js_paths
 

data/tasks/converter.rb

@@ -42,9 +42,9 @@ class Converter
     @cache_path = cache_path
     @repo_url   = "https://github.com/#@repo"
     @save_to    = {
-        js:    'vendor/assets/javascripts/bootstrap',
-        scss:  'vendor/assets/stylesheets/bootstrap',
-        fonts: 'vendor/assets/fonts/bootstrap'}.merge(save_to)
+        js:    'assets/javascripts/bootstrap',
+        scss:  'assets/stylesheets/bootstrap',
+        fonts: 'assets/fonts/bootstrap'}.merge(save_to)
   end
 
   def_delegators :@logger, :log, :log_status, :log_processing, :log_transform, :log_file_info, :log_processed, :log_http_get_file, :log_http_get_files, :silence_log

data/tasks/converter/js_conversion.rb

@@ -3,20 +3,26 @@ class Converter
     def process_javascript_assets
       log_status 'Processing javascripts...'
       save_to = @save_to[:js]
+      contents = {}
       read_files('js', bootstrap_js_files).each do |name, file|
+        contents[name] = file
         save_file("#{save_to}/#{name}", file)
       end
       log_processed "#{bootstrap_js_files * ' '}"
 
       log_status 'Updating javascript manifest'
-      content = ''
+      manifest = ''
+      cat = ''
       bootstrap_js_files.each do |name|
+        cat << contents[name] + "\n"
         name = name.gsub(/\.js$/, '')
-        content << "//= require bootstrap/#{name}\n"
+        manifest << "//= require ./bootstrap/#{name}\n"
+      end
+      {'assets/javascripts/bootstrap-sprockets.js' => manifest,
+       'assets/javascripts/bootstrap.js' => cat}.each do |path, content|
+        save_file path, content
+        log_processed path
       end
-      path = 'vendor/assets/javascripts/bootstrap.js'
-      save_file(path, content)
-      log_processed path
     end
 
     def bootstrap_js_files

data/tasks/converter/less_conversion.rb

@@ -79,7 +79,7 @@ class Converter
             file = deinterpolate_vararg_mixins(file)
           when 'mixins/vendor-prefixes.less'
             # remove second scale mixins as this is handled via vararg in the first one
-            file = replace_rules(file, '.scale(@ratioX; @ratioY)') {}
+            file = replace_rules(file, Regexp.escape('@mixin scale($ratioX, $ratioY...)')) { '' }
           when 'mixins/grid-framework.less'
             file = convert_grid_mixins file
           when 'component-animations.less'
@@ -88,13 +88,16 @@ class Converter
             file = apply_mixin_parent_selector file, '\.(?:visible|hidden)'
           when 'variables.less'
             file = insert_default_vars(file)
-            file = unindent <<-SCSS + file, 14
-              // a flag to toggle asset pipeline / compass integration
-              // defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side)
-              // in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
-              $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
+            file = unindent <<-SCSS + "\n" + file, 14
+              // When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
+              // When there no function is defined, `fn('')` is parsed as string that equals the right hand side
+              // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
+              $bootstrap-sass-asset-helper: #{sass_fn_exists('twbs-font-path')} !default;
+            SCSS
+            file = replace_all file, %r{(\$icon-font-path): \s*"(.*)" (!default);},  "\n" + unindent(<<-SCSS, 14)
+              // [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
+              \\1: if($bootstrap-sass-asset-helper, "bootstrap/", "\\2bootstrap/") \\3;
             SCSS
-            file = replace_all file, /(\$icon-font-path:).*(!default)/, '\1 "bootstrap/" \2'
           when 'close.less'
             # extract .close { button& {...} } rule
             file = extract_nested_rule file, 'button&'
@@ -111,8 +114,7 @@ class Converter
           when 'thumbnails.less', 'labels.less', 'badges.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file = bootstrap_font_files.map { |p| %Q(//= depend_on_asset "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
-            file = replace_all file, /\#\{(url\(.*?\))}/, '\1'
+            file = bootstrap_font_files.map { |p| %Q(//= depend_on "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
             file = replace_rules(file, '@font-face') { |rule|
               rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
               replace_asset_url rule, :font
@@ -123,18 +125,17 @@ class Converter
             file = replace_all(file, "  @include bg-variant($brand-primary);\n}", "}\n@include bg-variant('.bg-primary', $brand-primary);")
         end
 
-        name    = name.sub(/\.less$/, '.scss')
-        path    = File.join save_to, name
-        unless name == 'bootstrap.scss'
-          path = File.join File.dirname(path), '_' + File.basename(path)
-        end
+        path = File.join save_to, name.sub(/\.less$/, '.scss')
+        path = File.join File.dirname(path), '_' + File.basename(path)
         save_file(path, file)
         log_processed File.basename(path)
       end
 
-      # generate imports valid relative to both load path and file directory
-      save_file File.expand_path("#{save_to}/../bootstrap.scss"),
-                File.read("#{save_to}/bootstrap.scss").gsub(/ "/, ' "bootstrap/')
+      # move bootstrap/_bootstrap.scss to _bootstrap.scss adjusting import paths
+      main_from = "#{save_to}/_bootstrap.scss"
+      main_to   = File.expand_path("#{save_to}/../_bootstrap.scss")
+      save_file main_to, File.read(main_from).gsub(/ "/, ' "bootstrap/')
+      File.delete(main_from)
     end
 
     def bootstrap_less_files
@@ -161,6 +162,10 @@ class Converter
       file
     end
 
+    def sass_fn_exists(fn)
+      %Q{(#{fn}("") != unquote('#{fn}("")'))}
+    end
+
     def replace_asset_url(rule, type)
       replace_all rule, /url\((.*?)\)/, "url(if($bootstrap-sass-asset-helper, twbs-#{type}-path(\\1), \\1))"
     end
@@ -168,13 +173,17 @@ class Converter
     # convert recursively evaluated selector $list to @for loop
     def mixin_all_grid_columns(css, selector: raise('pass class'), from: 1, to: raise('pass to'))
       mxn_def = css.each_line.first.strip
+      # inject local variables as default arguments
+      # this is to avoid overwriting outer variables with the same name with Sass <= 3.3
+      # see also: https://github.com/twbs/bootstrap-sass/issues/636
+      locals = <<-SASS.strip
+        $i: #{from}, $list: "#{selector}"
+      SASS
+      mxn_def.sub!(/(\(?)(\)\s*\{)/) {  "#{$1}#{', ' if $1.empty?}#{locals}#{$2}" }
       step_body = (css =~ /\$list \{\n(.*?)\n[ ]*\}/m) && $1
 <<-SASS
 // [converter] This is defined recursively in LESS, but Sass supports real loops
 #{mxn_def}
-  $list: '';
-  $i: #{from};
-  $list: "#{selector}";
   @for $i from (#{from} + 1) through #{to} {
     $list: "\#{$list}, #{selector}";
   }
@@ -452,7 +461,7 @@ SASS
     end
 
     def replace_fadein(less)
-      less.gsub(/(?![\-$@.])fadein\((.*?),\s*(.*?)%\)/) { "rgba(#{$1}, #{$2.to_i / 100.0})" }
+      less.gsub(/(?![\-$@.])fadein\((.*?),\s*(.*?)%\)/) { "fade_in(#{$1}, #{$2.to_i / 100.0})" }
     end
 
     def replace_image_urls(less)

data/tasks/converter/logger.rb

@@ -32,6 +32,7 @@ class Converter
     end
 
     def log_http_get_files(files, from, cached = false)
+      return if files.empty?
       s = "  #{'CACHED ' if cached}GET #{files.length} files from #{from} #{files * ' '}..."
       if cached
         puts dark green s

data/tasks/converter/network.rb

@@ -7,20 +7,17 @@ class Converter
     end
 
     def read_files(path, files)
-      full_path = "https://raw.github.com/#@repo/#@branch_sha/#{path}"
-      if (contents = read_cached_files(path, files))
-        log_http_get_files files, full_path, true
-      else
-        log_http_get_files files, full_path, false
-        contents = {}
-        files.map do |name|
-          Thread.start {
-            content = open("#{full_path}/#{name}").read
-            Thread.exclusive { contents[name] = content }
-          }
-        end.each(&:join)
-        write_cached_files path, contents
-      end
+      full_path = "https://raw.githubusercontent.com/#@repo/#@branch_sha/#{path}"
+      contents = read_cached_files(path, files)
+      log_http_get_files contents.keys, full_path, true if contents.keys
+      files -= contents.keys
+      log_http_get_files files, full_path, false
+      files.map do |name|
+        Thread.start {
+          contents[name] = open("#{full_path}/#{name}").read
+          Thread.exclusive { write_cached_files path, name => contents[name] }
+        }
+      end.each(&:join)
       contents
     end
 
@@ -29,10 +26,11 @@ class Converter
       contents  = {}
       if File.directory?(full_path)
         files.each do |name|
-          contents[name] = File.read("#{full_path}/#{name}", mode: 'rb') || ''
+          path = "#{full_path}/#{name}"
+          contents[name] = File.read(path, mode: 'rb') if File.exists?(path)
         end
-        contents
       end
+      contents
     end
 
     def write_cached_files(path, files)