merb-assets 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-assets"
 NAME = "merb-assets"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Ezra Zygmuntowicz"
 EMAIL = "ez@engineyard.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-assets/"
@@ -20,10 +20,10 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
+  s.add_dependency('merb-core', '>= 0.9.3')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -31,7 +31,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources --no-update-sources}
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do

data/lib/merb-assets/assets.rb

@@ -42,10 +42,12 @@ module Merb
       #   # => "public/javascripts/dingo.js"
       def asset_path(asset_type, filename, local_path = false)
         filename = filename.to_s
-        if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/
+        if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/ && filename.index('?').nil?
           filename << ASSET_FILE_EXTENSIONS[asset_type]
         end
-        filename = "/#{asset_type}s/#{filename}"
+        if filename !~ %r{^https?://}
+          filename = "/#{asset_type}s/#{filename}"
+        end
         if local_path
           return "public#{filename}"
         else
@@ -59,8 +61,6 @@ module Merb
     # for downloading static files (css, js, images...)
     class UniqueAssetPath
       class << self
-        @@config = Merb::Plugins.config[:asset_helpers]
-        
         # Builds the path to the file based on the name
         # 
         # ==== Parameters
@@ -74,9 +74,10 @@ module Merb
         #   # => "https://assets5.my-awesome-domain.com/javascripts/my_fancy_script.js"
         #
         def build(filename)
-          #%{#{(USE_SSL ? 'https' : 'http')}://#{sprintf(@@config[:asset_domain],self.calculate_host_id(file))}.#{@@config[:domain]}/#{filename}}
-          path = @@config[:use_ssl] ? 'https://' : 'http://'
-          path << sprintf(@@config[:asset_domain],self.calculate_host_id(filename)) << ".#{@@config[:domain]}"
+          config = Merb::Plugins.config[:asset_helpers]
+          #%{#{(USE_SSL ? 'https' : 'http')}://#{sprintf(config[:asset_domain],self.calculate_host_id(file))}.#{config[:domain]}/#{filename}}
+          path = config[:use_ssl] ? 'https://' : 'http://'
+          path << sprintf(config[:asset_domain],self.calculate_host_id(filename)) << ".#{config[:domain]}"
           path << "/" if filename.index('/') != 0
           path << filename
         end
@@ -89,15 +90,48 @@ module Merb
           filename.each_byte {|byte|
             ascii_total += byte
           }
-          (ascii_total % @@config[:max_hosts] + 1)
+          (ascii_total % Merb::Plugins.config[:asset_helpers][:max_hosts] + 1)
         end
       end
     end
     
     # An abstract class for bundling text assets into single files.
     class AbstractAssetBundler
+      
+      class_inheritable_array :cached_bundles
+      self.cached_bundles ||= []
+      
       class << self
         
+        # Mark a bundle as cached.
+        #
+        # ==== Parameters
+        # name<~to_s>:: Name of the bundle
+        #
+        def cache_bundle(name)
+          cached_bundles.push(name.to_s)
+        end
+        
+        # Purge a bundle from the cache.
+        #
+        # ==== Parameters
+        # name<~to_s>:: Name of the bundle
+        #
+        def purge_bundle(name)
+          cached_bundles.delete(name.to_s)
+        end
+        
+        # Test if a bundle has been cached.
+        #
+        # ==== Parameters
+        # name<~to_s>:: Name of the bundle
+        #
+        # ==== Returns
+        # Boolean:: Whether the bundle has been cached or not.
+        def cached_bundle?(name)
+          cached_bundles.include?(name.to_s)
+        end
+        
         # ==== Parameters
         # &block:: A block to add as a post-bundle callback.
         #
@@ -145,10 +179,19 @@ module Merb
       # ==== Returns
       # Symbol:: Name of the bundle.
       def bundle!
-        # TODO: Move this file check out into an in-memory cache. Also, push it out to the helper level so we don't have to create the helper object.
-        unless File.exist?(@bundle_filename)
+        # TODO: push it out to the helper level so we don't have to create the helper object.
+        unless self.class.cached_bundle?(@bundle_name)
+          # skip regeneration of new bundled files - preventing multiple merb apps stepping on eachother
+          # file needs to be older than 60 seconds to be regenerated
+          if File.exist?(@bundle_filename) && File.mtime(@bundle_filename) >= Time.now - 60
+            return @bundle_name # serve the old file for now - to be regenerated later
+          end
           bundle_files(@bundle_filename, *@files)
-          self.class.callbacks.each { |c| c.call(@bundle_filename) }
+          if File.exist?(@bundle_filename)
+            self.class.callbacks.each { |c| c.call(@bundle_filename) }
+            Merb.logger.info("Assets: bundled :#{@bundle_name} into #{File.basename(@bundle_filename)}")
+            self.class.cache_bundle(@bundle_name)
+          end
         end
         return @bundle_name
       end
@@ -164,7 +207,9 @@ module Merb
       # *files<String>:: Filenames to be bundled.
       def bundle_files(filename, *files)
         File.open(filename, "w") do |f|
+          f.flock(File::LOCK_EX)
           files.each { |file| f.puts(File.read(file)) }
+          f.flock(File::LOCK_UN)
         end
       end
       

data/lib/merb-assets/assets_mixin.rb

@@ -7,6 +7,47 @@ module Merb
     # Merb provides views with convenience methods for links images and other
     # assets.
 
+
+    # ==== Parameters
+    # none
+    #
+    # ==== Returns
+    # html<String>
+    #    
+    # ==== Examples
+    #  We want all possible matches in the FileSys up to the action name
+    #     Given:  controller_name = "namespace/controller"
+    #             action_name     = "action"
+    #  If all files are present should generate link/script tags for:
+    #     namespace.(css|js)
+    #     namespace/controller.(css|js)
+    #     namespace/controller/action.(css|js)
+    #
+    def auto_link
+      html    = "" 
+      prefix  = ""
+      (controller_name / action_name).split("/").each do |path|
+        path = prefix + path
+
+        css_path  = path + ".css"
+        if File.exists? Merb.root / "public" / "stylesheets" / css_path
+          html << %{<link rel="stylesheet" type="text/css" href="/stylesheets/#{css_path}" /> }
+        end
+
+        js_path   = path + ".js"
+        if File.exists? Merb.root / "public" / "javascripts" / js_path
+          html << %{<script type="text/javascript" language="javascript" src="/javascripts/#{js_path}"></script>}
+        end
+
+        #Update the prefix for the next iteration
+        prefix += path / ""
+      end
+
+      #Return the generated HTML
+      html
+    end
+
+
     # ==== Parameters
     # name<~to_s>:: The text of the link.
     # url<~to_s>:: The URL to link to. Defaults to an empty string.
@@ -20,7 +61,7 @@ module Merb
     #     # => <a href="http://www.ruby-lang.org" class="special" target="blank">The Ruby home page</a>
     #
     #   link_to p.title, "/blog/show/#{p.id}"
-    #     # => <a href="blog/show/13">The Entry Title</a>
+    #     # => <a href="/blog/show/13">The Entry Title</a>
     #
     def link_to(name, url='', opts={})
       opts[:href] ||= url
@@ -102,7 +143,7 @@ module Merb
     #   link_to_function('Add to cart', "item_total += 1; alert('Item added!');")
     #     # => <a href="#" onclick="item_total += 1; alert('Item added!'); return false;">Add to cart</a>
     def link_to_function(name, function)
-      %{<a href="#" onclick="#{function}; return false;">#{name}</a>}
+      %{<a href="#" onclick="#{function.chomp(";")}; return false;">#{name}</a>}
     end
     
     # ==== Parameters
@@ -265,7 +306,7 @@ module Merb
     #
     def require_js(*js)
       @required_js ||= []
-      @required_js |= js
+      @required_js << js
     end
     
     # The require_css method can be used to require any CSS file anywhere in
@@ -287,7 +328,7 @@ module Merb
     #
     def require_css(*css)
       @required_css ||= []
-      @required_css |= css
+      @required_css << css
     end
     
     # A method used in the layout of an application to create +<script>+ tags
@@ -296,6 +337,10 @@ module Merb
     # 
     # ==== Parameters
     # options<Hash>:: Options to pass to js_include_tag.
+    #
+    # ==== Options
+    # :bundle<~to_s>::
+    #   The name of the bundle the scripts should be combined into.
     # 
     # ==== Returns
     # String:: The JavaScript tag.
@@ -314,8 +359,14 @@ module Merb
     #   #    <script src="/javascripts/validation.js" type="text/javascript"></script>
     #
     def include_required_js(options = {})
-      return '' if @required_js.nil?
-      js_include_tag(*(@required_js + [options]))
+      return '' if @required_js.nil? || @required_js.empty?
+      @required_js.map do |req_js|
+        if req_js.last.is_a?(Hash)
+          js_include_tag(*(req_js[0..-2] + [options.merge(req_js.last)]))
+        else
+          js_include_tag(*(req_js + [options]))
+        end
+      end.join
     end
     
     # A method used in the layout of an application to create +<link>+ tags for
@@ -327,6 +378,12 @@ module Merb
     # 
     # ==== Returns
     # String:: The CSS tag.
+    #
+    # ==== Options
+    # :bundle<~to_s>::
+    #   The name of the bundle the stylesheets should be combined into.
+    # :media<~to_s>::
+    #   The media attribute for the generated link element. Defaults to :all.
     # 
     # ==== Examples
     #   # my_action.herb has a call to require_css 'style'
@@ -334,15 +391,21 @@ module Merb
     #   include_required_css
     #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/>
     #
-    #   # my_action.herb has a call to require_js 'style', 'ie-specific'
+    #   # my_action.herb has a call to require_css 'style', 'ie-specific'
     #   # File: layout/application.html.erb
     #   include_required_css
     #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/>
     #   #    <link href="/stylesheets/ie-specific.css" media="all" rel="Stylesheet" type="text/css"/>
     #
     def include_required_css(options = {})
-      return '' if @required_css.nil?
-      css_include_tag(*(@required_css + [options]))
+      return '' if @required_css.nil? || @required_css.empty?
+      @required_css.map do |req_css|
+        if req_css.last.is_a?(Hash)
+          css_include_tag(*(req_css[0..-2] + [options.merge(req_css.last)]))
+        else
+          css_include_tag(*(req_css + [options]))
+        end
+      end.join
     end
     
     # ==== Parameters
@@ -466,7 +529,7 @@ module Merb
     # String:: if only a single path is requested
     # ==== Examples
     #  uniq_path("/javascripts/my.js","/javascripts/my.css")
-    #  #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets2.my-awesome-domain.com/javascripts/my.css"]
+    #  #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/javascripts/my.css"]
     #
     #  uniq_path(["/javascripts/my.js","/stylesheets/my.css"])
     #  #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/stylesheets/my.css"]
@@ -482,7 +545,7 @@ module Merb
     def uniq_path(*assets)      
       paths = []
       assets.collect.flatten.each do |filename|
-        paths.push(UniqueAssetPath.build(filename))
+        paths.push(Merb::Assets::UniqueAssetPath.build(filename))
       end
       paths.length > 1 ? paths : paths.first
     end
@@ -504,7 +567,7 @@ module Merb
     def uniq_js_path(*assets)
       paths = []
       assets.collect.flatten.each do |filename|
-        paths.push(UniqueAssetPath.build(asset_path(:javascript,filename,true)))
+        paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:javascript,filename)))
       end
       paths.length > 1 ? paths : paths.first
     end
