less-rails-bootstrap 1.3.2 → 1.3.3

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+test/dummy_app/log/*
+tmp/*

data/CHANGELOG.md

@@ -1,20 +1,27 @@
 CHANGELOG
 =========
 
-1.3.2 (Sept 28, 2011)
----------------------
+1.3.3 - 10/09/2011
+------------------
+
+* Move bootstrap LESS files to vendor/frameworks. Should fix assets:precompile bugs.
+* New test setup and hopefully a more sane engine initializer.
+
+
+1.3.2 - 09/28/2011
+------------------
 
 * Require less-rails properly. Thanks Benoit Bénézech (bbenezech).
 
 
-1.3.1 (Sept 26, 2011)
----------------------
+1.3.1 - 09/26/2011
+------------------
 
 * Require twipsy before popover [stratequip]
 
 
-1.3.0 (Sept 25, 2011)
----------------------
+1.3.0 - 09/25/2011
+------------------
 
 * Initial 1.3.0 release (68605bdd51760a929cc661607f06f479c53b0bee)
 

data/Gemfile

@@ -1,2 +1,5 @@
 source :rubygems
 gemspec
+
+gem 'less-rails', :path => ENV['LESS_RAILS_PATH'] if ENV['LESS_RAILS_PATH']
+

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'minitest' do
+  watch(%r|^lib/less/rails/bootstrap/(.*)\.rb|)   { |m| "test/cases/#{m[1]}_spec.rb" }
+  watch(%r|^test/spec_helper\.rb|)                { "test/cases" }
+  watch(%r|^test/cases/(.*)_spec\.rb|)
+end

data/Rakefile

@@ -1 +1,14 @@
-require "bundler/gem_tasks"
+require 'bundler'
+require 'rake/testtask'
+
+Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new do |t|
+  t.libs = ['lib','test']
+  t.test_files = Dir.glob("test/**/*_spec.rb").sort
+  t.verbose = true
+end
+
+task :default => [:test]
+task :spec => [:test]
+

data/less-rails-bootstrap.gemspec

@@ -15,4 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_runtime_dependency "less-rails", "~> 2.0.0"
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'guard-minitest'
+  s.add_development_dependency 'rails', '~> 3.1.1'
 end

data/lib/less-rails-bootstrap.rb

@@ -5,5 +5,5 @@ module Less
   end
 end
 
-require 'less/rails'
-require "less/rails/bootstrap"
+require 'less-rails'
+require 'less/rails/bootstrap'

data/lib/less/rails/bootstrap/engine.rb

@@ -3,9 +3,8 @@ module Less
     module Bootstrap
       class Engine < ::Rails::Engine
         
-        config.after_initialize do |app|
-          bootstrap_less_files = config.root + 'vendor/stylesheets/twitter/bootstrap'
-          app.config.less.paths << bootstrap_less_files
+        initializer 'less-rails-bootstrap.setup', :after => 'less-rails.after.load_config_initializers', :group => :all do |app|
+          app.config.less.paths << File.join(config.root, 'vendor', 'frameworks')
         end
         
       end

data/lib/less/rails/bootstrap/version.rb

@@ -1,7 +1,7 @@
 module Less
   module Rails
     module Bootstrap
-      VERSION = "1.3.2"
+      VERSION = "1.3.3"
     end
   end
 end

data/test/cases/engine_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+class EngineSpec < Less::Rails::Bootstrap::Spec
+  
+  it 'must be able to hook into a less-rails config' do
+    dummy_config.less.must_be_instance_of ActiveSupport::OrderedOptions
+  end
+  
+  it 'must append engines assets stylesheets to less-rails load paths' do
+    dummy_config.less.paths.must_be_instance_of Array
+    dummy_config.less.paths.must_include project_vendor_twitter_bootstrap
+  end
+  
+
+end

