evax 0.0.7 → 0.0.9

data/lib/evax.rb

@@ -17,7 +17,8 @@ class Evax
   end
 
   def config
-    YAML::load_file( @config_file )
+    default_opts = { "compress" => true }
+    default_opts.merge(YAML::load_file( @config_file ))
   end
 
   def join( type, group_name )
@@ -33,19 +34,19 @@ class Evax
 
   def build_js
     config["javascripts"].each_key do |group_name|
-      join_string     = join( :javascripts, group_name )
-      compress_string = Evax.compress_js( join_string )
+      result_string = join( :javascripts, group_name )
+      result_string = Evax.compress_js( result_string ) if config["compress"]
 
-      write_output( "#{group_name}.js", compress_string )
+      write_output( "#{group_name}.js", result_string )
     end
   end
 
   def build_css
     config["stylesheets"].each_key do |group_name|
-      join_string     = join( :stylesheets, group_name )
-      compress_string = Evax.compress_css( join_string )
+      result_string = join( :stylesheets, group_name )
+      result_string = Evax.compress_css( result_string ) if config["compress"]
 
-      write_output( "#{group_name}.css", compress_string )
+      write_output( "#{group_name}.css", result_string )
     end
   end
 

data/lib/evax/version.rb

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

data/test/evax_test.rb

@@ -14,9 +14,20 @@ class EvaxTest < Test::Unit::TestCase
   def test_read_config_file
     evax = Evax.new( "#{FIXTURES}/assets.yml")
     assert_equal( "tmp/", evax.config["output_path"] )
+    assert_equal( true, evax.config["compress"] )
     assert_equal( 2, evax.config["javascripts"].size )
   end
 
+  def test_read_config_file_compress_on
+    evax = Evax.new( "#{FIXTURES}/assets_compress_on.yml")
+    assert_equal( true, evax.config["compress"] )
+  end
+
+  def test_read_config_file_compress_off
+    evax = Evax.new( "#{FIXTURES}/assets_compress_off.yml")
+    assert_equal( false, evax.config["compress"] )
+  end
+
   def test_join
     evax = Evax.new( "#{FIXTURES}/assets.yml", "/wadus" )
 
@@ -71,6 +82,15 @@ class EvaxTest < Test::Unit::TestCase
     evax.build_js
   end
 
+  def test_build_js_compress_off
+    evax = Evax.new( "#{FIXTURES}/assets_compress_off.yml", "#{File.dirname(__FILE__)}/.." )
+    Evax.expects( :compress_js ).never
+    evax.expects( :write_output ).with( "js_one.js", File.read( "#{FIXTURES}/js_one.compress_off.js" ) )
+    evax.expects( :write_output ).with( "js_two.js", File.read( "#{FIXTURES}/js_two.compress_off.js" ) )
+
+    evax.build_js
+  end
+
   def test_build_css
     evax = Evax.new( "#{FIXTURES}/assets.yml", "#{File.dirname(__FILE__)}/.." )
     evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress.css" ) )
@@ -79,6 +99,15 @@ class EvaxTest < Test::Unit::TestCase
     evax.build_css
   end
 
+  def test_build_css_off
+    evax = Evax.new( "#{FIXTURES}/assets_compress_off.yml", "#{File.dirname(__FILE__)}/.." )
+    Evax.expects( :compress_css ).never
+    evax.expects( :write_output ).with( "css_one.css", File.read( "#{FIXTURES}/css_one.compress_off.css" ) )
+    evax.expects( :write_output ).with( "css_two.css", File.read( "#{FIXTURES}/css_two.compress_off.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__)}/.." )
 

data/test/fixtures/assets.yml

@@ -7,7 +7,7 @@ javascripts:
     - test/fixtures/javascripts/three.js
   js_two:
     - test/fixtures/javascripts/four.js
-    
+
 stylesheets:
   css_one:
     - test/fixtures/stylesheets/one.css

data/test/fixtures/assets_compress_off.yml

@@ -0,0 +1,18 @@
+compress:    off
+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
+
+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_compress_on.yml

@@ -0,0 +1,18 @@
+compress:    on
+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
+
+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/css_one.compress_off.css

@@ -0,0 +1,9 @@
+/* CSS ONE */
+#my-id-one{
+  background-color: pink;
+}
+
+/* CSS TWO */
+#my-id-two{
+  background-color: pink;
+}

data/test/fixtures/css_two.compress_off.css

@@ -0,0 +1,8 @@
+/* CSS THREE */
+#my-id-three{
+  background-color: pink;
+}
+/* CSS FOUR */
+#my-id-four{
+  background-color: pink;
+}

data/test/fixtures/javascripts/four.js

@@ -1,3 +1,3 @@
 /* This is the JS FOUR */
