zfben_rails_assets 0.0.8 → 0.0.9

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.log
 .bundle
+sass-cache
 Gemfile.lock
 pkg/*

data/Gemfile

@@ -10,5 +10,3 @@ gem 'compass'
 gem 'therubyracer'
 gem 'coffee-script'
 gem 'uglifier'
-
-#gem 'zfben_rails_assets', :path => File.dirname(__FILE__)

data/app/models/asset_format.rb

@@ -50,7 +50,7 @@ class AssetFormat
       not_found file
     end
   end
-  
+
   def find_file filename
     path = Rails.root.to_s + '/app/assets/' + filename
     if File.exist?(path)

data/app/models/asset_format/css.rb

@@ -6,14 +6,22 @@ class AssetFormat::Css < AssetFormat
   EXTEND_FORMATS = [:sass, :scss]
 
   def minify text
-    ::Sass::Engine.new(::Sass::CSS.new(text).render(:sass), { syntax: :sass, style: :compressed }).render
+    ::Sass::Engine.new(::Sass::CSS.new(text).render(:sass), MINIFY_OPTIONS).render
   end
 
   def sass text
-    ::Sass::Engine.new(text, { syntax: :sass, style: :expanded }).render
+    ::Sass::Engine.new("@import compass\n" << text, SASS_OPTIONS).render
   end
 
   def scss text
-    ::Sass::Engine.new(text, { syntax: :scss, style: :expanded }).render
+    ::Sass::Engine.new("@import \"compass\";\n" << text, SCSS_OPTIONS).render
   end
+
+  private
+  
+  COMPASS_OPTIONS = Compass.sass_engine_options.merge({ line_comments: false })
+  COMPASS_OPTIONS[:load_paths].push(File.realpath(Rails.root) << '/app/assets')
+  MINIFY_OPTIONS = { syntax: :sass, style: :compressed }
+  SASS_OPTIONS = { syntax: :sass, style: :expanded }.merge(COMPASS_OPTIONS)
+  SCSS_OPTIONS = { syntax: :scss, style: :expanded }.merge(COMPASS_OPTIONS)
 end

data/app/models/asset_format/js.rb

@@ -1,13 +1,17 @@
 class AssetFormat::Js < AssetFormat
   CONTENT_TYPE = 'text/javascript'
-  IMPORT = /[\/\*]{2} *@import[ "'\(]+([^\s"'\);]+)[ "'\)\/\*]*/
+  IMPORT = /[\/\*]{2}\s*@import[ "'\(]+([^\s"'\);]+)[\s"'\);]*(\*\/)?/
+  IMPORT_COFFEE = /# *@import[ "'\(]+([^\s"'\);]+)[ "'\)]*/
   EXTEND_FORMATS = [:coffee]
 
   def minify text
-    Uglifier.compile text, copyright: false
+    ::Uglifier.compile text, copyright: false
   end
 
   def coffee text
-    CoffeeScript.compile text
+    text = text.gsub(IMPORT_COFFEE){ |s|
+      "\n### @import #{IMPORT_COFFEE.match(s)[1]}\n###\n"
+    }
+    ::CoffeeScript.compile text
   end
 end

data/lib/zfben_rails_assets.rb

@@ -1,6 +1,14 @@
+require 'sass'
+require 'compass'
+require 'coffee-script'
+require 'uglifier'
+
 module ZfbenRailsAssets
   class Engine < Rails::Engine
     engine_name :zfben_rails_assets
     isolate_namespace ZfbenRailsAssets
+    initializer 'zfben_rails_assets.helper' do |app|
+      ActionView::Base.send :include, AssetsHelper
+    end
   end
 end

data/test/assets_test.rb

@@ -9,15 +9,15 @@ end
 class CssTest < ActiveSupport::TestCase
   ["@import file\n", '@import(file)', '@import("file")', '@import "file"', '@import file;', '/* @import file */'].each do |test|
     test('import regex: ' + test)do
-      assert_equal AssetFormat::Css::IMPORT.match(test)[1], 'file'
+      assert_equal AssetFormat::Css::IMPORT.match(test)[1], 'file', AssetFormat::Css::IMPORT.match(test)
     end
   end
 end
 
 class JsTest < 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 */', "// aaa\n/*\n @import file\n*/"].each do |test|
     test('import regex: ' + test)do
-      assert_equal AssetFormat::Js::IMPORT.match(test)[1], 'file'
+      assert_equal AssetFormat::Js::IMPORT.match(test)[1], 'file', AssetFormat::Js::IMPORT.match(test)
     end
   end
 end

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

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

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

@@ -4,8 +4,6 @@
 /* /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_twice.js

@@ -2,7 +2,6 @@
 /* /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/zfben_rails_assets.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "zfben_rails_assets"
-  s.version     = '0.0.8'
+  s.version     = '0.0.9'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9'
   
   s.add_dependency 'rails', '>=3.1.0'
+  s.add_dependency 'sass'
   s.add_dependency 'compass'
   s.add_dependency 'coffee-script'
   s.add_dependency 'uglifier'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_rails_assets
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19156440 !ruby/object:Gem::Requirement
+  requirement: &12307720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19156440
+  version_requirements: *12307720
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &12307340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12307340
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &19156060 !ruby/object:Gem::Requirement
+  requirement: &12306880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19156060
+  version_requirements: *12306880
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &19155600 !ruby/object:Gem::Requirement
+  requirement: &12306460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19155600
+  version_requirements: *12306460
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &19155180 !ruby/object:Gem::Requirement
+  requirement: &12306040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19155180
+  version_requirements: *12306040
 description: ''
 email:
 - ben@zfben.com