rack-bundle 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rack/bundle.rb

@@ -1,6 +1,14 @@
 require 'rack'
 require 'nokogiri'
 
+class File
+  def contents
+    _contents = read
+    rewind
+    _contents
+  end
+end
+
 module Rack
   class Bundle
     SELECTORS = Struct.new('Selector', :js, :css).new(
@@ -10,8 +18,8 @@ module Rack
     attr_accessor :storage, :document, :public_dir
     autoload :FileSystemStore,  'rack/bundle/file_system_store'
     autoload :DatabaseStore,    'rack/bundle/database_store'
-    autoload :JSBundle,         'rack/bundle/js_bundle'
-    autoload :CSSBundle,        'rack/bundle/css_bundle'
+    autoload :JSBundle,         'rack/bundle/bundles/js'
+    autoload :CSSBundle,        'rack/bundle/bundles/css'
 
     def initialize app, options = {}
       @app, @public_dir = app, options[:public_dir]
@@ -37,7 +45,6 @@ module Rack
     end
 
     def parse!
-      # http://github.com/logicaltext/rack-bundle/commit/8e7d0282b05b01a0cbfa59b519242046437605f6
       body = ""
       @response.each do |part| body << part end
       @document = Nokogiri::HTML(body)
@@ -49,7 +56,7 @@ module Rack
       @storage.add bundle unless @storage.has_bundle? bundle
       bundle_node = @document.create_element 'script',
         :type     => 'text/javascript',
-        :src      => bundle_path(bundle),
+        :src      => bundle.path,
         :charset  => 'utf-8'
       @document.css(SELECTORS.js).first.before(bundle_node)
       @document.css(SELECTORS.js).slice(1..-1).remove
@@ -61,13 +68,13 @@ module Rack
       styles = local_css_nodes.group_by { |node| node.attribute('media').value rescue nil }
       styles.each do |media, nodes|
         next unless nodes.count > 1
-        stylesheets = stylesheet_contents_for nodes
+        stylesheets = stylesheets_for nodes
         bundle = CSSBundle.new *stylesheets
         @storage.add bundle unless @storage.has_bundle? bundle
         node = @document.create_element 'link',
           :rel    => 'stylesheet',
           :type   => 'text/css',
-          :href   => bundle_path(bundle),
+          :href   => bundle.path,
           :media  => media
         nodes.first.before(node)
         nodes.map { |node| node.remove }
@@ -85,32 +92,27 @@ module Rack
     end
 
     def scripts
-      local_javascript_nodes.inject([]) do |contents, node|
+      local_javascript_nodes.inject([]) do |files, node|
         path = ::File.join(@public_dir, node.attribute('src').value)
-        contents << ::File.read(path) if ::File.exists?(path)
-        contents
+        files << ::File.open(path) if ::File.exists?(path)
+        files
       end
     end
 
-    def stylesheet_contents_for nodes
-      nodes.inject([]) do |contents, node|
+    def stylesheets_for nodes
+      nodes.inject([]) do |files, node|
         path = ::File.join(@public_dir, node.attribute('href').value)
-        contents << ::File.read(path) if ::File.exists?(path)
-        contents
+        files << ::File.open(path) if ::File.exists?(path)
+        files
       end
     end
 
-    def bundle_path bundle
-      "/rack-bundle-#{bundle.hash}.#{bundle.extension}"
-    end
-
     def not_found
       [404, {'Content-Type' => 'text/plain'}, ['Not Found']]
     end
 
     def respond_with bundle
-      content_type = bundle.is_a?(JSBundle) ? 'text/javascript' : 'text/css'
-      [200, {'Content-Type' => content_type}, [bundle.contents]]
+      [200, {'Content-Type' => bundle.mime_type}, [bundle.contents]]
     end
   end
 end

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

@@ -0,0 +1,44 @@
+require 'md5'
+
+class Rack::Bundle::Base  
+  class << self; attr_accessor :extension, :joiner, :mime_type; end
+  attr_accessor :contents, :files
+  
+  def self.new_from_contents contents
+    instance = new
+    instance.contents = contents
+    instance
+  end
+  
+  def initialize *files
+    @files = files
+  end
+  
+  def contents
+    @contents ||= @files.map { |file| file.contents }.join(joiner)
+  end
+  
+  def hash
+    @hash ||= MD5.new(@files.map { |file| File.basename(file.path) }.join).to_s
+  end
+  
+  def path
+    "/rack-bundle-#{hash}.#{extension}"
+  end
+  
+  def extension
+    self.class.extension
+  end
+  
+  def joiner
+    self.class.joiner
+  end
+  
+  def mime_type
+    self.class.mime_type
+  end
+  
+  def == bundle
+    self.class == bundle.class && hash == bundle.hash
+  end  
+end

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

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/base'
+
+class Rack::Bundle::CSSBundle < Rack::Bundle::Base  
+  @extension, @joiner, @mime_type = "css", "\n", "text/css"
+end

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

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/base'
+
+class Rack::Bundle::JSBundle < Rack::Bundle::Base  
+  @extension, @joiner, @mime_type = "js", ";", "text/javascript"
+end

data/lib/rack/bundle/database_store.rb

@@ -11,8 +11,8 @@ class Rack::Bundle::DatabaseStore
   def find_bundle_by_hash hash
     return nil unless result = @db[:rack_bundle].where(:hash => hash).first
     result[:type] == 'js' ? 
-      Rack::Bundle::JSBundle.new(result[:contents]) :
-      Rack::Bundle::CSSBundle.new(result[:contents])
+      Rack::Bundle::JSBundle.new_from_contents(result[:contents]) :
+      Rack::Bundle::CSSBundle.new_from_contents(result[:contents])
   end
   
   def add bundle
@@ -26,7 +26,7 @@ class Rack::Bundle::DatabaseStore
     not find_bundle_by_hash(bundle.hash).nil?
   end
     
-  private  
+  private
   def create_table!
     @db.create_table! 'rack_bundle' do
       String  :hash

data/lib/rack/bundle/file_system_store.rb

@@ -5,13 +5,14 @@ class Rack::Bundle::FileSystemStore
   
   def initialize dir = Dir.tmpdir
     @dir = dir
+    clear_existing_bundles
   end
   
   def find_bundle_by_hash hash
     found = Dir["#{dir}/rack-bundle-#{hash}.*"]
     return nil unless found.any?
     type, contents = File.extname(found.first).sub(/^./, ''), File.read(File.join(dir, File.basename(found.first)))
-    type == 'js' ? Rack::Bundle::JSBundle.new(contents) : Rack::Bundle::CSSBundle.new(contents)
+    type == 'js' ? Rack::Bundle::JSBundle.new_from_contents(contents) : Rack::Bundle::CSSBundle.new_from_contents(contents)
   end
     
   def has_bundle? bundle
@@ -22,5 +23,10 @@ class Rack::Bundle::FileSystemStore
     File.open("#{dir}/rack-bundle-#{bundle.hash}.#{bundle.extension}", 'w') do |file|
       file << bundle.contents
     end    
-  end    
+  end
+  
+  private
+  def clear_existing_bundles
+    Dir["#{dir}/rack-bundle-*"].each do |file| FileUtils.rm_f(file) end
+  end
 end

data/rack-bundle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-bundle}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-12}
+  s.date = %q{2010-07-14}
   s.description = %q{Javascript and CSS bundling at the Rack level}
   s.email = %q{julio.ody@gmail.com}
   s.extra_rdoc_files = [
@@ -23,13 +23,15 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/rack-bundle.rb",
      "lib/rack/bundle.rb",
-     "lib/rack/bundle/css_bundle.rb",
+     "lib/rack/bundle/bundles/base.rb",
+     "lib/rack/bundle/bundles/css.rb",
+     "lib/rack/bundle/bundles/js.rb",
      "lib/rack/bundle/database_store.rb",
      "lib/rack/bundle/file_system_store.rb",
-     "lib/rack/bundle/js_bundle.rb",
      "rack-bundle.gemspec",
-     "spec/bundles/css_bundle_spec.rb",
-     "spec/bundles/js_bundle_spec.rb",
+     "spec/bundles/base_spec.rb",
+     "spec/bundles/css_spec.rb",
+     "spec/bundles/js_spec.rb",
      "spec/fixtures/hh-reset.css",
      "spec/fixtures/index.html",
      "spec/fixtures/iphone.css",
@@ -52,8 +54,9 @@ Gem::Specification.new do |s|
   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",
-     "spec/bundles/js_bundle_spec.rb",
+    "spec/bundles/base_spec.rb",
+     "spec/bundles/css_spec.rb",
+     "spec/bundles/js_spec.rb",
      "spec/rack-bundle_spec.rb",
      "spec/spec_helper.rb",
      "spec/store/database_store_spec.rb",

data/spec/bundles/base_spec.rb

@@ -0,0 +1,55 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Rack::Bundle::Base do
+  before do
+    @bundle = Rack::Bundle::Base.new $jquery, $mylib
+    Rack::Bundle::Base.stub(:joiner).and_return(";")
+    Rack::Bundle::Base.stub(:extension).and_return("js")
+  end
+    
+  it { should respond_to :files }  
+  it { should respond_to :contents }
+  it { should respond_to :hash }
+  it { should respond_to :extension }  
+  
+  it 'makes the contents of one or more file(s) accessible via #contents' 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
+  end
+  
+  it 'returns the path through which the bundle can be retrieved on #path' do
+    @bundle.path.should == "/rack-bundle-#{@bundle.hash}.#{@bundle.extension}"
+  end
+  
+  context "bundled instances" do
+    before do
+      @bundled = Rack::Bundle::Base.new_from_contents "moo foo"
+    end
+    
+    it "are instances created from an existing bundle in storage" do
+    end
+    
+    it "are initialized through #new_from_contents, with the contents as argument" do
+      @bundled.is_a? Rack::Bundle::Base
+    end
+    
+    it "have #contents" do
+      @bundled.contents.should == "moo foo"
+    end
+    
+    it "doesn't have #files" do
+      @bundled.files.should be_empty
+    end
+  end
+  
+  
+  it "should be equal to another bundle of the same hash and class" do
+    another = Rack::Bundle::Base.new
+    subject.should_receive(:hash).and_return('moo')
+    another.should_receive(:hash).and_return('moo')
+    subject.should == another
+  end
+end

data/spec/bundles/css_spec.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Rack::Bundle::CSSBundle do
+  before do
+    @bundle = make_css_bundle
+  end
+  
+  it "should return 'css' as #extension" do
+    subject.extension.should == "css"
+  end
+  
+  it "should return 'text/css' as #mime_type" do
+    subject.mime_type.should == "text/css"
+  end      
+end

data/spec/bundles/js_spec.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+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

data/spec/rack-bundle_spec.rb

@@ -11,16 +11,16 @@ describe Rack::Bundle do
   end
 
   it 'defaults to FileSystemStore for storage' do
-    Rack::Bundle.new(index_page, :public_dir => '.').storage.is_a? Rack::Bundle::FileSystemStore
+    Rack::Bundle.new(index_page, :public_dir => FIXTURES_PATH).storage.is_a? Rack::Bundle::FileSystemStore
   end
 
   context 'serving bundles' do
     before do
       @jsbundle, @cssbundle = make_js_bundle, make_css_bundle
-      @bundle.storage.add  @jsbundle
+      @bundle.storage.add @jsbundle
       @bundle.storage.add @cssbundle
-      @js_request   = Rack::MockRequest.env_for @bundle.send(:bundle_path, @jsbundle)
-      @css_request  = Rack::MockRequest.env_for @bundle.send(:bundle_path, @cssbundle)
+      @js_request   = Rack::MockRequest.env_for @jsbundle.path
+      @css_request  = Rack::MockRequest.env_for @cssbundle.path
     end
 
     it "fetches a bundle from storage and serves if the request URL matches" do
@@ -59,6 +59,7 @@ describe Rack::Bundle do
     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
       bundle.should_not_receive :parse!
@@ -75,7 +76,7 @@ describe Rack::Bundle do
       @simple = Rack::Bundle.new simple_page, :public_dir => FIXTURES_PATH
     end
 
-    it "leaves externally hosted Javascripts alone" do
+    it "leaves Javascripts that are not locally hosted alone" do
       @bundle.call @env
       @bundle.document.css
     end
@@ -103,11 +104,4 @@ describe Rack::Bundle do
       end
     end
   end
-
-  context 'private methods' do
-    it 'returns a URL to a bundle on #bundle_path' do
-      @jsbundle = Rack::Bundle::JSBundle.new 'omg'
-      @bundle.send(:bundle_path, @jsbundle).should == "/rack-bundle-#{@jsbundle.hash}.js"
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -2,45 +2,48 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'spec'
 require 'fileutils'
 require 'rack/bundle'
+require 'rack/bundle/bundles/base'
 require 'tmpdir'
+
 include Rack::Utils
 alias :h :escape_html
 
 FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 
 def fixture name
-  File.read(File.join(FIXTURES_PATH, name))
+  File.open(File.join(FIXTURES_PATH, name))
 end
 
 def make_js_bundle
-  Rack::Bundle::JSBundle.new 'La laaaa'
+  Rack::Bundle::JSBundle.new $jquery, $mylib
 end
 
 def make_css_bundle
-  Rack::Bundle::CSSBundle.new 'La la laaaaaaa'
+  Rack::Bundle::CSSBundle.new $reset, $screen
+end
+
+def filename file
+  File.basename file.path
 end
 
 def index_page
-  lambda { |env| [200, { 'Content-Type' => 'text/html' }, [fixture('index.html')]] }
+  lambda { |env| [200, { 'Content-Type' => 'text/html' }, [fixture('index.html').contents]] }
 end
 
 def simple_page
-  lambda { |env| [200, { 'Content-Type' => 'text/html' }, [fixture('simple.html')]] }
+  lambda { |env| [200, { 'Content-Type' => 'text/html' }, [fixture('simple.html').contents]] }
 end
 
 def plain_text
   lambda { |env| [200, { 'Content-Type' => 'text/plain' }, ['plain texto']] }
 end
 
-
 Spec::Runner.configure do |config|
   $jquery, $mylib = fixture('jquery-1.4.1.min.js'), fixture('mylib.js')
   $reset, $screen = fixture('reset.css'), fixture('screen.css')
   $index          = fixture('index.html')
   $doc            = Nokogiri::HTML($index)
-  
   config.after(:all) do
     `rm -f #{FIXTURES_PATH}/rack-bundle*`
   end
-  
 end

data/spec/store/database_store_spec.rb

@@ -23,7 +23,7 @@ describe Rack::Bundle::DatabaseStore do
     it 'takes a bundle hash as argument and returns a matching bundle' do
       jsbundle = Rack::Bundle::JSBundle.new fixture('jquery-1.4.1.min.js'), fixture('mylib.js')
       @db_store.db[:rack_bundle].insert(:hash => jsbundle.hash, :contents => jsbundle.contents, :type => 'js')
-      @db_store.find_bundle_by_hash(jsbundle.hash).should == jsbundle
+      @db_store.find_bundle_by_hash(jsbundle.hash).should be_an_instance_of Rack::Bundle::JSBundle
     end    
     it "returns nil when a bundle can't be found with a matching hash" do
       @db_store.find_bundle_by_hash('non existant').should be_nil

data/spec/store/file_system_store_spec.rb

@@ -17,7 +17,13 @@ describe Rack::Bundle::FileSystemStore do
   end
   
   it "finds a bundle by it's hash on #find_bundle_by_hash" do
-    @storage.find_bundle_by_hash(@jsbundle.hash).should == @jsbundle
+    @storage.find_bundle_by_hash(@jsbundle.hash).should be_an_instance_of Rack::Bundle::JSBundle
+  end
+  
+  it "clears existing bundles when initializing" do
+    FileUtils.touch FIXTURES_PATH + '/rack-bundle-1234567890.js'
+    Rack::Bundle::FileSystemStore.new FIXTURES_PATH
+    File.exists?(FIXTURES_PATH + '/rack-bundle-1234567890.js').should be_false
   end
     
   context 'storing bundles in the file system' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-bundle
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +10:00
+date: 2010-07-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,13 +98,15 @@ files:
 - VERSION
 - lib/rack-bundle.rb
 - lib/rack/bundle.rb
-- lib/rack/bundle/css_bundle.rb
+- lib/rack/bundle/bundles/base.rb
+- lib/rack/bundle/bundles/css.rb
+- lib/rack/bundle/bundles/js.rb
 - lib/rack/bundle/database_store.rb
 - lib/rack/bundle/file_system_store.rb
-- lib/rack/bundle/js_bundle.rb
 - rack-bundle.gemspec
-- spec/bundles/css_bundle_spec.rb
-- spec/bundles/js_bundle_spec.rb
+- spec/bundles/base_spec.rb
+- spec/bundles/css_spec.rb
+- spec/bundles/js_spec.rb
 - spec/fixtures/hh-reset.css
 - spec/fixtures/index.html
 - spec/fixtures/iphone.css
@@ -155,8 +157,9 @@ signing_key:
 specification_version: 3
 summary: Javascript and CSS bundling at the Rack level
 test_files: 
-- spec/bundles/css_bundle_spec.rb
-- spec/bundles/js_bundle_spec.rb
+- spec/bundles/base_spec.rb
+- spec/bundles/css_spec.rb
+- spec/bundles/js_spec.rb
 - spec/rack-bundle_spec.rb
 - spec/spec_helper.rb
 - spec/store/database_store_spec.rb

data/lib/rack/bundle/css_bundle.rb

@@ -1,17 +0,0 @@
-require 'md5'
-
-class Rack::Bundle::CSSBundle
-  attr_accessor :contents, :hash
-  def initialize *files
-    @contents = files.join "\n"
-    @hash = MD5.new(@contents).to_s
-  end  
-  
-  def extension
-    'css'
-  end
-  
-  def == bundle
-    self.class == bundle.class && hash == bundle.hash
-  end  
-end

data/lib/rack/bundle/js_bundle.rb

@@ -1,17 +0,0 @@
-require 'md5'
-
-class Rack::Bundle::JSBundle
-  attr_accessor :contents, :hash
-  def initialize *files
-    @contents = files.join ';'
-    @hash = MD5.new(@contents).to_s
-  end
-  
-  def extension
-    'js'
-  end
-  
-  def == bundle
-    self.class == bundle.class && hash == bundle.hash
-  end  
-end

data/spec/bundles/css_bundle_spec.rb

@@ -1,15 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
-describe Rack::Bundle::CSSBundle do
-  before do
-    @bundle = Rack::Bundle::CSSBundle.new $reset, $screen
-  end
-  
-  it 'makes the contents of one or more stylesheets accessible via #contents' do
-    @bundle.contents.should == [$reset, $screen].join("\n")
-  end
-  
-  it 'creates a MD5 hash out of the contents of the bundle' do    
-    @bundle.hash.should == MD5.new(@bundle.contents).to_s
-  end
-end

data/spec/bundles/js_bundle_spec.rb

@@ -1,15 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
-describe Rack::Bundle::JSBundle do
-  before do
-    @bundle = Rack::Bundle::JSBundle.new $jquery, $mylib
-  end
-  
-  it 'makes the contents of one or more Javascript file(s) accessible via #contents' do
-    @bundle.contents.should == [$jquery, $mylib].join(';')
-  end
-  
-  it 'creates a MD5 hash out of the contents of the bundle' do    
-    @bundle.hash.should == MD5.new(@bundle.contents).to_s
-  end
-end