zfben_rails_assets 0.0.13 → 0.0.14

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.log
+.sass-cache
 .bundle
-sass-cache
 Gemfile.lock
 pkg/*
+test/dummy/tmp

data/Gemfile

@@ -10,3 +10,5 @@ gem 'compass'
 gem 'therubyracer'
 gem 'coffee-script'
 gem 'uglifier'
+
+gem 'haml'

data/README.md

@@ -14,6 +14,10 @@ A plugin for replace rails pipline.
 
   bundle install
 
+3. add .gitignore
+
+  public/assets
+
 ## How to Use
 
 ### Configuration

data/app/models/asset_format.rb

@@ -35,10 +35,10 @@ class AssetFormat
     @format = @option.last
     path = find_file(@option[0] + '.' + @option.last)
     unless path.nil?
-      text = read_file path
+      text = read_file(path)
       if defined?(self.class::IMPORT)
         regexp = self.class::IMPORT
-        text = import_file regexp, text
+        text = import_file(regexp, text)
       end
       if no_error?
         if @option.include?('min') && self.respond_to?(:minify)
@@ -82,7 +82,7 @@ class AssetFormat
   def write_file name, text
     dir = Rails.root.to_s + '/tmp/assets/'
     unless File.exist?(dir)
-      FileUtils.mkdir(dir)
+      FileUtils.mkdir_p(dir)
     end
     path = dir + File.basename(name)
     File.open(path, 'w'){ |f| f.write text }
@@ -91,7 +91,7 @@ class AssetFormat
   
   def import_file regexp, text
     text.gsub(regexp){ |s|
-      file = find_file(regexp.match(s)[1])
+      file = find_file(regexp.match(s).to_a.last)
       unless file.nil?
         "\n/* #{file} */\n" << import_file(regexp, read_file(file))
       else

data/app/models/asset_format/css.rb

@@ -2,7 +2,7 @@ require 'sass/css'
 
 class AssetFormat::Css < AssetFormat
   CONTENT_TYPE = 'text/css'
-  IMPORT = /[\/\* ]*@import[ "'\(]+([^url][^\s"'\);]+)[ "'\);\*\/]*/
+  IMPORT = /[\/\* ]*@import[\s("']*(url)?[("'\s]([^\s"'\);]+)["'); \*\/]*/
   EXTEND_FORMATS = [:sass, :scss]
 
   def minify text

data/app/models/asset_format/js.rb

@@ -1,6 +1,6 @@
 class AssetFormat::Js < AssetFormat
   CONTENT_TYPE = 'text/javascript'
-  IMPORT = /[\/\*]{2}\s*@import[ "'\(]+([^\s"'\);]+)[\s"'\);]*(\*\/)?/
+  IMPORT = /[\/\*]{2}\s*@import[ "'\(]+([^\s"'\);]+)[ "'\);\*\/]*/
   IMPORT_COFFEE = /# *@import[ "'\(]+([^\s"'\);]+)[ "'\)]*/
   EXTEND_FORMATS = [:coffee]
 

data/test/assets_test.rb

@@ -7,9 +7,14 @@ class ModuleTest < ActiveSupport::TestCase
 end
 
 class CssTest < ActiveSupport::TestCase
-  ["@import file\n", '@import(file)', '@import("file")', '@import "file"', '@import file;', '/* @import file */'].each do |test|
+  ["@import file\n", '@import(file)', '@import("file")', '@import "file"', '@import file;', '/* @import file */', '@import url(file);'].each do |test|
     test('import regex: ' + test)do
-      assert_equal AssetFormat::Css::IMPORT.match(test)[1], 'file', AssetFormat::Css::IMPORT.match(test)
+      assert_equal AssetFormat::Css::IMPORT.match(test).to_a.last, 'file', AssetFormat::Css::IMPORT.match(test)
+    end
+  end
+  ["@import file.css\n", '@import(file.css)', '@import("file.css")', '@import "file.css"', '@import file.css;', '/* @import file.css */', '@import url(file.css);'].each do |test|
+    test('import regex: ' + test)do
+      assert_equal AssetFormat::Css::IMPORT.match(test).to_a.last, 'file.css', AssetFormat::Css::IMPORT.match(test)
     end
   end
 end
@@ -17,7 +22,12 @@ end
 class JsTest < ActiveSupport::TestCase
   ["// @import file\n", '//@import(file)', '//@import("file")', '//@import "file"', '//@import file;', '/* @import file */', "// aaa\n/*\n @import file\n*/"].each do |test|
     test('import regex: ' + test)do
-      assert_equal AssetFormat::Js::IMPORT.match(test)[1], 'file', AssetFormat::Js::IMPORT.match(test)
+      assert_equal AssetFormat::Js::IMPORT.match(test).to_a.last, 'file', AssetFormat::Js::IMPORT.match(test)
+    end
+  end
+  ["// @import file.js\n", '//@import(file.js)', '//@import("file.js")', '//@import "file.js"', '//@import file.js;', '/* @import file.js */', "// aaa\n/*\n @import file.js\n*/"].each do |test|
+    test('import regex: ' + test)do
+      assert_equal AssetFormat::Js::IMPORT.match(test).to_a.last, 'file.js', AssetFormat::Js::IMPORT.match(test)
     end
   end
 end
@@ -105,18 +115,32 @@ class ControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal @response.body, ::Sass::Engine.new(File.read(Rails.root.to_s + '/app/assets/sass.sass'), { syntax: :sass, style: :expanded }).render
   end
+  
+  test 'sass_import.sass' do
+    get :index, file: 'sass_import', format: 'css'
+    assert_response :success
+    assert @response.body.include?(File.read(Rails.root.to_s + '/app/assets/blank.css'))
+  end
 
   test 'scss.css' do
     get :index, file: 'scss', format: 'css'
     assert_response :success
     assert_equal @response.body, ::Sass::Engine.new(File.read(Rails.root.to_s + '/app/assets/scss.scss'), { syntax: :scss, style: :expanded }).render
   end
+  
+  test 'scss_import.scss' do
+    get :index, file: 'scss_import', format: 'css'
+    assert_response :success
+    assert @response.body.include?(File.read(Rails.root.to_s + '/app/assets/blank.css'))
+  end
 
   test 'coffee.js' do
     get :index, file: 'coffee', format: 'js'
     assert_response :success
     assert_equal @response.body, CoffeeScript.compile(File.read(Rails.root.to_s + '/app/assets/coffee.coffee'))
   end
+  
+  
 end
 
 class AssetsHelperTest < ActionView::TestCase

data/test/dummy/app/assets/sass_import.sass

@@ -0,0 +1 @@
+@import blank.css

data/test/dummy/app/assets/scss_import.scss

@@ -0,0 +1 @@
+@import "blank.css";

data/zfben_rails_assets.gemspec

@@ -1,28 +1,20 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "zfben_rails_assets"
-  s.version     = '0.0.13'
+  s.name        = 'zfben_rails_assets'
+  s.version     = '0.0.14'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ben"]
-  s.email       = ["ben@zfben.com"]
-  s.homepage    = "https://github.com/benz303/zfben_rails_assets"
+  s.authors     = ['Ben']
+  s.email       = ['ben@zfben.com']
+  s.homepage    = 'https://github.com/benz303/zfben_rails_assets'
   s.summary     = %q{}
   s.description = %q{}
-  s.post_install_message =%q{********************************************************************************
-  Thank you for using zfben_rails_assets!
-  
-  Please follow @zfben on Twitter for announcements, updates, and news.
-  https://twitter.com/zfben
-
-********************************************************************************
-}
 
   s.files         = `git ls-files`.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.require_paths = ['lib']
   
   s.required_ruby_version     = '>= 1.9'
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_rails_assets
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10468460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10468460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &10467840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10467840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &10467360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10467360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &10466940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10466940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &10466520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10466520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &10466080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10466080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - ben@zfben.com
@@ -110,7 +140,9 @@ files:
 - test/dummy/app/assets/import_twice.css
 - test/dummy/app/assets/import_twice.js
 - test/dummy/app/assets/sass.sass
+- test/dummy/app/assets/sass_import.sass
 - test/dummy/app/assets/scss.scss
+- test/dummy/app/assets/scss_import.scss
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -141,29 +173,11 @@ files:
 - test/dummy/public/javascripts/rails.js
 - test/dummy/public/stylesheets/.gitkeep
 - test/dummy/script/rails
-- test/dummy/tmp/assets/blank.css
-- test/dummy/tmp/assets/blank.js
-- test/dummy/tmp/assets/coffee.js
-- test/dummy/tmp/assets/import.css
-- test/dummy/tmp/assets/import.js
-- test/dummy/tmp/assets/import_404.css
-- test/dummy/tmp/assets/import_404.js
-- test/dummy/tmp/assets/import_iteration.css
-- test/dummy/tmp/assets/import_iteration.js
-- test/dummy/tmp/assets/import_iteration.min.css
-- test/dummy/tmp/assets/import_iteration.min.js
-- test/dummy/tmp/assets/import_twice.css
-- test/dummy/tmp/assets/import_twice.js
-- test/dummy/tmp/assets/sass.css
-- test/dummy/tmp/assets/scss.css
-- test/dummy/tmp/assets/simple.sass
 - test/test_helper.rb
 - zfben_rails_assets.gemspec
 homepage: https://github.com/benz303/zfben_rails_assets
 licenses: []
-post_install_message: ! "********************************************************************************\n
-  \ Thank you for using zfben_rails_assets!\n  \n  Please follow @zfben on Twitter
-  for announcements, updates, and news.\n  https://twitter.com/zfben\n\n********************************************************************************\n"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +195,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ''
 test_files: []
+has_rdoc: 

data/test/dummy/tmp/assets/blank.css

@@ -1 +0,0 @@
-/* blank.css */

data/test/dummy/tmp/assets/blank.js

@@ -1 +0,0 @@
-// blank.js

data/test/dummy/tmp/assets/coffee.js

@@ -1,5 +0,0 @@
-(function() {
-
-  alert('hi');
-
-}).call(this);

data/test/dummy/tmp/assets/import.css

@@ -1,4 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.css */
-/* blank.css */
-

data/test/dummy/tmp/assets/import.js

@@ -1,3 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.js */
-// blank.js

data/test/dummy/tmp/assets/import_iteration.css

@@ -1,11 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/import_twice.css */
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.css */
-/* blank.css */
-
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.css */
-/* blank.css */
-
-

data/test/dummy/tmp/assets/import_iteration.js

@@ -1,9 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/import_twice.js */
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.js */
-// blank.js
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.js */
-// blank.js
-

data/test/dummy/tmp/assets/import_iteration.min.js

@@ -1 +0,0 @@
-;

data/test/dummy/tmp/assets/import_twice.css

@@ -1,8 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.css */
-/* blank.css */
-
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.css */
-/* blank.css */
-

data/test/dummy/tmp/assets/import_twice.js

@@ -1,7 +0,0 @@
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.js */
-// blank.js
-
-/* /home/ben/dev/zfben_rails_assets/test/dummy/app/assets/blank.js */
-// blank.js
-

data/test/dummy/tmp/assets/sass.css

@@ -1,3 +0,0 @@
-#id {
-  color: white;
-}

data/test/dummy/tmp/assets/scss.css

@@ -1,3 +0,0 @@
-#id {
-  color: white;
-}

data/test/dummy/tmp/assets/simple.sass

@@ -1,3 +0,0 @@
-#id {
-  color: white;
-}