merb-assets 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,73 +1,64 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides the helpers for assets and asset bundling"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Ezra Zygmuntowicz"
-GEM_EMAIL  = "ez@engineyard.com"
-
-GEM_NAME    = "merb-assets"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-assets/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Assets::VERSION
+
+    gemspec.name        = "merb-assets"
+    gemspec.description = "Merb plugin for supporting assets"
+    gemspec.summary     = "Merb plugin that provides helpers for assets and asset bundling"
+
+    gemspec.authors     = [ "Ezra Zygmuntowicz" ]
+    gemspec.email       = "ez@engineyard.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-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
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Assets::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/merb-assets/assets.rb

@@ -41,12 +41,16 @@ module Merb
       #   # => "public/javascripts/dingo.js"
       def asset_path(asset_type, filename, local_path = false)
         filename = filename.to_s
+        return filename if filename =~ %r{^https?://} #leave absolte paths alone
+
+        # add extension if none given
         if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/ && filename.index('?').nil?
           filename = "#{filename}#{ASSET_FILE_EXTENSIONS[asset_type]}" # don't modify receiver
         end
-        if filename !~ %r{^(/|https?://)}
-          filename = "/#{asset_type}s/#{filename}"
-        end
+
+        # prepend asset type's folder path
+        filename = "/#{asset_type}s/#{filename}" unless filename.index("/") == 0
+
         if local_path
           return "public#{filename}"
         else
@@ -56,7 +60,7 @@ module Merb
     end
     
     # Helper for creating unique paths to a file name
-    # Can increase speend for browsers that are limited to a certain number of connections per host 
+    # Can increase speed for browsers that are limited to a certain number of connections per host
     # for downloading static files (css, js, images...)
     class UniqueAssetPath
       class << self
@@ -76,7 +80,8 @@ module Merb
           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 << sprintf(config[:asset_domain],self.calculate_host_id(filename)) << "." if config[:asset_domain]
+          path << config[:domain]
           path << "/" if filename.index('/') != 0
           path << filename
         end
@@ -239,4 +244,4 @@ module Merb
     end
     
   end
-end
+end

data/lib/merb-assets/assets_mixin.rb

@@ -8,6 +8,25 @@ module Merb
     # assets.
 
 
+    # This tests whether a random query string shall be appended to a url.
+    # Basically, you tell it your intention and if it's ok to use default
+    # config values, and it will either use your intention or the value
+    # set in Merb::Config[:reload_templates]
+    #
+    # ==== Parameters
+    # intention<Boolean>: true if a random string shall be appended
+    # allow_default<Boolean>: true if it's ok to use Merb::Config[:reload_templates]
+    #
+    # ==== Returns
+    # <Boolean> true if a random query string shall be appended
+    #
+    # ==== Examples
+    #   Merb::AssetsMixin.append_random_query_string?(options[:reload])
+    #   Merb::AssetsMixin.append_random_query_string?(options[:reload], !absolute)
+    def self.append_random_query_string?(intention, allow_default = true)
+      intention.nil? && allow_default ? Merb::Config[:reload_templates] : intention
+    end
+
     # ==== Parameters
     # none
     #
@@ -24,29 +43,72 @@ module Merb
     #     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
+      [auto_link_css, auto_link_js].join("\n")
+    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
+    # ==== Parameters
+    # none
+    #
+    # ==== Returns
+    # html<String>
+    #
+    # ==== Examples
+    # We want all possible matches in the file system upto the action name
+    # for CSS. The reason for separating auto_link for CSS and JS is
+    # performance concerns with page loading. See Yahoo performance rules
+    # (http://developer.yahoo.com/performance/rules.html)
+    def auto_link_css
+      auto_link_paths.map do |path|
+        asset_exists?(:stylesheet, path) ? css_include_tag(path) : nil
+      end.compact.join("\n")
+    end
 
-        #Update the prefix for the next iteration
-        prefix += path / ""
-      end
+    # ==== Parameters
+    # none
+    #
+    # ==== Returns
+    # html<String>
+    #
+    # ==== Examples
+    # We want all possible matches in the file system upto the action name
+    # for JS. The reason for separating auto_link for CSS and JS is
+    # performance concerns with page loading. See Yahoo performance rules
+    # (http://developer.yahoo.com/performance/rules.html)
+    def auto_link_js
+      auto_link_paths.map do |path|
+        asset_exists?(:javascript, path) ? js_include_tag(path) : nil
+      end.compact.join("\n")
+    end
 
-      #Return the generated HTML
-      html
+    # ==== Parameters
+    # asset_type<Symbol>: A symbol representing the type of the asset.
+    # asset_path<String>: The path to the asset
+    #
+    # ==== Returns
+    # exists?<Boolean>
+    #
+    # ==== Examples
+    # This tests whether a give asset exists in the file system.
+    def asset_exists?(asset_type, asset_path)
+      File.exists?(Merb.root / asset_path(asset_type, asset_path, true))
     end
 
+    # ==== Parameters
+    # none
+    #
+    # ==== Returns
+    # paths<Array>
+    #
+    # ==== Examples
+    # This is an auxiliary method which returns an array of all possible asset
+    # paths for the current controller/action.
+    def auto_link_paths
+      paths = (controller_name / action_name).split('/')
+      first = paths.shift
+      paths.inject( [first] ) do |memo, val|
+        memo.push [memo.last, val].join('/')
+      end
+    end
 
     # ==== Parameters
     # name<~to_s>:: The text of the link.
@@ -77,6 +139,9 @@ module Merb
     #   Sets the path prefix for the image. Defaults to "/images/" or whatever
     #   is specified in Merb::Config. This is ignored if img is an absolute
     #   path or full URL.
+    # :reload<Boolean>::
+    #   Override the Merb::Config[:reload_templates] value. If true, a random query param will be appended
+    #   to the image url
     #
     # All other options set HTML attributes on the tag.
     #
@@ -98,23 +163,24 @@ module Merb
     #   image_tag('/dynamic/charts')
     #   # => <img src="/dynamic/charts">
     def image_tag(img, opts={})
+      return "" if img.blank?
       if img[0].chr == '/'
-        opts[:src] = img
+        opts[:src] = "#{Merb::Config[:path_prefix]}#{img}"
       else
         opts[:path] ||=
           if img =~ %r{^https?://}
+            absolute = true
             ''
           else
-            if Merb::Config[:path_prefix]
-              Merb::Config[:path_prefix] + '/images/'
-            else
-              '/images/'
-            end
+            "#{Merb::Config[:path_prefix]}/images/"
           end
         opts[:src] ||= opts.delete(:path) + img
       end
-      random = opts.delete(:reload) || Merb::Config[:reload_templates]
-      opts[:src] += opts[:src].include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if random
+
+      if AssetsMixin.append_random_query_string?(opts.delete(:reload), !absolute)
+        opts[:src] += opts[:src].include?('?') ? "&#{random_query_string}" : "?#{random_query_string}"
+      end
+
       %{<img #{ opts.to_xml_attributes } />}
     end
 
@@ -405,33 +471,53 @@ module Merb
     #   will be added to them.
     #
     # ==== Options
+    # :charset<~to_s>::
+    #   Charset which will be used as value for charset attribute
     # :bundle<~to_s>::
     #   The name of the bundle the scripts should be combined into.
+    # :prefix<~to_s>::
+    #   prefix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:js_prefix]
+    # :suffix<~to_s>::
+    #   suffix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:js_suffix]
+    # :reload<Boolean>::
+    #   Override the Merb::Config[:reload_templates] value. If true, a random query param will be appended
+    #   to the js url
     #
     # ==== Returns
     # String:: The JavaScript include tag(s).
     #
     # ==== Examples
     #   js_include_tag 'jquery'
-    #   # => <script src="/javascripts/jquery.js" type="text/javascript"></script>
+    #   # => <script src="/javascripts/jquery.js" type="text/javascript" charset="utf-8"></script>
+    #
+    #   js_include_tag 'jquery', :charset => 'iso-8859-1'
+    #   # => <script src="/javascripts/jquery.js" type="text/javascript" charset="iso-8859-1"></script>
     #
     #   js_include_tag 'moofx.js', 'upload'
-    #   # => <script src="/javascripts/moofx.js" type="text/javascript"></script>
-    #   #    <script src="/javascripts/upload.js" type="text/javascript"></script>
+    #   # => <script src="/javascripts/moofx.js" type="text/javascript" charset="utf-8"></script>
+    #   #    <script src="/javascripts/upload.js" type="text/javascript" charset="utf-8"></script>
     #
     #   js_include_tag :effects
-    #   # => <script src="/javascripts/effects.js" type="text/javascript"></script>
+    #   # => <script src="/javascripts/effects.js" type="text/javascript" charset="utf-8"></script>
     #
     #   js_include_tag :jquery, :validation
-    #   # => <script src="/javascripts/jquery.js" type="text/javascript"></script>
-    #   #    <script src="/javascripts/validation.js" type="text/javascript"></script>
+    #   # => <script src="/javascripts/jquery.js" type="text/javascript" charset="utf-8"></script>
+    #   #    <script src="/javascripts/validation.js" type="text/javascript" charset="utf-8"></script>
     #
+    #   js_include_tag :application, :validation, :prefix => "http://cdn.example.com"
+    #   # => <script src="http://cdn.example.com/javascripts/application.js" type="text/javascript" charset="utf-8"></script>
+    #   #    <script src="http://cdn.example.com/javascripts/validation.js" type="text/javascript" charset="utf-8"></script>
+    #
+    #   js_include_tag :application, :validation, :suffix => ".#{MyApp.version}"
+    #   # => <script src="/javascripts/application.1.0.3.js" type="text/javascript" charset="utf-8"></script>
+    #   #    <script src="/javascripts/validation.1.0.3.js" type="text/javascript" charset="utf-8"></script>
     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]
 
+      js_prefix = options[:prefix] || Merb::Plugins.config[:asset_helpers][:js_prefix]
+      js_suffix = options[:suffix] || Merb::Plugins.config[:asset_helpers][:js_suffix]
+      
       if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && scripts.size > 1
         bundler = Merb::Assets::JavascriptAssetBundler.new(bundle_name, *scripts)
         bundled_asset = bundler.bundle!
@@ -441,11 +527,21 @@ module Merb
       tags = ""
 
       for script in scripts
-        src = asset_path(:javascript, script)
-        src += src.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload
+        src = js_prefix.to_s + asset_path(:javascript, script)
+        
+        if js_suffix
+          ext_length = ASSET_FILE_EXTENSIONS[:javascript].length + 1
+          src.insert(-ext_length,js_suffix)
+        end
+
+        if AssetsMixin.append_random_query_string?(options[:reload])
+          src += src.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}"
+        end
+
         attrs = {
           :src => src,
-          :type => "text/javascript"
+          :type => "text/javascript",
+          :charset => options[:charset] || "utf-8"
         }
         tags << %Q{<script #{attrs.to_xml_attributes}></script>}
       end
@@ -460,10 +556,19 @@ module Merb
     #   names, it will be added to them.
     #
     # ==== Options
+    # :charset<~to_s>::
+    #   Charset which will be used as value for charset attribute
     # :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.
+    # :prefix<~to_s>::
+    #   prefix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:css_prefix]
+    # :suffix<~to_s>::
+    #   suffix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:css_suffix]
+    # :reload<Boolean>::
+    #   Override the Merb::Config[:reload_templates] value. If true, a random query param will be appended
+    #   to the css url
     #
     # ==== Returns
     # String:: The CSS include tag(s).
@@ -488,11 +593,18 @@ module Merb
     #
     #  css_include_tag :style, :charset => 'iso-8859-1'
     #  # => <link href="/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" charset="iso-8859-1" />
+    #
+    #  css_include_tag :style, :prefix => "http://static.example.com"
+    #  # => <link href="http://static.example.com/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" />
+    #
+    #  css_include_tag :style, :suffix => ".#{MyApp.version}"
+    #  # => <link href="/stylesheets/style.1.0.0.css" media="print" rel="Stylesheet" type="text/css" />
     def css_include_tag(*stylesheets)
       options = stylesheets.last.is_a?(Hash) ? stylesheets.pop : {}
       return nil if stylesheets.empty?
 
-      reload = options[:reload] || Merb::Config[:reload_templates]
+      css_prefix = options[:prefix] || Merb::Plugins.config[:asset_helpers][:css_prefix]
+      css_suffix = options[:suffix] || Merb::Plugins.config[:asset_helpers][:css_suffix]
 
       if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && stylesheets.size > 1
         bundler = Merb::Assets::StylesheetAssetBundler.new(bundle_name, *stylesheets)
@@ -503,13 +615,22 @@ module Merb
       tags = ""
 
       for stylesheet in stylesheets
-        href = asset_path(:stylesheet, stylesheet)
-        href += href.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload
+        href = css_prefix.to_s + asset_path(:stylesheet, stylesheet)
+        
+        if css_suffix
+          ext_length = ASSET_FILE_EXTENSIONS[:stylesheet].length + 1
+          href.insert(-ext_length,css_suffix)
+        end
+        
+        if AssetsMixin.append_random_query_string?(options[:reload])
+          href += href.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}"
+        end
+
         attrs = {
           :href => href,
           :type => "text/css",
           :rel => "Stylesheet",
-          :charset => options[:charset] || 'utf-8',
+          :charset => options[:charset] || "utf-8",
           :media => options[:media] || :all
         }
         tags << %Q{<link #{attrs.to_xml_attributes} />}
@@ -542,7 +663,7 @@ module Merb
     #  #=>"http://assets1.my-awesome-domain.com/images/hostsexypicture.jpg"
     def uniq_path(*assets)
       paths = []
-      assets.collect.flatten.each do |filename|
+      assets.flatten.each do |filename|
         paths.push(Merb::Assets::UniqueAssetPath.build(filename))
       end
       paths.length > 1 ? paths : paths.first
@@ -564,7 +685,7 @@ module Merb
     #         "http://assets1.my-awesome-domain.com/javascripts/home/signup.js"]
     def uniq_js_path(*assets)
       paths = []
-      assets.collect.flatten.each do |filename|
+      assets.flatten.each do |filename|
         paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:javascript,filename)))
       end
       paths.length > 1 ? paths : paths.first
@@ -586,7 +707,7 @@ module Merb
     #         "http://assets1.my-awesome-domain.com/stylesheets/home/signup.css"]
     def uniq_css_path(*assets)
       paths = []
-      assets.collect.flatten.each do |filename|
+      assets.flatten.each do |filename|
         paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:stylesheet,filename)))
       end
       paths.length > 1 ? paths : paths.first
