inline_styles 1.1.1 → 1.1.2

data/README.markdown

@@ -15,7 +15,7 @@ class Mailer < ActionMailer::Base
     subject "Looks nice, eh?"
     html = render(:file   => "message.html",
                   :layout => "email_layout.html")
-    body InlineStyles::Page.new(html).apply(stylesheet_content)
+    body InlineStyles::Page.new.with_html(html).with_css(stylesheet_content).apply
   end
 
   protected
@@ -27,7 +27,7 @@ end
 </pre>
 
 ## Requirements
-InlineStyles uses the [css_parser](http://github.com/DanaDanger/css_parser) and [Nokogiri](http://nokogiri.org) gems
+InlineStyles uses the [css_parser](http://github.com/DanaDanger/css_parser) and [Hpricot](http://github.com/hpricot/hpricot) gems
 
 ### Copyright
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/inline_styles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_styles}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
-  s.date = %q{2011-04-10}
+  s.date = %q{2011-06-15}
   s.description = %q{To make your HTML display properly when stylesheet support isn't available (e.g. Gmail) this lets you attach all your CSS to the 'style' attribute of each element.}
   s.email = %q{gitcommit@6brand.com}
   s.extra_rdoc_files = [
@@ -30,10 +30,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Squish a CSS stylesheet into any semantic HTML}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_inline_styles.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/inline_styles.rb

@@ -1,36 +1,54 @@
+require 'css_parser'
+require 'nokogiri'
 
 module InlineStyles
   class Page
     attr_accessor :html
 
-    def initialize(html)
+    def initialize(html = nil)
       @html = html
     end
 
-    def apply(css)
-      require_dependencies
+    def with_css(css)
+      @css = css
+      self
+    end
+
+    def with_html(html)
+      @html = html
+      self
+    end
 
-      parser = CssParser::Parser.new
-      parser.add_block! css
+    def selectors
+      @selectors ||= begin
+        parser = CssParser::Parser.new
+        parser.add_block! @css
 
-      tree = Nokogiri::HTML(html)
+        stable_sorter = 0
+        selectors = []
 
-      stable_sorter = 0
-      selectors = []
+        # extracting selectors via the API rather than
+        # just reaching in and grabbing @selectors
+        parser.each_selector do |selector, declarations, specificity|
+          selectors << [selector, declarations, specificity]
+        end
 
-      # extracting selectors via the API rather than
-      # just reaching in and grabbing @selectors
-      parser.each_selector do |selector, declarations, specificity|
-        selectors << [selector, declarations, specificity]
+        # stable-sort the selectors so that we get them sorted
+        # by specificity but also keeping their rough
+        # original order. This is how CSS selectors are applied
+        # in a browser
+        selectors.sort_by do |selector|
+          [selector.last, stable_sorter += 1]
+        end
       end
+    end
+
+    def apply(stylesheet_content = nil)
+      with_css(stylesheet_content) if stylesheet_content
+
+      tree = Nokogiri::HTML(@html)
 
-      # stable-sort the selectors so that we get them sorted
-      # by specificity but also keeping their rough
-      # original order. This is how CSS selectors are applied
-      # in a browser
-      selectors.sort_by do |selector|
-        [selector.last, stable_sorter += 1]
-      end.each do |selector, declarations, spec|
+      selectors.each do |selector, declarations, spec|
         # Find each element matching the given slector
         (tree.css selector).each do |element|
 
@@ -47,15 +65,6 @@ module InlineStyles
 
       tree.to_s
     end
-
-    protected
-
-      def require_dependencies
-        gem 'css_parser'
-        require 'css_parser'
-        gem 'nokogiri'
-        require 'nokogiri'
-      end
   end
 
   # taken from http://moserei.de/index.php/17/stable-array-sorting-in-ruby

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_styles
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
+date: 2011-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,5 @@ rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Squish a CSS stylesheet into any semantic HTML
-test_files: 
-- test/helper.rb
-- test/test_inline_styles.rb
+test_files: []
+