roadie 2.3.2 → 2.3.3

data/Changelog.md

@@ -1,8 +1,17 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v2.3.2...master)
+[full changelog](https://github.com/Mange/roadie/compare/v2.3.3...master)
 
-* Nothing yet
+* No changes yet.
+
+### 2.3.3
+
+[full changelog](https://github.com/Mange/roadie/compare/v2.3.2...v2.3.3)
+
+* Enhancements:
+  * Allow proc objects to the `:css` option
+* Bug fixes:
+  * Ignore HTML comments and CDATA sections in CSS (support TinyMCE)
 
 ### 2.3.2
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roadie (2.3.2)
+    roadie (2.3.3)
       actionmailer (> 3.0.0, < 3.3.0)
       css_parser
       nokogiri (>= 1.4.4)
@@ -37,7 +37,7 @@ GEM
       activemodel (= 3.0.12)
       activesupport (= 3.0.12)
     activesupport (3.0.12)
-    addressable (2.2.7)
+    addressable (2.3.2)
     appraisal (0.4.1)
       bundler
       rake
@@ -65,8 +65,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.1.0)
-    nokogiri (1.5.2)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)

data/README.md

@@ -38,7 +38,7 @@ Let me know if you want any other combination supported officially.
 
 ### Versioning ###
 
-This project follows [Semtantic Versioning](http://semver.org/) and has been since version 1.0.0.
+This project follows [Semantic Versioning](http://semver.org/) and has been since version 1.0.0.
 
 Features
 --------

data/lib/roadie/action_mailer_extensions.rb

@@ -46,8 +46,15 @@ module Roadie
       end
 
       def css_targets
-        return [] unless @targets
-        Array.wrap(@targets || []).map { |target| target.to_s }
+        Array.wrap(@targets || []).map { |target| resolve_target(target) }.compact.map(&:to_s)
+      end
+
+      def resolve_target(target)
+        if target.respond_to? :call
+          target.call
+        else
+          target
+        end
       end
   end
 end

data/lib/roadie/inliner.rb

@@ -65,15 +65,15 @@ module Roadie
 
       def parsed_css
         CssParser::Parser.new.tap do |parser|
-          parser.add_block!(css) if css
-          parser.add_block!(inline_css)
+          parser.add_block! clean_css(css) if css
+          parser.add_block! clean_css(inline_css)
         end
       end
 
       def adjust_html
         Nokogiri::HTML.parse(html).tap do |document|
           yield document
-        end.to_html
+        end.dup.to_html
       end
 
       def add_missing_structure
@@ -207,5 +207,19 @@ module Roadie
           absolute_path_url or blacklisted_element
         end
       end
+
+      CLEANING_MATCHER = /
+        (^\s*             # Beginning-of-lines matches
+          (<!\[CDATA\[)|
+          (<!--+)
+        )|(               # End-of-line matches
+          (--+>)|
+          (\]\]>)
+        $)
+      /x.freeze
+
+      def clean_css(css)
+        css.gsub(CLEANING_MATCHER, '')
+      end
   end
 end

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/spec/lib/roadie/action_mailer_extensions_spec.rb

@@ -30,6 +30,22 @@ module Roadie
       Roadie.stub(:current_provider => provider)
     end
 
+    it "uses the default CSS when :css is not specified" do
+      expect_global_css ['default']
+      mailer.default_css
+    end
+
+    it "uses the specified CSS instead of the default" do
+      expect_global_css ['some', 'other/files']
+      mailer.override_css([:some, 'other/files'])
+    end
+
+    it "allows procs defining the CSS files to use" do
+      expect_global_css ['from proc']
+      proc = lambda { 'from proc' }
+      mailer.override_css([proc])
+    end
+
     it "uses no global CSS when :css is set to nil" do
       expect_global_css []
       mailer.override_css(nil)
@@ -40,14 +56,9 @@ module Roadie
       mailer.override_css(false)
     end
 
-    it "uses the default CSS when :css is not specified" do
-      expect_global_css ['default']
-      mailer.default_css
-    end
-
-    it "uses the specified CSS instead of the default" do
-      expect_global_css ['some', 'other/files']
-      mailer.override_css([:some, 'other/files'])
+    it "uses no global CSS when :css is set to a proc returning nil" do
+      expect_global_css []
+      mailer.override_css(lambda { nil })
     end
   end
 

data/spec/lib/roadie/inliner_spec.rb

@@ -115,6 +115,26 @@ describe Roadie::Inliner do
       expect { rendering('<p></p>') }.not_to raise_error
     end
 
+    it 'ignores HTML comments and CDATA sections' do
+      # TinyMCE posts invalid CSS. We support that just to be pragmatic.
+      use_css %(<![CDATA[
+        <!--
+        p { color: green }
+        -->
+      ]]>)
+      expect { rendering '<p></p>' }.not_to raise_error
+
+      use_css %(
+        <!--
+        <![CDATA[
+            <![CDATA[
+        span { color: red }
+        ]]>
+        -->
+      )
+      expect { rendering '<p></p>' }.not_to raise_error
+    end
+
     describe "inline <style> element" do
       it "is used for inlined styles" do
         rendering(<<-HTML).should have_styling([['color', 'green'], ['font-size', '1.1em']])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3017908964885938458
+      hash: 2753670790342683218
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3017908964885938458
+      hash: 2753670790342683218
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24