rack-pagespeed 1.0.5 → 1.0.6

data/Gemfile

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

data/Gemfile.lock

@@ -19,7 +19,6 @@ GEM
       rake (>= 0.8.7)
     jsmin (1.0.1)
     json_pure (1.4.6)
-    memcached (1.0.2)
     mime-types (1.16)
     nokogiri (1.4.4)
     rack (1.2.1)
@@ -51,7 +50,6 @@ PLATFORMS
 DEPENDENCIES
   capybara (= 0.4.0)
   jsmin (= 1.0.1)
-  memcached (= 1.0.2)
   nokogiri (= 1.4.4)
   rack (= 1.2.1)
   rspec (= 2.3.0)

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/rack/pagespeed.rb

@@ -34,7 +34,11 @@ module Rack
       if asset = store[asset_id]
         [
           200,
-          { 'Content-Type' => (Rack::Mime.mime_type(::File.extname(asset_id))) },
+          {
+            'Content-Type' => (Rack::Mime.mime_type(::File.extname(asset_id))),
+            'Cache-Control' => "public, max-age=#{(60*60*24*365.25*10).to_i}",
+            'Expires' => (Time.now + 60*60*24*365.25*10).httpdate
+          },
           [asset]
         ]
       else

data/lib/rack/pagespeed/config.rb

@@ -1,7 +1,7 @@
 class Rack::PageSpeed::Config
   class NoSuchFilter < StandardError; end
   class NoSuchStorageMechanism < StandardError; end
-  load "#{::File.dirname(__FILE__)}/store/all.rb"
+  load "#{::File.dirname(__FILE__)}/store/disk.rb"
 
   attr_reader :filters, :public
 
@@ -18,12 +18,10 @@ class Rack::PageSpeed::Config
   def store type = nil, *args
     return @store unless type
     case type
-    when :disk
-      @store = Rack::PageSpeed::Store::Disk.new *args
-    when :memcached
-      @store = Rack::PageSpeed::Store::Memcached.new *args
     when {}
-      @store = {} # simple in-memory store
+      @store = {} # simple in-memory store      
+    when Symbol
+      @store = load_storage type, *args
     when Hash
       store *type.to_a.first
     else
@@ -69,4 +67,13 @@ class Rack::PageSpeed::Config
       end
     end
   end
+  
+  def load_storage type, *args
+    klass = type.to_s.capitalize
+    unless Rack::PageSpeed::Store.const_defined? klass
+      lib = ::File.join(::File.dirname(__FILE__), 'store', type.to_s) 
+      load lib
+    end
+    Rack::PageSpeed::Store.const_get(klass).new *args
+  end
 end

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

@@ -1,5 +1,7 @@
 require 'tmpdir'
 
+module Rack::PageSpeed::Store; end
+
 class Rack::PageSpeed::Store::Disk
   def initialize path = Dir.tmpdir
     raise ArgumentError, "#{path} is not a directory" unless File.directory? path

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

@@ -1,4 +1,8 @@
-require 'memcached' # wanted to use Dalli, but it just ain't working here right now
+begin
+  require 'memcached' # wanted to use Dalli, but it just ain't working here right now
+rescue LoadError
+  raise LoadError, ":memcached store requires the memcached gem to be installed."
+end
 
 class Rack::PageSpeed::Store::Memcached
   def initialize address_port = nil

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

@@ -0,0 +1,24 @@
+begin
+  require 'redis'
+rescue LoadError
+  raise LoadError, ":redis store requires the redis gem to be installed."
+end
+
+class Rack::PageSpeed::Store::Redis
+  def initialize address_port = nil
+    @client = if address_port.nil?
+      Redis.new
+    else
+      address, port = address_port.split(":")
+      Redis.new({ :address => address, :port => port })
+    end
+  end
+  
+  def [] key
+    @client.get key
+  end
+  
+  def []= key, value
+    @client.set key, value
+  end
+end

