bootstrap-sass 3.3.1.0 → 3.3.6

data/lib/bootstrap-sass/engine.rb

@@ -5,7 +5,12 @@ module Bootstrap
         %w(stylesheets javascripts fonts images).each do |sub|
           app.config.assets.paths << root.join('assets', sub).to_s
         end
-        app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
+
+        # sprockets-rails 3 tracks down the calls to `font_path` and `image_path`
+        # and automatically precompiles the referenced assets.
+        unless Sprockets::Rails::VERSION.split('.', 2)[0].to_i >= 3
+          app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
+        end
       end
     end
   end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.3.1.0'
-  BOOTSTRAP_SHA = '9a7e365c2c4360335d25246dac11afb1f577210a'
+  VERSION       = '3.3.6'
+  BOOTSTRAP_SHA = '81df608a40bf0629a1dc08e584849bb1e43e0b7a'
 end

data/lib/bootstrap-sass.rb

@@ -4,7 +4,15 @@ module Bootstrap
     # Inspired by Kaminari
     def load!
       register_compass_extension if compass?
-      register_rails_engine      if rails?
+
+      if rails?
+        register_rails_engine
+      elsif lotus?
+        register_lotus
+      elsif sprockets?
+        register_sprockets
+      end
+
       configure_sass
     end
 
@@ -30,18 +38,22 @@ module Bootstrap
     end
 
     # Environment detection helpers
-    def asset_pipeline?
+    def sprockets?
       defined?(::Sprockets)
     end
 
     def compass?
-      defined?(::Compass)
+      defined?(::Compass::Frameworks)
     end
 
     def rails?
       defined?(::Rails)
     end
 
+    def lotus?
+      defined?(::Lotus)
+    end
+
     private
 
     def configure_sass
@@ -49,8 +61,8 @@ module Bootstrap
 
       ::Sass.load_paths << stylesheets_path
 
-      # bootstrap requires minimum precision of 10, see https://github.com/twbs/bootstrap-sass/issues/409
-      ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
+      # bootstrap requires minimum precision of 8, see https://github.com/twbs/bootstrap-sass/issues/409
+      ::Sass::Script::Number.precision = [8, ::Sass::Script::Number.precision].max
     end
 
     def register_compass_extension
@@ -66,6 +78,16 @@ module Bootstrap
     def register_rails_engine
       require 'bootstrap-sass/engine'
     end
+
+    def register_lotus
+      Lotus::Assets.sources << assets_path
+    end
+
+    def register_sprockets
+      Sprockets.append_path(stylesheets_path)
+      Sprockets.append_path(fonts_path)
+      Sprockets.append_path(javascripts_path)
+    end
   end
 end
 

data/package.json

@@ -1,8 +1,8 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.1",
-  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
-  "main": "index.js",
+  "version": "3.3.6",
+  "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",
   "repository": {
     "type": "git",
     "url": "git://github.com/twbs/bootstrap-sass"
@@ -23,8 +23,8 @@
     "url": "https://github.com/twbs/bootstrap-sass/issues"
   },
   "devDependencies": {
-    "node-sass": "~1.0",
-    "mincer": "~1.1",
-    "ejs": "~1.0"
+    "node-sass": "~3.4.2",
+    "mincer": "~1.3",
+    "ejs": "~2.3"
   }
 }

data/sache.json

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

data/tasks/bower.rake

@@ -15,16 +15,13 @@ namespace :bower 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-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.(File.join(Bootstrap.stylesheets_path, '_bootstrap.scss')) +
           find_files.(Bootstrap.fonts_path) +
-          js_paths
+          %w(assets/javascripts/bootstrap.js)
 
-      spec['version'] = Bootstrap::VERSION[0..-3]
+      spec['version'] = Bootstrap::VERSION
 
       File.open('bower.json', 'w') do |f|
         f.puts JSON.pretty_generate(spec)

data/tasks/converter/fonts_conversion.rb

@@ -10,7 +10,7 @@ class Converter
     end
 
     def bootstrap_font_files
-      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff)$/)
+      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff2?)$/)
     end
   end
 end

data/tasks/converter/js_conversion.rb

@@ -12,14 +12,16 @@ class Converter
 
       log_status 'Updating javascript manifest'
       manifest = ''
