twbs_sass_rails 0.2.0 → 0.3.1

data/gemfiles/Gemfile.rails-3.2.x

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec path: '../'
 
 # Dummy application dependencies
-gem 'rails', '3.2.14'
-gem 'therubyracer'
-gem 'less-rails'
+gem 'rails', '3.2.16'
 gem 'uglifier'
+gem 'sass-rails',   '~> 3.2.3'

data/gemfiles/Gemfile.rails-4.0.x

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec path: '../'
 
 # Dummy application dependencies
-gem 'rails', '4.0.0'
-gem 'therubyracer'
-gem 'less-rails'
+gem 'rails', '4.0.2'
 gem 'uglifier'
+gem 'sass-rails', '~> 4.0.0'

data/lib/generators/twbs_sass_rails/install/install_generator.rb

@@ -23,8 +23,8 @@ module TwbsSassRails
 
       def copy_bootstrap
         copy_file 'twbs.js.coffee', 'app/assets/javascripts/twbs.js.coffee'
-        copy_file 'twbs-variables.css.less', 'app/assets/stylesheets/twbs-variables.css.less'
-        copy_file 'twbs.css.less', 'app/assets/stylesheets/twbs.css.less'
+        copy_file 'twbs-variables.css.scss', 'app/assets/stylesheets/twbs-variables.css.scss'
+        copy_file 'twbs.css.scss', 'app/assets/stylesheets/twbs.css.scss'
       end
     end
   end

data/lib/generators/twbs_sass_rails/install/templates/{twbs-variables.css.less → twbs-variables.css.scss}

@@ -1,5 +1,6 @@
-@import "twbs/bootstrap/variables";
-
 /* Override Bootstrap variables here
- * Example: @brand-primary: navy;
+ * Example: $brand-primary: navy;
  */
+
+/* Do not edit below this line */
+@import "twbs/bootstrap/variables";

data/lib/generators/twbs_sass_rails/install/templates/{twbs.css.less → twbs.css.scss}

@@ -1,10 +1,15 @@
-@import "twbs/bootstrap";
-//@import "twbs/bootstrap/theme";
-//@import "twbs/bootstrap/glyphicons";
-@import "fontawesome/font-awesome";
-
 /* Use twbs-variables to define new variables and override Bootstrap defaults.
- * Import "twbs-variables.css.less" instead of "twbs/bootstrap/variables"
+ * Import "twbs-variables" instead of "twbs/bootstrap/variables"
  * in each new stylesheet.
  */
-@import "twbs-variables.css.less";
+@import "twbs-variables";
+
+/* Start editing below this line */
+@import "twbs/bootstrap";
+
+/* Bootstrap Theme */
+//@import "twbs/bootstrap/theme";
+
+/* Glyphs */
+//@import "twbs/bootstrap/glyphicons";
+//@import "fontawesome/font-awesome";

data/lib/twbs_sass_rails/version.rb

@@ -1,3 +1,3 @@
 module TwbsSassRails
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/test/dummy/app/assets/stylesheets/test.css.scss

@@ -0,0 +1,9 @@
+@import "twbs-variables";
+
+.test-class {
+  color: $link-color;
+}
+
+.test-hover-class {
+  color: $link-hover-color;
+}

data/test/dummy/app/assets/stylesheets/twbs-variables.css.scss

@@ -0,0 +1,7 @@
+/* Override Bootstrap variables here
+ * Example: $brand-primary: navy;
+ */
+$brand-primary: #d10d10;
+
+/* Do not edit below this line */
+@import "twbs/bootstrap/variables";

data/test/dummy/app/assets/stylesheets/{twbs.css.less → twbs.css.scss}

@@ -1,10 +1,15 @@
-@import "twbs/bootstrap";
-@import "twbs/bootstrap/theme";
-@import "twbs/bootstrap/glyphicons";
-@import "fontawesome/font-awesome";
-
 /* Use twbs-variables to define new variables and override Bootstrap defaults.
- * Import "twbs-variables.css.less" instead of "twbs/bootstrap/variables"
+ * Import "twbs-variables" instead of "twbs/bootstrap/variables"
  * in each new stylesheet.
  */
-@import "twbs-variables.css.less";
+@import "twbs-variables";
+
+/* Start editing below this line */
+@import "twbs/bootstrap";
+
+/* Bootstrap Theme */
+//@import "twbs/bootstrap/theme";
+
+/* Glyphs */
+@import "twbs/bootstrap/glyphicons";
+@import "fontawesome/font-awesome";

data/test/dummy/config/application.rb

@@ -1,6 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 require "twbs_sass_rails"

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

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
+  # 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

data/test/generators/install_generator_test.rb

@@ -9,12 +9,12 @@ class InstallGeneratorTest < ::Rails::Generators::TestCase
   test "Assert all files are properly created" do
     run_generator
     assert_file 'app/assets/stylesheets/application.css'
-    assert_file 'app/assets/stylesheets/twbs-variables.css.less' do |file_content|
-      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.less', File.dirname(__FILE__))
+    assert_file 'app/assets/stylesheets/twbs-variables.css.scss' do |file_content|
+      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs-variables.css.scss', File.dirname(__FILE__))
       assert_match file_content, File.read(template_file)
     end
-    assert_file 'app/assets/stylesheets/twbs.css.less' do |file_content|
-      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.css.less', File.dirname(__FILE__))
+    assert_file 'app/assets/stylesheets/twbs.css.scss' do |file_content|
+      template_file = File.expand_path('../../lib/generators/twbs_sass_rails/install/templates/twbs.css.scss', File.dirname(__FILE__))
       assert_match file_content, File.read(template_file)
     end
     assert_file 'app/assets/javascripts/application.js'