data/test/cases/usage_css_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+class UsageCssSpec < Less::Rails::Bootstrap::Spec
+  
+  describe 'application.css' do
+    
+    let(:app_css) { dummy_asset('application.css') }
+    
+    it 'will render main bootstrap.less file and all included modules' do
+      app_css.must_include 'Bootstrap @VERSION',          'From boostrap.less'
+      app_css.must_include 'Forms.less',                  'From forms.less'
+      app_css.must_include 'Snippets of reusable CSS',    'From mixins.less'
+      app_css.must_include 'Patterns.less',               'From patterns.less'
+      app_css.must_include 'Scaffolding',                 'From scaffolding.less'
+      app_css.must_include 'Tables.less',                 'From tables.less'
+      app_css.must_include 'Typography.less',             'From type.less'
+      app_css.must_include 'Variables.less',              'From variables.less'
+    end
+    
+    it 'must include basic css afterward' do
+      app_css.must_include '#other-css { color: red; }',  'From our code afterward.'
+    end
+    
+  end
+  
+  describe 'framework.css.less' do
+    
+    before { dummy_config.less.compress = true }
+    
+    let(:framework_css) { dummy_asset('framework.css') }
+    
+    it 'will render bootstrap functions' do
+      border_radius_line = line_for_framework_css('framework-border-radius')
+      border_radius_line.must_include '-webkit-border-radius:4px'
+      border_radius_line.must_include '-moz-border-radius:4px'
+      border_radius_line.must_include 'border-radius:4px'
+    end
+    
+    it 'will render bootstrap variables' do
+      link_color_line = line_for_framework_css('framework-linkColor')
+      link_color_line.must_include 'color:#0069d6;'
+    end
+    
+  end
+  
+  describe 'individual.css.less' do
+    
+    before { dummy_config.less.compress = true }
+    
+    let(:individual_css) { dummy_asset('individual.css') }
+    
+    it 'will render bootstrap variables and mixins' do
+      my_button_line = line_for_individual_css('individual-my-button')
+      my_button_line.must_include '-webkit-border-radius:10px'
+      my_button_line.must_include '-moz-border-radius:10px'
+      my_button_line.must_include 'border-radius:10px'
+    end
+    
+  end
+
+
+  private
+  
+  def line_for_framework_css(name)
+    framework_css.each_line.detect{ |line| line.include? name }.strip
+  end
+  
+  def line_for_individual_css(name)
+    individual_css.each_line.detect{ |line| line.include? name }.strip
+  end
+
+end

data/test/cases/usage_js_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+class UsageJsSpec < Less::Rails::Bootstrap::Spec
+  
+  describe 'application.js' do
+    
+    let(:app_js) { dummy_asset('application.js') }
+    
+    it 'will render main bootstrap.js file and all included modules' do
+      app_js.must_include 'bootstrap-alerts.js'
+      app_js.must_include 'bootstrap-dropdown.js'
+      app_js.must_include 'bootstrap-modal.js'
+      app_js.must_include 'bootstrap-popover.js'
+      app_js.must_include 'bootstrap-scrollspy.js'
+      app_js.must_include 'bootstrap-tabs.js'
+      app_js.must_include 'bootstrap-twipsy.js'
+    end
+    
+    it 'must include basic js afterward' do
+      app_js.must_include '$(document).ready(function(){...});'
+    end
+    
+  end
+  
+  describe 'individual.css.less' do
+    
+    let(:individual_js) { dummy_asset('individual.js') }
+    
+    it 'will render bootstrap variables and mixins' do
+      individual_js.must_include 'bootstrap-modal.js'
+    end
+    
+  end
+
+
+end

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

@@ -0,0 +1,3 @@
+//= require twitter/bootstrap
+
+$(document).ready(function(){...});

data/test/dummy_app/app/assets/javascripts/individual.js

@@ -0,0 +1,2 @@
+//= require twitter/bootstrap/modal
+

data/test/dummy_app/app/assets/stylesheets/application.css

@@ -0,0 +1,6 @@
+/*
+ *= require twitter/bootstrap
+*/
+
+#other-css { color: red; }
+

data/test/dummy_app/app/assets/stylesheets/framework.css.less

@@ -0,0 +1,6 @@
+@import "twitter/bootstrap";
+
+#framework-start{color:red;}
+
+#framework-border-radius { .border-radius(4px); }
+#framework-linkColor { color: @linkColor; }

data/test/dummy_app/app/assets/stylesheets/individual.css.less

@@ -0,0 +1,10 @@
+@import "twitter/bootstrap/variables";
+@import "twitter/bootstrap/mixins";
+
+.myButton(@radius: 5px) {
+  .border-radius(@radius);
+}
+
+#individual-my-button {
+  .myButton(10px);
+}

data/test/dummy_app/init.rb

@@ -0,0 +1,21 @@
+require 'sprockets/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_view/base'
+require 'action_controller/base'
+
+module Dummy
+  class Application < ::Rails::Application
+
+    config.root = File.join __FILE__, '..'
+    config.active_support.deprecation = :stderr
+    config.cache_store = :memory_store
+    config.consider_all_requests_local = true
+    
+    config.assets.enabled = true
+    config.assets.cache_store = config.cache_store
+    
+  end
+end
+
+Dummy::Application.initialize!

data/test/spec_helper.rb

