evax 0.0.5 → 0.0.7

data/README.md

@@ -1,40 +1,47 @@
-# Evax Compressor
+# Evax Assets Compressor
+
+![Evax compressor logo](http://farm8.staticflickr.com/7166/6505430865_1f9f232e8c_o_d.png)
+*Evax compressor make you feel lighter*
 
 Evax is a simple asset packaging library for Ruby, providing JavaScript/CSS concatenation and compression using UglifyJS and a really simple regex based CSS compressor. Just because enough is enough.
 
-The idea behind it is to have a really simple library to compress your assets in the simplest way without any weird dependency. There are nice assets packaging systems out there but they have too many options for some cases. Sometimes, you just want to play with a pet project.
+The idea behind it is to have a really **simple library to compress your assets** in the simplest way without any weird dependency (who said Java?). There are nice assets packaging systems out there but they have too many options for some cases. Sometimes, you just want to play with a pet project.
 
-Create a YAML file describing assets, Evax will take it and compress the javascript and stylesheets files to the output directory of your choice. Done.
+Create a YAML file describing assets, Evax will take it and compress the javascript and stylesheets files to the *output directory* of your choice. Done.
 
 ## Instalation
 
-     gem install evax
+    gem install evax
+     
+## Dependencies
+
+As *Evax* has a dependency in *uglifier* who has a dependency in *execjs* it is needed to have a proper **JS runtime** installed in your system. Pick one from the [execjs README page](https://github.com/sstephenson/execjs)
 
 ## Usage
 
 ### assets.yml
 
-     output_path: tmp/
+    output_path: tmp/
 
-     javascripts:
-       js_package_one:
-         - test/fixtures/javascripts/one.js
-         - test/fixtures/javascripts/two.js
-         - test/fixtures/javascripts/three.js
-       js_package_two:
-         - test/fixtures/javascripts/four.js
+    javascripts:
+      js_package_one:
+        - test/fixtures/javascripts/one.js
+        - test/fixtures/javascripts/two.js
+        - test/fixtures/javascripts/three.js
+      js_package_two:
+        - test/fixtures/javascripts/four.js
 
-     stylesheets:
-       css_package_one:
-         - test/fixtures/stylesheets/one.css
-         - test/fixtures/stylesheets/two.css
-       css_package_two:
-         - test/fixtures/stylesheets/three.css
-         - test/fixtures/stylesheets/four.css
+    stylesheets:
+      css_package_one:
+        - test/fixtures/stylesheets/one.css
+        - test/fixtures/stylesheets/two.css
+      css_package_two:
+        - test/fixtures/stylesheets/three.css
+        - test/fixtures/stylesheets/four.css
 
 ### Command Line
 
-      evax /path/to/assets.yml /relative/path
+    evax /path/to/assets.yml /relative/path
 
 ### Rails
 
@@ -47,8 +54,8 @@ Create a Rake task for running it, e.g.:
     namespace :evax do
       desc 'Build assets'
       task :build do
-        ASSETS_PATH   = /path/to/assets.yml
-        RELATVE_PATH  = /relative/path
-        Evax.new(ASSETS_PATH, RELATVE_PATH).build
+        ASSETS_PATH   = "#{Rails.root}/config/assets.yml"
+        RELATIVE_PATH = Rails.root
+        Evax.new( ASSETS_PATH, RELATIVE_PATH ).build
       end
     end

data/TODO.md

@@ -0,0 +1,87 @@
+# TODO
+
+## JS Compressor options
+
+Accept JS compressor options from the *config.yml* file.
+
+## CSS Minifier
+
+from:
+
+    margin:0px 0px 0 0px
+    padding:0px 5px;
+
+to:
+
+    margin:0
+    padding:0 5px;
+
+
+from:
+
+    background:-moz-linear-gradient(top,#e2e2e2 0%,#fbfbfb 100%)
+
+to:
+
+    background:-moz-linear-gradient(top,#e2e2e2 0,#fbfbfb 100%);
+    
+
+from: 
+
+    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e2e2e2',endColorstr='#fbfbfb',GradientType=0 )}
+    
+to
+
+    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e2e2e2',endColorstr='#fbfbfb',GradientType=0)}
+    
+
+from: 
+
+    border:2px solid #779900;
+    color:#FFFFFF;
+
+to:
+
+    border:2px solid #790;
+    color:#FFF;
+    
+from: 
+
+  background:#fcf7df url("/images/video/movie-fail.png") no-repeat 50% 50%;
+  
+to: 
+
+  background:#fcf7df url(/images/video/movie-fail.png) no-repeat 50% 50%;
+  
+**This one is tricky because a path with weird characters can produces errors**
+
+
+from: 
+  
+  @page{margin:0.5cm}
+
+to:
+
+  @page{margin:.5cm}
+  
+  
+  
+from: 
+
+    ul#offers > li .reward a{color:white;
+
+to:
+
+    ul#offers>li .reward a{color:white;
+      
+from:
+
+    padding:0px 0px 0px 0px;
+    padding:0px 0px 0 0px;
+    padding:0 0px;
+    
+to:
+
+    padding:0;
+    padding:0;
+    padding:0;

data/lib/evax/css_minifier.rb

@@ -3,17 +3,16 @@
 module Evax::CssMinifier
 
   def self.build(css_string)
-    css_string.split('}').map do |block|
-      block.gsub!(/\n/,' ')
-      block.gsub!(/\/\*.*?\*\//m,'')
-      block.gsub!(/\s*:\s*/, ':')
-      block.gsub!(/\s*;\s*/, ';')
-      block.gsub!(/\s*,\s*/, ',')
-      block.gsub!(/\s*\{\s*/, '{')
-      block.gsub!(/\s\s+/, ' ')
-
-      block.strip + '}' if block.include?('{')
-    end.join(' ')
+    css_string.gsub!(/\n/," ")
+    css_string.gsub!(/\/\*.*?\*\//m,"")
+    css_string.gsub!(/\s*:\s*/, ":")
+    css_string.gsub!(/\s*;\s*/, ";")
+    css_string.gsub!(/\s*,\s*/, ",")
+    css_string.gsub!(/\s*\{\s*/, "{")
+    css_string.gsub!(/\s\s+/, " ")
+    css_string.gsub!(/^\s*/, "")
+    css_string.gsub!(/\s!important/, "!important")
+    css_string.gsub!(/;\s*\}\s*/, "}")
   end
 
 end

data/lib/evax/version.rb

@@ -1,3 +1,3 @@
 class Evax
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/evax.rb

@@ -27,8 +27,8 @@ class Evax
   end
 
   def build
-    build_js
-    build_css
+    build_js  if js_configured?
+    build_css if css_configured?
   end
 
   def build_js
@@ -60,11 +60,7 @@ class Evax
   end
 
   def self.compress_js( js_string )
-    opts = {
-      :max_line_length  => 1024,
-      :toplevel         => true,
-      :copyright        => false
-    }
+    opts = { :copyright => false }
     Uglifier.compile( js_string, opts )
   end
 
@@ -72,4 +68,14 @@ class Evax
     Evax::CssMinifier.build( css_string )
   end
 
+  private
+
+  def js_configured?
+    !config["javascripts"].nil?
+  end
+
+  def css_configured?
+    !config["stylesheets"].nil?
+  end
+
 end

data/test/evax_test.rb

@@ -64,7 +64,7 @@ class EvaxTest < Test::Unit::TestCase
   end
 
   def test_build_js
-    evax = Evax.new( "#{FIXTURES}/assets.yml",  "#{File.dirname(__FILE__)}/.." )
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :write_output ).with( "js_one.js", File.read( "#{FIXTURES}/js_one.compress.js" ) )
     evax.expects( :write_output ).with( "js_two.js", File.read( "#{FIXTURES}/js_two.compress.js" ) )
 
@@ -72,19 +72,37 @@ class EvaxTest < Test::Unit::TestCase
   end
 
   def test_build_css
-    evax = Evax.new( "#{FIXTURES}/assets.yml",  "#{File.dirname(__FILE__)}/.." )
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress.css" ) )
     evax.expects( :write_output ).with( "css_two.css", File.read( "#{FIXTURES}/css_two.compress.css" ) )
 
     evax.build_css
   end
 
+  def test_build_only_css_if_js_not_configured
+    evax = Evax.new( "#{FIXTURES}/assets_without_javascripts.yml", "#{File.dirname(__FILE__)}/.." )
+
+    evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress.css" ) )
+    evax.expects( :write_output ).with( "css_two.css", File.read( "#{FIXTURES}/css_two.compress.css" ) )
+
+    evax.build
+  end
+
+  def test_build_only_js_if_css_not_configured
+    evax = Evax.new( "#{FIXTURES}/assets_without_stylesheets.yml", "#{File.dirname(__FILE__)}/.." )
+
+    evax.expects( :write_output ).with( "js_one.js", File.read( "#{FIXTURES}/js_one.compress.js" ) )
+    evax.expects( :write_output ).with( "js_two.js", File.read( "#{FIXTURES}/js_two.compress.js" ) )
+
+    evax.build
+  end
+
   def test_build
-    evax = Evax.new
+    evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :build_js )
     evax.expects( :build_css )
 
     evax.build
   end
 
-end
+end

data/test/fixtures/assets_without_javascripts.yml

@@ -0,0 +1,10 @@
+output_path: tmp/
+
+stylesheets:
+  css_one:
+    - test/fixtures/stylesheets/one.css
+    - test/fixtures/stylesheets/two.css
+  css_two:
+    - test/fixtures/stylesheets/three.css
+    - test/fixtures/stylesheets/four.css
+

data/test/fixtures/assets_without_stylesheets.yml

@@ -0,0 +1,10 @@
+output_path: tmp/
+
+javascripts:
+  js_one:
+    - test/fixtures/javascripts/one.js
+    - test/fixtures/javascripts/two.js
+    - test/fixtures/javascripts/three.js
+  js_two:
+    - test/fixtures/javascripts/four.js
+

data/test/fixtures/css_one.compress.css

@@ -1 +1 @@
-#my-id-one{background-color:pink;} #my-id-two{background-color:pink;}
+#my-id-one{background-color:pink}#my-id-two{background-color:pink}

data/test/fixtures/css_two.compress.css

@@ -1 +1 @@
-#my-id-three{background-color:pink;} #my-id-four{background-color:pink;}
+#my-id-three{background-color:pink}#my-id-four{background-color:pink}

data/test/fixtures/js_one.compress.js

@@ -1 +1 @@
-function a(){}function b(){}function c(){}
+function js_one(){}function js_two(){}function js_three(){}

data/test/fixtures/js_two.compress.js

@@ -1 +1 @@
-function a(){}
+function js_four(){}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 +01:00
+date: 2011-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- TODO.md
 - bin/evax
+- etc/evax.png
 - evax.gemspec
 - lib/evax.rb
 - lib/evax/css_minifier.rb
@@ -120,6 +122,8 @@ files:
 - lib/evax/version.rb
 - test/evax_test.rb
 - test/fixtures/assets.yml
+- test/fixtures/assets_without_javascripts.yml
+- test/fixtures/assets_without_stylesheets.yml
 - test/fixtures/css_one.compress.css
 - test/fixtures/css_one.css
 - test/fixtures/css_two.compress.css
@@ -171,6 +175,8 @@ summary: Very simple assets compressor
 test_files: 
 - test/evax_test.rb
 - test/fixtures/assets.yml
+- test/fixtures/assets_without_javascripts.yml
+- test/fixtures/assets_without_stylesheets.yml
 - test/fixtures/css_one.compress.css
 - test/fixtures/css_one.css
 - test/fixtures/css_two.compress.css