more 0.1.0 → 0.1.1

data/rails/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'controller_extension') if RAILS_ENV == 'development'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'less', 'controller_extension') if RAILS_ENV == 'development'

data/test/controller_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class ExampleController < ActionController::Base
+  def test
+    render :text => 'OK'
+  end
+end
+
+class ControllerTest < ActionController::TestCase
+  def setup
+    @controller = ExampleController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    setup_for_generate_test
+  end
+
+  def teardown
+    teardown_for_generate_test
+  end
+
+  should "generate less files" do
+    write_less 'xxx.less', 'a{color:red}'
+    get :test
+    assert_equal 'a { color: red; }', read_css('xxx.css').strip
+  end
+end

data/test/more_test.rb

@@ -1,102 +1,213 @@
 require 'test_helper'
 
-class MoreTest < Test::Unit::TestCase
-  def setup
+class MoreTest < ActiveSupport::TestCase
+  setup do
     [:compression, :header, :destination_path, :source_path].each do |variable|
       Less::More.send("#{variable}=", nil)
     end
   end
 
-  def prepare_for_generate
-    Less::More.source_path = 'less_files'
-    Less::More.destination_path = 'css'
+  context :header do
+    should "be true by default" do
+      assert_equal Less::More.header, true
+    end
 
-    `rm -rf #{css_path}`
-    `mkdir -p #{css_path}`
+    should "be overwriteable" do
+      Less::More.header = false
+      assert_equal false, Less::More.header
+    end
   end
 
-  def css_path
-    "#{Rails.root}/public/css"
-  end
+  context :source_path do
+    should "be app/stylesheets by default" do
+      assert_equal 'app/stylesheets', Less::More.source_path
+    end
 
-  def teardown
-    `rm -rf #{css_path}`
+    should "be overwritteable" do
+      Less::More.source_path = 'xxx'
+      assert_equal 'xxx', Less::More.source_path
+    end
   end
 
-  def test_default_for_header
-    assert_equal Less::More.header, true
-  end
+  context :destination_path do
+    should "be public/stylesheets by default" do
+      assert_equal 'stylesheets', Less::More.destination_path
+    end
 
-  def test_header_can_be_overwritten
-    Less::More.header = false
-    assert_equal false, Less::More.header
+    should "be overwritteable" do
+      Less::More.destination_path = 'xxx'
+      assert_equal 'xxx', Less::More.destination_path
+    end
   end
 
-  def test_default_for_source_path
-    assert_equal 'app/stylesheets', Less::More.source_path
-  end
+  context :compression do
+    should "be off by default" do
+      assert_equal nil, Less::More.compression
+    end
 
-  def test_source_path_can_be_overwritten
-    Less::More.source_path = 'xxx'
-    assert_equal 'xxx', Less::More.source_path
+    should "be overwritteable" do
+      Less::More.compression = true
+      assert_equal true, Less::More.compression
+    end
   end
 
-  def test_default_for_destination_path
-    assert_equal 'stylesheets', Less::More.destination_path
-  end
+  context :generate do
+    setup do
+      setup_for_generate_test
+    end
 
-  def test_destination_path_can_be_overwritten
-    Less::More.destination_path = 'xxx'
-    assert_equal 'xxx', Less::More.destination_path
-  end
+    teardown do
+      teardown_for_generate_test
+    end
 
-  def test_default_for_compression
-    assert_equal nil, Less::More.compression
-  end
+    should 'generate css from .less files' do
+      write_less 'test.less', "a{color:red}"
+      Less::More.generate_all
+      assert_include 'a { color: red; }', read_css('test.css')
+    end
 
-  def test_compression_can_be_overwritten
-    Less::More.compression = true
-    assert_equal true, Less::More.compression
-  end
+    should 'generate css from .lss files' do
+      write_less 'test.lss', "a{color:red}"
+      Less::More.generate_all
+      assert_include 'a { color: red; }', read_css('test.css')
+    end
 
-  def test_generate_with_partials
-    prepare_for_generate
-    Less::More.generate_all
-    css = File.read(File.join(css_path, 'test.css'))
-    assert css.include?(".allforms { font-size: 110%; }
-body { color: #222222; }
-form {
-  font-size: 110%;
-  color: #ffffff;
-}")
-  end
+    should 'generate for files in subfolders' do
+      write_less 'xxx/test.less', "a{color:red}"
+      Less::More.generate_all
+      assert_include 'a { color: red; }', read_css('xxx/test.css')
+    end
 
-  def test_generate_does_not_parse_css
-    prepare_for_generate
-    Less::More.generate_all
-    original_css = File.read(File.join(css_path, 'plain.css'))
-    assert_equal File.read(File.join(Rails.root,'less_files', 'plain.css')), original_css
-  end
+    should "include imported partials" do
+      write_less 'test.less', "@import '_partial';\nb{color:blue}"
+      write_less '_partial.less', 'a{color:red}'
+      Less::More.generate_all
+      assert_include 'a { color: red; }', read_css('test.css')
+    end
 
-  def test_generate_uses_header_when_set
-    prepare_for_generate
-    Less::More.header = true
-    Less::More.generate_all
-    css = File.read(File.join(css_path, 'test.css'))
-    assert_match /^\/\*/, css # starts with comment -> header
-  end
+    should "not generate css from partials" do
+      write_less '_partial.less', 'a{color:red}'
+      Less::More.generate_all
+      assert_equal '', `ls #{css_path}`.strip
+    end
 
-  def test_generate_uses_no_header_when_not_set
-    prepare_for_generate
-    Less::More.header = false
-    Less::More.generate_all
-    css = File.read(File.join(css_path, 'test.css'))
-    assert_match /^\.allforms/, css
+    should "not parse css" do
+      write_less 'test.css', 'a{color:red}'
+      Less::More.generate_all
+      assert_equal 'a{color:red}', read_css('test.css')
+    end
+
+    should "add disclaimer-header when active" do
+      write_less 'test.less', 'a{color:red}'
+      Less::More.header = true
+      Less::More.generate_all
+      assert_match /^\/\*/, read_css('test.css')
+    end
+
+    should "not include header when not set" do
+      write_less 'test.less', 'a{color:red}'
+      Less::More.header = false
+      Less::More.generate_all
+      assert_not_include '/*', read_css('test.css')
+    end
+
+    should "fail with current file when encountering an error" do
+      write_less 'test.less', 'import xxxx;;;;;'
+      content = begin
+        Less::More.generate_all
+        '!no exception!'
+      rescue Exception => e
+        e.message
+      end
+      assert_include '/test.less', content
+    end
+
+    context 'mtime' do
+      should "generate for outdated less files" do
+        write_less 'test.less', "a{color:red}"
+        Less::More.generate_all
+
+        write_css 'test.css', 'im updated!'
+        sleep 1 # or mtime will be still the same ...
+        write_less 'test.less', "a{color:blue}"
+        Less::More.generate_all
+
+        assert_equal 'a { color: blue; }', read_css('test.css').strip
+      end
+
+      should "not generate for up-to-date less files" do
+        write_less 'test.less', "a{color:red}"
+        Less::More.generate_all
+
+        write_css 'test.css', 'im updated!'
+        Less::More.generate_all
+
+        assert_equal 'im updated!', read_css('test.css')
+      end
+
+      should "not generate for files with up-to-date partials" do
+        write_less 'test.less', "@import 'xxx/_test.less';"
+        write_less 'xxx/_test.less', "a{color:red}"
+        Less::More.generate_all
+
+        write_css 'test.css', 'im updated!'
+        Less::More.generate_all
+
+        assert_equal 'im updated!', read_css('test.css')
+      end
+
+      should "generate for files with outdated partials" do
+        write_less 'test.less', "@import 'xxx/_test.less';"
+        write_less 'xxx/_test.less', "a{color:red}"
+        Less::More.generate_all
+
+        write_css 'test.css', 'im updated!'
+        sleep 1 # or mtime will be still the same ...
+        write_less 'xxx/_test.less', "a{color:blue}"
+        Less::More.generate_all
+
+        assert_equal 'a { color: blue; }', read_css('test.css').strip
+      end
+
+      should "generate for files with outdated partials that are not named .less" do
+        write_less 'test.less', "@import 'xxx/_test';"
+        write_less 'xxx/_test.less', "a{color:red}"
+        Less::More.generate_all
+
+        write_css 'test.css', 'im updated!'
+        sleep 1 # or mtime will be still the same ...
+        write_less 'xxx/_test.less', "a{color:blue}"
+        Less::More.generate_all
+
+        assert_equal 'a { color: blue; }', read_css('test.css').strip
+      end
+    end
   end
 
-  def test_generate_does_not_generate_partials
-    prepare_for_generate
-    Less::More.generate_all
-    assert !File.exist?(File.join(css_path, '_global.css'))
+  context :remove_all_generated do
+    setup do
+      setup_for_generate_test
+    end
+
+    teardown do
+      teardown_for_generate_test
+    end
+
+    should "remove all generated css" do
+      write_less 'xxx.less', 'a{color:red}'
+      write_less 'yyy.css', 'a{color:red}'
+      write_less 'xxx/yyy.css', 'a{color:red}'
+      Less::More.generate_all
+      Less::More.remove_all_generated
+      # should be '' ideally, but an empty folder is no thread :)
+      assert_equal 'xxx', `ls #{css_path}`.strip
+    end
+
+    should "not remove other files" do
+      write_css 'xxx.css', 'a{color:red}'
+      Less::More.generate_all
+      Less::More.remove_all_generated
+      assert_equal 'xxx.css', `ls #{css_path}`.strip
+    end
   end
 end

data/test/test_helper.rb

@@ -1,14 +1,79 @@
-require 'test/unit'
-
+# fake Rails with loaded plugin
 require 'rubygems'
 require 'active_support'
+require 'action_pack'
+require 'action_controller'
 
-class Rails
+module Rails
   def self.root
     File.expand_path(File.dirname(__FILE__))
   end
+
+  def self.backtrace_cleaner
+    ActiveSupport::BacktraceCleaner.new
+  end
 end
 
+RAILS_ENV = 'development'
+
+# load plugin
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'less/more'
+load 'init.rb'
+
+# load testing libs
+require 'test/unit'
+require 'active_support/test_case'
+begin; require 'redgreen'; rescue LoadError; end
+require 'shoulda'
+
+# setup controller testing
+require 'action_controller/test_process'
+ActionController::Base.logger = nil
+ActionController::Routing::Routes.reload rescue nil
+
+# test helpers
+def css_path
+  "#{Rails.root}/public/css"
+end
+
+def less_path
+  "#{Rails.root}/less_files"
+end
+
+def write_less file, content
+  write_content File.join(less_path, file), content
+end
+
+def write_css file, content
+  write_content File.join(css_path, file), content
+end
+
+def write_content file, content
+  `mkdir -p #{File.dirname(file)}`
+  File.open(file,'w'){|f| f.print content }
+end
+
+def read_css(file)
+  File.read(File.join(css_path, file)) rescue nil
+end
+
+def assert_include(item, obj)
+  assert_block("#{obj.inspect}\ndoes not include\n#{item.inspect}."){ obj.include? item }
+end
+
+def assert_not_include(item, obj)
+  assert_block("#{obj.inspect}\ndoes include\n#{item.inspect}."){ !obj.include? item }
+end
+
+def setup_for_generate_test
+  Less::More.source_path = 'less_files'
+  Less::More.destination_path = 'css'
+  Less::More.header = false
+  `mkdir -p #{css_path}`
+end
 
-require 'less/more'
+def teardown_for_generate_test
+  `rm -rf #{css_path}`
+  `rm -rf #{less_path}`
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: more
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - August Lilleaas
@@ -10,19 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +01:00
+date: 2010-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: less
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: "    More is a plugin for Ruby on Rails applications. It automatically\n    parses your applications .less files through LESS and outputs CSS files.\n"
 email: 
 executables: []
@@ -36,11 +46,11 @@ files:
 - MIT-LICENSE
 - Rakefile
 - init.rb
-- lib/controller_extension.rb
 - rails/init.rb
 - tasks/more_tasks.rake
-- test/more_test.rb
 - test/test_helper.rb
+- test/controller_test.rb
+- test/more_test.rb
 has_rdoc: true
 homepage: http://github.com/cloudhead/more
 licenses: []
@@ -51,21 +61,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: LESS on Rails

data/lib/controller_extension.rb

@@ -1,8 +0,0 @@
-class ActionController::Base
-  def process_with_less(*args)
-    Less::More.generate_all
-    process_without_less(*args)
-  end
-
-  alias_method_chain :process, :less
-end