roadie 2.3.4 → 2.4.0

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/{rails-3.2.gemfile.lock → rails_3.2.gemfile.lock}

@@ -1,14 +1,14 @@
 PATH
-  remote: /Users/mange/Projects/roadie
+  remote: /home/mange/Projects/roadie
   specs:
-    roadie (2.3.3)
-      actionmailer (> 3.0.0, < 3.3.0)
-      css_parser
-      nokogiri (>= 1.4.4)
+    roadie (2.3.4)
+      actionmailer (> 3.0.0, < 5.0.0)
+      css_parser (~> 1.3.4)
+      nokogiri (~> 1.6.0)
       sprockets
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.2)
       actionpack (= 3.2.2)
@@ -37,37 +37,36 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.2)
-    appraisal (0.4.1)
+    addressable (2.3.5)
+    appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)
     builder (3.0.0)
-    css_parser (1.2.6)
+    css_parser (1.3.4)
       addressable
-      rdoc
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    json (1.6.5-java)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.1.0)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-java)
+    mime-types (1.19)
+    mini_portile (0.5.0)
+    multi_json (1.4.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.2)
       actionmailer (= 3.2.2)
@@ -84,39 +83,42 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rspec-rails (2.9.0)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.9.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.35)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   appraisal
-  rails (~> 3.2.0.rc1)
+  rails (~> 3.2.0)
+  rake
   roadie!
+  rspec
   rspec-rails

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0"
+
+gemspec :path=>"../"

data/gemfiles/rails_4.0.gemfile.lock

@@ -0,0 +1,119 @@
+PATH
+  remote: /home/mange/Projects/roadie
+  specs:
+    roadie (2.3.4)
+      actionmailer (> 3.0.0, < 5.0.0)
+      css_parser (~> 1.3.4)
+      nokogiri (~> 1.6.0)
+      sprockets
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    css_parser (1.3.4)
+      addressable
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    mini_portile (0.5.0)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  rails (~> 4.0)
+  rake
+  roadie!
+  rspec
+  rspec-rails

data/lib/roadie.rb

@@ -38,22 +38,36 @@ module Roadie
     def current_provider
       return config.roadie.provider if config.roadie.provider
 
-      if config.respond_to?(:assets) and config.assets and config.assets.enabled
+      if assets_enabled?
         AssetPipelineProvider.new
       else
         FilesystemProvider.new
       end
     end
 
+    # Returns the value of +config.roadie.after_inlining+
+    #
+    def after_inlining_handler
+      config.roadie.after_inlining
+    end
+
     private
       def config
         Roadie.app.config
       end
+
+      def assets_enabled?
+        # In Rails 4.0, config.assets.enabled is nil by default, so we need to
+        # explicitly make sure it's not false rather than checking for a
+        # truthy value.
+        config.respond_to?(:assets) and config.assets and config.assets.enabled != false
+      end
   end
 end
 
 require 'roadie/version'
 require 'roadie/css_file_not_found'
+require 'roadie/selector'
 require 'roadie/style_declaration'
 
 require 'roadie/asset_provider'

data/lib/roadie/action_mailer_extensions.rb

@@ -9,7 +9,11 @@ module Roadie
   module ActionMailerExtensions
     def self.included(base)
       base.class_eval do
-        alias_method_chain :collect_responses_and_parts_order, :inline_styles
+        if base.method_defined?(:collect_responses)
+          alias_method_chain :collect_responses, :inline_styles
+        else
+          alias_method_chain :collect_responses_and_parts_order, :inline_styles
+        end
         alias_method_chain :mail, :inline_styles
       end
     end
@@ -22,11 +26,28 @@ module Roadie
           @targets = default_css_targets
         end
 
+        if headers.has_key?(:after_inlining)
+          @after_inlining_handler = headers[:after_inlining]
+        else
+          @after_inlining_handler = default_after_inlining || Roadie.after_inlining_handler 
+        end
+
         mail_without_inline_styles(headers, &block).tap do |email|
-          email.header.fields.delete_if { |field| field.name == 'css' }
+          email.header.fields.delete_if { |field| %w(css after_inlining).include?(field.name) }
+        end
+      end
+
+      # Rails 4
+      def collect_responses_with_inline_styles(headers, &block)
+        responses = collect_responses_without_inline_styles(headers, &block)
+        if Roadie.enabled?
+          responses.map { |response| inline_style_response(response) }
+        else
+          responses
         end
       end
 
+      # Rails 3
       def collect_responses_and_parts_order_with_inline_styles(headers, &block)
         responses, order = collect_responses_and_parts_order_without_inline_styles(headers, &block)
         if Roadie.enabled?
@@ -41,9 +62,17 @@ module Roadie
         self.class.default[:css]
       end
 
+      def default_after_inlining
+        self.class.default[:after_inlining]
+      end
+
+      def after_inlining_handler 
+        @after_inlining_handler 
+      end
+
       def inline_style_response(response)
         if response[:content_type] == 'text/html'
-          response.merge :body => Roadie.inline_css(Roadie.current_provider, css_targets, response[:body], url_options)
+          response.merge :body => Roadie.inline_css(Roadie.current_provider, css_targets, response[:body], url_options, after_inlining_handler)
         else
           response
         end
@@ -54,8 +83,8 @@ module Roadie
       end
 
       def resolve_target(target)
-        if target.respond_to? :bind
-          target.bind(self).call
+        if target.kind_of? Proc
+          instance_exec(&target)
         elsif target.respond_to? :call
           target.call
         else

data/lib/roadie/asset_provider.rb

@@ -40,7 +40,7 @@ module Roadie
     #   MyProvider.find("mystyle.css")
     #   MyProvider.find(:mystyle)
     #
-    # @param [String, Symbol] name Name of the file requested
+    # @param [String] name Name of the file requested
     # @raise [CSSFileNotFound] In case any of the elements is not found
     def find(name)
       raise "Not implemented"

data/lib/roadie/inliner.rb

@@ -29,12 +29,14 @@ module Roadie
     # @param [Array] targets List of CSS files to load via the provider
     # @param [String] html
     # @param [Hash] url_options Supported keys: +:host+, +:port+, +:protocol+
-    def initialize(assets, targets, html, url_options)
+    # @param [lambda] after_inlining_handler A lambda that accepts one parameter or an object that responds to the +call+ method with one parameter.
+    def initialize(assets, targets, html, url_options, after_inlining_handler=nil)
       @assets = assets
       @css = assets.all(targets)
       @html = html
       @inline_css = []
       @url_options = url_options
+      @after_inlining_handler = after_inlining_handler
 
       if url_options and url_options[:asset_path_prefix]
         raise ArgumentError, "The asset_path_prefix URL option is not working anymore. You need to add the following configuration to your application.rb:\n" +
@@ -54,12 +56,13 @@ module Roadie
         inline_css_rules
         make_image_urls_absolute
         make_style_urls_absolute
+        after_inlining_handler.call(document) if after_inlining_handler.respond_to?(:call)
         @document = nil
       end
     end
 
     private
-      attr_reader :css, :html, :assets, :url_options, :document
+      attr_reader :css, :html, :assets, :url_options, :document, :after_inlining_handler
 
       def inline_css
         @inline_css.join("\n")
@@ -133,9 +136,9 @@ module Roadie
       def elements_with_declarations
         Hash.new { |hash, key| hash[key] = [] }.tap do |element_declarations|
           parsed_css.each_rule_set do |rule_set|
-            each_selector_without_pseudo(rule_set) do |selector, specificity|
+            each_good_selector(rule_set) do |selector|
               each_element_in_selector(selector) do |element|
-                style_declarations_in_rule_set(specificity, rule_set) do |declaration|
+                style_declarations_in_rule_set(selector.specificity, rule_set) do |declaration|
                   element_declarations[element] << declaration
                 end
               end
@@ -144,16 +147,26 @@ module Roadie
         end
       end
 
-      def each_selector_without_pseudo(rules)
-        rules.selectors.reject { |selector| selector.include?(':') or selector.starts_with?('@') }.each do |selector|
-          yield selector, CssParser.calculate_specificity(selector)
+      def each_good_selector(rules)
+        rules.selectors.each do |selector_string|
+          selector = Selector.new(selector_string)
+          yield selector if selector.inlinable?
         end
       end
 
       def each_element_in_selector(selector)
-        document.css(selector.strip).each do |element|
+        document.css(selector.to_s).each do |element|
           yield element
         end
+      # There's no way to get a list of supported pseudo rules, so we're left
+      # with having to rescue errors.
+      # Pseudo selectors that are known to be bad are skipped automatically but
+      # this will catch the rest.
+      rescue Nokogiri::XML::XPath::SyntaxError, Nokogiri::CSS::SyntaxError => error
+        warn "Roadie cannot use #{selector.inspect} when inlining stylesheets"
+      rescue => error
+        warn "Roadie got error when looking for #{selector.inspect}: #{error}"
+        raise unless error.message.include?('XPath')
       end
 
       def style_declarations_in_rule_set(specificity, rule_set)
@@ -189,14 +202,21 @@ module Roadie
       def absolute_url_base(base_path)
         return nil unless url_options
         port = url_options[:port]
+        scheme = protocol_to_scheme url_options[:protocol]
         URI::Generic.build({
-          :scheme => url_options[:protocol] || 'http',
+          :scheme => scheme,
           :host => url_options[:host],
           :port => (port ? port.to_i : nil),
           :path => base_path
         })
       end
 
+      # Strip :// from any protocol, if present
+      def protocol_to_scheme(protocol)
+        return 'http' unless protocol
+        protocol.to_s[/^\w+/]
+      end
+
       def all_link_elements_with_url
         document.css("link[rel=stylesheet]").map { |link| [link, URI.parse(link['href'])] }
       end