roadie 1.1.1 → 1.1.2

data/Changelog.md

@@ -1,14 +1,20 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.1.1...master)
+[full changelog](https://github.com/Mange/roadie/compare/v1.1.2...master)
 
 * Nothing yet
 
+### 1.1.2
+
+[full changelog](https://github.com/Mange/roadie/compare/v1.1.1...v1.1.2)
+
+* Support for Rails 3.1.0 and later inside gemspec
+
 ### 1.1.1
 
 [full changelog](https://github.com/Mange/roadie/compare/v1.1.0...v1.1.1)
 
-* Support for Rails 3.1.x (RC4 and later)
+* Support for Rails 3.1.x (up to and including RC4)
   * Rails 3.0.x is still supported
 * Added CI via [Travis CI](http://travis-ci.org)
 

data/Gemfile.lock

@@ -1,76 +1,90 @@
 PATH
   remote: .
   specs:
-    roadie (1.1.0)
-      actionmailer (>= 3.0.0)
+    roadie (1.1.1)
+      actionmailer (~> 3.0)
       css_parser
       nokogiri (>= 1.4.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    builder (2.1.2)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
     css_parser (1.1.9)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    multi_json (1.0.3)
+    nokogiri (1.5.0)
     polyglot (0.3.2)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
 
 PLATFORMS
   ruby

data/README.md

@@ -126,8 +126,8 @@ Bugs / TODO
 Documentation
 -------------
 
+* [Online documentation for 1.1.2](http://rubydoc.info/gems/roadie/1.1.2/frames)
 * [Online documentation for 1.0.1](http://rubydoc.info/gems/roadie/1.0.1/frames)
-* [Online documentation for 1.0.0](http://rubydoc.info/gems/roadie/1.0.0/frames)
 * [Online documentation for master](http://rubydoc.info/github/Mange/roadie/master/frames)
 * [Changelog](https://github.com/Mange/roadie/blob/master/Changelog.md)
 

data/gemfiles/rails-3.1.x.Gemfile

@@ -2,6 +2,6 @@ source :rubygems
 
 gem 'nokogiri', '>= 1.4.4'
 gem 'css_parser'
-gem 'actionmailer', '~> 3.1.0.rc6'
+gem 'actionmailer', '~> 3.1.0'
 
 gem 'rspec-rails', :group => :development

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/roadie.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'nokogiri', '>= 1.4.4'
   s.add_dependency 'css_parser'
-  s.add_dependency 'actionmailer', '>= 3.0.0'
+  s.add_dependency 'actionmailer', '~> 3.0'
 
   s.add_development_dependency 'rspec-rails', '>= 2.0.0'
 

data/spec/fixtures/public/stylesheets/integration.css

@@ -1,4 +1,10 @@
 body { background: url(../images/dots.png) repeat-x; }
 #message { background-color: #fff; margin: 0 auto; width: 75%; }
 
-h1 { color: #eee; }
+h1 { color: #eee; }
+strong {
+  -moz-box-shadow: #62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0;
+  -webkit-box-shadow: #62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0;
+  -o-box-shadow: #62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0;
+  box-shadow: #62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0;
+}

data/spec/integration_spec.rb

@@ -59,4 +59,13 @@ describe "roadie integration" do
     email = IntegrationMailer.marketing('everyone@inter.net')
     email.header['X-Spam'].should be_present
   end
+
+  it "applies CSS3 styles" do
+    email = IntegrationMailer.notification('doe@example.com', 'your quota limit has been reached')
+    document = Nokogiri::HTML.parse(email.html_part.body.decoded)
+    strong_node = document.css('strong').first
+    stylings = SpecHelpers.styling_of_node(strong_node)
+    stylings.should include(['box-shadow', '#62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0'])
+    stylings.should include(['-o-box-shadow', '#62b0d7 1px 1px 1px 1px inset, #aaaaaa 1px 1px 3px 0'])
+  end
 end

data/spec/lib/roadie/inliner_spec.rb

@@ -20,6 +20,16 @@ describe Roadie::Inliner do
       rendering('<p></p>').should have_styling('color' => 'green')
     end
 
+    it "inlines browser-prefixed attributes" do
+      use_css 'p { -vendor-color: green }'
+      rendering('<p></p>').should have_styling('-vendor-color' => 'green')
+    end
+
+    it "inlines CSS3 attributes" do
+      use_css 'p { border-radius: 2px; }'
+      rendering('<p></p>').should have_styling('border-radius' => '2px')
+    end
+
     it "keeps the order of the styles that are inlined" do
       use_css 'h1 { padding: 2px; margin: 5px; }'
       rendering('<h1></h1>').should have_styling([['padding', '2px'], ['margin', '5px']])

data/spec/support/have_styling_matcher.rb

@@ -18,19 +18,8 @@ RSpec::Matchers.define :have_styling do |rules|
   failure_message_for_should_not { "expected styles at #{@selector.inspect} to not be #{rules.inspect}" }
 
   def parsed_styles(document)
-    parse_styles(element_style(document))
-  end
-
-  def element_style(document)
     node = document.css(@selector).first
-    node && node['style']
-  end
-
-  def parse_styles(styles)
-    return [] if styles.blank?
-    styles.split(';').inject([]) do |array, item|
-      array << item.split(':', 2).map(&:strip)
-    end
+    SpecHelpers.styling_of_node(node)
   end
 end
 

data/spec/support/parse_styling.rb

@@ -0,0 +1,17 @@
+module SpecHelpers
+  class << self
+    def styling_of_node(node)
+      if node and node['style'].present?
+        parse_styling(node['style'])
+      else
+        []
+      end
+    end
+
+    def parse_styling(styles)
+      styles.split(';').inject([]) do |array, item|
+        array << item.split(':', 2).map(&:strip)
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: roadie
 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: 
 - Magnus Bergmark
@@ -53,14 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -128,6 +127,7 @@ files:
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb
 - spec/support/have_styling_matcher.rb
+- spec/support/parse_styling.rb
 homepage: http://github.com/Mange/roadie
 licenses: []
 
@@ -180,3 +180,4 @@ test_files:
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb
 - spec/support/have_styling_matcher.rb
+- spec/support/parse_styling.rb