roadie-rails 1.0.6 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fced095e9fe73e6a92eb55d780a42c06460a3486
-  data.tar.gz: dcd230517d07a86435ccf5c0fa861511e22722b4
+  metadata.gz: b6e069d2ab9315717c52c90b8546ceaed0e11886
+  data.tar.gz: ef744fe87053f03b4f01d4c30433b4bc1bb57e6c
 SHA512:
-  metadata.gz: 56363e116f1c696afdeb9acf7cd8b3451de312137cbc92e681d754725ee4e41627c7fefa6b550fcb26e0da1f7fb8df9f19c9969fb491c83ebc95346e886cc6c4
-  data.tar.gz: da2dc4683b3f24d4572c43cdcc4f3f427420efc28554f67b156ae24c7d4eb633e41b5abed0bb03c9e89292c521515f4f0f32f33446168602ea197b341d2c1b5d
+  metadata.gz: 5a92864739208eab2125a21d3b89de11a113c784bf48ee44ed51b41a227109addb71ad98eab4898914f58657a3c909ba8cc5eba7da6c1f279e36ca79371329c3
+  data.tar.gz: 74da180802daf9f9ed9c73d1e8de4dd21461dc9be39fc64514e8f7fca6eecf0c10090aa9974cce6deed3e787d6179d816054e4491bf9587e09312ac55291efd3

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby
   - rbx
 
@@ -12,4 +13,3 @@ script: "rake"
 matrix:
   allow_failures:
     - rvm: rbx
-    - rvm: jruby

data/Changelog.md

@@ -1,6 +1,12 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.6...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc1...master)
+
+### 1.1.0.rc1
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.6...v1.1.0.rc1)
+
+* Add support for `roadie`'s `keep_uninlinable_css` option.
 
 ### 1.0.6
 

data/README.md

@@ -15,7 +15,7 @@ This gem hooks up your Rails application with Roadie to help you generate HTML e
 [Add this gem to your Gemfile as recommended by Rubygems][gem] and run `bundle install`.
 
 ```ruby
-gem 'roadie-rails', '~> x.y.0'
+gem 'roadie-rails', '~> 3.1'
 ```
 
 ## Usage ##
@@ -247,7 +247,7 @@ class Admin::EmailsController < AdminController
   private
   def render_email(email)
     respond_to do |format|
-      format.html { render html: email.html_part.decoded }
+      format.html { render html: email.html_part.decoded.html_safe }
       format.text { render text: email.text_part.decoded }
     end
   end
@@ -277,8 +277,11 @@ Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of]
 
 * Ruby:
   * MRI 1.9.3
-  * MRI 2.0.0
-  * MRI 2.1.0
+  * MRI 2.0
+  * MRI 2.1
+  * MRI 2.2
+  * JRuby (latest)
+  * Rubinius (experimental)
 * Rails
   * 3.0
   * 3.1
@@ -291,7 +294,7 @@ Let me know if you want any other combination supported officially.
 
 ### Versioning ###
 
-This project follows [Semantic Versioning][semver]. The 0.x branch is considered unstable.
+This project follows [Semantic Versioning][semver].
 
 ## Documentation ##
 
@@ -312,7 +315,7 @@ rake spec
 
 (The MIT License)
 
-Copyright © 2013-2014
+Copyright © 2013-2015
 
 * [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>
 

data/lib/roadie/rails/options.rb

@@ -1,18 +1,23 @@
 module Roadie
   module Rails
     class Options
-      private
-      ATTRIBUTE_NAMES = [:url_options, :before_transformation, :after_transformation, :asset_providers]
-
-      public
-      attr_reader *ATTRIBUTE_NAMES
+      ATTRIBUTE_NAMES = [
+        :after_transformation,
+        :asset_providers,
+        :before_transformation,
+        :keep_uninlinable_css,
+        :url_options,
+      ]
+      private_constant :ATTRIBUTE_NAMES
+      attr_reader(*ATTRIBUTE_NAMES)
 
       def initialize(options = {})
         complain_about_unknown_keys options.keys
-        self.url_options           = options[:url_options]
-        self.before_transformation = options[:before_transformation]
         self.after_transformation  = options[:after_transformation]
         self.asset_providers       = options[:asset_providers]
+        self.before_transformation = options[:before_transformation]
+        self.keep_uninlinable_css  = options[:keep_uninlinable_css]
+        self.url_options           = options[:url_options]
       end
 
       def url_options=(options)
@@ -27,6 +32,10 @@ module Roadie
         @after_transformation = callback
       end
 
+      def keep_uninlinable_css=(bool)
+        @keep_uninlinable_css = bool
+      end
+
       def asset_providers=(providers)
         if providers
           @asset_providers = ProviderList.wrap providers
@@ -43,6 +52,7 @@ module Roadie
         # #asset_providers default to nil in this class and it's the one option
         # that is not allowed to be nil on Document.
         document.asset_providers = asset_providers if asset_providers
+        document.keep_uninlinable_css = keep_uninlinable_css unless keep_uninlinable_css.nil?
       end
 
       def merge(options)
@@ -50,7 +60,7 @@ module Roadie
       end
 
       def merge!(options)
-        [:url_options, :before_transformation, :after_transformation, :asset_providers].each do |attribute|
+        ATTRIBUTE_NAMES.each do |attribute|
           send "#{attribute}=", options.fetch(attribute, send(attribute))
         end
         self
@@ -61,10 +71,25 @@ module Roadie
       end
 
       def combine!(options)
-        self.url_options = combine_hash url_options, options[:url_options]
-        self.before_transformation = combine_callable before_transformation, options[:before_transformation]
-        self.after_transformation = combine_callable after_transformation, options[:after_transformation]
-        self.asset_providers = combine_providers asset_providers, options[:asset_providers]
+        self.after_transformation = combine_callable(
+          after_transformation, options[:after_transformation]
+        )
+
+        self.asset_providers = combine_providers(
+          asset_providers, options[:asset_providers]
+        )
+
+        self.before_transformation = combine_callable(
+          before_transformation, options[:before_transformation]
+        )
+
+        self.keep_uninlinable_css =
+          options[:keep_uninlinable_css] if options.has_key?(:keep_uninlinable_css)
+
+        self.url_options = combine_hash(
+          url_options, options[:url_options]
+        )
+
         self
       end
 

data/lib/roadie/rails/version.rb

@@ -1,5 +1,5 @@
 module Roadie
   module Rails
-    VERSION = "1.0.6"
+    VERSION = "1.1.0.rc1"
   end
 end

data/roadie-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = %w[README.md Changelog.md LICENSE.txt]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "roadie", "~> 3.0"
+  spec.add_dependency "roadie", ">= 3.1.0.rc1", "< 4.0"
   spec.add_dependency "railties", ">= 3.0", "< 4.3"
 
   spec.add_development_dependency "rails", ">= 3.0", "< 4.3"

data/spec/lib/roadie/rails/options_spec.rb

@@ -66,6 +66,12 @@ module Roadie
               options.combine(name => other_valid_value)
               expect(options.send(name)).to eq(valid_value)
             end
+
+            it "does not touch initial value if no new value is passed" do
+              options = Options.new(name => valid_value)
+              combined = options.combine({})
+              expect(combined.send(name)).to eq(valid_value)
+            end
           end
 
           describe "destructive combining" do
@@ -87,6 +93,15 @@ module Roadie
         end
       end
 
+      it_behaves_like "attribute", :keep_uninlinable_css do
+        let(:valid_value) { true }
+        let(:other_valid_value) { false }
+
+        def expect_combinated_value(value)
+          expect(value).to eq other_valid_value
+        end
+      end
+
       it_behaves_like "attribute", :before_transformation do
         let(:valid_value) { Proc.new { } }
         let(:other_valid_value) { Proc.new { } }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roadie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0.rc1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0.rc1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -278,12 +284,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Making HTML emails comfortable for the Rails rockstars