rack-bundle 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/rack/bundle.rb

@@ -30,12 +30,17 @@ module Rack
         parse!
         replace_javascripts!
         replace_stylesheets!
-        [status, headers, [@document.to_html]]
+        body = @document.to_html
+        headers['Content-Length'] = body.length.to_s if headers['Content-Length'] # Not sure how UTF-8 plays into this
+        [status, headers, [body]]
       end
     end
 
     def parse!
-      @document = Nokogiri::HTML(@response.join)
+      # http://github.com/logicaltext/rack-bundle/commit/8e7d0282b05b01a0cbfa59b519242046437605f6
+      body = ""
+      @response.each do |part| body << part end
+      @document = Nokogiri::HTML(body)
     end
 
     def replace_javascripts!

data/rack-bundle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-bundle}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-06-18}
+  s.date = %q{2010-07-12}
   s.description = %q{Javascript and CSS bundling at the Rack level}
   s.email = %q{julio.ody@gmail.com}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/juliocesar/rack-bundle}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Javascript and CSS bundling at the Rack level}
   s.test_files = [
     "spec/bundles/css_bundle_spec.rb",
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])

data/spec/rack-bundle_spec.rb

@@ -13,7 +13,7 @@ describe Rack::Bundle do
   it 'defaults to FileSystemStore for storage' do
     Rack::Bundle.new(index_page, :public_dir => '.').storage.is_a? Rack::Bundle::FileSystemStore
   end
-  
+
   context 'serving bundles' do
     before do
       @jsbundle, @cssbundle = make_js_bundle, make_css_bundle
@@ -22,17 +22,42 @@ describe Rack::Bundle do
       @js_request   = Rack::MockRequest.env_for @bundle.send(:bundle_path, @jsbundle)
       @css_request  = Rack::MockRequest.env_for @bundle.send(:bundle_path, @cssbundle)
     end
-    
+
     it "fetches a bundle from storage and serves if the request URL matches" do
       @bundle.storage.should_receive(:find_bundle_by_hash).with(@jsbundle.hash).and_return(@jsbundle)
-      status, headers, response = @bundle.call @js_request      
+      status, headers, response = @bundle.call @js_request
       response.join.should == @jsbundle.contents
     end
+
+    context 'the Content-Length header' do
+      it "gets updated if it's been previously set" do
+        app = Rack::Builder.new do
+          use Rack::Lint
+          use Rack::Bundle, :public_dir => FIXTURES_PATH
+          use Rack::ContentLength
+          run index_page
+        end
+        status, headers, response = app.call @env
+        output = ""
+        response.each do |part| output << part end
+        headers['Content-Length'].should == output.length.to_s
+      end
+
+      it "isn't touched if it's not set" do
+        app = Rack::Builder.new do
+          use Rack::Lint
+          use Rack::Bundle, :public_dir => FIXTURES_PATH
+          run index_page
+        end
+        status, headers, response = app.call(@env)
+        headers['Content-Length'].should == nil
+      end
+    end
   end
 
   context 'parsing the document' do
-    before do 
-      status, headers, @response = @bundle.call(@env) 
+    before do
+      status, headers, @response = @bundle.call(@env)
     end
     it "doesn't happen unless the response is HTML" do
       bundle = Rack::Bundle.new plain_text, :public_dir => FIXTURES_PATH
@@ -49,34 +74,34 @@ describe Rack::Bundle do
     before do
       @simple = Rack::Bundle.new simple_page, :public_dir => FIXTURES_PATH
     end
-    
+
     it "leaves externally hosted Javascripts alone" do
       @bundle.call @env
       @bundle.document.css
     end
-    
+
     it "skips #replace_javascripts! if there's only one script tag linking a Javascript in" do
       Rack::Bundle::JSBundle.should_not_receive :new
       @simple.call @env
     end
-    
+
     it "replaces multiple references to Javascrips to one single reference to the bundle" do
       @bundle.call @env
       @bundle.document.css(Rack::Bundle::SELECTORS.js).count.should == 1
     end
-    
+
     it "skips #replace_stylesheets! if there's only one stylesheet being included in" do
       Rack::Bundle::CSSBundle.should_not_receive :new
       @simple.call @env
     end
-    
+
     it "replaces references to external stylesheets of the same media type to their respective bundle" do
       @bundle.call @env
       styles = @bundle.document.css(Rack::Bundle::SELECTORS.css).group_by { |node| node.attribute('media').value rescue nil }
       styles.each_key do |media|
         styles[media].count.should == 1
       end
-    end    
+    end
   end
 
   context 'private methods' do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-bundle
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -9,49 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +10:00
+date: 2010-07-12 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Javascript and CSS bundling at the Rack level
 email: julio.ody@gmail.com
 executables: []
@@ -100,21 +130,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Javascript and CSS bundling at the Rack level