sqwish 0.1.2 → 0.2.0

data/README.md

@@ -1,21 +1,47 @@
 # Sqwish-ruby
 #### A CSS compressor
 
-This as a Ruby bridge to [Sqwish](https://github.com/ded/sqwish) by Dustin 
-Diaz. Just install it:
+This as a Ruby bridge to [Sqwish](https://github.com/ded/sqwish) by Dustin Diaz
+to compress CSS very efficiently.
+
+### Ruby usage
+
+Just install it:
 
     $ gem install sqwish
 
-And use it like so:
+Then use it like so:
+
+``` ruby
+require 'sqwish'
+
+Sqwish.minify "div { color: red; } div { background: black; }"
+#=> "div{color:red}div{background:black}"
+````
+
+You can also use the `strict: true` flag (it defaults to false):
+
+  ``` ruby
+Sqwish.minify "div { color: red; } div { background: black; }", strict: true
+#=> "div{color:red;background:black}"
+```
+
+## Rails usage
+
+In your Gemfile:
+
+``` ruby
+gem 'sqwish'
 
-    require 'sqwish'
-    Sqwish.minify "div { color: red; } div { background: black; }"
-    #=> "div{color:red;background:black}"
+# or optionally:
+gem 'sqwish', github: 'rstacruz/sqwish.rb'
+```
 
-You can also use the `strict: false` flag (it defaults to true):
+In your `config/environments/production.rb`:
 
-    Sqwish.minify "div { color: red; } div { background: black; }", strict: false
-    #=> "div{color:red}div{background:black}"
+``` ruby
+config.assets.css_compressor = Sqwish
+```
 
 ## Authors
 

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+
+desc "Test"
+task :test do
+  require './test/sqwish_test.rb'
+end

data/lib/sqwish.rb

@@ -2,16 +2,19 @@ require 'execjs'
 
 module Sqwish
   class << self
-    def minify(src, options={:strict => true})
-      sqwish_js.call "sqwish", src, !! options[:strict]
+    def minify(src, options={:strict => false})
+      is_strict = !! options[:strict]
+      sqwish_js.call "sqwish", src, is_strict
     end
 
+    alias compress minify
+
     def sqwish_js
       @squish_js ||= ExecJS.compile(sqwish_wrapper)
     end
 
     def sqwish_wrapper
-      # If we're not using node, some things will have to be stubbed.
+      # Since we're not using node, some things will have to be stubbed.
       %{
         var require = function() { return {}; };
         var module  = { exports: {} };
@@ -28,7 +31,7 @@ module Sqwish
     end
 
     def version
-      "0.1.2"
+      "0.2.0"
     end
   end
 end

data/sqwish/src/index.js

@@ -13,12 +13,12 @@ function uniq(ar) {
   for (i = ar.length - 1; i >= 0; i--) {
     for (j = a.length - 1; j >= 0; j--) {
       if (a[j] == ar[i]) {
-        continue label;
+        continue label
       }
     }
-    a[a.length] = ar[i];
+    a[a.length] = ar[i]
   }
-  return a;
+  return a
 }
 
 function sqwish(css, strict) {
@@ -50,24 +50,24 @@ function sqwish(css, strict) {
     .replace(/#([a-fA-F0-9])\1([a-fA-F0-9])\2([a-fA-F0-9])\3/g, '#$1$2$3')
 
     // replace longhand values with shorthand '5px 5px 5px 5px' => '5px'
-    .replace(/(\d+[a-z]{2}) \1 \1 \1/gi, '$1')
+    .replace(/\b(\d+[a-z]{2}) \1 \1 \1/gi, '$1')
 
     // replace double-specified longhand values with shorthand '5px 2px 5px 2px' => '5px 2px'
-    .replace(/(\d+[a-z]{2}) (\d+[a-z]{2}) \1 \2/gi, '$1 $2')
+    .replace(/\b(\d+[a-z]{2}) (\d+[a-z]{2}) \1 \2/gi, '$1 $2')
 
     // replace 0px with 0
-    .replace(/([\s|:])[0]+px/g, '$10');
+    .replace(/([\s|:])[0]+px/g, '$10')
 
   if (strict) {
-    css = strict_css(css);
+    css = strict_css(css)
   }
 
   // put back in copyrights
   if (comments) {
-    comments = comments ? comments.join('\n') : '';
-    css = comments + '\n' + css;
+    comments = comments ? comments.join('\n') : ''
+    css = comments + '\n' + css
   }
-  return css;
+  return css
 }
 
 function strict_css(css) {
@@ -75,59 +75,61 @@ function strict_css(css) {
   // into combined rules
 
   // store global dict of all rules
-  var ruleList = {},
-      rules = css.match(/([^{]+\{[^}]+\})+?/g);
+  var ruleList = {}
+    , rules = css.match(/([^{]+\{[^}]+\})+?/g)
 
   // lets find the dups
   rules.forEach(function (rule) {
     // break rule into selector|declaration parts
-    var parts = rule.match(/([^{]+)\{([^}]+)/),
-        selector = parts[1],
-        declarations = parts[2];
+    var parts = rule.match(/([^{]+)\{([^}]+)/)
+      , selector = parts[1]
+      , declarations = parts[2]
 
     // start new list if it wasn't created already
     if (!ruleList[selector]) {
-      ruleList[selector] = [];
+      ruleList[selector] = []
     }
 
-    declarations = declarations.split(';');
+    declarations = declarations.split(';')
     // filter out duplicate properties
     ruleList[selector] = ruleList[selector].filter(function (decl) {
-      var prop = decl.match(/[^:]+/)[0];
+      var prop = decl.match(/[^:]+/)[0]
       // pre-existing properties are not wanted anymore
       return !declarations.some(function (dec) {
         // must include '^' as to not confuse "color" with "border-color" etc.
-        return dec.match(new RegExp('^' + prop + ':'));
-      });
-    });
+        return dec.match(new RegExp('^' + prop + ':'))
+      })
+    })
 
     // latter takes presedence :)
     ruleList[selector] = ruleList[selector].concat(declarations);
     // still dups? just in case
-    ruleList[selector] = uniq(ruleList[selector]);
-  });
+    ruleList[selector] = uniq(ruleList[selector])
+  })
 
   // reset css because we're gonna recreate the whole shabang.
-  css = '';
+  css = ''
   for (var selector in ruleList) {
-    var joinedRuleList = ruleList[selector].join(';');
-    css += selector + '{' + (joinedRuleList).replace(/;$/, '') + '}';
+    var joinedRuleList = ruleList[selector].join(';')
+    css += selector + '{' + (joinedRuleList).replace(/;$/, '') + '}'
   }
-  return css;
+  return css
 }
 
 module.exports.exec = function (args) {
-  var out;
-  var read = args[0];
+  var out, data
+    , read = args[0]
   if (out = args.indexOf('-o') != -1) {
-    out = args[out + 1];
+    out = args[out + 1]
   } else {
-    out = read.replace(/\.css$/, '.min.css');
+    out = read.replace(/\.css$/, '.min.css')
   }
-  console.log('compressing ' + read + ' to ' + out + '...');
-  var data = fs.readFileSync(read, 'utf8');
-  fs.writeFileSync(out, sqwish(data, (args.indexOf('--strict') != -1)), 'utf8');
+  if (args.indexOf('-v') != -1) {
+    console.log('compressing ' + read + ' to ' + out + '...')
+  }
+  data = fs.readFileSync(read, 'utf8')
+  fs.writeFileSync(out, sqwish(data, (~args.indexOf('--strict'))), 'utf8')
 };
 module.exports.minify = function (css, strict) {
-  return sqwish(css, strict);
-};
+  return sqwish(css, strict)
+};

metadata

@@ -1,71 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sqwish
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Rico Sta. Cruz
 - Dustin Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-05 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: execjs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Compresses CSS.
-email: 
+email:
 - rico@sinefunc.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/sqwish.rb
 - sqwish/src/index.js
 - HISTORY.md
 - README.md
-has_rdoc: true
-homepage: http://github.com/rstacruz/sqwish
+- Rakefile
+homepage: http://github.com/rstacruz/sqwish.rb
 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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A node-based CSS compressor
 test_files: []
-
+has_rdoc: