rack-pagespeed 0.1.0 → 0.2.0

data/Gemfile

@@ -3,7 +3,6 @@ source :rubygems
 gem 'nokogiri',     '1.4.4'
 gem 'rack',         '1.2.1'
 gem 'memcached',    '1.0.2'
-gem 'mime-types',   '1.16'
 gem 'jsmin',        '1.0.1'
 
 group :test do

data/Gemfile.lock

@@ -52,7 +52,6 @@ DEPENDENCIES
   capybara (= 0.4.0)
   jsmin (= 1.0.1)
   memcached (= 1.0.2)
-  mime-types (= 1.16)
   nokogiri (= 1.4.4)
   rack (= 1.2.1)
   rspec (= 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rack/pagespeed.rb

@@ -1,6 +1,5 @@
 require 'rack'
 require 'nokogiri'
-require 'mime/types'
 
 module Rack
   class PageSpeed
@@ -35,7 +34,7 @@ module Rack
       if asset = store[asset_id]
         [
           200,
-          { 'Content-Type' => (MIME::Types.type_for(asset_id).first.content_type rescue 'text/plain') },
+          { 'Content-Type' => (Rack::Mime.mime_type(::File.extname(asset_id))) },
           [asset]
         ]
       else

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

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

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

@@ -44,8 +44,15 @@ module Rack::PageSpeed::Filters
 
     private
     def file_for node
-      path = ::File.join(options[:public], node[node.name == 'script' ? 'src' : 'href'])
-      ::File.open path if ::File.exists? path
+      path = ::File.join options[:public], case node.name
+      when 'script'
+        node['src']
+      when 'img'
+        node['src']        
+      when 'link'
+        node['href']
+      end
+      ::File.open path if ::File.exists? path      
     end
   end
   # shortcut

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

@@ -4,7 +4,7 @@ rescue LoadError
   require 'digest/md5'
 end
 
-class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filters::Base
+class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
   requires_store
   priority 9
   

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

@@ -4,7 +4,7 @@ rescue LoadError
   require 'digest/md5'
 end
 
-class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filters::Base
+class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   requires_store
   name      'combine_javascripts'
   priority  2

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

@@ -1,4 +1,4 @@
-class Rack::PageSpeed::Filters::InlineCSS < Rack::PageSpeed::Filters::Base
+class Rack::PageSpeed::Filters::InlineCSS < Rack::PageSpeed::Filter
   priority 10
   
   def execute! document

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

@@ -0,0 +1,17 @@
+class Rack::PageSpeed::Filters::InlineImages < Rack::PageSpeed::Filter
+  priority 8
+  
+  def execute! document
+    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)
+      img = node.clone
+      img['src'] = "data:#{Rack::Mime.mime_type(File.extname(file.path))};base64,#{[file.read].pack('m')}"
+      img['alt'] = node['alt'] if node['alt']
+      node.before img
+      node.remove
+    end
+  end
+end

data/rack-pagespeed.gemspec

