middleman-autoprefixer 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e4222dfeb14498a0d05024934954b82c85495c
-  data.tar.gz: 60754eeb1ff19d79724340153f9cb041ab7b62ce
+  metadata.gz: c8e0dbefd3dbf52be4931785c1fbaae0d7581bdf
+  data.tar.gz: d0f3812a1266d1f4f0e2699e329234d49df519e2
 SHA512:
-  metadata.gz: aa7e0e853bd427743ac7ad346542b94362daf224c2f3d0e2900f42893b307f1594ec70a0b8b011ba6d8cc7ed772cad611c4ce446c6752e10181263477722259f
-  data.tar.gz: a994f9afc1f39ca70b892ba8aad3425d2ca421589a09d2dead26ca8d2aaddf33d9a99b43b1e9d6b91c20317cb00adcb69911f4b8c1d2f0e6f4a2d2ecc4358db9
+  metadata.gz: b5a31ff16e80e345d3a58c8b6f08d16fe02f6221a4c632353d2a8fa1a407a4121dc86e4aa519090ef13f8e410313db01b8bb87555d4bd22d181630db2cb89af5
+  data.tar.gz: a3c9daaefdfc70169fb95b00bf25ca7116025e4c16b9f43f1242d065e3a364120dc486602c4be6f161fb674e131fc33f8dcd996705c4767f4da34bbb5d977bea

data/README.md