@@ -644,6 +765,5 @@ module Merb
     def random_query_string
       Time.now.strftime("%m%d%H%M%S#{rand(99)}")
     end
-    
   end
-end
+end

data/lib/merb-assets/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Assets
+    VERSION = '1.1.0.pre'.freeze
+  end
+end

data/lib/merb-assets.rb

@@ -10,5 +10,17 @@ Merb::Plugins.config[:asset_helpers] = {
     :max_hosts => 4,
     :asset_domain => "assets%s",
     :domain => "my-awesome-domain.com",
-    :use_ssl => false
+    :use_ssl => false,
+    
+    # Global prefix/suffix for css/js include tags, overridable in js_include_tag and css_include_tag
+    #
+    # :js_prefix => "http://cdn.example.com"
+    # require_js :application # => "http://cdn.example.com/javascripts/application.js"
+    #
+    # :js_suffix => "_#{MyApp.version}"
+    # require_js :application # => "/javascripts/application_0.2.2.js"
+    :js_prefix => nil,
+    :js_suffix => nil,
+    :css_prefix => nil,
+    :css_suffix => nil
   } if Merb::Plugins.config[:asset_helpers].nil?

data/spec/merb-assets_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
+
 include Merb::AssetsMixin
 
 describe "Accessing Assets" do
@@ -58,7 +59,127 @@ describe "Accessing Assets" do
     result = image_tag('foo.gif', :reload => true)
     result.should match(%r{<img src="/images/foo.gif\?\d+" />})
   end
+  
+  it "should not create image tag with nil image" do
+    image_tag(nil).should == ""
+  end
+  
+  it  "should not create image tag with empty string" do
+    image_tag('').should == ""
+  end
+end
+
+describe "With Merb::Config[:path_prefix] set," do
+  before(:all) do
+    Merb::Config[:path_prefix] = "/myapp"
+  end
+  after(:all) do
+    Merb::Config[:path_prefix] = nil
+  end
+
+  describe "create an image tag" do
+    it "with a relative url" do
+      image_tag('foo.gif').should ==
+        "<img src=\"/myapp/images/foo.gif\" />"
+    end
+
+    it "with an absolute url" do
+      image_tag('/foo.gif').should ==
+        "<img src=\"/myapp/foo.gif\" />"
+    end
+
+    it "with an external url" do
+      image_tag('http://example.com/foo.gif').should ==
+        "<img src=\"http://example.com/foo.gif\" />"
+    end
+  end
+
+  describe "create a stylesheet include tag" do
+    it "with a relative url" do
+      result = css_include_tag('bar.css')
+      result.should match(%r{^<link})
+      result.should match(%r{media="all"})
+      result.should match(%r{type="text/css"})
+      result.should match(%r{href="/myapp/stylesheets/bar.css"})
+      result.should match(%r{charset="utf-8"})
+      result.should match(%r{rel="Stylesheet"})
+    end
+
+    it "with an absolute url" do
+      result = css_include_tag('/bar.css')
+      result.should match(%r{^<link})
+      result.should match(%r{media="all"})
+      result.should match(%r{type="text/css"})
+      result.should match(%r{href="/myapp/bar.css"})
+      result.should match(%r{charset="utf-8"})
+      result.should match(%r{rel="Stylesheet"})
+    end
+
+    it "with an external url" do
+      result = css_include_tag('http://example.com/bar.css')
+      result.should match(%r{^<link})
+      result.should match(%r{media="all"})
+      result.should match(%r{type="text/css"})
+      result.should match(%r{href="http://example.com/bar.css"})
+      result.should match(%r{charset="utf-8"})
+      result.should match(%r{rel="Stylesheet"})
+    end
+  end
+
+  describe "create a javascript include tag" do
+    it "with a relative url" do
+      result = js_include_tag("bar.js")
+      result.should match(%r{^<script}); result.should match(%r{</script>$})
+      result.should match(%r{type="text/javascript"})
+      result.should match(%r{src="/myapp/javascripts/bar.js"})
+      result.should match(%r{charset="utf-8"})
+    end
+
+    it "with an absolute url" do
+      result = js_include_tag("/bar.js")
+      result.should match(%r{^<script}); result.should match(%r{</script>$})
+      result.should match(%r{type="text/javascript"})
+      result.should match(%r{src="/myapp/bar.js"})
+    end
+
+    it "with an external url" do
+      result = js_include_tag("http://example.com/bar.js")
+      result.should match(%r{^<script}); result.should match(%r{</script>$})
+      result.should match(%r{type="text/javascript"})
+      result.should match(%r{src="http://example.com/bar.js"})
+    end
+
+    it "with a specific charset option" do
+      result = js_include_tag("bar.js", :charset => 'iso-8859-1')
+      result.should match(%r{^<script}); result.should match(%r{</script>$})
+      result.should match(%r{type="text/javascript"})
+      result.should match(%r{src="/myapp/javascripts/bar.js"})
+      result.should match(%r{charset="iso-8859-1"})
+    end
+  end
+end
+
+describe "With Merb::Config[:reload_templates] set," do
+  before(:all) do
+    Merb::Config[:reload_templates] = true
+  end
+  after(:all) do
+    Merb::Config[:reload_templates] = false
+  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 absolute url and random string if :reload option is set" do
+    image_tag('http://example.com/foo.gif', :reload => true).should =~
+      %r{<img src="http://example.com/foo.gif\?\d+" />}
+  end
+
+  it "should create image tag with relative url" do
+    image_tag('foo.gif').should =~ %r{<img src="/images/foo.gif\?\d+" />}
+  end
 end
 
 describe "JavaScript related functions" do