-function js_four(){  
+function js_four(){
 }

data/test/fixtures/javascripts/one.js

@@ -1,3 +1,3 @@
 /* This is the JS ONE */
-function js_one(){  
+function js_one(){
 }

data/test/fixtures/javascripts/three.js

@@ -1,3 +1,3 @@
 /* This is the JS THREE */
-function js_three(){  
+function js_three(){
 }

data/test/fixtures/javascripts/two.js

@@ -1,3 +1,3 @@
 /* This is the JS TWO */
-function js_two(){  
+function js_two(){
 }

data/test/fixtures/js_one.compress_off.js

@@ -0,0 +1,9 @@
+/* This is the JS ONE */
+function js_one(){
+}
+/* This is the JS TWO */
+function js_two(){
+}
+/* This is the JS THREE */
+function js_three(){
+}

data/test/fixtures/js_one.js

@@ -1,9 +1,9 @@
 /* This is the JS ONE */
-function js_one(){  
+function js_one(){
 }
 /* This is the JS TWO */
-function js_two(){  
+function js_two(){
 }
 /* This is the JS THREE */
-function js_three(){  
+function js_three(){
 }

data/test/fixtures/js_two.compress_off.js

@@ -0,0 +1,3 @@
+/* This is the JS FOUR */
+function js_four(){
+}

metadata

@@ -1,112 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: evax
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Fernando Guillen
 - Juan Vidal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70293863557040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc.6
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70293863557040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70293863554720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70293863554720
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70293863552720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: delorean
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70293863552720
+- !ruby/object:Gem::Dependency
+  name: delorean
+  requirement: &70293863550860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: uglifier
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70293863550860
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: &70293863541740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id005
-description: "    Evax is a simple asset packaging library for Ruby,\n    providing JavaScript/CSS concatenation and compression\n    using UglifyJS and a really simple regex based CSS\n    compressor. Just because enough is enough.\n"
-email: 
+  prerelease: false
+  version_requirements: *70293863541740
+description: ! "    Evax is a simple asset packaging library for Ruby,\n    providing
+  JavaScript/CSS concatenation and compression\n    using UglifyJS and a really simple
+  regex based CSS\n    compressor. Just because enough is enough.\n"
+email:
 - fguillen.mail@gmail.com
 - juanjicho@gmail.com
-executables: 
+executables:
 - evax
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc.example
 - Gemfile
@@ -122,71 +93,75 @@ files:
 - lib/evax/version.rb
 - test/evax_test.rb
 - test/fixtures/assets.yml
+- test/fixtures/assets_compress_off.yml
+- test/fixtures/assets_compress_on.yml
 - test/fixtures/assets_without_javascripts.yml
 - test/fixtures/assets_without_stylesheets.yml
 - test/fixtures/css_one.compress.css
+- test/fixtures/css_one.compress_off.css
 - test/fixtures/css_one.css
 - test/fixtures/css_two.compress.css
+- test/fixtures/css_two.compress_off.css
 - test/fixtures/javascripts/four.js
 - test/fixtures/javascripts/one.js
 - test/fixtures/javascripts/three.js
 - test/fixtures/javascripts/two.js
 - test/fixtures/js_one.compress.js
+- test/fixtures/js_one.compress_off.js
 - test/fixtures/js_one.js
 - test/fixtures/js_two.compress.js
+- test/fixtures/js_two.compress_off.js
 - test/fixtures/stylesheets/four.css
 - test/fixtures/stylesheets/one.css
 - test/fixtures/stylesheets/three.css
 - test/fixtures/stylesheets/two.css
 - test/logger_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/SponsorPay/Evax
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: evax
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Very simple assets compressor
-test_files: 
+test_files:
 - test/evax_test.rb
 - test/fixtures/assets.yml
+- test/fixtures/assets_compress_off.yml
+- test/fixtures/assets_compress_on.yml
 - test/fixtures/assets_without_javascripts.yml
 - test/fixtures/assets_without_stylesheets.yml
 - test/fixtures/css_one.compress.css
+- test/fixtures/css_one.compress_off.css
 - test/fixtures/css_one.css
 - test/fixtures/css_two.compress.css
+- test/fixtures/css_two.compress_off.css
 - test/fixtures/javascripts/four.js
 - test/fixtures/javascripts/one.js
 - test/fixtures/javascripts/three.js
 - test/fixtures/javascripts/two.js
 - test/fixtures/js_one.compress.js
+- test/fixtures/js_one.compress_off.js
 - test/fixtures/js_one.js
 - test/fixtures/js_two.compress.js
+- test/fixtures/js_two.compress_off.js
 - test/fixtures/stylesheets/four.css
 - test/fixtures/stylesheets/one.css
 - test/fixtures/stylesheets/three.css