RubyGems - rack-bundle - Versions diffs - 0.1.0 → 0.2.0 - Mend

rack-bundle 0.1.0 → 0.2.0

Files changed (17) hide show

data/Gemfile +1 -0
data/README.md +21 -25
data/Rakefile +1 -1
data/VERSION +1 -1
data/lib/rack/bundle/css_bundle.rb +4 -0
data/lib/rack/bundle/database_store.rb +39 -0
data/lib/rack/bundle/file_system_store.rb +13 -10
data/lib/rack/bundle/js_bundle.rb +4 -0
data/lib/rack/bundle.rb +51 -32
data/rack-bundle.gemspec +85 -0
data/spec/bundles/css_bundle_spec.rb +1 -1
data/spec/bundles/js_bundle_spec.rb +1 -1
data/spec/rack-bundle_spec.rb +18 -3
data/spec/spec_helper.rb +9 -0
data/spec/store/database_store_spec.rb +38 -0
data/spec/store/file_system_store_spec.rb +14 -22
metadata +6 -2

data/Gemfile CHANGED Viewed

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 gem 'nokogiri', '>= 1.4.2'
 gem 'rack',     '>= 1.0.0'
+gem 'sequel',   '>= 3.12.1'
 group :test do
   gem 'rspec',    '>= 1.3.0', :require => 'spec'
 end

data/README.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # rack-bundle
-A Rack middleware for grouping Javascripts into one single file. It also works for stylesheets, grouping them by media type.
+A Rack middleware for grouping Javascripts and stylesheets into one single file (styles are grouped by media type).
 # Installation
@@ -10,50 +10,46 @@ A Rack middleware for grouping Javascripts into one single file. It also works f
 Rack:
-    use Rack::Bundle, :public_dir => "path to your application's public directory"
+    use Rack::Bundle, :public_dir => "path/to/app/public/dir"
     run app
 Sinatra it's almost the same as above, except you don't need to explicitly call run as Sinatra will handle that:
     use Rack::Bundle, :public_dir => Sinatra::Application.public
-As for Rails, google around how to add Rack middlewares to the stack. I'm too lazy right now to look it up. But as a
-general pointer, I know it's in _ROOT/config/environment.rb_.
+As for Rails, google around how to add Rack middlewares to the stack. I'm too lazy right now to look it up. But as a general pointer, I know it's in _ROOT/config/environment.rb_.
+By default, this middleware will use the file system for storing bundles. For Heroku and a few other setups where the application doesn't have permission to write to certain directories, you can store and serve bundles directly from a database. Like so:
+    use Rack::Bundle, :public_dir => 'path/to/public' do |rack_bundle|
+      rack_bundle.storage = Rack::Bundle::DatabaseStore.new
+    end
+_DatabaseStore_ assumes an environment variable called *DATABASE_URL* exists, which is an URL that the adapter can use to connect to a database ([See examples](http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html)). You can alternatively supply that as parameter. For instance:
+    use Rack::Bundle, :public_dir => 'path/to/public' do |rack_bundle|
+      rack_bundle.storage = Rack::Bundle::DatabaseStore.new "sqlite://foo.sqlite3"
+    end
 # A few assumptions
 There's a few assumptions that this middleware makes in order to work. Note that *all* of those will change soon:
-* That your app can write to a directory that's visible to the internet (a.k.a.: the application's public dir). I'm
-aware that from a security perspective (and for the sake of this working on Heroku), this is a *bad* idea. Consider this an interim
-measure so I can get something out quickly.
-* That external Javascripts (read: not hosted on the same web server as the app itself) come *first* in the DOM. This may or
-may not be an issue for you, but I've experienced a few. I'll add automatic reordering soon.
-* That you're linking Javascripts inside the <head> tag. It won't break your app if you don't. But scripts that sit outside
-will be ignored.
+* That external Javascripts (read: not hosted on the same web server as the app itself) come *first* in the DOM. This may or may not be an issue for you, but I've experienced a few. I'll add automatic reordering soon.
+* That you're linking Javascripts inside the <head> tag. It won't break your app if you don't. But scripts that sit outside will be ignored.
 # How does it work
-It parses the response body using [Nokogiri](http://nokogiri.org/), finds every reference to external scripts/stylesheets, locates
-them in the file system, bundles them, saves the bundle in the application's public directory, and replaces the references in the
-response for one single reference to the bundle(s).
+It parses the response body using [Nokogiri](http://nokogiri.org/), finds every reference to external scripts/stylesheets, locates them in the file system, bundles them, saves the bundle in the application's public directory, and replaces the references in the response for one single reference to the bundle(s).
 # Performance
-This project is currently at *very* early stages of development, which in my case means I haven't bothered making it do what it's
-supposed to do fast. It's quite possible however that your app will still perform a lot better with it as is, depending on how
-lazy you were when writing your layouts/templates. After the first release I'll be addressing performance almost exclusively.
+This project is currently at *very* early stages of development, which in my case means I haven't bothered making it do what it's supposed to do fast. It's quite possible however that your app will still perform a lot better with it as is, depending on how lazy you were when writing your layouts/templates. After the first release I'll be addressing performance almost exclusively.
 # Compared to...
-rack-bundle is, as of now, a lot simpler (as in less features) than solutions such as [Jammit](http://documentcloud.github.com/jammit/).
-But it is plug-and-play: you load up the middleware with a few configuration parameters and you're set. No need to modify templates, no
-helpers, nothing. Oh also, it's framework agnostic, and that's priceless.
-# Heroku
-Heroku support is in the works. As Heroku doesn't won't allow an application to write to the filesystem, rack-bundle won't work.
-That will be addressed soon.
+rack-bundle is, as of now, a lot simpler (as in less features) than solutions such as [Jammit](http://documentcloud.github.com/jammit/). But it is plug-and-play: you load up the middleware with a few configuration parameters and you're set. No need to modify templates, no helpers, nothing. Oh also, it's framework agnostic, and that's priceless.
 # License

data/Rakefile CHANGED Viewed

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec', 'spec_helper')
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
+  t.spec_files = FileList['spec/*_spec.rb', 'spec/*/*_spec.rb']
   t.spec_opts = ['--colour', '--format nested']
 end

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.0
1	+ 0.2.0

data/lib/rack/bundle/css_bundle.rb CHANGED Viewed

@@ -10,4 +10,8 @@ class Rack::Bundle::CSSBundle
   def extension
     'css'
   end
+  def == bundle
+    self.class == bundle.class && hash == bundle.hash
+  end
 end

data/lib/rack/bundle/database_store.rb ADDED Viewed

@@ -0,0 +1,39 @@
+require 'sequel'
+class Rack::Bundle::DatabaseStore
+  attr_accessor :db, :bundles
+  def initialize url = ENV['DATABASE_URL']
+    @db = Sequel.connect(url)
+    create_table!
+  end
+  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])
+  end
+  def add bundle
+    return false if has_bundle? bundle
+    @db[:rack_bundle].insert :contents => bundle.contents,
+      :hash => bundle.hash,
+      :type => bundle.is_a?(Rack::Bundle::JSBundle) ? 'js' : 'css'
+  end
+  def has_bundle? bundle
+    not find_bundle_by_hash(bundle.hash).nil?
+  end
+  private
+  def create_table!
+    @db.create_table! 'rack_bundle' do
+      String  :hash
+      String  :type
+      Text    :contents
+      index   :hash
+    end
+  end
+end

data/lib/rack/bundle/file_system_store.rb CHANGED Viewed

@@ -5,19 +5,22 @@ class Rack::Bundle::FileSystemStore
   def initialize dir = Dir.tmpdir
     @dir = dir
-    @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)
+  end
   def has_bundle? bundle
     File.exists? "#{dir}/rack-bundle-#{bundle.hash}.#{bundle.extension}"
   end
-  def save!
-    @bundles.each do |bundle|
-      next if has_bundle? bundle
-      File.open("#{dir}/rack-bundle-#{bundle.hash}.#{bundle.extension}", 'w') do |file|
-        file << bundle.contents
-      end
-    end
-  end
+  def add bundle
+    File.open("#{dir}/rack-bundle-#{bundle.hash}.#{bundle.extension}", 'w') do |file|
+      file << bundle.contents
+    end
+  end
 end

data/lib/rack/bundle/js_bundle.rb CHANGED Viewed

@@ -10,4 +10,8 @@ class Rack::Bundle::JSBundle
   def extension
     'js'
   end
+  def == bundle
+    self.class == bundle.class && hash == bundle.hash
+  end
 end

data/lib/rack/bundle.rb CHANGED Viewed

@@ -3,54 +3,64 @@ require 'nokogiri'
 module Rack
   class Bundle
+    SELECTORS = Struct.new('Selector', :js, :css).new(
+      'head script[src$=".js"]:not([src^="http"])',
+      'head link[href$=".css"]:not([href^="http"])'
+    )
     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'
     def initialize app, options = {}
       @app, @public_dir = app, options[:public_dir]
-      raise ArgumentError, ":public needs to be a directory" unless ::File.directory?(@public_dir.to_s)
-      @storage = FileSystemStore.new @public_dir
-      yield self if block_given?
+      @storage = options[:storage] || FileSystemStore.new(@public_dir)
+      yield self if block_given?
+      raise ArgumentError, ":public_dir needs to be a directory" unless ::File.directory?(@public_dir.to_s)
     end
     def call env
-      status, headers, @response = @app.call(env)
-      return [status, headers, @response] unless headers['Content-Type'] =~ /html/
-      parse!
-      replace_javascripts!
-      replace_stylesheets!
-      [status, headers, [@document.to_html]]
+      if match = %r(^/rack-bundle-(\w+)).match(env['PATH_INFO'])
+        bundle = @storage.find_bundle_by_hash match[1]
+        bundle ? respond_with(bundle) : not_found
+      else
+        status, headers, @response = @app.call(env)
+        return [status, headers, @response] unless headers['Content-Type'] =~ /html/
+        parse!
+        replace_javascripts!
+        replace_stylesheets!
+        [status, headers, [@document.to_html]]
+      end
     end
     def parse!
       @document = Nokogiri::HTML(@response.join)
     end
     def replace_javascripts!
-      return false unless local_javascript_nodes.count > 1
+      return unless @document.css(SELECTORS.js).count > 1
       bundle = JSBundle.new *scripts
-      @storage.bundles << bundle and @storage.save! unless @storage.has_bundle? bundle
-      bundle_node = @document.create_element 'script',
-        :type     => 'text/javascript',
+      @storage.add bundle unless @storage.has_bundle? bundle
+      bundle_node = @document.create_element 'script',
+        :type     => 'text/javascript',
         :src      => bundle_path(bundle),
         :charset  => 'utf-8'
-      local_javascript_nodes.first.before(bundle_node)
-      local_javascript_nodes.slice(0..-1).remove
+      @document.css(SELECTORS.js).first.before(bundle_node)
+      @document.css(SELECTORS.js).slice(1..-1).remove
       @document
     end
     def replace_stylesheets!
-      return false unless local_css_nodes.count > 1
+      return unless local_css_nodes.count > 1
       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
         bundle = CSSBundle.new *stylesheets
-        @storage.bundles << bundle and @storage.save! unless @storage.has_bundle? bundle
-        node = @document.create_element 'link',
-          :rel    => 'stylesheet',
+        @storage.add bundle unless @storage.has_bundle? bundle
+        node = @document.create_element 'link',
+          :rel    => 'stylesheet',
           :type   => 'text/css',
           :href   => bundle_path(bundle),
           :media  => media
@@ -59,16 +69,16 @@ module Rack
       end
       @document
     end
     private
     def local_javascript_nodes
-      @js_nodes ||= @document.css('head script[src$=".js"]:not([src^="http"])')
+      @document.css(SELECTORS.js)
     end
     def local_css_nodes
-      @css_nodes ||= @document.css('head link[href$=".css"]:not([href^="http"])')
+      @document.css(SELECTORS.css)
     end
     def scripts
       local_javascript_nodes.inject([]) do |contents, node|
         path = ::File.join(@public_dir, node.attribute('src').value)
@@ -76,17 +86,26 @@ module Rack
         contents
       end
     end
     def stylesheet_contents_for nodes
       nodes.inject([]) do |contents, node|
         path = ::File.join(@public_dir, node.attribute('href').value)
         contents << ::File.read(path) if ::File.exists?(path)
         contents
-      end
+      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]]
+    end
   end
 end

data/rack-bundle.gemspec ADDED Viewed

@@ -0,0 +1,85 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = %q{rack-bundle}
+  s.version = "0.2.0"
+  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.description = %q{Javascript and CSS bundling at the Rack level}
+  s.email = %q{julio.ody@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+     "README.md",
+     "Rakefile",
+     "TODO.txt",
+     "VERSION",
+     "lib/rack-bundle.rb",
+     "lib/rack/bundle.rb",
+     "lib/rack/bundle/css_bundle.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/fixtures/hh-reset.css",
+     "spec/fixtures/index.html",
+     "spec/fixtures/iphone.css",
+     "spec/fixtures/jquery-1.4.1.min.js",
+     "spec/fixtures/medialess1.css",
+     "spec/fixtures/medialess2.css",
+     "spec/fixtures/mylib.js",
+     "spec/fixtures/reset.css",
+     "spec/fixtures/screen.css",
+     "spec/fixtures/simple.html",
+     "spec/rack-bundle_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/store/database_store_spec.rb",
+     "spec/store/file_system_store_spec.rb",
+     "vendor/jsmin.rb"
+  ]
+  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.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/rack-bundle_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/store/database_store_spec.rb",
+     "spec/store/file_system_store_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::RubyGemsVersion) >= 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"])
+      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
+    else
+      s.add_dependency(%q<rack>, [">= 1.0.0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 1.0.0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
+  end
+end

data/spec/bundles/css_bundle_spec.rb CHANGED Viewed

@@ -10,6 +10,6 @@ describe Rack::Bundle::CSSBundle do
   end
   it 'creates a MD5 hash out of the contents of the bundle' do
-    @bundle.hash.should == MD5.new(@bundle.contents)
+    @bundle.hash.should == MD5.new(@bundle.contents).to_s
   end
 end

data/spec/bundles/js_bundle_spec.rb CHANGED Viewed

@@ -10,6 +10,6 @@ describe Rack::Bundle::JSBundle do
   end
   it 'creates a MD5 hash out of the contents of the bundle' do
-    @bundle.hash.should == MD5.new(@bundle.contents)
+    @bundle.hash.should == MD5.new(@bundle.contents).to_s
   end
 end

data/spec/rack-bundle_spec.rb CHANGED Viewed

@@ -13,6 +13,22 @@ 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
+      @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)
+    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
+      response.join.should == @jsbundle.contents
+    end
+  end
   context 'parsing the document' do
     before do
@@ -46,8 +62,7 @@ describe Rack::Bundle do
     it "replaces multiple references to Javascrips to one single reference to the bundle" do
       @bundle.call @env
-      puts h(@bundle.document.to_html)
-      @bundle.document.css('head script:not([src^="http"])').count.should == 1
+      @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
@@ -57,7 +72,7 @@ describe Rack::Bundle do
     it "replaces references to external stylesheets of the same media type to their respective bundle" do
       @bundle.call @env
-      styles = @bundle.document.css('link[rel="stylesheet"]').group_by { |node| node.attribute('media').value rescue nil }
+      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

data/spec/spec_helper.rb CHANGED Viewed

@@ -2,6 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'spec'
 require 'fileutils'
 require 'rack/bundle'
+require 'tmpdir'
 include Rack::Utils
 alias :h :escape_html
@@ -11,6 +12,14 @@ def fixture name
   File.read(File.join(FIXTURES_PATH, name))
 end
+def make_js_bundle
+  Rack::Bundle::JSBundle.new 'La laaaa'
+end
+def make_css_bundle
+  Rack::Bundle::CSSBundle.new 'La la laaaaaaa'
+end
 def index_page
   lambda { |env| [200, { 'Content-Type' => 'text/html' }, [fixture('index.html')]] }
 end

data/spec/store/database_store_spec.rb ADDED Viewed

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+describe Rack::Bundle::DatabaseStore do
+  before do
+    ENV['DATABASE_URL'] = "sqlite://#{Dir.tmpdir}/foo.db"
+    @db_store = Rack::Bundle::DatabaseStore.new
+  end
+  context 'initializing' do
+    it 'looks for a DATABASE_URL environment variable when a database URL is not specified' do
+      @db_store.db.url.should == "sqlite:/#{Dir.tmpdir}/foo.db"
+    end
+    it 'takes a database url as a parameter' do
+      db_store = Rack::Bundle::DatabaseStore.new "sqlite://#{Dir.tmpdir}/bar.db"
+      db_store.db.url.should == "sqlite:/#{Dir.tmpdir}/bar.db"
+    end
+    it 'creates a table to store bundles in' do
+      @db_store.db.tables.should include(:rack_bundle)
+    end
+  end
+  context '#find_bundle_by_hash' 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
+    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
+    end
+  end
+  it "saves bundles to the database on #add" do
+    jsbundle = make_js_bundle
+    @db_store.add jsbundle
+    @db_store.db[:rack_bundle].where(:hash => jsbundle.hash).first[:hash].should == jsbundle.hash
+  end
+end

data/spec/store/file_system_store_spec.rb CHANGED Viewed

@@ -1,48 +1,40 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 describe Rack::Bundle::FileSystemStore do
-  it "stores bundles in a location specified on the argument when instancing" do
-    Rack::Bundle::FileSystemStore.new(FIXTURES_PATH).dir.should == FIXTURES_PATH
+  before do
+    @jsbundle, @cssbundle = make_js_bundle, make_css_bundle
+    @storage = Rack::Bundle::FileSystemStore.new FIXTURES_PATH
+    @storage.add @jsbundle
+    @storage.add @cssbundle
   end
-  it "keeps a collection of bundles in #bundles" do
-    subject.bundles.should be_an Array
+  it "stores bundles in a location specified on the argument when instancing" do
+    Rack::Bundle::FileSystemStore.new(FIXTURES_PATH).dir.should == FIXTURES_PATH
   end
   it "defaults to the system's temporary dir" do
     subject.dir.should == Dir.tmpdir
   end
-  context 'storing bundles in the file system' do
-    before do
-      @store = Rack::Bundle::FileSystemStore.new FIXTURES_PATH
-      @jsbundle   = mock Rack::Bundle::JSBundle,
-        :contents   => 'All we are saaaaaayin...',
-        :hash       => MD5.new($jquery),
-        :extension  => 'js'
-      @cssbundle  = mock Rack::Bundle::CSSBundle,
-        :contents   => '... is give peace a chaaaaance',
-        :hash       => MD5.new($screen),
-        :extension  => 'css'
-      @store.bundles.concat [@jsbundle, @cssbundle]
-      @store.save!
-    end
+  it "finds a bundle by it's hash on #find_bundle_by_hash" do
+    @storage.find_bundle_by_hash(@jsbundle.hash).should == @jsbundle
+  end
+  context 'storing bundles in the file system' do
     it "checks if a bundle exists with #has_bundle?" do
-      @store.has_bundle?(@jsbundle).should be_true
+      @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)
-      @store.save!
     end
     it 'stores Javascripts in a single Javascript file' do
-      File.size(File.join(@store.dir, "rack-bundle-#{@jsbundle.hash}.js")).should > 0
+      File.size(File.join(@storage.dir, "rack-bundle-#{@jsbundle.hash}.js")).should > 0
     end
     it 'stores stylesheets in a single CSS file' do
-      File.size(File.join(@store.dir, "rack-bundle-#{@cssbundle.hash}.css")).should > 0
+      File.size(File.join(@storage.dir, "rack-bundle-#{@cssbundle.hash}.css")).should > 0
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-bundle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Julio Cesar Ody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-06-11 00:00:00 +10:00
+date: 2010-06-18 00:00:00 +10:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -69,8 +69,10 @@ files:
 - lib/rack-bundle.rb
 - lib/rack/bundle.rb
 - lib/rack/bundle/css_bundle.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/fixtures/hh-reset.css
@@ -85,6 +87,7 @@ files:
 - spec/fixtures/simple.html
 - spec/rack-bundle_spec.rb
 - spec/spec_helper.rb
+- spec/store/database_store_spec.rb
 - spec/store/file_system_store_spec.rb
 - vendor/jsmin.rb
 has_rdoc: true
@@ -120,4 +123,5 @@ test_files:
 - spec/bundles/js_bundle_spec.rb
 - spec/rack-bundle_spec.rb
 - spec/spec_helper.rb
+- spec/store/database_store_spec.rb
 - spec/store/file_system_store_spec.rb