inline_styles_mailer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f953a4701883b50e6877e503faefa2a0065062
-  data.tar.gz: be0992b44ad67895c45ffdf585963b53c58ce5a2
+  metadata.gz: 5e1389e41082caa2d0472886c8e51022cbce2659
+  data.tar.gz: 1a73bfb345f3e10cfff7ab3a0cd037befb426a36
 SHA512:
-  metadata.gz: a4580aa94c6304bba9fb4640712c1e2f8787b8e85c050e2f1da5286ed810251bd2df8f9e9d47728dc126eeba1f401f1a27bd9cfc3bd01347e11949c464c5ee71
-  data.tar.gz: ad140d8d77a849b096e2fc37bb040f6c7ca1362bc2560ddcdc3b9274ba1239a484ebd323220488af944e67d1025e1cad9e5bf4e6a9b2b00534ecd7d3b2e17791
+  metadata.gz: 12c4cb965729bebe1dde750e47a18ae5d633e697f9753b7adc13466b879a4ea840eec23f90e2f695e833055f48abae6273d3bedd81b677f3e3e9f08790182f7c
+  data.tar.gz: 477a86cab6c58746d0fcf65ace05de7169311ab678755fff4c81b2551703781520f8978b17b24f289ebc560a34943659a12d1e325feda73eb80f6d53d6ca0e02

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 matrix:
   include:
-    - rvm: 2.0.0
+    - rvm: 2.0.0-p648
       gemfile: spec/Gemfile.rails-4.2
     - rvm: 2.1.8
       gemfile: spec/Gemfile.rails-4.2
@@ -13,4 +13,8 @@ matrix:
       gemfile: spec/Gemfile.rails-4.2
     - rvm: 2.3.0
       gemfile: spec/Gemfile.rails-5.0
+    - rvm: 2.3.3
+      gemfile: spec/Gemfile.rails-5.1
+    - rvm: 2.3.3
+      gemfile: spec/Gemfile.rails-5.2
 sudo: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Next
 
+## v1.0.2
+
+Added support for Rails 5.1 and 5.2.
+
+## v1.0.1
+
+Now works with Rails 5.0 final (just a change to the `.gemspec`)
+
+## v1.0.0
+
+Changes to the way we find nested templates which might break the way you define their location (but probably won't affect most people). See the [note here](https://github.com/billhorsman/inline_styles_mailer#upgrading-to-version-10).
+
 ## v0.0.9
 
 Now needs Ruby 1.9.3 (drop support for 1.9.2), because Rails 4.1 does so.
@@ -35,4 +47,4 @@ Documentation changes only.
 
 ## v0.0.1
 
-Initial release
+Initial release

data/README.md

@@ -1,3 +1,7 @@
+## Update for Rails 5.1+
+
+I've started to use the [premailer](https://github.com/premailer/premailer) gem for Rails > 5.0. I'd welcome patches to keep this gem going.
+
 ## Inline Styles Mailer [![Build Status](https://secure.travis-ci.org/billhorsman/inline_styles_mailer.png)](http://travis-ci.org/billhorsman/inline_styles_mailer)
 
 Using Jack Danger's excellent [Inline Styles](https://github.com/jackdanger/inline_styles) gem is even easier if you're using Rails 3.1+ and this gem.
@@ -98,7 +102,7 @@ We decided to bump up the major version because of a fix (5d0b6f4) we made to th
 
 ## What versions of Rails does this work with?
 
-We run tests using Rails `4.2.6` and `5.0.0.beta3`.
+We run tests using Rails `4.2.6`, `5.0.0.beta3`, `5.1.6` and `5.2`
 
 | Version | Working? |
 | --- | --- |
@@ -109,9 +113,13 @@ We run tests using Rails `4.2.6` and `5.0.0.beta3`.
 | 4.1 | Yes |
 | 4.2 | Yes |
 | 5.0 | Yes |
+| 5.1 | Yes |
+| 5.2 | Yes |
 
 \* It relies on the asset pipeline so I'd be surprised if it works. Not tested.
 
+\** I'm recommending using the [premailer](https://github.com/premailer/premailer) gem for Rails > 5.0.
+
 ## What about Ruby?
 
 Anything later than Ruby `1.9.2` should be fine. We test using Ruby 2.0.0`, `2.1.8`, `2.2.4` and `2.3.0`.

data/inline_styles_mailer.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
   s.add_development_dependency "rspec"
   s.add_runtime_dependency "inline_styles"
-  s.add_runtime_dependency "rails", [">= 3.1", "< 5.1"]
+  s.add_runtime_dependency "rails", [">= 3.1", "<= 5.2"]
   s.add_runtime_dependency "sass-rails"
 end

data/lib/inline_styles_mailer.rb

@@ -23,9 +23,8 @@ module InlineStylesMailer
     end
 
     def css_content
-      @stylesheets ||= ["_#{self.name.underscore}*"]
       @stylesheet_path ||= File.join("app", "assets", "stylesheets")
-      @css_content ||= @stylesheets.map {|stylesheet|
+      @css_content ||= stylesheets.map {|stylesheet|
         Dir[Rails.root.join(@stylesheet_path, "#{stylesheet}")].map {|file|
           case file
           when /\.scss$/
@@ -41,6 +40,10 @@ module InlineStylesMailer
       @css_content
     end
 
+    def stylesheets
+      @stylesheets ||= [self.name.underscore.sub(/^(.*\/)*(.*)$/, '\1_\2*')]
+    end
+
     def page
       @page ||= InlineStyles::Page.new.with_css(css_content)
     end
@@ -61,7 +64,7 @@ module InlineStylesMailer
         # Rails 3.1 takes an array, while Rails 3.0 takes a string.
         # See https://github.com/billhorsman/inline_styles_mailer/issues/1
         prefixes = options[:template_path] || self.class.name.underscore
-        prefixes = [prefixes] unless Rails.version =~ /^3\.0/
+        prefixes = [prefixes].flatten unless Rails.version =~ /^3\.0/
         templates = lookup_context.find_all(options[:template_name] || action_name, prefixes)
         options.reverse_merge!(:mime_version => "1.0", :charset => "UTF-8", :content_type => "text/plain", :parts_order => [ "text/plain", "text/enriched", "text/html"])
         templates.sort_by {|t|
@@ -82,7 +85,12 @@ module InlineStylesMailer
             case extension
             when :html
               html = render_to_string :file => file, :layout => layout_to_use, handlers: [handler]
-              render :text => self.class.page.with_html(html).apply
+              # Rails 5.1 removed render :text
+              if Gem.loaded_specs['rails'].version >= Gem::Version.create('5.0')
+                render :plain => self.class.page.with_html(html).apply
+              else
+                render :text => self.class.page.with_html(html).apply
+              end
             else
               render
             end

data/lib/inline_styles_mailer/version.rb

@@ -1,3 +1,3 @@
 module InlineStylesMailer
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/Gemfile.rails-5.1

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'inline_styles'
+gem 'rails', '~> 5.1.6'
+gem 'rspec'
+gem 'sass-rails'

data/spec/Gemfile.rails-5.2

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'inline_styles'
+gem 'rails', '~> 5.2'
+gem 'rspec'
+gem 'sass-rails'

data/spec/fixtures/assets/stylesheets/_foo_mailer.css.scss

@@ -1,5 +1,5 @@
 body {
-  background: yellow;
+  background-color: yellow;
   p {
     color: red;
   }

data/spec/fixtures/assets/stylesheets/_override.css

@@ -1,5 +1,5 @@
 body {
-  background: yellow;
+  background-color: yellow;
 }
 body p {
   color: blue;

data/spec/fixtures/assets/stylesheets/_override.css.sass

@@ -1,5 +1,5 @@
 body
-  :background yellow
+  :background-color yellow
   p
     :color green
 

data/spec/fixtures/assets/stylesheets/_override.css.scss

@@ -1,5 +1,5 @@
 body {
-  background: yellow;
+  background-color: yellow;
   p {
     color: orange;
   }

data/spec/fixtures/assets/stylesheets/foo/_bar_mailer.css.scss

@@ -0,0 +1,6 @@
+body {
+  background-color: orange;
+  p {
+    color: purple;
+  }
+}

data/spec/fixtures/mailers/foo/bar_mailer.rb

@@ -0,0 +1,11 @@
+require 'rails/all'
+
+module Foo
+  class BarMailer < ActionMailer::Base
+    include InlineStylesMailer
+
+    def bar
+      mail(:to => "test@localhost", :subject => "Test Bar")
+    end
+  end
+end

data/spec/fixtures/views/foo/bar_mailer/bar.html.erb

@@ -0,0 +1 @@
+<p>Testing foobar html.</p>

data/spec/inline_styles_mailer/inline_styles_mailer_spec.rb

@@ -18,7 +18,7 @@ describe InlineStylesMailer do
         mail = FooMailer.foo
         mail.body.parts.length.should eq(2)
         mail.body.parts[1].body.should =~ /<p style="color: red;">Testing foo text\/html\.<\/p>/
-        mail.body.parts[1].body.should =~ /<body style="background: yellow;">/
+        mail.body.parts[1].body.should =~ /<body style="background-color: yellow;">/
       end
     end
 
@@ -30,7 +30,7 @@ describe InlineStylesMailer do
         mail = FooMailer.foo
         mail.body.parts.length.should eq(2)
         mail.body.parts[1].body.should =~ /<p style="color: orange;">Testing foo text\/html\.<\/p>/
-        mail.body.parts[1].body.should =~ /<body style="background: yellow;">/
+        mail.body.parts[1].body.should =~ /<body style="background-color: yellow;">/
       end
     end
 
@@ -42,7 +42,7 @@ describe InlineStylesMailer do
         mail = FooMailer.foo
         mail.body.parts.length.should eq(2)
         mail.body.parts[1].body.should =~ /<p style="color: green;">Testing foo text\/html\.<\/p>/
-        mail.body.parts[1].body.should =~ /<body style="background: yellow;">/
+        mail.body.parts[1].body.should =~ /<body style="background-color: yellow;">/
       end
     end
 
@@ -54,7 +54,7 @@ describe InlineStylesMailer do
         mail = FooMailer.foo
         mail.body.parts.length.should eq(2)
         mail.body.parts[1].body.should =~ /<p style="color: blue;">Testing foo text\/html\.<\/p>/
-        mail.body.parts[1].body.should =~ /<body style="background: yellow;">/
+        mail.body.parts[1].body.should =~ /<body style="background-color: yellow;">/
       end
     end
 
@@ -82,4 +82,18 @@ describe InlineStylesMailer do
 
   end
 
+  describe "Namespaced mailers" do
+    context "Default CSS file" do
+      before do
+        Foo::BarMailer.stylesheet_path "assets/stylesheets"
+      end
+
+      it "should inline the CSS" do
+        mail = Foo::BarMailer.bar
+        mail.body.should =~ /<p style="color: purple;">Testing foobar html\.<\/p>/
+        mail.body.should =~ /<body style="background-color: orange;">/
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rails/all'
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.prepend_view_path File.join(File.dirname(__FILE__), "fixtures", "views")
 
-Dir["#{File.dirname(__FILE__)}/fixtures/mailers/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/fixtures/mailers/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_styles_mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bill Horsman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,9 +45,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +55,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -93,11 +93,17 @@ files:
 - lib/inline_styles_mailer/version.rb
 - spec/Gemfile.rails-4.2
 - spec/Gemfile.rails-5.0
+- spec/Gemfile.rails-5.1
+- spec/Gemfile.rails-5.2
 - spec/fixtures/assets/stylesheets/_foo_mailer.css.scss
 - spec/fixtures/assets/stylesheets/_override.css
 - spec/fixtures/assets/stylesheets/_override.css.sass
 - spec/fixtures/assets/stylesheets/_override.css.scss
+- spec/fixtures/assets/stylesheets/foo/_bar_mailer.css.scss
 - spec/fixtures/layout.html.erb
+- spec/fixtures/mailers/Untitled
+- spec/fixtures/mailers/foo/bar_mailer.rb
+- spec/fixtures/views/foo/bar_mailer/bar.html.erb
 - spec/fixtures/views/foo_mailer/backwards.html.erb
 - spec/fixtures/views/foo_mailer/backwards.text.erb
 - spec/fixtures/views/foo_mailer/foo.html.erb
@@ -125,18 +131,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inline_styles_mailer
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Convenient use of inline_styles gem with Rails 3.1+ and Rails 4
 test_files:
 - spec/Gemfile.rails-4.2
 - spec/Gemfile.rails-5.0
+- spec/Gemfile.rails-5.1
+- spec/Gemfile.rails-5.2
 - spec/fixtures/assets/stylesheets/_foo_mailer.css.scss
 - spec/fixtures/assets/stylesheets/_override.css
 - spec/fixtures/assets/stylesheets/_override.css.sass
 - spec/fixtures/assets/stylesheets/_override.css.scss
+- spec/fixtures/assets/stylesheets/foo/_bar_mailer.css.scss
 - spec/fixtures/layout.html.erb
+- spec/fixtures/mailers/Untitled
+- spec/fixtures/mailers/foo/bar_mailer.rb
+- spec/fixtures/views/foo/bar_mailer/bar.html.erb
 - spec/fixtures/views/foo_mailer/backwards.html.erb
 - spec/fixtures/views/foo_mailer/backwards.text.erb
 - spec/fixtures/views/foo_mailer/foo.html.erb