rack-pagespeed-fork 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583d2f74f36b8f3f550ee2abeaf37459d51509cf
-  data.tar.gz: 093d507aede980e1871c6883fcda57a8ce46c5ab
+  metadata.gz: ec363d5fedd80da9e96fa635b10808d5b02a0f8d
+  data.tar.gz: 1654be013612d6d260554321ea6f08d095697a7c
 SHA512:
-  metadata.gz: 1aa719697358b8fe33516a2d6565b8099c9b28994a9bba69c8337fd03ee8ea4ab2d76c76717826f7cd55e62dc73919b45006a757f11464e59d3b12fe017c049a
-  data.tar.gz: 8d5a2a15f7523c740b3020d2172b8bad881d8edecb308bf3b7f9c1caf6f43358ccdf68c04d39ef81a155322c665c989769884cc2c2faa2f560626515d2ea330a
+  metadata.gz: 3d58e5223f6e7df77d93dfa77047f182ab86d72fb002101b1b95368ee4e3640c1b222997d04092e7a5ed9a61a9f92046966d7a7daa52f280ba15eb8006c1c8b9
+  data.tar.gz: a898d685a180fe5786d668d745c8e63b8205b32f5a6e0361a02ecdd554cf44aea92db3015e4e4e522f9832bd8e4da87162b2c04952af87715886a764190fbd1b

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/rack/pagespeed.rb

@@ -9,7 +9,7 @@ module Rack
 
     def initialize app, options, &block
       @app = app
-      @config = Config.new options, &block
+      @config = Config.new options.merge(app: app), &block
     end
 
     def call env
@@ -21,11 +21,12 @@ module Rack
         body = ""; @response.each do |part| body << part end
         @document = Nokogiri::HTML(body)
         @config.filters.each do |filter|
+          filter.options[:env] = env
           filter.execute! @document
         end
         body = @document.to_html
         headers['Content-Length'] = body.length.to_s if headers['Content-Length'] # still UTF-8 unsafe
-        [status, headers, [body]]        
+        [status, headers, [body]]
       end
     end
     
