bootstrap-sass 3.1.1.1 → 3.2.0.4

data/templates/project/{_variables.sass.erb → _bootstrap-variables.sass.erb}

@@ -1,5 +1,3 @@
-@import "bootstrap/variables"
-
 <% require 'bootstrap-sass/version' %>
 // Override Bootstrap variables here (defaults from bootstrap-sass v<%= Bootstrap::VERSION %>):
 

data/templates/project/manifest.rb

@@ -3,23 +3,24 @@ description 'Bootstrap for Sass'
 # Stylesheet importing bootstrap
 stylesheet 'styles.sass'
 
-# SCSS:
-
-assets = "../../vendor/assets"
+manifest = Pathname.new(File.dirname(__FILE__))
+assets   = File.expand_path('../../assets', manifest)
 
+# Provide variables files
 bs_stylesheets = "#{assets}/stylesheets/bootstrap"
-stylesheet '_variables.sass.erb', :to => '_variables.sass', :erb => true,
-           :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
-
-# JS:
-bs_javascripts = "#{assets}/javascripts/bootstrap"
-Dir.glob File.expand_path("#{bs_javascripts}/*.js", File.dirname(__FILE__)) do |path|
-  file = File.basename(path)
-  javascript "#{bs_javascripts}/#{file}", :to => "bootstrap/#{file}"
-end
+stylesheet '_bootstrap-variables.sass.erb',
+           :erb               => true,
+           :to                => '_bootstrap-variables.sass',
+           :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", manifest)
 
-bs_fonts = "#{assets}/fonts/bootstrap"
-Dir.glob File.expand_path("#{bs_fonts}/*", File.dirname(__FILE__)) do |path|
-  file = File.basename(path)
-  font "#{bs_fonts}/#{file}", :to => "bootstrap/#{file}"
+# Copy JS and fonts
+{:javascript => 'javascripts',
+ :font       => 'fonts'
+}.each do |method, dir|
+  root = Pathname.new(assets).join(dir)
+  Dir.glob root.join('**', '*.*') do |path|
+    path = Pathname.new(path)
+    send method, path.relative_path_from(manifest).to_s,
+         :to => path.relative_path_from(root).to_s
+  end
 end

data/templates/project/styles.sass

@@ -1,3 +1,3 @@
-// customize bootstrap variables here:
-@import "variables"
+@import "bootstrap-compass"
+@import "bootstrap-variables"
 @import "bootstrap"

data/test/compass_test.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
 
-class CompassTest < Test::Unit::TestCase
-  def test_create_project_with_boostrap
-    command = 'compass create tmp/new-compass-project -r bootstrap-sass --using bootstrap --trace --force'
-    assert silence_stream(STDOUT) { system(command) }, 'Compass project creation failed!'
+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/compilation_test.rb

@@ -1,17 +1,18 @@
 require 'test_helper'
 require 'fileutils'
+require 'sass'
 
-class CompilationTest < Test::Unit::TestCase
+class CompilationTest < Minitest::Test
   def test_compilation
-    path = 'vendor/assets/stylesheets'
-    %w(bootstrap bootstrap/_theme).each do |file|
+    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])
-      assert_nothing_raised do
-        FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
-        File.open("tmp/#{file}.css", 'w') { |f|
-          f.write engine.render
-        }
-      end
+      FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
+      File.open("tmp/#{file}.css", 'w') { |f|
+        f.write engine.render
+      }
+      assert true # nothing was raised
     end
   end
 end

data/test/dummy_node_mincer/manifest.js

@@ -39,10 +39,10 @@ var environment = new Mincer.Environment(process.cwd());
 
 // Include bootstrap scss load path
 var bootstrapPath = '../../';
-environment.appendPath(bootstrapPath + 'vendor/assets/stylesheets');
+environment.appendPath(bootstrapPath + 'assets/stylesheets');
 
 // Include fonts load path
-environment.appendPath(bootstrapPath + 'vendor/assets/fonts');
+environment.appendPath(bootstrapPath + 'assets/fonts');
 
 // Include dir with assets, root just for test
 environment.appendPath('./');

data/test/dummy_rails/README.rdoc

@@ -1,3 +1,3 @@
 == README
 
-This is a dummy app for testing REP
+This is a minimal Rails app for testing

data/test/dummy_rails/app/assets/javascripts/application.js

@@ -1,2 +1,2 @@
 //= require jquery
-//= require bootstrap
+//= require bootstrap-sprockets

data/test/dummy_rails/app/assets/stylesheets/application.css.sass

@@ -1 +1,2 @@
-@import "bootstrap"
+@import 'bootstrap-sprockets'
+@import 'bootstrap'

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

@@ -32,7 +32,7 @@
 
           form.form-inline
             .form-group
-              input.sr-only for="exampleInputEmail2" Email address
+              label.sr-only for="exampleInputEmail2" Email address
               input.form-control#exampleInputEmail2 type="email" placeholder="Enter email"
             .checkbox
               label

