merb-assets 0.9.7 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 YOUR NAME
+Copyright (c) 2008 Ezra Zygmuntowicz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "ez@engineyard.com"
 
 GEM_NAME    = "merb-assets"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
@@ -45,21 +45,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
-
 end
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/merb-assets/assets.rb

@@ -169,8 +169,8 @@ module Merb
       # *files<String>:: Names of the files to bundle.
       def initialize(name, *files)
         @bundle_name = name == true ? :all : name
-        @bundle_filename = asset_path(self.class.asset_type, @bundle_name, true)
-        @files = files.map { |f| asset_path(self.class.asset_type, f, true) }
+        @bundle_filename = Merb.root / asset_path(self.class.asset_type, @bundle_name, true)
+        @files = files.map { |f| Merb.root / asset_path(self.class.asset_type, f, true) }
       end
       
       # Creates the new bundled file, executing all the callbacks.

data/lib/merb-assets/assets_mixin.rb

@@ -113,6 +113,8 @@ module Merb
           end
         opts[:src] ||= opts.delete(:path) + img
       end
+      random = opts.delete(:reload) || Merb::Config[:reload_templates]
+      opts[:src] += random_query_string if random
       %{<img #{ opts.to_xml_attributes } />}
     end
 
@@ -427,6 +429,8 @@ module Merb
     def js_include_tag(*scripts)
       options = scripts.last.is_a?(Hash) ? scripts.pop : {}
       return nil if scripts.empty?
+      
+      reload = options[:reload] || Merb::Config[:reload_templates]
 
       if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && scripts.size > 1
         bundler = Merb::Assets::JavascriptAssetBundler.new(bundle_name, *scripts)
@@ -437,8 +441,10 @@ module Merb
       tags = ""
 
       for script in scripts
+        src = asset_path(:javascript, script)
+        src += random_query_string if reload
         attrs = {
-          :src => asset_path(:javascript, script),
+          :src => src,
           :type => "text/javascript"
         }
         tags << %Q{<script #{attrs.to_xml_attributes}></script>}
@@ -486,6 +492,8 @@ module Merb
       options = stylesheets.last.is_a?(Hash) ? stylesheets.pop : {}
       return nil if stylesheets.empty?
 
+      reload = options[:reload] || Merb::Config[:reload_templates]
+
       if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && stylesheets.size > 1
         bundler = Merb::Assets::StylesheetAssetBundler.new(bundle_name, *stylesheets)
         bundled_asset = bundler.bundle!
@@ -495,8 +503,10 @@ module Merb
       tags = ""
 
       for stylesheet in stylesheets
+        href = asset_path(:stylesheet, stylesheet)
+        href += random_query_string if reload
         attrs = {
-          :href => asset_path(:stylesheet, stylesheet),
+          :href => href,
           :type => "text/css",
           :rel => "Stylesheet",
           :charset => options[:charset] || 'utf-8',
@@ -631,5 +641,9 @@ module Merb
       end
     end
     
+    def random_query_string
+      Time.now.strftime("?%m%d%H%M%S#{rand(99)}")
+    end
+    
   end
 end

data/spec/merb-assets_spec.rb

@@ -53,6 +53,11 @@ describe "Accessing Assets" do
     image_tag('charts', :path => '/dynamic/').should ==
       "<img src=\"/dynamic/charts\" />"
   end
+  
+  it "should create image tag with a random query string" do
+    result = image_tag('foo.gif', :reload => true)
+    result.should match(%r{<img src="/images/foo.gif\?\d+" />})
+  end
 
 end
 
@@ -182,7 +187,19 @@ describe "External JavaScript and Stylesheets" do
     result.should match(%r{/stylesheets/style.css})
     result.should match(%r{/stylesheets/layout.css})
   end
+   
+  it "should create a js include tag with a random query string" do
+    Merb::Config[:reload_templates] = true
+    result = js_include_tag('jquery.js')
+    result.should match(%r{/javascripts/jquery.js\?\d+})
+    Merb::Config[:reload_templates] = false
+  end
 
+  it "should create a css include tag with a random query string" do
+    result = css_include_tag('style.css', :reload => true)
+    result.should match(%r{/stylesheets/style.css\?\d+})
+  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

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-assets
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 description: Merb plugin that provides the helpers for assets and asset bundling
 email: ez@engineyard.com