@@ -526,7 +589,7 @@ module Merb
     def uniq_css_path(*assets)
       paths = []
       assets.collect.flatten.each do |filename|
-        paths.push(UniqueAssetPath.build(asset_path(:stylesheet,filename,true)))
+        paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:stylesheet,filename)))
       end
       paths.length > 1 ? paths : paths.first
     end
@@ -542,7 +605,7 @@ module Merb
     #  uniq_js_tag("my")
     #  #=> <script type="text/javascript" src="http://assets2.my-awesome-domain.com/javascripts/my.js"></script>
     def uniq_js_tag(*assets)
-      js_include_tag(uniq_js_path(assets))
+      js_include_tag(*uniq_js_path(assets))
     end
     
     # ==== Parameters
@@ -556,7 +619,7 @@ module Merb
     #  uniq_css_tag("my")
     #  #=> <link href="http://assets2.my-awesome-domain.com/stylesheets/my.css" type="text/css" />
     def uniq_css_tag(*assets)
-      css_include_tag(uniq_css_path(assets))
+      css_include_tag(*uniq_css_path(assets))
     end
   end
 end

data/spec/merb-assets_spec.rb

@@ -0,0 +1,240 @@
+require File.dirname(__FILE__) + '/spec_helper'
+include Merb::AssetsMixin
+
+describe "Accessing Assets" do
+  it "should create link to name with absolute url" do
+    link_to("The Merb home page", "http://www.merbivore.com/").should == 
+      "<a href=\"http://www.merbivore.com/\">The Merb home page</a>"
+  end
+  
+  it "should create link to name with relative url" do
+    link_to("The Entry Title", "/blog/show/13").should == 
+      "<a href=\"/blog/show/13\">The Entry Title</a>"
+  end
+  
+  it "should create link with attributes" do
+    link_to("The Ruby home page", "http://www.ruby-lang.org", {'class' => 'special', 'target' => 'blank'}).should == 
+      "<a class=\"special\" href=\"http://www.ruby-lang.org\" target=\"blank\">The Ruby home page</a>"
+  end
+  
+  it "should create link with explicit href" do
+    link_to("The Foo home page", "http://not.foo.example.com/", :href => "http://foo.example.com").should == 
+      "<a href=\"http://foo.example.com\">The Foo home page</a>"
+  end
+  
+  it "should create image tag with absolute url" do
+    image_tag('http://example.com/foo.gif').should ==
+      "<img src=\"http://example.com/foo.gif\" />"
+  end
+  
+  it "should create image tag with relative url" do
+    image_tag('foo.gif').should ==
+      "<img src=\"/images/foo.gif\" />"
+  end
+  
+  it "should create image tag with class" do
+    result = image_tag('foo.gif', :class => 'bar')
+    result.should match(%r{<img .*? />})
+    result.should match(%r{src="/images/foo.gif"})
+    result.should match(/class="bar"/)
+  end
+  
+  it "should create image tag with specified path" do
+    image_tag('foo.gif', :path => '/files/').should ==
+      "<img src=\"/files/foo.gif\" />"
+  end
+  
+  it "should create image tag without extension" do
+    image_tag('/dynamic/charts').should ==
+      "<img src=\"/dynamic/charts\" />"
+  end
+  
+  it "should create image tag without extension and with specified path" do
+    image_tag('charts', :path => '/dynamic/').should ==
+      "<img src=\"/dynamic/charts\" />"
+  end
+  
+end
+
+describe "JavaScript related functions" do
+  it "should escape js having quotes" do
+    escape_js("'Lorem ipsum!' -- Some guy").should ==
+      "\\'Lorem ipsum!\\' -- Some guy"
+  end
+  
+  it "should escape js having new lines" do
+    escape_js("Please keep text\nlines as skinny\nas possible.").should ==
+      "Please keep text\\nlines as skinny\\nas possible."
+  end
+  
+  it "should create link to a function" do
+    link_to_function('Click me', "alert('hi!')").should ==
+      "<a href=\"#\" onclick=\"alert('hi!'); return false;\">Click me</a>"
+  end
+  
+  it "should create a link to a function having multiple statements" do
+    link_to_function('Add to cart', "item_total += 1; alert('Item added!');").should ==
+      "<a href=\"#\" onclick=\"item_total += 1; alert('Item added!'); return false;\">Add to cart</a>"
+  end
+  
+  it "should convert objects that respond to to_json to json" do
+    js({'user' => 'Lewis', 'page' => 'home'}).should ==
+      "{\"user\":\"Lewis\",\"page\":\"home\"}"
+  end
+  
+  it "should convert objects using inspect that don't respond to_json to json" do
+    js([ 1, 2, {"a"=>3.141}, false, true, nil, 4..10 ]).should ==
+      "[1,2,{\"a\":3.141},false,true,null,\"4..10\"]"
+  end
+end
+
+describe "External JavaScript and Stylesheets" do
+  it "should require a js file only once" do
+    require_js 'jquery'
+    require_js 'jquery', 'effects'
+
+    include_required_js.scan(%r{/javascripts/jquery.js}).should have(1).things
+    include_required_js.scan(%r{/javascripts/effects.js}).should have(1).things
+  end
+  
+  it "should require a css file only once" do
+    require_css('style')
+    require_css('style', 'ie-specific')
+
+    include_required_css.scan(%r{/stylesheets/style.css}).should have(1).things
+    include_required_css.scan(%r{/stylesheets/ie-specific.css}).should have(1).things
+  end
+  
+  it "should require included js" do
+    require_js 'jquery', 'effects', 'validation'
+    result = include_required_js
+    result.scan(/<script/).should have(3).things
+    result.should match(%r{/javascripts/jquery.js})
+    result.should match(%r{/javascripts/effects.js})
+    result.should match(%r{/javascripts/validation.js})
+  end
+  
+  it "should require included css" do
+    require_css 'style', 'ie-specific'
+    result = include_required_css
+    result.scan(/<link/).should have(2).things
+    result.should match(%r{/stylesheets/style.css})
+    result.should match(%r{/stylesheets/ie-specific.css})
+  end
+  
+  it "should create a js include tag with the extension specified" do
+    js_include_tag('jquery.js').should ==
+      "<script type=\"text/javascript\" src=\"/javascripts/jquery.js\"></script>"
+  end
+  
+  it "should create a js include tag and and the extension" do
+    js_include_tag('jquery').should ==
+      "<script type=\"text/javascript\" src=\"/javascripts/jquery.js\"></script>"
+  end
+  
+  it "should create a js include tag for multiple includes" do
+    result = js_include_tag('jquery.js', :effects)
+    result.scan(/<script/).should have(2).things
+    result.should match(%r{/javascripts/jquery.js})
+    result.should match(%r{/javascripts/effects.js})
+  end
+  
+  it "should create a css include tag with the extension specified" do
+    result = css_include_tag('style.css')
+    result.should match(%r{<link (.*?) />})
+    result.should match(/charset="utf-8"/)
+    result.should match(%r{type="text/css"})
+    result.should match(%r{href="/stylesheets/style.css"})
+    result.should match(%r{rel="Stylesheet"})
+    result.should match(%r{media="all"})
+  end
+  
+  it "should create a css include tag and add the extension" do
+    result = css_include_tag('style')
+    result.should match(%r{<link (.*?) />})
+    result.should match(/charset="utf-8"/)
+    result.should match(%r{type="text/css"})
+    result.should match(%r{href="/stylesheets/style.css"})
+    result.should match(%r{rel="Stylesheet"})
+    result.should match(%r{media="all"})
+  end
+  
+  it "should create a css include tag for multiple includes" do
+    result = css_include_tag('style.css', :layout)
+    result.scan(/<link/).should have(2).things
+    result.should match(%r{/stylesheets/style.css})
+    result.should match(%r{/stylesheets/layout.css})
+  end
+  
+  it "should create a css include tag with the specified media" do
+    css_include_tag('style', :media => :print).should match(%r{media="print"})
+  end
+  
+  it "should create a css include tag with the specified charset" do
+    css_include_tag('style', :charset => 'iso-8859-1').should match(%r{charset="iso-8859-1"})
+  end
+  
+  it "should return a uniq path for a single asset" do
+    uniq_path("/javascripts/my.js").should == 
+      "http://assets2.my-awesome-domain.com/javascripts/my.js"
+  end
+  
+  it "should return a uniq path for multiple assets" do
+    uniq_path("/javascripts/my.js","/javascripts/my.css").should == 
+      ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets2.my-awesome-domain.com/javascripts/my.css"]
+  end
+  
+  it "should return a uniq path for multiple assets passed as a single array" do
+    uniq_path(["/javascripts/my.js","/javascripts/my.css"]).should == 
+      ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets2.my-awesome-domain.com/javascripts/my.css"]
+  end
+  
+  it "should return a uniq js path for a single js file" do
+    uniq_js_path("my").should == 
+      "http://assets2.my-awesome-domain.com/javascripts/my.js"
+  end
+  
+  it "should return a uniq js path for multiple js files" do
+    uniq_js_path(["admin/secrets","home/signup"]).should == 
+      ["http://assets1.my-awesome-domain.com/javascripts/admin/secrets.js", "http://assets2.my-awesome-domain.com/javascripts/home/signup.js"]
+  end
+  
+  it "should return a uniq css path for a single css file" do
+    uniq_css_path("my").should == 
+      "http://assets1.my-awesome-domain.com/stylesheets/my.css"
+  end
+  
+  it "should return a uniq css path for multiple css files" do
+    uniq_css_path(["admin/secrets","home/signup"]).should == 
+      ["http://assets4.my-awesome-domain.com/stylesheets/admin/secrets.css", "http://assets1.my-awesome-domain.com/stylesheets/home/signup.css"]
+  end
+  
+  it "should create a uniq js tag for a single js file" do
+    uniq_js_tag("my").should ==
+      "<script type=\"text/javascript\" src=\"http://assets2.my-awesome-domain.com/javascripts/my.js\"></script>"
+  end
+  
+  it "should create a uniq js tag for each js file specified" do
+    result = uniq_js_tag("jquery.js", :effects)
+    result.scan(/<script/).should have(2).things
+    result.should match(%r{/javascripts/jquery.js})
+    result.should match(%r{/javascripts/effects.js})
+  end
+  
+  it "should create a uniq css tag for a single css file" do
+    result = uniq_css_tag("my")
+    result.should match(%r{<link (.*?) />})
+    result.should match(/charset="utf-8"/)
+    result.should match(%r{type="text/css"})
+    result.should match(%r{http://assets1.my-awesome-domain.com/stylesheets/my.css})
+    result.should match(%r{rel="Stylesheet"})
+    result.should match(%r{media="all"})
+  end
+  
+  it "should create a uniq css tag for each css file specified" do
+    result = uniq_css_tag("style.css", :layout)
+    result.scan(/<link/).should have(2).things
+    result.should match(%r{/stylesheets/style.css})
+    result.should match(%r{/stylesheets/layout.css})
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+$TESTING=true
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
+require "merb-core"
+require "merb-assets"
+# require File.dirname(__FILE__) / "controllers" / "action-args"
+require "spec"
+
+Merb.start :environment => 'test'
+
+Spec::Runner.configure do |config|
+  config.include Merb::Test::RequestHelper  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-assets
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire: merb-assets
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 description: Merb plugin that provides the helpers for assets and asset bundling
 email: ez@engineyard.com
@@ -40,6 +40,8 @@ files:
 - lib/merb-assets/assets.rb
 - lib/merb-assets/assets_mixin.rb
 - lib/merb-assets.rb
+- spec/merb-assets_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-assets/
 post_install_message: