rack-pagespeed 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

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

@@ -56,7 +56,15 @@ class Rack::PageSpeed::Filters::CombineCSS < Rack::PageSpeed::Filter
   end
 
   def unique_id nodes
-    Digest::MD5.hexdigest nodes.map { |node| file = file_for node; file.mtime.to_i.to_s + file.read }.join
+    return Digest::MD5.hexdigest nodes.map { |node| 
+      file = file_for node
+      next unless file
+      file.mtime.to_i.to_s + file.read
+    }.join unless @options[:hash]
+    @options[:hash].each do |urls, hash|
+      next unless (nodes.map { |node| node['href'] } & urls).length == urls.length
+      return hash
+    end
   end
 
   def group_siblings nodes

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

@@ -52,7 +52,15 @@ class Rack::PageSpeed::Filters::CombineJavaScripts < Rack::PageSpeed::Filter
   end
 
   def unique_id nodes
-    Digest::MD5.hexdigest nodes.map { |node| file = file_for node; file.mtime.to_i.to_s + file.read }.join
+    return Digest::MD5.hexdigest nodes.map { |node| 
+      file = file_for node
+      next unless file
+      file.mtime.to_i.to_s + file.read
+    }.join unless @options[:hash]
+    @options[:hash].each do |urls, hash|
+      next unless (nodes.map { |node| node['src'] } & urls).length == urls.length
+      return hash
+    end
   end
   
   def group_siblings nodes

data/rack-pagespeed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-pagespeed}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   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-20}
+  s.date = %q{2011-01-24}
   s.description = %q{Web page speed optimizations at the Rack level}
   s.email = %q{julio@awesomebydesign.com}
   s.extra_rdoc_files = [

data/spec/filters/combine_javascripts_spec.rb

@@ -39,10 +39,20 @@ describe 'the combine_javascripts filter' do
       result = @filter.send :group_siblings, nodes
       result.should == [[nodes[0].previous_element, nodes[0]], [nodes[1].previous_element, nodes[1]]]
     end
-
-    it '#unique_id a key thats unique to the nodes combination of content + mtime' do
-      nodes = Fixtures.complex.css('script[src$=".js"]:not([src^="http"]) + script[src$=".js"]:not([src^="http"])')
-      @filter.send(:unique_id, nodes).should == Digest::MD5.hexdigest(nodes.map { |node| file = @filter.send(:file_for, node); file.mtime.to_i.to_s + file.read }.join)
+    
+    context 'the #unique_id method' do
+      it "generates a hash thats unique to the nodes' combination of content + mtime in the absence of @options[:hash]" do
+        nodes = Fixtures.complex.css('script[src$=".js"]:not([src^="http"]) + script[src$=".js"]:not([src^="http"])')
+        @filter.send(:unique_id, nodes).should == Digest::MD5.hexdigest(nodes.map { |node| file = @filter.send(:file_for, node); file.mtime.to_i.to_s + file.read }.join)
+      end
+      
+      it "uses values for hashes estipulated in @options[:hash] if any" do
+        nodes = []
+        nodes << Fixtures.complex.at_css('script[src="ohno.js"]')
+        nodes << Fixtures.complex.at_css('script[src="foo.js"]')
+        filter = Rack::PageSpeed::Filters::CombineJavaScripts.new :store => {}, :hash => { %W(ohno.js foo.js) => "romanking" }
+        filter.send(:unique_id, nodes).should == "romanking"
+      end
     end
   end
 end

data/spec/integration/integration_spec.rb

@@ -19,7 +19,7 @@ RSpec.configure do |config|
       store :disk => Dir.tmpdir + '/pagespeed'
       inline_javascripts
       inline_css
-      combine_javascripts
+      combine_javascripts :hash => { %W(js/jquery-1.4.2.min.js js/awesomebydesign.js) => "omghash" }
       combine_css
     end
     run lambda { |env| [200, { 'Content-Type' => 'text/html' }, [File.read(File.join(zecoolwebsite, 'index.html')) ] ] }
@@ -31,23 +31,23 @@ feature "playing out in the real world" do
     visit '/'
     page.body.should include(fixture('zecoolwebsite/js/sayhi.js'))
   end
-  
+
   scenario "bundles jquery and awesomebydesign.js together" do
     visit '/'
-    page.should have_css('script[src*="rack-pagespeed"]')
+    page.should have_css('script[src*="rack-pagespeed-omghash"]')
     page.should_not have_css('script[src*="jquery"]')
-    page.should_not have_css('script[src*="awesomebydesign"]')    
-    
+    page.should_not have_css('script[src*="awesomebydesign"]')
+
     visit page.find('script[src*="rack-pagespeed"]')['src']
     page.body.should == [fixture('zecoolwebsite/js/jquery-1.4.2.min.js'), fixture('zecoolwebsite/js/awesomebydesign.js')].join(';')
   end
-  
+
   scenario "bundles reset.css and awesomebydesign.css together" do
     visit '/'
     page.should have_css('link[rel="stylesheet"][href*="rack-pagespeed"]')
     page.should_not have_css('link[rel="stylesheet"][href*="reset.css"]')
-    page.should_not have_css('link[rel="stylesheet"][href*="awesomebydesign.css"]')    
-    
+    page.should_not have_css('link[rel="stylesheet"][href*="awesomebydesign.css"]')
+
     visit page.find('link[rel="stylesheet"][href*="rack-pagespeed"]')['href']
     page.body.should == [fixture('zecoolwebsite/css/reset.css'), fixture('zecoolwebsite/css/awesomebydesign.css')].join("\n")
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-pagespeed
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +11:00
+date: 2011-01-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -85,6 +90,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 4
@@ -100,6 +106,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
@@ -115,6 +122,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
@@ -130,6 +138,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 1
         - 16
@@ -144,6 +153,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -159,6 +169,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -174,6 +185,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -189,6 +201,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -285,6 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -293,6 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"