@@ -1,5 +1,4 @@
-[![Gem version](http://img.shields.io/gem/v/middleman-autoprefixer.svg)](http://badge.fury.io/rb/middleman-autoprefixer) [![Build status](http://img.shields.io/travis/porada/middleman-autoprefixer.svg)](https://travis-ci.org/porada/middleman-autoprefixer) [![Dependency status](http://img.shields.io/gemnasium/porada/middleman-autoprefixer.svg)](https://gemnasium.com/porada/middleman-autoprefixer) [![Code Climate](http://img.shields.io/codeclimate/github/porada/middleman-autoprefixer.svg
-)](https://codeclimate.com/github/porada/middleman-autoprefixer)
+[![Gem version](http://img.shields.io/gem/v/middleman-autoprefixer.svg?style=flat)](http://badge.fury.io/rb/middleman-autoprefixer) [![Build status](http://img.shields.io/travis/porada/middleman-autoprefixer.svg?style=flat)](https://travis-ci.org/porada/middleman-autoprefixer) [![Dependency status](http://img.shields.io/gemnasium/porada/middleman-autoprefixer.svg?style=flat)](https://gemnasium.com/porada/middleman-autoprefixer) [![Code Climate](http://img.shields.io/codeclimate/github/porada/middleman-autoprefixer.svg?style=flat)](https://codeclimate.com/github/porada/middleman-autoprefixer)
 
 # Middleman::Autoprefixer
 
@@ -21,16 +20,32 @@ activate :autoprefixer
 
 ## Configuration
 
-The extension has 2 optionally configurable fields:
+The extension has 4 optionally configurable fields:
 
 ```ruby
 activate :autoprefixer do |config|
   config.browsers = ['last 2 versions', 'Explorer >= 9']
   config.cascade  = false
+  config.inline   = true
+  config.ignore   = ['hacks.css']
 end
 ```
 
-Both fields take values (and use defaults) accordingly to [Autoprefixer’s](https://github.com/ai/autoprefixer#browsers) [documentation](https://github.com/ai/autoprefixer#visual-cascade).
+### browsers
+
+The list of targeted browsers. Takes values and uses defaults accordingly to [Autoprefixer’s documentation](https://github.com/ai/autoprefixer#browsers).
+
+### cascade
+
+The visual cascade of prefixed properties: `true` or `false`.  Uses the default value accordingly to [Autoprefixer’s documentation](https://github.com/ai/autoprefixer#visual-cascade).
+
+### inline
+
+Whether to prefix inline styles within HTML files: `true` or `false`. Disabled by default.
+
+### ignore
+
+The array of patterns or paths to exclude from prefixing. Empty by default.
 
 ## License
 

data/features/autoprefixer.feature

@@ -5,6 +5,8 @@ Feature: Postprocessing stylesheets with Autoprefixer in different configuration
     When I go to "/stylesheets/page.css"
     Then I should not see "-ms-border-radius"
     And I should see "border-radius"
+    When I go to "/index.html"
+    Then I should see "-ms-border-radius"
 
   Scenario: Passing options in a block
     Given the Server is running at "block-app"
@@ -39,3 +41,17 @@ Feature: Postprocessing stylesheets with Autoprefixer in different configuration
         -moz-box-sizing: border-box;
         box-sizing: border-box;
       """
+
+  Scenario: Inline HTML
+    Given the Server is running at "inline-app"
+    When I go to "/index.html"
+    Then I should not see "-ms-border-radius"
+    And I should see "border-radius"
+
+  Scenario: Ignoring paths
+    Given the Server is running at "ignore-app"
+    When I go to "/stylesheets/yep.css"
+    Then I should see "-ms-border-radius"
+    When I go to "/stylesheets/nope.css"
+    Then I should not see "-ms-border-radius"
+    And I should see "border-radius"

data/fixtures/default-app/source/index.html

@@ -0,0 +1,12 @@
+<html>
+<head>
+</head>
+<body>
+<style>
+  input {
+    -ms-border-radius: 5px;
+    border-radius: 5px;
+  }
+</style>
+</body>
+</html>

data/fixtures/ignore-app/config.rb

@@ -0,0 +1 @@
+activate :autoprefixer, ignore: ['yep.css']

data/fixtures/ignore-app/source/stylesheets/nope.scss

@@ -0,0 +1,4 @@
+input {
+  -ms-border-radius: 5px;
+  border-radius: 5px;
+}

data/fixtures/ignore-app/source/stylesheets/yep.scss

@@ -0,0 +1,4 @@
+input {
+  -ms-border-radius: 5px;
+  border-radius: 5px;
+}

data/fixtures/inline-app/config.rb

@@ -0,0 +1 @@
+activate :autoprefixer, inline: true

data/fixtures/inline-app/source/index.html

@@ -0,0 +1,12 @@
+<html>
+<head>
+</head>
+<body>
+<style>
+  input {
+    -ms-border-radius: 5px;
+    border-radius: 5px;
+  }
+</style>
+</body>
+</html>

data/lib/middleman-autoprefixer.rb

@@ -1,8 +1,8 @@
 require 'middleman-core'
 
 require_relative 'middleman-autoprefixer/version'
-require_relative 'middleman-autoprefixer/extension'
 
 ::Middleman::Extensions.register(:autoprefixer) do
+  require_relative 'middleman-autoprefixer/extension'
   ::Middleman::Autoprefixer::Extension
 end

data/lib/middleman-autoprefixer/extension.rb

@@ -1,17 +1,83 @@
-require_relative 'processor'
-
 module Middleman
   module Autoprefixer
     class Extension < ::Middleman::Extension
-      option :browsers
-      option :cascade
+      option :browsers, nil, 'Supported browsers'
+      option :cascade, nil, 'Should it cascade'
+      option :inline, false, 'Whether to prefix CSS inline within HTML files'
+      option :ignore, [], 'Patterns to avoid prefixing'
 
-      def initialize(app, options_hash = {}, &block)
+      def initialize(app, options={}, &block)
         super
+
+        require 'middleman-core/util'
+        require 'autoprefixer-rails'
       end
 
       def after_configuration
-        Processor.new(options).configure(app.sprockets)
+        # Setup Rack middleware to apply prefixes
+        app.use Rack, browsers: options[:browsers],
+                      cascade: options[:cascade],
+                      inline: options[:inline],
+                      ignore: options[:ignore]
+      end
+
+      # Rack middleware to look for CSS and apply prefixes.
+      class Rack
+        INLINE_CSS_REGEX = /(<style[^>]*>\s*(?:\/\*<!\[CDATA\[\*\/\n)?)(.*?)((?:(?:\n\s*)?\/\*\]\]>\*\/)?\s*<\/style>)/m
+
+        # Init
+        # @param [Class] app
+        # @param [Hash] options
+        def initialize(app, options={})
+          @app = app
+          @browsers = options[:browsers]
+          @cascade = options[:cascade]
+          @inline = options[:inline]
+          @ignore = options[:ignore]
+        end
+
+        # Rack interface
+        # @param [Rack::Environmemt] env
+        # @return [Array]
+        def call(env)
+          status, headers, response = @app.call(env)
+
+          if inline_html_content?(env['PATH_INFO'])
+            prefixed = ::Middleman::Util.extract_response_text(response)
+
+            prefixed.gsub!(INLINE_CSS_REGEX) do
+              $1 << process($2) << $3
+            end
+
+            headers['Content-Length'] = ::Rack::Utils.bytesize(prefixed).to_s
+            response = [prefixed]
+          elsif standalone_css_content?(env['PATH_INFO'])
+            prefixed_css = process(::Middleman::Util.extract_response_text(response))
+
+            headers['Content-Length'] = ::Rack::Utils.bytesize(prefixed_css).to_s
+            response = [prefixed_css]
+          end
+
+          [status, headers, response]
+        end
+
+        private
+
+        def process(css)
+          config = {}
+          config[:browsers] = Array(@browsers)
+          config[:cascade] = @cascade unless @cascade.nil?
+
+          ::AutoprefixerRails.process(css, config).css
+        end
+
+        def inline_html_content?(path)
+          (path.end_with?('.html') || path.end_with?('.php')) && @inline
+        end
+
+        def standalone_css_content?(path)
+          path.end_with?('.css') && @ignore.none? { |ignore| ::Middleman::Util.path_match(ignore, path) }
+        end
       end
     end
   end

data/lib/middleman-autoprefixer/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Autoprefixer
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

data/middleman-autoprefixer.gemspec

@@ -6,8 +6,8 @@ require 'middleman-autoprefixer/version'
 Gem::Specification.new do |spec|
   spec.name          = 'middleman-autoprefixer'
   spec.version       = Middleman::Autoprefixer::VERSION
-  spec.authors       = ['Dominik Porada']
-  spec.email         = ['dominik@porada.co']
+  spec.authors       = ['Dominik Porada', 'Thomas Reynolds']
+  spec.email         = ['dominik@porada.co', 'me@tdreyno.com']
   spec.summary       = 'Autoprefixer integration with Middleman'
   spec.homepage      = 'https://github.com/porada/middleman-autoprefixer'
   spec.license       = 'MIT'
@@ -17,12 +17,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'middleman-core',        '>= 3.3.3'
-  spec.add_dependency 'middleman-sprockets',   '>= 3.3.3'
-  spec.add_dependency 'autoprefixer-rails',    '~> 2.1.0'
+  spec.add_dependency 'autoprefixer-rails',    '~> 2.1.1'
 
   spec.add_development_dependency 'middleman', '>= 3.3.3'
-  spec.add_development_dependency 'cucumber',  '~> 1.3.14'
-  spec.add_development_dependency 'aruba',     '~> 0.5.4'
+  spec.add_development_dependency 'cucumber',  '~> 1.3'
+  spec.add_development_dependency 'aruba',     '~> 0.6'
 
   spec.add_development_dependency 'bundler',   '>= 1.6'
   spec.add_development_dependency 'rake',      '>= 10.3'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: middleman-autoprefixer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Dominik Porada
+- Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -24,34 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.3
-- !ruby/object:Gem::Dependency
-  name: middleman-sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.14
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.14
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +112,7 @@ dependencies:
 description: 
 email:
 - dominik@porada.co
+- me@tdreyno.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -152,11 +140,15 @@ files:
 - fixtures/hash-app/source/index.html
 - fixtures/hash-app/source/stylesheets/_link.sass
 - fixtures/hash-app/source/stylesheets/page.scss
+- fixtures/ignore-app/config.rb
+- fixtures/ignore-app/source/index.html
+- fixtures/ignore-app/source/stylesheets/nope.scss
+- fixtures/ignore-app/source/stylesheets/yep.scss
+- fixtures/inline-app/config.rb
+- fixtures/inline-app/source/index.html
 - lib/middleman-autoprefixer.rb
 - lib/middleman-autoprefixer/extension.rb
-- lib/middleman-autoprefixer/processor.rb
 - lib/middleman-autoprefixer/version.rb
-- lib/middleman_extension.rb
 - middleman-autoprefixer.gemspec
 homepage: https://github.com/porada/middleman-autoprefixer
 licenses:
@@ -201,3 +193,9 @@ test_files:
 - fixtures/hash-app/source/index.html
 - fixtures/hash-app/source/stylesheets/_link.sass
 - fixtures/hash-app/source/stylesheets/page.scss
+- fixtures/ignore-app/config.rb
+- fixtures/ignore-app/source/index.html
+- fixtures/ignore-app/source/stylesheets/nope.scss
+- fixtures/ignore-app/source/stylesheets/yep.scss
+- fixtures/inline-app/config.rb
+- fixtures/inline-app/source/index.html

data/lib/middleman-autoprefixer/processor.rb

@@ -1,36 +0,0 @@
-require 'autoprefixer-rails'
-
-module Middleman
-  module Autoprefixer
-    class Processor < AutoprefixerRails::Processor
-      def initialize(options)
-        super *to_processor_arguments(options)
-      end
-
-      def postprocess(context, content)
-        begin
-          process(content).css
-        rescue ExecJS::ProgramError => error
-          if error.message =~ /Can't parse CSS/
-            content
-          else
-            raise error
-          end
-        end
-      end
-
-      def configure(sprockets_env)
-        sprockets_env.register_postprocessor 'text/css', :autoprefixer, &method(:postprocess)
-      end
-
-      private
-
-      def to_processor_arguments(options)
-        [
-          Array(options.browsers),
-          options.to_h.except(:browsers).reject { |_, value| value.nil? }
-        ]
-      end
-    end
-  end
-end

data/lib/middleman_extension.rb

@@ -1 +0,0 @@
-require_relative 'middleman-autoprefixer'