data/test/integration/assets_precompile_integration_test.rb

@@ -4,11 +4,11 @@ describe "assets precompile in production environment integration" do
   FileUtils::rm_rf 'test/dummy/public/assets'
   system 'cd test/dummy && RAILS_ENV=production rake assets:precompile'
 
-  it "provides respond.js" do
+  it "provides Respond.js" do
     visit "/assets/#{get_asset_name('respond','js')}"
   end
 
-  it "provides fontawesome" do
+  it "provides Font Awesome" do
     ['eot', 'svg', 'ttf', 'woff'].each do |fmt|
       font_file = get_asset_name('fontawesome-webfont', fmt)
       # NOTE: Rails 3 skips fingerprint when asset has parameters.
@@ -20,7 +20,7 @@ describe "assets precompile in production environment integration" do
     end
   end
 
-  it "provides glyphicons" do
+  it "provides Glyphicons" do
     ['eot', 'svg', 'ttf', 'woff'].each do |fmt|
       font_file = get_asset_name('glyphicons-halflings-regular', fmt)
       # NOTE: Rails 3 skips fingerprint when asset has parameters.
@@ -34,12 +34,18 @@ describe "assets precompile in production environment integration" do
 
   it "overrides Bootstrap variables" do
     visit "/assets/#{get_asset_name('application', 'css')}"
-    page.text.must_include 'color: #d10d10;'
+    color = Rails.version.start_with?('3') ? 'color: #d10d10;' : 'color:#d10d10'
+    hover_color = Rails.version.start_with?('3') ? 'color: #89090a;' : 'color:#89090a'
+    page.text.must_include color
+    page.text.must_include hover_color # automatically generated hover
   end
 
   it "overrides Bootstrap variables in user stylesheets" do
     visit "/assets/#{get_asset_name('application', 'css')}"
-    page.text.must_include '.test-class { color: #d10d10; }'
+    test_class = Rails.version.start_with?('3') ? '.test-class { color: #d10d10; }' : '.test-class{color:#d10d10}'
+    test_hover_class = Rails.version.start_with?('3') ? '.test-hover-class { color: #89090a; }' : '.test-hover-class{color:#89090a}'
+    page.text.must_include test_class
+    page.text.must_include test_hover_class
   end
 
   private

data/test/integration/twbs_sass_rails_integration_test.rb

@@ -1,34 +1,35 @@
 require 'test_helper'
 
 describe "twbs sass rails integration" do
-  it "does not default to glyphicons" do
+  it "does not include icons by default" do
     visit '/assets/default-twbs.css'
     page.text.wont_include 'Glyphicons Halflings'
+    page.text.wont_include 'FontAwesome'
   end
 
-  it "provides bootstrap stylesheet on the asset pipeline" do
+  it "provides Bootstrap stylesheets on the asset pipeline" do
     visit '/assets/application.css'
-    page.text.must_include '* Bootstrap'
+    page.text.must_include 'MIT License'
   end
 
-  it "provides bootstrap javscript on the asset pipeline" do
+  it "provides Bootstrap javscripts on the asset pipeline" do
     visit '/assets/application.js'
     page.text.must_include '* Bootstrap'
   end
 
-  it "provides respond.js on the asset pipeline" do
+  it "provides Respond.js on the asset pipeline" do
     visit '/assets/respond.js'
     page.text.must_include 'Respond.js'
   end
 
-  it "provides fontawesome on the asset pipeline" do
+  it "provides Font Awesome on the asset pipeline" do
     visit '/assets/fontawesome-webfont.eot'
     visit '/assets/fontawesome-webfont.svg'
     visit '/assets/fontawesome-webfont.ttf'
     visit '/assets/fontawesome-webfont.woff'
   end
 
-  it "provides glyphicons on the asset pipeline" do
+  it "provides Glyphicons on the asset pipeline" do
     visit '/assets/glyphicons-halflings-regular.eot'
     visit '/assets/glyphicons-halflings-regular.svg'
     visit '/assets/glyphicons-halflings-regular.ttf'

data/test/test_helper.rb

@@ -11,15 +11,13 @@ end
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
+require 'minitest/autorun'
+
 require 'rails/test_help'
 Rails.backtrace_cleaner.remove_silencers!
 
-require 'minitest/autorun'
 require 'capybara/rails'
 
-require 'debugger'
-Debugger.settings[:autoeval] = true
-
 require 'turn'
 Turn.config.format = :cool
 Turn.config.natural = true

data/twbs_sass_rails.gemspec

@@ -10,25 +10,22 @@ Gem::Specification.new do |s|
   s.authors     = ['diowa']
   s.email       = ['dev@diowa.com']
   s.homepage    = 'https://github.com/diowa/twbs_sass_rails'
-  s.summary     = 'Bootstrap Sass assets in a Rails application.'
-  s.description = s.summary
-  s.license     = 'BSD 2-Clause'
+  s.summary     = 'Bootstrap and FontAwesome assets in Rails applications'
+  s.description = 'Provides assets for Bootstrap and FontAwesome in your Rails application.'
+  s.license     = 'BSD-2-Clause'
 
   s.files         = `git ls-files`.split("\n") - `git ls-files -- {src/*,".*"}`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'rails', '>= 3.2.14'
-  s.add_runtime_dependency 'therubyracer'
-  s.add_runtime_dependency 'less-rails'
+  s.add_runtime_dependency 'rails', '>= 3.2.16'
+  s.add_runtime_dependency 'sass-rails', '>= 3.2'
 
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'debugger'
-  s.add_development_dependency 'minitest', '~> 4'
+  s.add_development_dependency 'minitest', '~> 4' # NOTE: version 5 is not supported by Rails 4.0
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'turn'
 end