multi_css 0.0.3 → 0.1.0

data/README.md

@@ -19,13 +19,12 @@ supported engines already loaded, it will utilize them before attempting to
 load any. 
 It will load libraries in following order:
 
- - [css_press](https://github.com/stereobooster/css_press)
  - [cssminify](https://github.com/matthiassiegel/cssminify)
  - [yuicssmin](https://github.com/matthiassiegel/yuicssmin)
  - [ruby-yui-compressor](https://github.com/sstephenson/ruby-yui-compressor). Doesn't test with travis-ci
  - [rainpress](https://github.com/sprsquish/rainpress)
 
-If no other library is available, MultiCss falls back to vendored [cssminify](https://github.com/matthiassiegel/cssminify), a simple and reliable library.
+If no other library is available, MultiCss falls back to [css_press](https://github.com/stereobooster/css_press).
 
 ## TODO
 

data/lib/multi_css.rb

@@ -11,11 +11,11 @@ module MultiCss
   @adapter = nil
   
   REQUIREMENT_MAP = [
-    ["css_press", :css_press],
     ["cssminify", :cssminify],
     ["yuicssmin", :yuicssmin],
     ["yui/compressor", :yui_compressor],
-    ["rainpress", :rainpress]
+    ["rainpress", :rainpress],
+    ["css_press", :css_press]
   ]
 
   class << self
@@ -25,11 +25,11 @@ module MultiCss
     # if any adapters are already loaded, then checks
     # to see which are installed if none are loaded.
     def default_adapter
-      return :css_press if defined?(::CssPress)
       return :cssminify if defined?(::CSSminify)      
       return :yuicssmin if defined?(::Yuicssmin)
       return :yui_compressor if defined?(::YUI::CssCompressor)
       return :rainpress if defined?(::Rainpress)
+      return :css_press if defined?(::CssPress)
 
       REQUIREMENT_MAP.each do |(library, adapter)|
         begin
@@ -40,8 +40,7 @@ module MultiCss
         end
       end
 
-      Kernel.warn "[WARNING] MultiCss is using the default adapter."
-      :vendored
+      :css_press
     end
     # :nodoc:
     alias :default_engine :default_adapter

data/lib/multi_css/version.rb

@@ -1,3 +1,3 @@
 module MultiCss
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/multi_css.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
-  gem.files        += `cd vendor/cssminify && git ls-files`.split($/).map{|f| 'vendor/cssminify/' + f}
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'css_press'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rdoc'
   gem.add_development_dependency 'rspec'

data/spec/multi_css_spec.rb

@@ -38,18 +38,13 @@ describe 'MultiCss' do
       end
 
       it 'defaults to vendored implemention if no other implementions are available' do
-        MultiCss.default_adapter.should eq :vendored
-      end
-
-      it 'prints a warning' do
-        Kernel.should_receive(:warn).with(/warning/i)
-        MultiCss.default_adapter
+        MultiCss.default_adapter.should eq :css_press
       end
     end
 
-    it 'defaults to the best available gem' do
-      require 'css_press'
-      MultiCss.adapter.name.should eq 'MultiCss::Adapters::CssPress'
+    it 'defaults to the best not vendored lib if any other lib available' do
+      require 'cssminify'
+      MultiCss.adapter.name.should eq 'MultiCss::Adapters::Cssminify'
     end
 
     it 'is settable via a symbol' do
@@ -63,7 +58,7 @@ describe 'MultiCss' do
     end
   end
 
-  %w(css_press cssminify yuicssmin rainpress vendored).each do |adapter|
+  %w(css_press cssminify yuicssmin rainpress).each do |adapter|
     context adapter do
       it_behaves_like "an adapter", adapter
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_css
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: css_press
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +99,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .gitmodules
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -93,7 +108,6 @@ files:
 - lib/multi_css/adapters/css_press.rb
 - lib/multi_css/adapters/cssminify.rb
 - lib/multi_css/adapters/rainpress.rb
-- lib/multi_css/adapters/vendored.rb
 - lib/multi_css/adapters/yui_compressor.rb
 - lib/multi_css/adapters/yuicssmin.rb
 - lib/multi_css/version.rb
@@ -101,113 +115,6 @@ files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
 - spec/multi_css_spec.rb
-- vendor/cssminify/.gitignore
-- vendor/cssminify/.travis.yml
-- vendor/cssminify/CHANGES.md
-- vendor/cssminify/Gemfile
-- vendor/cssminify/LICENSE.md
-- vendor/cssminify/README.md
-- vendor/cssminify/cssminify.gemspec
-- vendor/cssminify/lib/cssminify.rb
-- vendor/cssminify/lib/cssminify/cssmin.rb
-- vendor/cssminify/lib/cssminify/version.rb
-- vendor/cssminify/spec/cssminify_spec.rb
-- vendor/cssminify/spec/sample.css
-- vendor/cssminify/spec/spec_helper.rb
-- vendor/cssminify/spec/tests/background-position.css
-- vendor/cssminify/spec/tests/background-position.css.min
-- vendor/cssminify/spec/tests/border-none.css
-- vendor/cssminify/spec/tests/border-none.css.min
-- vendor/cssminify/spec/tests/box-model-hack.css
-- vendor/cssminify/spec/tests/box-model-hack.css.min
-- vendor/cssminify/spec/tests/bug2527974.css
-- vendor/cssminify/spec/tests/bug2527974.css.min
-- vendor/cssminify/spec/tests/bug2527991.css
-- vendor/cssminify/spec/tests/bug2527991.css.min
-- vendor/cssminify/spec/tests/bug2527998.css
-- vendor/cssminify/spec/tests/bug2527998.css.min
-- vendor/cssminify/spec/tests/bug2528034.css
-- vendor/cssminify/spec/tests/bug2528034.css.min
-- vendor/cssminify/spec/tests/bug2528093.css
-- vendor/cssminify/spec/tests/bug2528093.css.min
-- vendor/cssminify/spec/tests/charset-media.css
-- vendor/cssminify/spec/tests/charset-media.css.min
-- vendor/cssminify/spec/tests/color-simple.css
-- vendor/cssminify/spec/tests/color-simple.css.min
-- vendor/cssminify/spec/tests/color.css
-- vendor/cssminify/spec/tests/color.css.min
-- vendor/cssminify/spec/tests/comment.css
-- vendor/cssminify/spec/tests/comment.css.min
-- vendor/cssminify/spec/tests/concat-charset.css
-- vendor/cssminify/spec/tests/concat-charset.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-doublequotes.css
-- vendor/cssminify/spec/tests/dataurl-base64-doublequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-eof.css
-- vendor/cssminify/spec/tests/dataurl-base64-eof.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-linebreakindata.css
-- vendor/cssminify/spec/tests/dataurl-base64-linebreakindata.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-noquotes.css
-- vendor/cssminify/spec/tests/dataurl-base64-noquotes.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-singlequotes.css
-- vendor/cssminify/spec/tests/dataurl-base64-singlequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-base64-twourls.css
-- vendor/cssminify/spec/tests/dataurl-base64-twourls.css.min
-- vendor/cssminify/spec/tests/dataurl-dbquote-font.css
-- vendor/cssminify/spec/tests/dataurl-dbquote-font.css.min
-- vendor/cssminify/spec/tests/dataurl-nonbase64-doublequotes.css
-- vendor/cssminify/spec/tests/dataurl-nonbase64-doublequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-nonbase64-noquotes.css
-- vendor/cssminify/spec/tests/dataurl-nonbase64-noquotes.css.min
-- vendor/cssminify/spec/tests/dataurl-nonbase64-singlequotes.css
-- vendor/cssminify/spec/tests/dataurl-nonbase64-singlequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-noquote-multiline-font.css
-- vendor/cssminify/spec/tests/dataurl-noquote-multiline-font.css.min
-- vendor/cssminify/spec/tests/dataurl-realdata-doublequotes.css
-- vendor/cssminify/spec/tests/dataurl-realdata-doublequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-realdata-noquotes.css
-- vendor/cssminify/spec/tests/dataurl-realdata-noquotes.css.min
-- vendor/cssminify/spec/tests/dataurl-realdata-singlequotes.css
-- vendor/cssminify/spec/tests/dataurl-realdata-singlequotes.css.min
-- vendor/cssminify/spec/tests/dataurl-realdata-yuiapp.css
-- vendor/cssminify/spec/tests/dataurl-realdata-yuiapp.css.min
-- vendor/cssminify/spec/tests/dataurl-singlequote-font.css
-- vendor/cssminify/spec/tests/dataurl-singlequote-font.css.min
-- vendor/cssminify/spec/tests/decimals.css
-- vendor/cssminify/spec/tests/decimals.css.min
-- vendor/cssminify/spec/tests/dollar-header.css
-- vendor/cssminify/spec/tests/dollar-header.css.min
-- vendor/cssminify/spec/tests/font-face.css
-- vendor/cssminify/spec/tests/font-face.css.min
-- vendor/cssminify/spec/tests/ie5mac.css
-- vendor/cssminify/spec/tests/ie5mac.css.min
-- vendor/cssminify/spec/tests/media-empty-class.css
-- vendor/cssminify/spec/tests/media-empty-class.css.min
-- vendor/cssminify/spec/tests/media-multi.css
-- vendor/cssminify/spec/tests/media-multi.css.min
-- vendor/cssminify/spec/tests/media-test.css
-- vendor/cssminify/spec/tests/media-test.css.min
-- vendor/cssminify/spec/tests/opacity-filter.css
-- vendor/cssminify/spec/tests/opacity-filter.css.min
-- vendor/cssminify/spec/tests/preserve-case.css
-- vendor/cssminify/spec/tests/preserve-case.css.min
-- vendor/cssminify/spec/tests/preserve-new-line.css
-- vendor/cssminify/spec/tests/preserve-new-line.css.min
-- vendor/cssminify/spec/tests/preserve-strings.css
-- vendor/cssminify/spec/tests/preserve-strings.css.min
-- vendor/cssminify/spec/tests/pseudo-first.css
-- vendor/cssminify/spec/tests/pseudo-first.css.min
-- vendor/cssminify/spec/tests/pseudo.css
-- vendor/cssminify/spec/tests/pseudo.css.min
-- vendor/cssminify/spec/tests/special-comments.css
-- vendor/cssminify/spec/tests/special-comments.css.min
-- vendor/cssminify/spec/tests/star-underscore-hacks.css
-- vendor/cssminify/spec/tests/star-underscore-hacks.css.min
-- vendor/cssminify/spec/tests/string-in-comment.css
-- vendor/cssminify/spec/tests/string-in-comment.css.min
-- vendor/cssminify/spec/tests/webkit-transform.css
-- vendor/cssminify/spec/tests/webkit-transform.css.min
-- vendor/cssminify/spec/tests/zeros.css
-- vendor/cssminify/spec/tests/zeros.css.min
 homepage: https://github.com/stereobooster/multi_css
 licenses:
 - MIT
@@ -221,18 +128,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -293339025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -293339025
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/cssminify"]
-	path = vendor/cssminify
-	url = https://github.com/matthiassiegel/cssminify.git

data/lib/multi_css/adapters/vendored.rb

@@ -1,9 +0,0 @@
-require File.expand_path('../../../../vendor/cssminify/lib/cssminify', __FILE__)
-require 'cssminify'
-
-module MultiCss
-  module Adapters
-    class Vendored < Cssminify
-    end
-  end
-end

data/vendor/cssminify/.gitignore

@@ -1,9 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-coverage
-rdoc
-doc
-.yardoc
-.rspec

data/vendor/cssminify/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
-script: bundle exec rspec spec

data/vendor/cssminify/CHANGES.md

@@ -1,12 +0,0 @@
-### 1.0.2 (30 June 2012)
-
-* Removed unnecessary Bundler dependency
-
-### 1.0.1 (30 June 2012)
-
-* Updated cssmin.rb to 1.0.1
-* Updated tests
-
-## 1.0.0  (29 June 2012)
-
-First release

data/vendor/cssminify/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in cssminify.gemspec
-gemspec

data/vendor/cssminify/LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Matthias Siegel (matthias.siegel@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Note: the included Ruby port of YUI compressor has a different license. See the [source code](https://github.com/matthiassiegel/cssminify/blob/master/lib/cssminify/cssmin.rb) for details.

data/vendor/cssminify/README.md

@@ -1,64 +0,0 @@
-# CSSminify [![Build Status](https://secure.travis-ci.org/matthiassiegel/cssminify.png)](http://travis-ci.org/matthiassiegel/cssminify)
-
-CSS minification with YUI compressor, but as native Ruby port.
-
-The CSSminify gem provides CSS compression using YUI compressor. Instead of wrapping around the Java or Javascript version of YUI compressor it uses a native [Ruby port](https://github.com/matthiassiegel/cssmin) of the CSS engine. Therefore this gem has no dependencies.
-
-In basic benchmarks the Ruby version performed about as good as the Java jar. It currently passes all CSS test cases included with the YUI compressor Java source code.
-
-Main motivation for the Ruby port and this gem was to reduce dependencies like Java.
-
-## Installation
-Install CSSminify from RubyGems:
-
-    gem install cssminify
-
-Or include it in your project's Gemfile:
-
-    gem 'cssminify'
-
-## Usage
-
-    require 'cssminify'
-    
-    CSSminify.compress('/* a comment */ .test { display: block; }')
-    # => minified CSS
-    
-    CSSminify.compress(File.read('path/to/styles.css'))
-    # => minified CSS
-    
-    CSSminify.compress(File.open('path/to/styles.css'))
-    # => minified CSS
-    
-    # Alternatively use instance method...
-    compressor = CSSminify.new
-    compressor.compress(File.read("path/to/styles.css"))
-    # => minified CSS
-
-Files or strings are acceptable as input.
-
-You can pass in a second argument to control the maximum output line length (default 5000 characters):
-
-    CSSminify.compress(File.read("path/to/styles.css"), 200)
-
-Note: in most cases line length will only be approximated.
-
-## Rails asset pipeline
-Rails 3.1 integrated [Sprockets](https://github.com/sstephenson/sprockets) to provide asset packaging and minimising out of the box. For CSS compression it relies on the [yui-compressor gem](https://github.com/sstephenson/ruby-yui-compressor) which requires Java. To use CSSminify instead, edit your config/application.rb file:
-
-    config.assets.css_compressor = CSSminify.new
-
-## Compatibility
-Tested with Ruby 1.9.2, 1.9.3, jruby-19mode, rbx-19mode
-
-## Changelog
-See [CHANGES](https://github.com/matthiassiegel/cssminify/blob/master/CHANGES.md).
-
-## Copyright
-
-### CSSminify gem and documentation
-Copyright (c) 2012 Matthias Siegel (matthias.siegel@gmail.com)
-See [LICENSE](https://github.com/matthiassiegel/cssminify/blob/master/LICENSE.md) for details.
-
-### YUI compressor
-See [file](https://github.com/matthiassiegel/cssminify/blob/master/lib/cssminify/cssmin.rb).

data/vendor/cssminify/cssminify.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "cssminify/version"
-
-Gem::Specification.new do |s|
-  s.name        = "cssminify"
-  s.version     = CSSminify::VERSION
-  s.author      = "Matthias Siegel"
-  s.email       = "matthias.siegel@gmail.com"
-  s.homepage    = "https://github.com/matthiassiegel/cssminify"
-  s.summary     = "CSS minification with YUI compressor, but as native Ruby port."
-  s.description = <<-EOF
-    The CSSminify gem provides CSS compression using YUI compressor. Instead of wrapping around the Java or Javascript version of YUI compressor it uses a native Ruby port of the CSS engine. Therefore this gem has no dependencies.
-  EOF
-  
-  s.extra_rdoc_files = [
-    "CHANGES.md",
-    "LICENSE.md",
-    "README.md"
-  ]
-  
-  s.license = "MIT"
-  s.rubyforge_project = "cssminify"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- spec/*`.split("\n")
-  s.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec", "~> 2.7"
-end