rack-pagespeed 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/rack/pagespeed/filters/base.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Rack::PageSpeed::Filters
   class Base
     attr_reader :document, :options
@@ -44,7 +46,7 @@ module Rack::PageSpeed::Filters
 
     private
     def file_for node
-      path = ::File.join options[:public], case node.name
+      path = case node.name
       when 'script'
         node['src']
       when 'img'
@@ -52,6 +54,8 @@ module Rack::PageSpeed::Filters
       when 'link'
         node['href']
       end
+      return false unless path
+      path = ::File.join(options[:public], URI.parse(path).path)
       ::File.open path if ::File.exists? path      
     end
   end

data/lib/rack/pagespeed/filters/combine_css.rb

@@ -9,7 +9,7 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
   priority 9
   
   def execute! document
-    nodes = document.css('link[rel="stylesheet"][href$=".css"]:not([href^="http"])')
+    nodes = document.css('link[rel="stylesheet"][href]')
     return false unless nodes.count > 0
     groups = group_siblings topmost_of_sequence(nodes)
     groups.each do |group|
@@ -32,7 +32,7 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
   end
   
   def local_css? node
-    node.name == 'link' && !(node['href'] =~ /^http/ or !(node['href'] =~ /.css$/))
+    node.name == 'link' and file_for(node)
   end
   
   def topmost_of_sequence nodes

data/lib/rack/pagespeed/filters/combine_javascripts.rb

@@ -10,7 +10,7 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   priority  2
   
   def execute! document
-    nodes = document.css('script[src$=".js"]:not([src^="http"])')
+    nodes = document.css('script[src]')
     return false unless nodes.count > 0
     groups = group_siblings topmost_of_sequence(nodes)
     groups.each do |group|
@@ -36,7 +36,7 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   end
   
   def local_script? node
-    node.name == 'script' && !(node['src'] =~ /^http/ or !(node['src'] =~ /.js$/))
+    node.name == 'script' and file_for(node)
   end
   
   def topmost_of_sequence nodes
@@ -44,7 +44,7 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
     nodes.each do |node|
       _previous, _next = node.previous_sibling, node.next_sibling
       if _previous && local_script?(_previous) &&
-        (!_next || !local_script?(_next))
+        (!_next || !file_for(_next))
         result << node
       end
     end

data/lib/rack/pagespeed/filters/inline_css.rb

@@ -2,11 +2,11 @@ class Rack::PageSpeed::Filters::InlineCSS < Rack::PageSpeed::Filter
   priority 10
   
   def execute! document
-    nodes = document.css('link[rel="stylesheet"][href$=".css"]:not([href^="http"])')
+    nodes = document.css('link[rel="stylesheet"][href]')
     return false unless nodes.count > 0
     nodes.each do |node|
       file = file_for node
-      next if file.stat.size > (@options[:max_size] or 2048)
+      next if !file or file.stat.size > (@options[:max_size] or 2048)
       inline = Nokogiri::XML::Node.new 'style', document
       inline.content = file.read
       node.before inline

data/lib/rack/pagespeed/filters/inline_javascripts.rb

@@ -3,11 +3,11 @@ class Rack::PageSpeed::Filters::InlineJavaScripts < Rack::PageSpeed::Filter
   priority  10
       
   def execute! document
-    nodes = document.css('script[src$=".js"]:not([src^="http"])')
+    nodes = document.css('script[src]')
     return false unless nodes.count > 0
     nodes.each do |node|
       file = file_for node
-      next if file.stat.size > (@options[:max_size] or 2048)
+      next if !file or file.stat.size > (@options[:max_size] or 2048)
       inline = Nokogiri::XML::Node.new 'script', document
       inline.content = file.read
       node.before inline

data/rack-pagespeed.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-pagespeed}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Julio Cesar Ody