rack-bundle 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rack/bundle/bundles/base.rb

@@ -19,7 +19,7 @@ class Rack::Bundle::Base
   end
   
   def hash
-    @hash ||= MD5.new(@files.map { |file| File.basename(file.path) }.join).to_s
+    @hash ||= MD5.new(@files.map { |file| File.basename(file.path) + File.mtime(file.path).to_s }.join).to_s
   end
   
   def path

data/lib/rack/bundle/bundles/js.rb

@@ -2,4 +2,23 @@ require File.dirname(__FILE__) + '/base'
 
 class Rack::Bundle::JSBundle < Rack::Bundle::Base  
   @extension, @joiner, @mime_type = "js", ";", "text/javascript"
+  
+  def contents
+    @contents ||= @files.map { |file| file.contents }.join(joiner)
+  end
+  
+  # Leaving this comment here for the sake of documenting my intention.
+  # For some reason, opening the pipe below makes Rack hang indefinitely,
+  # even though specs pass.
+  # 
+  # def compress javascript
+  #   compressed = ""
+  #   open(%Q{| #{Rack::Bundle.vendor_path}/jsmin.rb}, 'w+') do |process|
+  #     process.write javascript
+  #     process.close_write
+  #     compressed = process.read
+  #   end
+  #   puts compressed
+  #   compressed
+  # end
 end

data/rack-bundle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-bundle}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-07-15}
   s.description = %q{Javascript and CSS bundling at the Rack level}
   s.email = %q{julio.ody@gmail.com}
   s.extra_rdoc_files = [

data/spec/bundles/base_spec.rb

@@ -16,8 +16,8 @@ describe Rack::Bundle::Base do
     @bundle.contents.should == [$jquery.contents, $mylib.contents].join(';')
   end
 
-  it 'creates a MD5 hash out of the file names in the bundle' do    
-    @bundle.hash.should == MD5.new([filename($jquery), filename($mylib)].join).to_s
+  it 'creates a MD5 hash out of the file names and mtimes in the bundle' do    
+    @bundle.hash.should == MD5.new([filename($jquery) + File.mtime($jquery.path).to_s, filename($mylib) + File.mtime($mylib.path).to_s].join).to_s
   end
   
   it 'returns the path through which the bundle can be retrieved on #path' do

data/spec/bundles/js_spec.rb

@@ -4,12 +4,17 @@ describe Rack::Bundle::JSBundle do
   before do
     @bundle = make_js_bundle
   end
-  
+
   it "should return 'js' as #extension" do
     subject.extension.should == "js"
   end
-  
+
   it "should return 'text/javascript' as #mime_type" do
     subject.mime_type.should == "text/javascript"
-  end      
+  end
+  
+  it 'compresses Javascript when you try to access the #contents' do
+    pending
+    @bundle.contents.length.should < [$jquery.contents, $mylib.contents].join(";").length
+  end
 end

data/spec/store/file_system_store_spec.rb

@@ -25,12 +25,12 @@ describe Rack::Bundle::FileSystemStore do
     Rack::Bundle::FileSystemStore.new FIXTURES_PATH
     File.exists?(FIXTURES_PATH + '/rack-bundle-1234567890.js').should be_false
   end
+  
+  it "checks if a bundle exists with #has_bundle?" do
+    @storage.has_bundle?(@jsbundle).should be_true
+  end
     
   context 'storing bundles in the file system' do
-    it "checks if a bundle exists with #has_bundle?" do
-      @storage.has_bundle?(@jsbundle).should be_true
-    end
-
     it 'skips saving a bundle if one with a matching hash already exists' do
       File.should_not_receive(:open)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-bundle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +10:00
+date: 2010-07-15 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency