csso-rails 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f348466dbf9fcc505bfac786253c5015f5b75e41
+  data.tar.gz: e6429cbdbe44a344e4913aee08b545eb8139bbc7
+SHA512:
+  metadata.gz: fc6c958f36d17d9e59894d9db0a2d987e0c7fd7a645a6edae72261412da36e6eb4f5420dac23fa59864f10ec9aeb3c5e51b6623cab7a03e28c9467cfd1dc31b2
+  data.tar.gz: 80b063cba7ed2f87b66575c98d33e6920f4756cea73d7aa7391aed09286ddf365f293370d8d013c2cc3f39f5bd7448f922ced6cbb9d9a013f6479cad10c7af09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csso-rails (0.3.2)
+    csso-rails (0.3.3)
       execjs (>= 1)
 
 GEM

data/Rakefile

@@ -25,7 +25,8 @@ file 'csso' do
   }
 end
 
-task :update_csso => :csso do
+desc "updates csso repo"
+task :update_csso_repo => :csso do
   #??
   Dir.chdir('csso'){
     puts 'Updating csso...'
@@ -41,8 +42,10 @@ file Csso::CSSO_JS_LIB => [lib_template, 'csso', 'vendor/csso', 'csso/.git/HEAD'
   `erb #{lib_template} > #{Csso::CSSO_JS_LIB}`
 end
 
-task :generate_files => [Csso::CSSO_JS_LIB]
+desc "Generate bundled csso from repo"
+task :generate_files => [:csso, Csso::CSSO_JS_LIB]
 
+desc "Clean generated files"
 task :rm_generated do
   puts "Removing #{Csso::CSSO_JS_LIB}"
   `rm #{Csso::CSSO_JS_LIB}`
@@ -50,4 +53,7 @@ end
 
 task :regenerate => [:rm_generated, :generate_files]
 
-task :build => :generate_files
+desc "Update CSSO"
+task :update_csso => [:rm_generated, :update_csso_repo, :generate_files]
+
+task :build => :generate_files

data/bin/ruby_csso

@@ -1,25 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'csso-rails'
+require 'csso/cli'
 
-def help
-  puts <<-HLP
-  csso- CSS Optimizer (ruby bindings by vasfed)
-Usage:
-  $ ruby_csso < style.css - read stdin and output to stdout
-  $ ruby_csso file1.css [file2.css [...]] - read all files and output to stdout (concatenating, no optimization between files yet)
-  --help - print this help
-  --maniac - enable maniac mode (optimize file multiple times until optimization stops to give any results)
-HLP
-end
-
-maniac = ARGV.delete('--maniac') && true || false
-
-if ($stdin.tty? && ARGV.empty?) || ARGV.delete('-h') || ARGV.delete('--help')
-  help
-else
-  # Well, lets read those files
-  css = ARGF.read
-
-  puts Csso.optimize(css, maniac)
-end
+Csso::CLI.run!

data/lib/csso/cli.rb

@@ -0,0 +1,44 @@
+#encofing: utf-8
+
+require 'optparse'
+
+module Csso
+  module CLI
+    def self.run!(argv=ARGV)
+      maniac = false
+      opts = OptionParser.new do |opts|
+        opts.version = Csso::VERSION
+        opts.banner = "CSS Optimizer (ruby bindings by vasfed) version #{opts.version}"
+        opts.separator ""
+        opts.separator "Usage:"
+        opts.separator "  #{opts.program_name} [options] FILE [FILE2 [FILE3 [...]]"
+        opts.separator "  #{opts.program_name} [options] < some_file.css"
+        opts.separator ""
+        opts.separator "All input files are concatenated and fed to stdout after processing."
+        opts.separator ""
+
+        opts.separator "Options:"
+        opts.on("-m", "--[no-]maniac", "\"Maniac mode\" optimizes input multiple times until optimization stops to give any results.") do |v|
+          maniac = v
+        end
+
+        opts.on_tail("-v", "--version", "Print version information") do
+          return puts opts.ver
+        end
+        opts.on_tail("-h", "--help", "Show this message") do
+          return puts opts.help
+        end
+      end
+
+      opts.parse!(argv)
+
+      if $stdin.tty? && argv.empty?
+        return puts opts.help
+      end
+
+      ARGV.replace(argv)
+      css = ARGF.read
+      puts Csso.optimize(css, maniac)
+    end
+  end
+end

data/lib/csso/version.rb

@@ -1,4 +1,4 @@
 module Csso
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   CSSO_JS_LIB = 'vendor/csso/csso.js'
 end

data/vendor/csso/csso.js

@@ -2,7 +2,7 @@
  THIS FILE IS AUTOGENERATED! DO NOT EDIT!
  See lib/csso/csso.js.erb instead.
 
- Based on CSSO 1.3.8 revision 7061510a0f2b896cd7899836889b91453c4c6e2a
+ Based on CSSO 1.3.10 revision ed443db03803fb9e04918e1c6307053c2a731160
 */
 
 console = {
@@ -162,7 +162,7 @@ function getTokens(s) {
             if (c === '/' && cn === '*') {
                 parseMLComment(s);
             } else if (!urlMode && c === '/' && cn === '/') {
-                if (blockMode > 0) parseIdentifier(s); 
+                if (blockMode > 0) parseIdentifier(s);
                 else parseSLComment(s);
             } else if (c === '"' || c === "'") {
                 parseString(s, c);
@@ -593,8 +593,8 @@ function getCSSPAST(_tokens, rule, _needInfo) {
     }
 
     function getAttrib() {
-        if (checkAttrib1(pos)) return getAttrib1(); 
-        if (checkAttrib2(pos)) return getAttrib2(); 
+        if (checkAttrib1(pos)) return getAttrib1();
+        if (checkAttrib2(pos)) return getAttrib2();
     }
 
 //attrselector = (seq('=') | seq('~=') | seq('^=') | seq('$=') | seq('*=') | seq('|=')):x -> [#attrselector, x]
@@ -1330,7 +1330,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
                         (tokens[_i].type !== TokenType.DecimalNumber || !wasIdent)
                         ) break;
                     else wasIdent = true;
-            }   
+            }
         }
 
         if (!wasIdent && tokens[start].type !== TokenType.Asterisk) return fail(tokens[_i]);
@@ -3477,7 +3477,7 @@ CSSOCompressor.prototype.getVendorFromString = function(string) {
     var vendor = string.charAt(0), i;
     if (vendor === '-') {
         if ((i = string.indexOf('-', 2)) !== -1) return string.substr(0, i + 1);
-    } 
+    }
     return '';
 };
 

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: csso-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Invoke the CSSO from Ruby
@@ -77,6 +70,7 @@ files:
 - csso-rails.gemspec
 - lib/csso-rails.rb
 - lib/csso.rb
+- lib/csso/cli.rb
 - lib/csso/compressor.rb
 - lib/csso/csso.js.erb
 - lib/csso/js_lib.rb
@@ -87,33 +81,26 @@ files:
 homepage: https://github.com/Vasfed/csso-rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4417280419298130483
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4417280419298130483
 requirements: []
 rubyforge_project: csso-rails
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CSS Stylesheet optimizer/compressor for Rails
 test_files:
 - spec/csso/csso_spec.rb