data/rack-pagespeed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-pagespeed}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2011-03-25}
+  s.date = %q{2011-04-02}
   s.description = %q{Web page speed optimizations at the Rack level}
   s.email = %q{julio@awesomebydesign.com}
   s.extra_rdoc_files = [
@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
     "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",
+    "lib/rack/pagespeed/store/redis.rb",
     "rack-pagespeed.gemspec",
     "spec/config_spec.rb",
     "spec/filters/combine_css_spec.rb",
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/jquery-1.4.1.min.js",
     "spec/fixtures/medialess1.css",
     "spec/fixtures/medialess2.css",
+    "spec/fixtures/mock_store.rb",
     "spec/fixtures/mylib.js",
     "spec/fixtures/noexternalcss.html",
     "spec/fixtures/noscripts.html",
@@ -81,11 +82,12 @@ Gem::Specification.new do |s|
     "spec/pagespeed_spec.rb",
     "spec/spec_helper.rb",
     "spec/store/disk_spec.rb",
-    "spec/store/memcached_spec.rb"
+    "spec/store/memcached_spec.rb",
+    "spec/store/redis_spec.rb"
   ]
   s.homepage = %q{http://github.com/juliocesar/rack-pagespeed}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.1}
   s.summary = %q{Web page speed optimizations at the Rack level}
   s.test_files = [
     "spec/config_spec.rb",
@@ -96,21 +98,21 @@ Gem::Specification.new do |s|
     "spec/filters/inline_images_spec.rb",
     "spec/filters/inline_javascript_spec.rb",
     "spec/filters/minify_javascript_spec.rb",
+    "spec/fixtures/mock_store.rb",
     "spec/integration/integration_spec.rb",
     "spec/pagespeed_spec.rb",
     "spec/spec_helper.rb",
     "spec/store/disk_spec.rb",
-    "spec/store/memcached_spec.rb"
+    "spec/store/memcached_spec.rb",
+    "spec/store/redis_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"])
@@ -123,7 +125,6 @@ Gem::Specification.new do |s|
     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"])
@@ -137,7 +138,6 @@ Gem::Specification.new do |s|
   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"])

data/spec/config_spec.rb

@@ -49,7 +49,7 @@ describe 'rack-pagespeed configuration' do
       config.filters.first.should be_a MakesItLookGood
     end
 
-    it "if it's a hash, it let's you pass options to the filters logically" do
+    it "if it's a hash, it let's you pass options to the filters" do
       config = Rack::PageSpeed::Config.new :filters => {:makes_it_look_good => {:test => 6000}}
       filter = config.filters.first
       filter.should be_a MakesItLookGood
@@ -97,92 +97,14 @@ describe 'rack-pagespeed configuration' do
 
   context 'setting a storage mechanism' do
     before { File.stub(:directory?).and_return(true) }
-
-    context 'through the hash options' do
-      context ':disk => "directory path" sets to disk storage, with a specific path' do
-        before  { @config = Rack::PageSpeed::Config.new :store => { :disk => Fixtures.path } }
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Disk }
-        specify { subject.instance_variable_get(:@path).should == Fixtures.path }
-      end
-      context ":disk sets to disk storage, in the system's temp dir" do
-        before  { @config = Rack::PageSpeed::Config.new :store => :disk }
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Disk }
-        specify { subject.instance_variable_get(:@path).should == Dir.tmpdir }
-      end
-      context 'sets to memcache storage if :memcache => "server address/port"' do
-        before  { @config = Rack::PageSpeed::Config.new :store => { :memcached => 'localhost:11211' } }
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Memcached }
-        specify { subject.instance_variable_get(:@client).servers.first.should =~ /localhost:11211/ }
-      end
-      context 'sets to memcache storage, 127.0.0.1:11211 if :memcache"' do
-        before  { @config = Rack::PageSpeed::Config.new :store => :memcached }
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Memcached }
-        specify { subject.instance_variable_get(:@client).servers.first.should =~ /127.0.0.1:11211/ }
-      end
-      context "raises NoSuchStorageMechanism for weird stuff" do
-        specify { expect { Rack::PageSpeed::Config.new :store => :poo }.to raise_error(Rack::PageSpeed::Config::NoSuchStorageMechanism) }
-      end
-    end
-
-    context 'through a block passed to the initializer' do
-      context 'to a simple Hash, if {} gets passed' do
-        before do
-          @config = Rack::PageSpeed::Config.new do
-            store({})
-          end
-        end
-        subject { @config.store }
-        specify { should == {} }
-      end
-      context 'to disk storage, in a specific path if :disk => "some directory path"' do
-        before do
-          @config = Rack::PageSpeed::Config.new do
-            store :disk => Fixtures.path
-          end
-        end
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Disk }
-        specify { subject.instance_variable_get(:@path).should == Fixtures.path }
-      end
-      context ":disk sets to disk storage, in the system's temp dir" do
-        before do
-          @config = Rack::PageSpeed::Config.new do
-            store :disk
-          end
-        end
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Disk }
-        specify { subject.instance_variable_get(:@path).should == Dir.tmpdir }
-      end
-      context 'sets to memcache storage if :memcache => "server address/port"' do
-        before do
-          @config = Rack::PageSpeed::Config.new do
-            store :memcached => 'localhost:11211'
-          end
-        end
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Memcached }
-        specify { subject.instance_variable_get(:@client).servers.first.should =~ /localhost:11211/ }
-      end
-      context 'sets to memcache storage, localhost:11211 if :memcache"' do
-        before do
-          @config = Rack::PageSpeed::Config.new do
-            store :memcached
-          end
-        end
-        subject { @config.store }
-        specify { should be_a Rack::PageSpeed::Store::Memcached }
-        specify { subject.instance_variable_get(:@client).servers.first.should =~ /127.0.0.1:11211/ }
-      end
-      context "raises NoSuchStorageMechanism for weird stuff" do
-        specify do
-          expect { Rack::PageSpeed::Config.new do store :poo end }.to raise_error(Rack::PageSpeed::Config::NoSuchStorageMechanism)
+    
+    it 'loads the appropriate class on request' do
+      ::File.stub(:join).and_return(File.dirname(__FILE__) + '/fixtures/mock_store.rb')
+      expect {
+        Rack::PageSpeed::Config.new do
+          store :mock
         end
-      end
+      }.to change { Rack::PageSpeed::Store.const_defined?('Mock') }.from(false).to(true)
     end
   end
 end

data/spec/fixtures/mock_store.rb

@@ -0,0 +1,3 @@
+class Rack::PageSpeed::Store::Mock
+  
+end

data/spec/pagespeed_spec.rb

@@ -86,6 +86,11 @@ describe 'rack-pagespeed' do
       it "responds with HTTP 200" do
         @status.should == 200
       end
+      
+      it "instructs clients to cache asset for 10 years" do
+        @headers['Cache-Control'].should == "public, max-age=315576000"
+        Time.parse(@headers['Expires']).to_i.should be_within(10).of(Time.now.to_i + 315576000)
+      end
     end
   end
   

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rspec'
 require 'fileutils'
 require 'rack/pagespeed'
+require 'rack/pagespeed/store/disk'
+require 'rack/pagespeed/store/memcached'
+require 'rack/pagespeed/store/redis'
 require 'fileutils'
 require 'tmpdir'
 require 'ostruct'

data/spec/store/redis_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "redis storage" do
+  before :all do
+    @store = Rack::PageSpeed::Store::Redis.new
+    @client = @store.instance_variable_get(:@client)
+  end
+
+  context 'writing' do
+    it "writes with a Hash-like syntax" do
+      @client.should_receive(:set).with('omg', 'value')
+      @store['omg'] = "value"
+    end
+  end
+
+  context 'reading' do
+    it "reads with a Hash-like syntax" do
+      @client.set 'hola', 'Hola mundo'
+      @store['hola'].should == "Hola mundo"
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rack-pagespeed
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
+  prerelease: 
+  version: 1.0.6
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +11:00
-default_executable: 
+date: 2011-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :runtime
   version_requirements: *id001
@@ -40,162 +31,108 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: memcached
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jsmin
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: memcached
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
         version: "1.16"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jsmin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: steak
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 description: Web page speed optimizations at the Rack level
 email: julio@awesomebydesign.com
 executables: []
@@ -221,9 +158,9 @@ files:
 - 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
+- lib/rack/pagespeed/store/redis.rb
 - rack-pagespeed.gemspec
 - spec/config_spec.rb
 - spec/filters/combine_css_spec.rb
@@ -242,6 +179,7 @@ files:
 - spec/fixtures/jquery-1.4.1.min.js
 - spec/fixtures/medialess1.css
 - spec/fixtures/medialess2.css
+- spec/fixtures/mock_store.rb
 - spec/fixtures/mylib.js
 - spec/fixtures/noexternalcss.html
 - spec/fixtures/noscripts.html
@@ -271,7 +209,7 @@ files:
 - spec/spec_helper.rb
 - spec/store/disk_spec.rb
 - spec/store/memcached_spec.rb
-has_rdoc: true
+- spec/store/redis_spec.rb
 homepage: http://github.com/juliocesar/rack-pagespeed
 licenses: []
 
@@ -285,21 +223,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Web page speed optimizations at the Rack level
@@ -312,8 +246,10 @@ test_files:
 - spec/filters/inline_images_spec.rb
 - spec/filters/inline_javascript_spec.rb
 - spec/filters/minify_javascript_spec.rb
+- spec/fixtures/mock_store.rb
 - spec/integration/integration_spec.rb
 - spec/pagespeed_spec.rb
 - spec/spec_helper.rb
 - spec/store/disk_spec.rb
 - spec/store/memcached_spec.rb
+- spec/store/redis_spec.rb

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

@@ -1,6 +0,0 @@
-lib = File.join(File.dirname(__FILE__), '..')
-module Rack::PageSpeed::Store; end
-require "#{lib}/store/disk"
-require "#{lib}/store/memcached"
-
-