middleman-inline-style 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1ba4737bd9ab7d57803703ca5b57e646938874
-  data.tar.gz: 8e771299193d7dae034d80fc79597f61f317f0a9
+  metadata.gz: 677ad33830746a1c3f553a1d9bb705dd6a89ef42
+  data.tar.gz: 38c460fa9378722186efadaee2f6509bff0dd4c9
 SHA512:
-  metadata.gz: ead817715c64b55db01dc560fbb6b80a757865bbe84be8ecb6d8cf01b0d833c14ef3ad34aabe9e226cf773f8a691b63212892d7ef9c37000aa57cce79216f5f6
-  data.tar.gz: 77dc5338f4cc4dcf50b48e33c797c2f8827e78f066e036ab845dc5e798179340a885737c5678389a23290475fafe3f05e90cf966f925c1c34021ada7bc4a7803
+  metadata.gz: 4039068172e0749fd7f2c42207904b685b35eedc62c32d61332c1cea5a4f1ddcdd7d403b792e095121271bda6f1b4798d037fb5c3dcaeabf81441bac416f5641
+  data.tar.gz: e734b18410dcc8b6ef01a75c8e24f2f5e84258d7894f575354113acf43f950f98d2969c6144026a16453942e2054555495d06c6064f7f86a4d84602396728224

data/.gitignore