@@ -0,0 +1,152 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rack-pagespeed}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Julio Cesar Ody"]
+  s.date = %q{2011-01-10}
+  s.description = %q{Web page speed optimizations at the Rack level}
+  s.email = %q{julio@awesomebydesign.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/rack-pagespeed.rb",
+    "lib/rack/pagespeed.rb",
+    "lib/rack/pagespeed/config.rb",
+    "lib/rack/pagespeed/filters/all.rb",
+    "lib/rack/pagespeed/filters/base.rb",
+    "lib/rack/pagespeed/filters/combine_css.rb",
+    "lib/rack/pagespeed/filters/combine_javascripts.rb",
+    "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_javascripts.rb",
+    "lib/rack/pagespeed/store/all.rb",
+    "lib/rack/pagespeed/store/disk.rb",
+    "lib/rack/pagespeed/store/memcached.rb",
+    "rack-pagespeed.gemspec",
+    "spec/config_spec.rb",
+    "spec/filters/combine_css_spec.rb",
+    "spec/filters/combine_javascripts_spec.rb",
+    "spec/filters/filter_spec.rb",
+    "spec/filters/inline_css_spec.rb",
+    "spec/filters/inline_images_spec.rb",
+    "spec/filters/inline_javascript_spec.rb",
+    "spec/filters/minify_javascript_spec.rb",
+    "spec/fixtures/all-small-dog-breeds.jpg",
+    "spec/fixtures/complex.html",
+    "spec/fixtures/foo.js",
+    "spec/fixtures/hh-reset.css",
+    "spec/fixtures/huge.css",
+    "spec/fixtures/iphone.css",
+    "spec/fixtures/jquery-1.4.1.min.js",
+    "spec/fixtures/medialess1.css",
+    "spec/fixtures/medialess2.css",
+    "spec/fixtures/mylib.js",
+    "spec/fixtures/noexternalcss.html",
+    "spec/fixtures/noscripts.html",
+    "spec/fixtures/ohno.js",
+    "spec/fixtures/reset.css",
+    "spec/fixtures/screen.css",
+    "spec/fixtures/styles.html",
+    "spec/fixtures/zecoolwebsite/css/awesomebydesign.css",
+    "spec/fixtures/zecoolwebsite/css/reset.css",
+    "spec/fixtures/zecoolwebsite/img/bg-idevice.png",
+    "spec/fixtures/zecoolwebsite/img/bg.png",
+    "spec/fixtures/zecoolwebsite/img/bottom-left-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/bottom-right-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/consulting-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/design-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/prototyping-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/top-left-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/top-right-arrow.png",
+    "spec/fixtures/zecoolwebsite/img/webdev-arrow.png",
+    "spec/fixtures/zecoolwebsite/index.html",
+    "spec/fixtures/zecoolwebsite/js/awesomebydesign.js",
+    "spec/fixtures/zecoolwebsite/js/jquery-1.4.2.min.js",
+    "spec/fixtures/zecoolwebsite/js/modernizr-1.5.min.js",
+    "spec/fixtures/zecoolwebsite/js/sayhi.js",
+    "spec/integration/integration_spec.rb",
+    "spec/pagespeed_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/store/disk_spec.rb",
+    "spec/store/memcached_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/juliocesar/rack-pagespeed}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Web page speed optimizations at the Rack level}
+  s.test_files = [
+    "spec/config_spec.rb",
+    "spec/filters/combine_css_spec.rb",
+    "spec/filters/combine_javascripts_spec.rb",
+    "spec/filters/filter_spec.rb",
+    "spec/filters/inline_css_spec.rb",
+    "spec/filters/inline_images_spec.rb",
+    "spec/filters/inline_javascript_spec.rb",
+    "spec/filters/minify_javascript_spec.rb",
+    "spec/integration/integration_spec.rb",
+    "spec/pagespeed_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/store/disk_spec.rb",
+    "spec/store/memcached_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, ["= 1.4.4"])
+      s.add_runtime_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<memcached>, ["= 1.0.2"])
+      s.add_runtime_dependency(%q<jsmin>, ["= 1.0.1"])
+      s.add_runtime_dependency(%q<nokogiri>, ["= 1.4.4"])
+      s.add_runtime_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<memcached>, ["= 1.0.2"])
+      s.add_runtime_dependency(%q<mime-types>, ["= 1.16"])
+      s.add_runtime_dependency(%q<jsmin>, ["= 1.0.1"])
+      s.add_development_dependency(%q<rspec>, ["= 2.1.0"])
+      s.add_development_dependency(%q<steak>, ["= 1.0.0"])
+      s.add_development_dependency(%q<capybara>, ["= 0.4.0"])
+    else
+      s.add_dependency(%q<nokogiri>, ["= 1.4.4"])
+      s.add_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_dependency(%q<memcached>, ["= 1.0.2"])
+      s.add_dependency(%q<jsmin>, ["= 1.0.1"])
+      s.add_dependency(%q<nokogiri>, ["= 1.4.4"])
+      s.add_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_dependency(%q<memcached>, ["= 1.0.2"])
+      s.add_dependency(%q<mime-types>, ["= 1.16"])
+      s.add_dependency(%q<jsmin>, ["= 1.0.1"])
+      s.add_dependency(%q<rspec>, ["= 2.1.0"])
+      s.add_dependency(%q<steak>, ["= 1.0.0"])
+      s.add_dependency(%q<capybara>, ["= 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<nokogiri>, ["= 1.4.4"])
+    s.add_dependency(%q<rack>, ["= 1.2.1"])
+    s.add_dependency(%q<memcached>, ["= 1.0.2"])
+    s.add_dependency(%q<jsmin>, ["= 1.0.1"])
+    s.add_dependency(%q<nokogiri>, ["= 1.4.4"])
+    s.add_dependency(%q<rack>, ["= 1.2.1"])
+    s.add_dependency(%q<memcached>, ["= 1.0.2"])
+    s.add_dependency(%q<mime-types>, ["= 1.16"])
+    s.add_dependency(%q<jsmin>, ["= 1.0.1"])
+    s.add_dependency(%q<rspec>, ["= 2.1.0"])
+    s.add_dependency(%q<steak>, ["= 1.0.0"])
+    s.add_dependency(%q<capybara>, ["= 0.4.0"])
+  end
+end
+

data/spec/filters/filter_spec.rb

@@ -8,20 +8,20 @@ describe 'the base filter class' do
   end
   
   it 'when subclassing, it adds the new class to the #available_filters list' do
-    class Moo < Rack::PageSpeed::Filters::Base; end
+    class Moo < Rack::PageSpeed::Filter; end
     Rack::PageSpeed::Filters::Base.available_filters.should include(Moo)
   end
 
   context 'the #name declaration, which can be used to declare a name which the filter can be called upon' do
     it 'can be called from inside the class' do
-      class Boo < Rack::PageSpeed::Filters::Base
+      class Boo < Rack::PageSpeed::Filter
         name 'mooers'
       end
       Boo.name.should == 'mooers'
     end
 
     it 'defaults to the class name if not called' do
-      class BananaSmoothie < Rack::PageSpeed::Filters::Base; end
+      class BananaSmoothie < Rack::PageSpeed::Filter; end
       BananaSmoothie.name.should == 'banana_smoothie'
     end      
   end
@@ -53,5 +53,10 @@ describe 'the base filter class' do
       style = Fixtures.complex.at_css('link')
       @base.send(:file_for, style).stat.size.should == File.size(File.join(Fixtures.path, 'reset.css'))
     end
+    
+    it "for an image" do
+      image = Fixtures.complex.at_css('img[src="all-small-dog-breeds.jpg"]')
+      @base.send(:file_for, image).stat.size.should == File.size(File.join(Fixtures.path, 'all-small-dog-breeds.jpg'))
+    end
   end
 end

data/spec/filters/inline_images_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'the inline_css filter' do
+  it "is called \"inline_images\" as far as Config is concerned" do
+    Rack::PageSpeed::Filters::InlineImages.name.should == 'inline_images'
+  end
+  
+  it "is a priority 8 filter" do
+    Rack::PageSpeed::Filters::InlineImages.priority.should == 8
+  end
+  
+  context "#execute!" do
+    before :each do
+      @filter = Rack::PageSpeed::Filters::InlineImages.new :public => Fixtures.path, :max_size => 2048
+      @document = Fixtures.complex
+      @filter.execute! @document
+    end
+
+    it "returns false if there are no images in the document" do
+      Rack::PageSpeed::Filters::InlineImages.new(:public => Fixtures.path).execute!(Fixtures.noexternalcss).should be_false
+    end
+
+    it 'inlines images files that are smaller than 1kb in size by default using data URI' do
+      image = fixture 'all-small-dog-breeds.jpg'
+      @document.at_css('img:last')['src'].should == "data:image/jpeg;base64,#{[image].pack('m')}"
+    end
+  end
+end

data/spec/fixtures/complex.html

@@ -15,7 +15,7 @@
     <p>A fixture page</p>
     <p>With 2 paragraphs<p>
     <img src="/foobar.jpg" />
-    <img src="/dog.jpg" />    
+    <img src="all-small-dog-breeds.jpg" />    
     <p id="test">A test paragraph</p>
     <p id="foo">Foo bar</p>
     <div id="footer">And a footer, in poorly semantic HTML</div>    

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-pagespeed
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +11:00
+date: 2011-01-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,25 +66,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jsmin
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,11 +81,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,11 +97,11 @@ dependencies:
         - 4
         version: 1.4.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,11 +113,11 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: memcached
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -144,11 +129,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -159,11 +144,11 @@ dependencies:
         - 16
         version: "1.16"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jsmin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -175,11 +160,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -191,11 +176,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: steak
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -207,11 +192,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -223,7 +208,7 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 description: Web page speed optimizations at the Rack level
 email: julio@awesomebydesign.com
 executables: []
@@ -246,18 +231,22 @@ files:
 - lib/rack/pagespeed/filters/combine_css.rb
 - lib/rack/pagespeed/filters/combine_javascripts.rb
 - 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_javascripts.rb
 - lib/rack/pagespeed/store/all.rb
 - lib/rack/pagespeed/store/disk.rb
 - lib/rack/pagespeed/store/memcached.rb
+- rack-pagespeed.gemspec
 - spec/config_spec.rb
 - spec/filters/combine_css_spec.rb
 - spec/filters/combine_javascripts_spec.rb
 - spec/filters/filter_spec.rb
 - spec/filters/inline_css_spec.rb
+- spec/filters/inline_images_spec.rb
 - spec/filters/inline_javascript_spec.rb
 - spec/filters/minify_javascript_spec.rb
+- spec/fixtures/all-small-dog-breeds.jpg
 - spec/fixtures/complex.html
 - spec/fixtures/foo.js
 - spec/fixtures/hh-reset.css
@@ -335,6 +324,7 @@ test_files:
 - spec/filters/combine_javascripts_spec.rb
 - spec/filters/filter_spec.rb
 - spec/filters/inline_css_spec.rb
+- spec/filters/inline_images_spec.rb
 - spec/filters/inline_javascript_spec.rb
 - spec/filters/minify_javascript_spec.rb
 - spec/integration/integration_spec.rb