@@ -0,0 +1,54 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+require 'less-rails-bootstrap'
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'dummy_app/init'
+
+module Less
+  module Rails
+    module Bootstrap
+      class Spec < MiniTest::Spec
+
+        before do
+          reset_caches
+        end
+
+
+        private
+
+        def dummy_app
+          Dummy::Application
+        end
+
+        def dummy_config
+          dummy_app.config
+        end
+
+        def dummy_assets
+          dummy_app.assets
+        end
+
+        def dummy_asset(name)
+          dummy_assets[name].to_s.strip
+        end
+
+        def reset_caches
+          dummy_assets.version = SecureRandom.hex(32)
+          dummy_assets.cache.clear
+        end
+        
+        def project_root
+          File.expand_path File.join(File.dirname(__FILE__), '..')
+        end
+        
+        def project_vendor_twitter_bootstrap
+          File.join project_root, 'vendor', 'frameworks'
+        end
+
+      end
+    end
+  end
+end
+

data/vendor/frameworks/twitter/bootstrap.less

@@ -0,0 +1 @@
+@import "bootstrap/bootstrap.less";

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: less-rails-bootstrap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Ken Collins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 -04:00
+date: 2011-10-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,50 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard-minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
+        version: 3.1.1
+  type: :development
+  version_requirements: *id004
 description: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline
 email: 
 - ken@metaskills.net
@@ -47,6 +91,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - less-rails-bootstrap.gemspec
@@ -54,6 +99,16 @@ files:
 - lib/less/rails/bootstrap.rb
 - lib/less/rails/bootstrap/engine.rb
 - lib/less/rails/bootstrap/version.rb
+- test/cases/engine_spec.rb
+- test/cases/usage_css_spec.rb
+- test/cases/usage_js_spec.rb
+- test/dummy_app/app/assets/javascripts/application.js
+- test/dummy_app/app/assets/javascripts/individual.js
+- test/dummy_app/app/assets/stylesheets/application.css
+- test/dummy_app/app/assets/stylesheets/framework.css.less
+- test/dummy_app/app/assets/stylesheets/individual.css.less
+- test/dummy_app/init.rb
+- test/spec_helper.rb
 - vendor/assets/javascripts/twitter/bootstrap.js
 - vendor/assets/javascripts/twitter/bootstrap/alerts.js
 - vendor/assets/javascripts/twitter/bootstrap/dropdown.js
@@ -63,16 +118,16 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap/tabs.js
 - vendor/assets/javascripts/twitter/bootstrap/twipsy.js
 - vendor/assets/stylesheets/twitter/bootstrap.css.less
-- vendor/assets/stylesheets/twitter/bootstrap.less
-- vendor/assets/stylesheets/twitter/bootstrap/bootstrap.less
-- vendor/assets/stylesheets/twitter/bootstrap/forms.less
-- vendor/assets/stylesheets/twitter/bootstrap/mixins.less
-- vendor/assets/stylesheets/twitter/bootstrap/patterns.less
-- vendor/assets/stylesheets/twitter/bootstrap/reset.less
-- vendor/assets/stylesheets/twitter/bootstrap/scaffolding.less
-- vendor/assets/stylesheets/twitter/bootstrap/tables.less
-- vendor/assets/stylesheets/twitter/bootstrap/type.less
-- vendor/assets/stylesheets/twitter/bootstrap/variables.less
+- vendor/frameworks/twitter/bootstrap.less
+- vendor/frameworks/twitter/bootstrap/bootstrap.less
+- vendor/frameworks/twitter/bootstrap/forms.less
+- vendor/frameworks/twitter/bootstrap/mixins.less
+- vendor/frameworks/twitter/bootstrap/patterns.less
+- vendor/frameworks/twitter/bootstrap/reset.less
+- vendor/frameworks/twitter/bootstrap/scaffolding.less
+- vendor/frameworks/twitter/bootstrap/tables.less
+- vendor/frameworks/twitter/bootstrap/type.less
+- vendor/frameworks/twitter/bootstrap/variables.less
 has_rdoc: true
 homepage: http://github.com/metaskills/less-rails-bootstrap
 licenses: []
@@ -107,5 +162,14 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline
-test_files: []
-
+test_files: 
+- test/cases/engine_spec.rb
+- test/cases/usage_css_spec.rb
+- test/cases/usage_js_spec.rb
+- test/dummy_app/app/assets/javascripts/application.js
+- test/dummy_app/app/assets/javascripts/individual.js
+- test/dummy_app/app/assets/stylesheets/application.css
+- test/dummy_app/app/assets/stylesheets/framework.css.less
+- test/dummy_app/app/assets/stylesheets/individual.css.less
+- test/dummy_app/init.rb
+- test/spec_helper.rb

data/vendor/assets/stylesheets/twitter/bootstrap.less

@@ -1 +0,0 @@
-@import "bootstrap/bootstrap";