@@ -1,4 +1,22 @@
-pkg/*
 *.gem
+*.rbc
 .bundle
-*.swp
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in middleman-inline-style.gemspec
 gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Trenton Broughton
+
+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.

data/README.md

@@ -0,0 +1,42 @@
+# middleman-inline-style
+
+Inline all of your styles. Why would you do such a horrible thing? Probably only for developing email templates.
+
+This takes some of the pain out of developing templates by allowing you to centralize your CSS, and not worrying about writing style attributes for every element.
+
+This uses the [inline-style][0] gem from Macario Ortega to do all the work
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'middleman-inline-style'
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install middleman-inline-style
+
+## Usage
+
+Add this to your config.rb:
+
+    require "middleman-inline-style"
+    activate :inline_style
+
+## Contributing
+
+1. Fork it ( https://github.com/trenton42/middleman-inline-style/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## License
+
+MIT
+
+[0]: https://github.com/maca/inline-style

data/Rakefile

@@ -1,9 +1,2 @@
-require 'bundler'
-require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
-task :default => [:spec]
-
-desc "Run specs"
-RSpec::Core::RakeTask.new(:spec)
-
-Bundler::GemHelper.install_tasks

data/lib/middleman-inline-style.rb

@@ -1,105 +1,9 @@
-require 'nokogiri'
-require 'open-uri'
-
-$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require "middleman-inline-style/rule"
-require "middleman-inline-style/rack-middleware" # This two may be should be required by user if she needs it
-require "middleman-inline-style/mail-interceptor"
+require "middleman-inline-style/version"
+require "middleman-inline-style/rack-middleware"
 
 require "middleman-core"
 
 ::Middleman::Extensions.register(:inline_style) do
   require "middleman-inline-style/middleman-extension"
   ::Middleman::InlineStyleExtension
-end
-
-class InlineStyle
-  CSSParser =
-  if const_defined? :CSSPool
-    require 'middleman-inline-style/csspool_wrapper'
-    CSSPoolWrapper
-  else
-    require 'middleman-inline-style/css_parser_wrapper'
-    CssParserWrapper
-  end
-
-  # @param [String, Nokogiri::HTML::Document] html Html or Nokogiri html to be inlined
-  # @param [Hash] opts Processing options
-  #
-  # @option opts [String] :stylesheets_path (ENV['DOCUMENT_ROOT']) 
-  #       Stylesheets root path or app's public directory where the stylesheets are to be found
-  def self.process html, opts = {}
-    new(html, opts).process
-  end
-
-  def initialize html, opts = {}
-    @stylesheets_path = opts[:stylesheets_path] || ENV['DOCUMENT_ROOT'] || '.'
-    @html           = html
-    @dom = String === html ? Nokogiri.HTML(html) : html
-  end
-
-  def process
-    nodes_with_rules.each_pair do |node, rules|
-      rules = rules.sort_by{ |sel| "#{sel.specificity}%04d" % rules.index(sel) }
-
-      styles = []
-      rules.each do |rule|
-        next if rule.dynamic_pseudo_class
-        rule.declarations.each do |declaration| 
-          if defined = styles.assoc(declaration.first)
-            styles[styles.index(defined)] = declaration # overrides defined declaration
-          else
-            styles << declaration
-          end
-        end
-      end
-
-      style = styles.map{ |declaration| declaration.join(': ') }.join('; ') 
-      node['style'] = "#{style};" unless style.empty?
-    end
-    pre_parsed? ? @dom : @dom.to_s
-  end
-
-  private
-  def nodes_with_rules
-    nodes, body = {}, @dom.css('body')
-
-    parse_css.rules.each do |rule|
-      body.css(rule.selector).each do |node|
-        nodes[node] ||= []
-        nodes[node].push rule
-      end
-    end
-
-    body.css('[style]').each do |node| 
-      nodes[node] ||= []
-      nodes[node].push Rule.new ':inline', node['style'], '1000' # :inline is not really a pseudoclass
-    end
-
-    nodes
-  end
-
-  def pre_parsed?
-    @html == @dom
-  end
-
-  # Returns parsed CSS
-  def extract_css
-    @dom.css('style, link[rel=stylesheet]').collect do |node|
-      next unless /^$|screen|all/ === node['media'].to_s
-      node.remove
-
-      if node.name == 'style'
-        node.content 
-      else
-        uri = %r{^https?://} === node['href'] ? node['href'] : File.join(@stylesheets_path, node['href'].sub(/\?.+$/,'')) 
-        open(uri).read
-      end
-    end.join("\n")
-  end
-
-  def parse_css
-    CSSParser.new extract_css 
-  end
-end
+end

data/lib/middleman-inline-style/middleman-extension.rb

@@ -5,7 +5,7 @@ module Middleman
     end
 
     def after_configuration
-      app.use ::InlineStyle::Rack::Middleware
+      app.use ::MiddlemanInlineStyle::Rack::Middleware
     end
   end
 end

data/lib/middleman-inline-style/rack-middleware.rb

@@ -1,4 +1,6 @@
-module InlineStyle::Rack
+require "inline-style"
+
+module MiddlemanInlineStyle::Rack
   class Middleware
     # @param [Hash] opts Middlewar options
     #

data/lib/middleman-inline-style/version.rb

@@ -1,3 +1,3 @@
-class InlineStyle
-  VERSION = '0.5.1'
+class MiddlemanInlineStyle
+  VERSION = "0.6.0"
 end

data/middleman-inline-style.gemspec

@@ -1,29 +1,23 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
 require "middleman-inline-style/version"
 
-Gem::Specification.new do |s|
-  s.name        = "middleman-inline-style"
-  s.version     = InlineStyle::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Macario Ortega", "Eric Anderson", "Trenton Broughton"]
-  s.email       = ["trenton@ikso.us"]
-  s.homepage    = "https://github.com/trenton42/middleman-inline-style"
-  s.summary     = %q{Inlines CSS for html email delivery}
-  s.description = %q{Inlines CSS for html email delivery}
-  s.post_install_message = %{Please read documentation for changes on the default css parser gem, specifically if you use csspool}
+Gem::Specification.new do |spec|
+  spec.name          = "middleman-inline-style"
+  spec.version       = MiddlemanInlineStyle::VERSION
+  spec.authors       = ["Trenton Broughton"]
+  spec.email         = ["trenton@ikso.us"]
+  spec.summary       = "Middleman extension to inline your css"
+  spec.description   = "Inline the css in your templates. Useful for developing email templates"
+  spec.homepage      = "https://github.com/trenton42/middleman-inline-style"
+  spec.license       = "MIT"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split("\n")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rack'
-  s.add_development_dependency 'rspec-core'
-  s.add_development_dependency 'mail'
-
-  s.add_dependency 'nokogiri'
-  s.add_dependency 'css_parser'
-  s.add_dependency 'maca-fork-csspool'
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_dependency "inline-style"
 end

metadata

@@ -1,11 +1,9 @@
 --- !ruby/object:Gem::Specification
 name: middleman-inline-style
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
-- Macario Ortega
-- Eric Anderson
 - Trenton Broughton
 autorequire: 
 bindir: bin
@@ -13,49 +11,21 @@ cert_chain: []
 date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -69,35 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: css_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: maca-fork-csspool
+  name: inline-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -110,7 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Inlines CSS for html email delivery
+description: Inline the css in your templates. Useful for developing email templates
 email:
 - trenton@ikso.us
 executables: []
@@ -118,39 +60,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - Gemfile
-- Gemfile.lock
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
-- example.rb
 - lib/middleman-inline-style.rb
-- lib/middleman-inline-style/css_parser_wrapper.rb
-- lib/middleman-inline-style/csspool_wrapper.rb
-- lib/middleman-inline-style/mail-interceptor.rb
 - lib/middleman-inline-style/middleman-extension.rb
 - lib/middleman-inline-style/rack-middleware.rb
-- lib/middleman-inline-style/rule.rb
 - lib/middleman-inline-style/version.rb
 - middleman-inline-style.gemspec
-- spec/css_inlining_spec.rb
-- spec/css_parsing_spec.rb
-- spec/fixtures/all.css
-- spec/fixtures/boletin.html
-- spec/fixtures/box-model.html
-- spec/fixtures/inline.html
-- spec/fixtures/none.css
-- spec/fixtures/print.css
-- spec/fixtures/selectors.html
-- spec/fixtures/style.css
-- spec/interceptor_spec.rb
-- spec/rack_middleware_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/trenton42/middleman-inline-style
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: Please read documentation for changes on the default css parser
-  gem, specifically if you use csspool
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -169,18 +92,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Inlines CSS for html email delivery
-test_files:
-- spec/css_inlining_spec.rb
-- spec/css_parsing_spec.rb
-- spec/fixtures/all.css
-- spec/fixtures/boletin.html
-- spec/fixtures/box-model.html
-- spec/fixtures/inline.html
-- spec/fixtures/none.css
-- spec/fixtures/print.css
-- spec/fixtures/selectors.html
-- spec/fixtures/style.css
-- spec/interceptor_spec.rb
-- spec/rack_middleware_spec.rb
-- spec/spec_helper.rb
+summary: Middleman extension to inline your css
+test_files: []