premailer-rails3 1.1.0 → 1.2.0

data/LICENSE

@@ -0,0 +1,14 @@
+Copyright (C) 2011-2012 Philipe Fatio (fphilipe)
+
+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

@@ -54,13 +54,23 @@ pass these options on to the underlying premailer instance, specify them in an
 initializer:
 
 ```ruby
-PremailerRails.config = {
-  :preserve_styles => true,
-  :remove_ids      => true
-}
+PremailerRails.config.merge(:preserve_styles => true,
+                            :remove_ids      => true)
 ```
 
 For a list of options, refer to the [Premailer documentation](http://rubydoc.info/gems/premailer/1.7.3/Premailer:initialize)
 
-Note that the options `with_html_string` and `css_string` are used to make this
-gem work and will thus be overridden.
+The default configs are:
+
+```ruby
+{
+  :input_encoding     => 'UTF-8',
+  :generate_text_part => true
+}
+```
+
+If you don't want to generate a text part from the html part, set the config
+`:generate_text_part` to false.
+
+Note that the options `:with_html_string` and `:css_string` are used to make
+this gem work and will thus be overridden.

data/lib/premailer-rails3.rb

@@ -4,7 +4,10 @@ require 'premailer-rails3/premailer'
 require 'premailer-rails3/hook'
 
 module PremailerRails
-  @config = {}
+  @config = {
+    :input_encoding     => 'UTF-8',
+    :generate_text_part => true
+  }
   class << self
     attr_accessor :config
   end

data/lib/premailer-rails3/css_helper.rb

@@ -51,9 +51,9 @@ module PremailerRails
       end
 
       @@css_cache[path]
-    rescue => ex
-      # Print an error and return empty css:
-      puts ex.message
+    rescue NoMethodError => ex
+      # Log an error and return empty css:
+      Rails.logger.try(:warn, ex.message)
       ''
     end
 

data/lib/premailer-rails3/hook.rb

@@ -5,27 +5,37 @@ module PremailerRails
       # case, if the mail content type is text/html, the body part will be the
       # html body.
       if message.html_part
-        html_body = message.html_part.body.to_s
+        html_body       = message.html_part.body.to_s
+        needs_multipart = true
+        message.parts.delete(message.html_part)
       elsif message.content_type =~ /text\/html/
-        html_body = message.body.to_s
-        message.body = nil
+        html_body       = message.body.to_s
+        message.body    = nil
+        needs_multipart = PremailerRails.config[:generate_text_part]
       end
 
       if html_body
         premailer = Premailer.new(html_body)
         charset   = message.charset
 
-        # IMPRTANT: Plain text part must be generated before CSS is inlined.
-        # Not doing so results in CSS declarations visible in the plain text
-        # part.
-        message.text_part do
-          content_type "text/plain; charset=#{charset}"
-          body premailer.to_plain_text
-        end unless message.text_part
+        if needs_multipart
+          # IMPORTANT: Plain text part must be generated before CSS is inlined.
+          # Not doing so results in CSS declarations visible in the plain text
+          # part.
+          if PremailerRails.config[:generate_text_part] \
+          and not message.text_part
+            message.text_part do
+              content_type "text/plain; charset=#{charset}"
+              body premailer.to_plain_text
+            end
+          end
 
-        message.html_part do
-          content_type "text/html; charset=#{charset}"
-          body premailer.to_inline_css
+          message.html_part do
+            content_type "text/html; charset=#{charset}"
+            body premailer.to_inline_css
+          end
+        else
+          message.body = premailer.to_inline_css
         end
       end
     end

data/lib/premailer-rails3/premailer.rb

@@ -7,14 +7,11 @@ module PremailerRails
       # suitable adaptor (Nokogiri or Hpricot). To make load_html work, an
       # adaptor needs to be included and @options[:with_html_string] needs to be
       # set. For further information, refer to ::Premailer#initialize.
-      @options = { :with_html_string => true }
+      @options = PremailerRails.config.merge(:with_html_string => true)
       ::Premailer.send(:include, Adapter.find(Adapter.use))
       doc = load_html(html)
 
-      options = PremailerRails.config.merge(
-        :with_html_string => true,
-        :css_string       => CSSHelper.css_for_doc(doc)
-      )
+      options = @options.merge(:css_string => CSSHelper.css_for_doc(doc))
       super(html, options)
     end
   end

data/lib/premailer-rails3/version.rb

@@ -1,3 +1,3 @@
 module PremailerRails
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/premailer-rails3/hook_spec.rb

@@ -20,6 +20,20 @@ describe PremailerRails::Hook do
         PremailerRails::Premailer.any_instance.expects(:to_inline_css)
         run_hook(message)
       end
+
+      it 'should not create a text part if disabled' do
+        PremailerRails::Premailer.any_instance.expects(:to_plain_text).never
+        PremailerRails.config[:generate_text_part] = false
+        run_hook(message)
+        PremailerRails.config[:generate_text_part] = true
+        message.text_part.should be_nil
+        message.html_part.should be_a Mail::Part
+      end
+
+      it 'should not create an additional html part' do
+        run_hook(message)
+        message.parts.count { |i| i.content_type =~ /text\/html/ }.should == 1
+      end
     end
 
     context 'when message contains text part' do
@@ -59,6 +73,16 @@ describe PremailerRails::Hook do
         run_hook(message)
         message.html_part.should be_a Mail::Part
       end
+
+      it 'should not create a text part if disabled' do
+        PremailerRails::Premailer.any_instance.expects(:to_plain_text).never
+        PremailerRails.config[:generate_text_part] = false
+        run_hook(message)
+        PremailerRails.config[:generate_text_part] = true
+        message.text_part.should be_nil
+        message.html_part.should be_nil
+        message.body.should_not be_empty
+      end
     end
 
     context 'when message contains text body' do

data/spec/premailer-rails3/premailer_rails_3_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe PremailerRails do
   describe '#config' do
     subject { PremailerRails.config }
-    it { should == {} }
-
     context 'when set' do
       before { PremailerRails.config = { :foo => :bar } }
       it { should == { :foo => :bar } }

data/spec/premailer-rails3/premailer_spec.rb

@@ -37,5 +37,12 @@ describe PremailerRails::Premailer do
       premailer = PremailerRails::Premailer.new('some html')
       premailer.instance_variable_get(:'@options')[:foo].should == :bar
     end
+
+    it 'should not allow to override with_html_string' do
+      PremailerRails.config = { :with_html_string => false }
+      premailer = PremailerRails::Premailer.new('some html')
+      options = premailer.instance_variable_get(:'@options')
+      options[:with_html_string].should == true
+    end
   end
 end

data/spec/stubs/rails.rb

@@ -1,5 +1,11 @@
 require 'stubs/dummy'
 
+module Logger
+  extend self
+
+  def try(*args); end
+end
+
 module Rails
   extend self
 
@@ -30,7 +36,13 @@ module Rails
   module Application
     extend self
 
-    def assets; end
+    module Assets
+      extend self
+    end
+
+    def assets
+      Assets
+    end
   end
 
   def env
@@ -41,6 +53,10 @@ module Rails
     Configuration
   end
 
+  def logger
+    Logger
+  end
+
   def root
     'RAILS_ROOT'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &2151950140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2151950140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151949620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2151949620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2151949240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151949240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2151948780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151948780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151948360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151948360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &2151947940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151947940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151947520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151947520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2151947100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151947100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "This gem brings you the power of the premailer gem to Rails 3\n                     without
   any configuration needs. Create HTML emails, include a\n                     CSS
   file as you do in a normal HTML document and premailer will\n                     inline
@@ -113,6 +153,7 @@ files:
 - .rspec
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/premailer-rails3.rb
@@ -153,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: premailer-rails3
-rubygems_version: 1.8.8
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easily create HTML emails in Rails 3.