-      cat = ''
       bootstrap_js_files.each do |name|
-        cat << contents[name] + "\n"
         name = name.gsub(/\.js$/, '')
         manifest << "//= require ./bootstrap/#{name}\n"
       end
-      {'assets/javascripts/bootstrap-sprockets.js' => manifest,
-       'assets/javascripts/bootstrap.js' => cat}.each do |path, content|
+      dist_js = read_files('dist/js', %w(bootstrap.js bootstrap.min.js))
+      {
+          'assets/javascripts/bootstrap-sprockets.js' => manifest,
+          'assets/javascripts/bootstrap.js'           => dist_js['bootstrap.js'],
+          'assets/javascripts/bootstrap.min.js'       => dist_js['bootstrap.min.js'],
+      }.each do |path, content|
         save_file path, content
         log_processed path
       end
@@ -27,7 +29,7 @@ class Converter
 
     def bootstrap_js_files
       @bootstrap_js_files ||= begin
-        files = get_paths_by_type 'js', /\.js$/
+        files = get_paths_by_type('js', /\.js$/).reject { |path| path =~ %r(^tests/) }
         files.sort_by { |f|
           case f
             # tooltip depends on popover and must be loaded earlier

data/tasks/converter/less_conversion.rb

@@ -1,4 +1,5 @@
 require_relative 'char_string_scanner'
+require 'bootstrap-sass/version'
 
 # This is the script used to automatically convert all of twbs/bootstrap LESS to Sass.
 #
@@ -95,16 +96,17 @@ class Converter
             file = apply_mixin_parent_selector file, '\.(?:visible|hidden)'
           when 'variables.less'
             file = insert_default_vars(file)
-            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 = ['$bootstrap-sass-asset-helper: false !default;', file].join("\n")
             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
+              // [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+              // [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
               \\1: if($bootstrap-sass-asset-helper, "bootstrap/", "\\2bootstrap/") \\3;
             SCSS
+          when 'breadcrumbs.less'
+            file = replace_all file, /(.*)(\\00a0)/, unindent(<<-SCSS, 8) + "\\1\#{$nbsp}"
+              // [converter] Workaround for https://github.com/sass/libsass/issues/1115
+              $nbsp: "\\2";
+            SCSS
           when 'close.less'
             # extract .close { button& {...} } rule
             file = extract_nested_rule file, 'button&'
@@ -114,14 +116,17 @@ class Converter
           when 'forms.less'
             file = extract_nested_rule file, 'textarea&'
             file = apply_mixin_parent_selector(file, '\.input-(?:sm|lg)')
+            file = replace_rules file, /\.form-group-(?:sm|lg)/ do |rule|
+              apply_mixin_parent_selector rule, '.form-control'
+            end
           when 'navbar.less'
             file = replace_all file, /(\s*)\.navbar-(right|left)\s*\{\s*@extend\s*\.pull-(right|left);\s*/, "\\1.navbar-\\2 {\\1  float: \\2 !important;\\1"
           when 'tables.less'
             file = replace_all file, /(@include\s*table-row-variant\()(\w+)/, "\\1'\\2'"
-          when 'thumbnails.less', 'labels.less', 'badges.less'
+          when 'thumbnails.less', 'labels.less', 'badges.less', 'buttons.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file = replace_rules(file, '@font-face') { |rule|
+            file = replace_rules(file, /\s*@font-face/) { |rule|
               rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
               replace_asset_url rule, :font
             }
@@ -146,13 +151,11 @@ class Converter
       # generate variables template
       save_file 'templates/project/_bootstrap-variables.sass',
                 "// Override Bootstrap variables here (defaults from bootstrap-sass v#{Bootstrap::VERSION}):\n\n" +
-                    File.read("#{save_to}/_variables.scss").gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '')
+                    File.read("#{save_to}/_variables.scss").lines[1..-1].join.gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '')
     end
 
     def bootstrap_less_files
-      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/) +
-        get_paths_by_type('mixins', /\.less$/,
-                          get_tree(get_tree_sha('mixins', get_tree(get_tree_sha('less'))))).map { |p| "mixins/#{p}" }
+      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/)
     end
 
     # apply general less to scss conversion
@@ -171,9 +174,16 @@ class Converter
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
       file   = replace_file_imports(file)
+      file   = wrap_at_groups_with_at_root(file)
       file
     end
 
+    def wrap_at_groups_with_at_root(file)
+      replace_rules(file, /@(?:font-face|-ms-viewport)/) { |rule, _pos|
+        %Q(@at-root {\n#{indent rule, 2}\n})
+      }
+    end
+
     def sass_fn_exists(fn)
       %Q{(#{fn}("") != unquote('#{fn}("")'))}
     end
@@ -206,7 +216,7 @@ class Converter
 SASS
     end
 
-    # convert grid mixins LESS when => SASS @if
+    # convert grid mixins LESS when => Sass @if
     def convert_grid_mixins(file)
       file = replace_rules file, /@mixin make-grid-columns/, comments: false do |css, pos|
         mixin_all_grid_columns css, selector: '.col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}', to: '$grid-columns'
@@ -263,8 +273,8 @@ SASS
 
     # margin: a -b
     # LESS: sets 2 values
-    # SASS: sets 1 value (a-b)
-    # This wraps a and -b so they evaluates to 2 values in SASS
+    # Sass: sets 1 value (a-b)
+    # This wraps a and -b so they evaluates to 2 values in Sass
     def replace_calculation_semantics(file)
       # split_prop_val.call('(@navbar-padding-vertical / 2) -@navbar-padding-horizontal')
       # #=> ["(navbar-padding-vertical / 2)", "-navbar-padding-horizontal"]
@@ -384,8 +394,10 @@ SASS
         end
         # unwrap, and replace @include
         unindent unwrap_rule_block(rule).gsub(/(@include [\w-]+)\(?([\$\w\-,\s]*)\)?/) {
-          args = $2
-          "#{cmt}#{$1}('#{sel.gsub(/\s+/, ' ')}'#{', ' if args && !args.empty?}#{args})"
+          name, args = $1, $2
+          sel.gsub(/\s+/, ' ').split(/,\s*/ ).map { |sel_part|
+            "#{cmt}#{name}('#{sel_part}'#{', ' if args && !args.empty?}#{args})"
+          }.join(";\n")
         }
       end
     end
@@ -424,16 +436,16 @@ SASS
     #  #scope > .mixin()    -> @include scope-mixin()
     #  &:extend(.mixin all) -> @include mixin()
     def replace_mixins(less, mixin_names)
-      mixin_pattern = /(\s+)(([#|\.][\w-]+\s*>\s*)*)\.([\w-]+\(.*\))(?!\s\{)/
-
-      less = less.gsub(mixin_pattern) do |match|
-        matches    = match.scan(mixin_pattern).flatten
-        scope      = matches[1] && matches[1] != '' ? matches[1].scan(/[\w-]+/).join('-') + '-' : ''
-        mixin_name = match.scan(/\.([\w-]+)\(.*\)\s?\{?/).first
-        if mixin_name && mixin_names.include?("#{scope}#{mixin_name.first}")
-          "#{matches.first}@include #{scope}#{matches.last.gsub(/;\s*\$/, ', $').sub(/;\)$/, ')').sub(/\(\)$/, '')}"
+      mixin_pattern = /(?<=^|\s)((?:[#|\.][\w-]+\s*>\s*)*)\.([\w-]+)\((.*)\)(?!\s\{)/
+
+      less = less.gsub(mixin_pattern) do |_|
+        scope, name, args = $1, $2, $3
+        scope = scope.scan(/[\w-]+/).join('-') + '-' unless scope.empty?
+        args = "(#{args.tr(';', ',')})" unless args.empty?
+        if name && mixin_names.include?("#{scope}#{name}")
+          "@include #{scope}#{name}#{args}"
         else
-          "#{matches.first}@extend .#{scope}#{matches.last.gsub(/\(\)/, '')}"
+          "@extend .#{scope}#{name}"
         end
       end
 
@@ -449,7 +461,7 @@ SASS
       end
     end
 
-    # change Microsoft filters to SASS calling convention
+    # change Microsoft filters to Sass calling convention
     def replace_ms_filters(file)
       log_transform
       file.gsub(
@@ -497,7 +509,7 @@ SASS
     end
 
     def replace_escaping(less)
-      less = less.gsub(/~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
+      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}")
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape

data/tasks/converter/network.rb

@@ -3,8 +3,12 @@ class Converter
   module Network
     protected
 
-    def get_paths_by_type(dir, file_re, tree = get_tree(get_tree_sha(dir)))
-      tree['tree'].select { |f| f['type'] == 'blob' && f['path'] =~ file_re }.map { |f| f['path'] }
+    def get_paths_by_type(dir, file_re, recursive = true)
+      get_file_paths(dir, recursive).select { |path| path =~ file_re }
+    end
+
+    def get_file_paths(dir, recursive = true)
+      get_tree(get_tree_sha(dir), recursive)['tree'].select { |f| f['type'] == 'blob' }.map { |f| f['path'] }
     end
 
     def read_files(path, files)
@@ -44,7 +48,8 @@ class Converter
 
 
     def get_file(url)
-      cache_path = "./#@cache_path#{URI(url).path}"
+      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)
         log_http_get_file url, true
@@ -81,8 +86,8 @@ class Converter
       @trees ||= get_tree(@branch_sha)
     end
 
-    def get_tree(sha)
-      get_json("https://api.github.com/repos/#@repo/git/trees/#{sha}")
+    def get_tree(sha, recursive = true)
+      get_json("https://api.github.com/repos/#@repo/git/trees/#{sha}#{'?recursive=1' if recursive}")
     end
 
     def get_json(url)

data/tasks/converter.rb

@@ -50,7 +50,7 @@ class Converter
   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
 
   def process_bootstrap
-    log_status "Convert Bootstrap LESS to SASS"
+    log_status "Convert Bootstrap LESS to Sass"
     puts " repo   : #@repo_url"
     puts " branch : #@branch_sha #@repo_url/tree/#@branch"
     puts " save to: #{@save_to.to_json}"

data/templates/project/_bootstrap-variables.sass

@@ -1,9 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.1.0):
-
-// 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: (twbs-font-path("") != unquote('twbs-font-path("")'))
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.6):
 
 //
 // Variables
@@ -21,7 +16,7 @@
 // $gray-light:             lighten($gray-base, 46.7%) // #777
 // $gray-lighter:           lighten($gray-base, 93.5%) // #eee
 
-// $brand-primary:         darken(#428bca, 6.5%)
+// $brand-primary:         darken(#428bca, 6.5%) // #337ab7
 // $brand-success:         #5cb85c
 // $brand-info:            #5bc0de
 // $brand-warning:         #f0ad4e
@@ -84,7 +79,8 @@
 
 //** Load fonts from this directory.
 
-// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
 // $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/")
 
 //** File name for all font files.
@@ -109,7 +105,7 @@
 // $padding-xs-vertical:       1px
 // $padding-xs-horizontal:     5px
 
-// $line-height-large:         1.33
+// $line-height-large:         1.3333333 // extra decimals for Win 8.1 Chrome
 // $line-height-small:         1.5
 
 // $border-radius-base:        4px
@@ -180,6 +176,11 @@
 
 // $btn-link-disabled-color:        $gray-light
 
+// Allows for customizing button radius independently from global border radius
+// $btn-border-radius-base:         $border-radius-base
+// $btn-border-radius-large:        $border-radius-large
+// $btn-border-radius-small:        $border-radius-small
+
 
 //== Forms
 //
@@ -197,6 +198,7 @@
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 // $input-border-radius:            $border-radius-base
 //** Large `.form-control` border radius
 // $input-border-radius-large:      $border-radius-large
@@ -216,6 +218,9 @@
 //** Small `.form-control` height
 // $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
 
+//** `.form-group` margin
+// $form-group-margin-bottom:       15px
+
 // $legend-color:                   $gray-dark
 // $legend-border-color:            #e5e5e5
 
@@ -275,7 +280,8 @@
 // $zindex-popover:           1060
 // $zindex-tooltip:           1070
 // $zindex-navbar-fixed:      1030
-// $zindex-modal:             1040
+// $zindex-modal-background:  1040
+// $zindex-modal:             1050
 
 
 //== Media queries breakpoints
@@ -388,7 +394,7 @@
 // $navbar-default-toggle-border-color:       #ddd
 
 
-// Inverted navbar
+//=== Inverted navbar
 // Reset inverted navbar basics
 // $navbar-inverse-color:                      lighten($gray-light, 15%)
 // $navbar-inverse-bg:                         #222
@@ -489,6 +495,7 @@
 // $jumbotron-bg:                   $gray-lighter
 // $jumbotron-heading-color:        inherit
 // $jumbotron-font-size:            ceil(($font-size-base * 1.5))
+// $jumbotron-heading-font-size:    ceil(($font-size-base * 4.5))
 
 
 //== Form states and alerts
@@ -862,5 +869,7 @@
 // $page-header-border-color:    $gray-lighter
 //** Width of horizontal description list titles
 // $dl-horizontal-offset:        $component-offset-horizontal
+//** Point at which .dl-horizontal becomes horizontal
+// $dl-horizontal-breakpoint:    $grid-float-breakpoint
 //** Horizontal line color.
 // $hr-border:                   $gray-lighter

data/templates/project/styles.sass

@@ -1,3 +1,6 @@
+// Import Bootstrap Compass integration
 @import "bootstrap-compass"
+// Import custom Bootstrap variables
 @import "bootstrap-variables"
+// Import Bootstrap for Sass
 @import "bootstrap"

data/test/dummy_rails/app/views/pages/root.html.slim

@@ -1,3 +1,46 @@
+.navbar.navbar-inverse: .container-fluid
+  .navbar-header
+    button.navbar-toggle.collapsed type="button" data-toggle="collapse" data-target="#c1"
+      span.sr-only Toggle navigation
+      span.icon-bar
+      span.icon-bar
+      span.icon-bar
+    a.navbar-brand href="#" Bootstrap for Sass Test Rails App
+  .collapse.navbar-collapse#c1
+    ul.nav.navbar-nav
+      li.active: a href="#"
+        ' Home
+        span.sr-only (current)
+      li: a href="#" Link
+      li.dropdown
+        a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+          ' Dropdown
+          span.caret
+        ul.dropdown-menu role="menu"
+          li: a href="#" Action
+          li: a href="#" Another action
+          li: a href="#" Something else here
+          li.divider
+          li: a href="#" Separated link
+          li.divider
+          li: a href="#" One more separated link
+    form.navbar-form.navbar-left role="search"
+      .input-group
+        input.form-control type="search" placeholder="Search..."
+        .input-group-btn: button.btn.btn-primary type="submit" Go
+    ul.nav.navbar-nav.navbar-right
+      li: a href="#" Link
+      li.dropdown
+        a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+          ' Dropdown
+          span.caret
+        ul.dropdown-menu role="menu"
+          li: a href="#" Action
+          li: a href="#" Another action
+          li: a href="#" Something else here
+          li.divider
+          li: a href="#" Separated link
+
 .container
   .panel.panel-primary
     .panel-heading: h1 Dummy App

data/test/dummy_rails/config/application.rb

@@ -12,13 +12,13 @@ end
 
 require 'slim-rails'
 require 'jquery-rails'
-require 'compass'
 require 'bootstrap-sass'
 require 'uglifier'
 
 module Dummy
   class Application < Rails::Application
     config.assets.enabled = true if config.assets.respond_to?(:enabled)
+    config.assets.precompile += %w( application.css application.js )
     config.to_prepare do
       if ENV['VERBOSE']
         STDERR.puts "Loaded Rails #{Rails::VERSION::STRING}, Sprockets #{Sprockets::VERSION}",

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 'sass', '~> 3.3'
 gem 'bootstrap-sass', path: '../..'

data/test/gemfiles/rails_head.gemfile

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gem 'actionpack', github: 'rails/rails'
+gem 'activesupport', github: 'rails/rails'
+
+# Required git dependencies as per https://github.com/rails/rails/blob/51211a94bd7a34d80f2412a7f94fefe7366647a5/Gemfile:
+gem 'rack', github: 'rack/rack'
+gem 'sprockets', github: 'rails/sprockets'
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
+gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
+
+gem 'autoprefixer-rails', github: 'ai/autoprefixer-rails'
+
+gem 'compass', '~> 1.0.1', require: false
+
+gemspec path: '../../'
+