@@ -35,6 +36,7 @@ module Rack
         [
           200,
           {
+            'Last-Modified' => store.mtime(asset_id).httpdate,
             'Content-Length' => asset.length,
             'Content-Type' => (Rack::Mime.mime_type(::File.extname(asset_id))),
             'Cache-Control' => "public, max-age=#{(60*60*24*365.25*10).to_i}",

data/lib/rack/pagespeed/config.rb

@@ -3,11 +3,10 @@ class Rack::PageSpeed::Config
   class NoSuchStorageMechanism < StandardError; end
   load "#{::File.dirname(__FILE__)}/store/disk.rb"
 
-  attr_reader :filters, :public
+  attr_reader :filters, :app
 
   def initialize options = {}, &block
-    @filters, @options, @public = [], options, options[:public]
-    raise ArgumentError, ":public needs to be a directory" unless File.directory? @public.to_s
+    @filters, @options, @app = [], options, options[:app]
     filters_to_methods
     enable_filters_from_options
     enable_store_from_options
@@ -61,7 +60,7 @@ class Rack::PageSpeed::Config
   def filters_to_methods
     Rack::PageSpeed::Filter.available_filters.each do |klass|
       (class << self; self; end).send :define_method, klass.name do |*options|
-        default_options = {:public => @options[:public], :store => @store}
+        default_options = {:app => @options[:app], :store => @store}
         instance = klass.new(options.any? ? default_options.merge(*options) : default_options)
         @filters << instance if instance and !@filters.select { |k| k.is_a? instance.class }.any?
       end

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

@@ -6,3 +6,4 @@ require "#{lib}/filters/combine_javascripts.rb"
 require "#{lib}/filters/combine_css.rb"
 require "#{lib}/filters/minify_javascripts.rb"
 require "#{lib}/filters/inline_images.rb"
+require "#{lib}/filters/minify_css.rb"

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

@@ -45,18 +45,46 @@ module Rack::PageSpeed::Filters
     end
 
     private
-    def file_for node
-      path = case node.name
-      when 'script'
-        node['src']
-      when 'img'
-        node['src']        
-      when 'link'
-        node['href']
+    # Asset is not local if it has either a scheme (e.g. 'http:') or a host (e.g. '//google.com/')
+    def is_local? path
+      uri = URI.parse(path)
+      uri.scheme.nil? && uri.host.nil?
+      rescue URI::BadURIError
+        false
+      rescue URI::InvalidURIError
+        false
+    end
+
+    def content? node
+      content_for(node)[0] == 200
+    end
+
+    def content_only node
+      status, headers, body = content_for(node)
+      return nil if status != 200
+      full_body = ""; body.each do |part| full_body << part end
+      full_body
+    end
+
+    def path_for node
+      case node.name
+        when 'script'
+          node['src']
+        when 'img'
+          node['src']
+        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
+
+    # Retrieve the referenced asset through the Rack application
+    def content_for node
+      path = path_for node
+      return [404, {}, ""] unless path && is_local?(path)
+      app = options[:app]
+      env = options[:env].dup
+      env['PATH_INFO'] = path
+      app.call(env)
     end
   end
   # shortcut

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

@@ -22,7 +22,7 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
 
   private
   def merge_contents nodes, separator = ';'
-    nodes.map { |node| file_for(node).read rescue "" }.join("\n")
+    nodes.map { |node| content_only(node) rescue "" }.join("\n")
   end
   
   def save nodes
@@ -32,7 +32,7 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
   end
   
   def local_css? node
-    node.name == 'link' and file_for(node)
+    node.name == 'link' and content_for(node)[0] == 200
   end
   
   def topmost_of_sequence nodes
@@ -57,9 +57,10 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
 
   def unique_id nodes
     return Digest::MD5.hexdigest nodes.map { |node| 
-      file = file_for node
-      next unless file
-      file.mtime.to_i.to_s + file.read
+      status, headers, body = content_for node
+      next unless status == 200
+      full_body = ""; body.each do |part| full_body << part end
+      headers['Last-Modified'] + full_body
     }.join unless @options[:hash]
     @options[:hash].each do |urls, hash|
       next unless (nodes.map { |node| node['href'] } & urls).length == urls.length

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

@@ -7,7 +7,7 @@ end
 class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   requires_store
   name      'combine_javascripts'
-  priority  8
+  priority  10
   
   def execute! document
     nodes = document.css('script[src]')
@@ -23,7 +23,7 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
 
   private
   def save nodes
-    contents = nodes.map { |node| file_for(node).read rescue "" }.join(';')
+    contents = nodes.map { |node| content_only(node) rescue "" }.join(';')
     nodes_id = unique_id nodes
     @options[:store]["#{nodes_id}.js"] = contents
   end
@@ -36,7 +36,7 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   end
   
   def local_script? node
-    node.name == 'script' and file_for(node)
+    node.name == 'script' and content?(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 || !file_for(_next))
+        (!_next || !local_script?(_next))
         result << node
       end
     end
@@ -52,10 +52,11 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   end
 
   def unique_id nodes
-    return Digest::MD5.hexdigest nodes.map { |node| 
-      file = file_for node
-      next unless file
-      file.mtime.to_i.to_s + file.read
+    return Digest::MD5.hexdigest nodes.map { |node|
+      status, headers, body = content_for node
+      next unless status == 200
+      full_body = ""; body.each do |part| full_body << part end
+      headers['Last-Modified'] + full_body
     }.join unless @options[:hash]
     @options[:hash].each do |urls, hash|
       next unless (nodes.map { |node| node['src'] } & urls).length == urls.length

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

@@ -1,3 +1,4 @@
+require 'csso'
 class Rack::PageSpeed::Filters::InlineCSS < Rack::PageSpeed::Filter
   priority 10
   
@@ -5,10 +6,11 @@ class Rack::PageSpeed::Filters::InlineCSS < Rack::PageSpeed::Filter
     nodes = document.css('link[rel="stylesheet"][href]')
     return false unless nodes.count > 0
     nodes.each do |node|
-      file = file_for node
-      next if !file or file.stat.size > (@options[:max_size] or 2048)
+      status, headers, body = content_for node
+      next if !status == 200 or headers['Content-Length'].to_i > (@options[:max_size] or 2048)
       inline = Nokogiri::XML::Node.new 'style', document
-      inline.content = file.read
+      full_body = ""; body.each do |part| full_body << part end
+      inline.content = Csso.optimize(full_body)
       node.before inline
       node.remove
     end

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

@@ -5,10 +5,12 @@ class Rack::PageSpeed::Filters::InlineImages < Rack::PageSpeed::Filter
     nodes = document.css('img')
     return false unless nodes.count > 0
     nodes.each do |node|
-      file = file_for node
-      next if !file or file.stat.size > (@options[:max_size] or 1024)
+      status, headers, body = content_for node
+      next if status != 200 or headers['Content-Length'].to_i > (@options[:max_size] or 1024)
+      url = node['src']
       img = node.clone
-      img['src'] = "data:#{Rack::Mime.mime_type(File.extname(file.path))};base64,#{[file.read].pack('m')}"
+      full_body = ""; body.each do |part| full_body << part end
+      img['src'] = "data:#{Rack::Mime.mime_type(File.extname(path_for(node)))};base64,#{[full_body].pack('m')}"
       img['alt'] = node['alt'] if node['alt']
       node.before img
       node.remove

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

@@ -1,15 +1,16 @@
 class Rack::PageSpeed::Filters::InlineJavaScripts < Rack::PageSpeed::Filter
   name      'inline_javascripts'
-  priority  10
+  priority  8
       
   def execute! document
     nodes = document.css('script[src]')
     return false unless nodes.count > 0
     nodes.each do |node|
-      file = file_for node
-      next if !file or file.stat.size > (@options[:max_size] or 2048)
+      status, headers, body = content_for node
+      next if status != 200 or headers['Content-Length'].to_i > (@options[:max_size] or 2048)
       inline = Nokogiri::XML::Node.new 'script', document
-      inline.content = file.read
+      full_body = ""; body.each do |part| full_body << part end
+      inline.content = JSMin.minify(full_body)
       node.before inline
       node.remove
     end

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

@@ -0,0 +1,31 @@
+require 'csso'
+
+begin
+  require 'md5'
+rescue LoadError
+  require 'digest/md5'
+end
+
+class Rack::PageSpeed::Filters::MinifyCSS < Rack::PageSpeed::Filters::Base
+  requires_store
+  name      'minify_css'
+  priority  2
+
+  def execute! document
+    nodes = document.css('link[rel="stylesheet"][href]')
+    return false unless nodes.count > 0
+    nodes.each do |node|
+      if match = %r(^/rack-pagespeed-(.*)).match(node['href'])
+        store = @options[:store]
+        store[match[1]] = Csso.optimize(store[match[1]])
+      else
+        status, headers, body = content_for node
+        next unless node.name == 'link' && status == 200
+        css = ""; body.each do |part| css << part end
+        hash = Digest::MD5.hexdigest headers['Last-Modified'] + css
+        @options[:store]["#{hash}.css"] = Csso.optimize(css)
+        node['href'] = "/rack-pagespeed-#{hash}.css"
+      end
+    end
+  end
+end

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

@@ -21,10 +21,10 @@ class Rack::PageSpeed::Filters::MinifyJavaScripts < Rack::PageSpeed::Filters::Ba
           store = @options[:store]
           store[match[1]] = JSMin.minify store[match[1]]
         else
-          next unless local_script? node
-          file = file_for node
-          javascript = file.read
-          hash = Digest::MD5.hexdigest file.mtime.to_i.to_s + javascript
+          status, headers, body = content_for node
+          next unless node.name == 'script' && status == 200
+          javascript = ""; body.each do |part| javascript << part end
+          hash = Digest::MD5.hexdigest headers['Last-Modified'] + javascript
           compressed = Nokogiri::XML::Node.new 'script', document
           compressed['src'] = "/rack-pagespeed-#{hash}.js"
           @options[:store]["#{hash}.js"] = JSMin.minify javascript
@@ -34,8 +34,4 @@ class Rack::PageSpeed::Filters::MinifyJavaScripts < Rack::PageSpeed::Filters::Ba
       end
     end
   end
-  
-  def local_script? node
-    node.name == 'script' and file_for(node)
-  end
 end

data/lib/rack/pagespeed/store/disk.rb

@@ -8,6 +8,12 @@ class Rack::PageSpeed::Store::Disk
     @path = path
   end
 
+  # Retrieve last modified time from Disk asset
+  def mtime key
+    path = "#{@path}/rack-pagespeed-#{key}"
+    File.mtime path if File.exists? path
+  end
+
   def [] key
     path = "#{@path}/rack-pagespeed-#{key}"
     File.read path if File.exists? path

data/rack-pagespeed-fork.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-pagespeed-fork 0.1.0 ruby lib
+# stub: rack-pagespeed-fork 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-pagespeed-fork"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Will Jordan", "Julio Cesar Ody"]
-  s.date = "2014-10-08"
+  s.date = "2014-10-09"
   s.description = "Web page speed optimizations at the Rack level - fork"
   s.email = "will@code.org"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/rack/pagespeed/filters/inline_css.rb",
     "lib/rack/pagespeed/filters/inline_images.rb",
     "lib/rack/pagespeed/filters/inline_javascripts.rb",
+    "lib/rack/pagespeed/filters/minify_css.rb",
     "lib/rack/pagespeed/filters/minify_javascripts.rb",
     "lib/rack/pagespeed/store/disk.rb",
     "lib/rack/pagespeed/store/memcached.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-pagespeed-fork
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Will Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -116,6 +116,7 @@ files:
 - lib/rack/pagespeed/filters/inline_css.rb
 - lib/rack/pagespeed/filters/inline_images.rb
 - lib/rack/pagespeed/filters/inline_javascripts.rb
+- lib/rack/pagespeed/filters/minify_css.rb
 - lib/rack/pagespeed/filters/minify_javascripts.rb
 - lib/rack/pagespeed/store/disk.rb
 - lib/rack/pagespeed/store/memcached.rb