data/test/dummy_rails/config/application.rb

@@ -1,14 +1,30 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
-Bundler.require(*Rails.groups)
-require 'bootstrap-sass'
+require 'rails'
+
+%w(
+  action_controller
+  action_view
+  sprockets
+).each do |framework|
+  require "#{framework}/railtie"
+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.to_prepare do
+      if ENV['VERBOSE']
+        STDERR.puts "Loaded Rails #{Rails::VERSION::STRING}, Sprockets #{Sprockets::VERSION}",
+                    "Asset paths: #{Rails.application.config.assets.paths}"
+      end
+    end
   end
 end
 

data/test/dummy_sass_only/compile.rb

@@ -1,12 +1,12 @@
 require 'sass'
 require 'bootstrap-sass'
+require 'fileutils'
 
-css = Sass.compile(
-    File.read(File.expand_path('./import_all.sass', File.dirname(__FILE__))),
-    :syntax => 'sass'
-)
+scss_path = File.expand_path('./import_all.sass', File.dirname(__FILE__))
+css = Sass.compile File.read(scss_path), syntax: 'sass'
 
 if ARGV[0]
+  FileUtils.mkdir_p File.dirname(ARGV[0])
   File.open(ARGV[0], 'w') { |f| f.write css }
 else
   puts css

data/test/gemfiles/sass_3_2.gemfile

@@ -1,16 +1,6 @@
 source "https://rubygems.org"
 
 gem 'sass', '~> 3.2.0'
-
-platform :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-test-unit', '~> 2.0'
-  gem 'json', '>= 1.8.1'
-  gem 'racc'
-end
-
-platform :jruby do
-  gem 'test-unit'
-end
+gem 'compass', require: false
 
 gemspec path: '../../'

data/test/gemfiles/sass_3_3.gemfile

@@ -1,17 +1,6 @@
 source "https://rubygems.org"
 
-gem 'sass', '~> 3.3.4'
-gem 'compass', '~> 1.0.0.alpha.19'
-
-platform :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-test-unit', '~> 2.0'
-  gem 'json', '>= 1.8.1'
-  gem 'racc'
-end
-
-platform :jruby do
-  gem 'test-unit'
-end
+gem 'sass', '~> 3.3.14'
+gem 'compass', '~> 1.0.1', require: false
 
 gemspec path: '../../'

data/test/gemfiles/sass_3_4.gemfile

@@ -0,0 +1,7 @@
+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,17 +1,6 @@
 source "https://rubygems.org"
 
-gem 'sass', git: 'https://github.com/nex3/sass'
-gem 'compass', git: 'https://github.com/chriseppstein/compass', branch: 'master'
-
-platform :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-test-unit', '~> 2.0'
-  gem 'json', '>= 1.8.1'
-  gem 'racc'
-end
-
-platform :jruby do
-  gem 'test-unit'
-end
+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: '../../'

data/test/node_mincer_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'json'
 
-class NodeMincerTest < Test::Unit::TestCase
+class NodeMincerTest < Minitest::Test
   DUMMY_PATH = 'test/dummy_node_mincer'
 
   def test_font_helper_without_suffix
@@ -21,13 +21,14 @@ class NodeMincerTest < Test::Unit::TestCase
   end
 
   def setup
-    tmp_dir = File.join Bootstrap.gem_path, 'tmp/node-mincer'
+    tmp_dir = File.join GEM_PATH, 'tmp/node-mincer'
     command = "node manifest.js #{tmp_dir}"
-    Dir.chdir DUMMY_PATH do
-      assert silence_stream(STDOUT) {
+    success = Dir.chdir DUMMY_PATH do
+      silence_stdout_if !ENV['VERBOSE'] do
         system(command)
-      }, 'Node.js Mincer compilation failed'
+      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 = File.read("#{tmp_dir}/#{css_name}")

data/test/node_sass_test.rb

@@ -1,15 +1,16 @@
 require 'test_helper'
 require 'fileutils'
 
-class NodeSassTest < Test::Unit::TestCase
+class NodeSassTest < Minitest::Test
   def test_node_sass_compilation
-    path = 'vendor/assets/stylesheets'
+    path = 'assets/stylesheets'
     %w(bootstrap bootstrap/_theme).each do |file|
-      FileUtils.mkdir_p "tmp/node-sass"
+      FileUtils.mkdir_p 'tmp/node-sass'
       command = "node-sass #{path}/#{file} -o tmp/node-sass/#{File.basename file}.css"
-      assert silence_stream(STDOUT) {
-        system(command)
-      }, 'node-sass compilation failed'
+      success = silence_stderr_if !ENV['VERBOSE'] do
+        system command
+      end
+      assert success, 'node-sass compilation failed'
     end
   end
 end

data/test/pages_test.rb

@@ -1,7 +1,7 @@
-require 'test_helper'
+require 'test_helper_rails'
 
 class PagesTest < ActionDispatch::IntegrationTest
-  include ::IntegrationTest
+  include ::DummyRailsIntegration
 
   def test_visit_root
     visit root_path
@@ -11,4 +11,4 @@ class PagesTest < ActionDispatch::IntegrationTest
 
     screenshot!
   end
-end
+end

data/test/sass_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
+require 'shellwords'
 
-class SassTest < Test::Unit::TestCase
+class SassTest < Minitest::Test
   DUMMY_PATH = 'test/dummy_sass_only'
 
   def test_font_helper
@@ -9,15 +10,17 @@ class SassTest < Test::Unit::TestCase
 
   def setup
     Dir.chdir DUMMY_PATH do
+      %x[rm -rf .sass-cache/]
       %x[bundle]
     end
-    css_path = File.join Bootstrap.gem_path, 'tmp/bootstrap-sass-only.css'
-    command = "bundle exec ruby compile.rb #{css_path}"
-    Dir.chdir DUMMY_PATH do
-      assert silence_stream(STDOUT) {
+    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)
-      }, 'Sass-only compilation failed'
+      end
     end
+    assert success, 'Sass-only compilation failed'
     @css = File.read(css_path)
   end
 end

data/test/sprockets_rails_test.rb

@@ -3,12 +3,18 @@ require 'fileutils'
 require 'find'
 require 'shellwords'
 
-class SprocketsRailsTest < ActiveSupport::TestCase
+class SprocketsRailsTest < Minitest::Test
 
   def test_sprockets_digest_asset_refs
-    system "cd #{Shellwords.escape Rails.root.to_s} && bundle exec rake assets:precompile GEMFILE=#{Bootstrap.gem_path}/Gemfile RAILS_ENV=production"
-    Dir.glob(Rails.root.join('public', 'assets', 'app*.*')) do |path|
-      next unless path =~ /\.(css|js)$/
+    root     = 'test/dummy_rails'
+    command  = "bundle exec rake assets:precompile GEMFILE=#{GEM_PATH}/Gemfile RAILS_ENV=production"
+    compiled = Dir.chdir root do
+      silence_stderr_if !ENV['VERBOSE'] do
+        system(command)
+      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
@@ -16,6 +22,6 @@ class SprocketsRailsTest < ActiveSupport::TestCase
       end
     end
   ensure
-    system "rm -rf #{Rails.root}/public/assets/ #{Rails.root}/tmp/cache/"
+    FileUtils.rm_rf %W(#{root}/public/assets/ #{root}/tmp/cache/), secure: true
   end
 end

data/test/support/dummy_rails_integration.rb

@@ -0,0 +1,22 @@
+require 'capybara'
+require 'fileutils'
+module DummyRailsIntegration
+  include Capybara::DSL
+
+  def setup
+    super
+    FileUtils.rm_rf('test/dummy_rails/tmp/cache', secure: true)
+  end
+
+  def teardown
+    super
+    Capybara.reset_sessions!
+    Capybara.use_default_driver
+  end
+
+  def screenshot!
+    path = "tmp/#{name}.png"
+    page.driver.render(File.join(GEM_PATH, path), full: true)
+    STDERR.puts "Screenshot saved to #{path}"
+  end
+end

data/test/support/integration_test.rb

@@ -4,7 +4,7 @@ module IntegrationTest
 
   def setup
     super
-    %x[rm -rf test/dummy/tmp/cache]
+    %x[rm -rf test/dummy_rails/tmp/cache]
   end
 
   def teardown
@@ -13,17 +13,10 @@ module IntegrationTest
     Capybara.use_default_driver
   end
 
-  def after_teardown
-    if @passed.blank?
-      screenshot!
-      puts "Failed at: #{current_url}"
-    end
-  end
-
   def screenshot!
     screenshot_dir = File.expand_path('../../tmp/', File.dirname(__FILE__))
-    page.driver.render(File.join(screenshot_dir, "#{@__name__}.png"), :full => true)
+    page.driver.render(File.join(screenshot_dir, "#{name}.png"), :full => true)
     source = page.evaluate_script("document.getElementsByTagName('html')[0].outerHTML") rescue nil
-    File.open(File.join(screenshot_dir, "#{@__name__}.html"), 'w') { |f| f.write(source) } if source
+    File.open(File.join(screenshot_dir, "#{name}.html"), 'w') { |f| f.write(source) } if source
   end
-end
+end

data/test/support/reporting.rb

@@ -0,0 +1,17 @@
+module Kernel
+  def silence_stdout_if(cond, &run)
+    silence_stream_if(cond, STDOUT, &run)
+  end
+
+  def silence_stderr_if(cond, &run)
+    silence_stream_if(cond, STDERR, &run)
+  end
+
+  def silence_stream_if(cond, stream, &run)
+    if cond
+      silence_stream(stream, &run)
+    else
+      run.call
+    end
+  end
+end