@@ -145,13 +266,17 @@ describe "External JavaScript and Stylesheets" do
   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>"
+    result = js_include_tag('jquery.js')
+    result.scan(/<script/).should have(1).things
+    result.should match(%r{src="/javascripts/jquery.js"})
+    result.should match(%r{type="text/javascript"})
   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>"
+    result =js_include_tag('jquery')
+    result.scan(/<script/).should have(1).things
+    result.should match(%r{src="/javascripts/jquery.js"})
+    result.should match(%r{type="text/javascript"})
   end
 
   it "should create a js include tag for multiple includes" do
@@ -244,8 +369,10 @@ describe "External JavaScript and Stylesheets" do
   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>"
+    result = uniq_js_tag("my")
+    result.scan(/<script/).should have(1).things
+    result.should match(%r{src="http://assets2.my-awesome-domain.com/javascripts/my.js"})
+    result.should match(%r{type="text/javascript"})
   end
 
   it "should create a uniq js tag for each js file specified" do
@@ -271,4 +398,66 @@ 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 prefix' do
+    result = js_include_tag('jquery.js', :effects, :prefix => "http://cdn.example.com")
+    result.scan(/<script/).should have(2).things
+    result.should match(%r{http://cdn.example.com/javascripts/jquery.js})
+    result.should match(%r{http://cdn.example.com/javascripts/effects.js})
+  end
+
+  it 'should create a js include tag with a suffix' do
+    @js_version = "3.0.1"
+    result = js_include_tag('jquery.js', :effects, :suffix => ".#{@js_version}")
+    result.scan(/<script/).should have(2).things
+    result.should match(%r{/javascripts/jquery.3.0.1.js})
+    result.should match(%r{/javascripts/effects.3.0.1.js})
+  end
+
+  it 'should create a css include tag with a prefix' do
+    result = css_include_tag('style.css', :layout, :prefix => "http://cdn.example.com")
+    result.scan(/<link/).should have(2).things
+    result.should match(%r{http://cdn.example.com/stylesheets/style.css})
+    result.should match(%r{http://cdn.example.com/stylesheets/layout.css})
+  end
+
+  it 'should create a css include tag with a suffix' do
+    @css_version = "0.1.3"
+    result = css_include_tag('style.css', :layout, :suffix => ".#{@css_version}")
+    result.scan(/<link/).should have(2).things
+    result.should match(%r{/stylesheets/style.0.1.3.css})
+    result.should match(%r{/stylesheets/layout.0.1.3.css})
+  end
+end
+
+describe "using assets unique assets helper in localhost environment" do
+  before(:all) do
+    Merb::Plugins.config[:asset_helpers][:asset_domain] = nil
+    Merb::Plugins.config[:asset_helpers][:domain] = "localhost:4000"
+  end
+
+  after(:all) do
+    Merb::Plugins.config[:asset_helpers][:asset_domain] = "assets%d"
+    Merb::Plugins.config[:asset_helpers][:domain] = "my-awesome-domain.com"
+  end
+
+  it "should return a js path for a single js file" do
+    uniq_js_path("my").should ==
+      "http://localhost:4000/javascripts/my.js"
+  end
+
+  it "should return a js path for multiple js files" do
+    uniq_js_path(["admin/secrets","home/signup"]).should ==
+      ["http://localhost:4000/javascripts/admin/secrets.js", "http://localhost:4000/javascripts/home/signup.js"]
+  end
+
+  it "should return a css path for a single css file" do
+    uniq_css_path("my").should ==
+      "http://localhost:4000/stylesheets/my.css"
+  end
+
+  it "should return a css path for multiple css files" do
+    uniq_css_path(["admin/secrets","home/signup"]).should ==
+      ["http://localhost:4000/stylesheets/admin/secrets.css", "http://localhost:4000/stylesheets/home/signup.css"]
+  end
 end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
-require "merb-core"
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# The lib under test
 require "merb-assets"
-# require File.dirname(__FILE__) / "controllers" / "action-args"
-require "spec"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
 
 Merb.start :environment => 'test'
 
@@ -11,7 +17,6 @@ Merb::Plugins.config[:asset_helpers][:max_hosts] = 4
 Merb::Plugins.config[:asset_helpers][:asset_domain] = "assets%d"
 Merb::Plugins.config[:asset_helpers][:domain] = "my-awesome-domain.com"
 
-
 Spec::Runner.configure do |config|
   config.include Merb::Test::RequestHelper  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-assets
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,35 +20,47 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
-description: Merb plugin that provides the helpers for assets and asset bundling
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin for supporting assets
 email: ez@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
+- lib/merb-assets.rb
 - lib/merb-assets/assets.rb
 - lib/merb-assets/assets_mixin.rb
-- lib/merb-assets.rb
+- lib/merb-assets/version.rb
 - spec/merb-assets_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -59,16 +71,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Merb plugin that provides the helpers for assets and asset bundling
+summary: Merb plugin that provides helpers for assets and asset bundling
 test_files: []