Fixed proper querystring handling. Thanks Felix.

akatz · Oct 7, 2008 · 936cf4b · 936cf4b
1 parent b325107
commit 936cf4b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/merb-assets/lib/merb-assets/assets_mixin.rb b/merb-assets/lib/merb-assets/assets_mixin.rb
@@ -114,7 +114,7 @@ def image_tag(img, opts={})
         opts[:src] ||= opts.delete(:path) + img
       end
       random = opts.delete(:reload) || Merb::Config[:reload_templates]
-      opts[:src] += random_query_string if random
+      opts[:src] += opts[:src].include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if random
       %{<img #{ opts.to_xml_attributes } />}
     end
 
@@ -442,7 +442,7 @@ def js_include_tag(*scripts)
 
       for script in scripts
         src = asset_path(:javascript, script)
-        src += random_query_string if reload
+        src += src.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload
         attrs = {
           :src => src,
           :type => "text/javascript"
@@ -504,7 +504,7 @@ def css_include_tag(*stylesheets)
 
       for stylesheet in stylesheets
         href = asset_path(:stylesheet, stylesheet)
-        href += random_query_string if reload
+        href += href.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload
         attrs = {
           :href => href,
           :type => "text/css",
@@ -642,8 +642,8 @@ def extract_required_files(files, options = {})
     end
 
     def random_query_string
-      Time.now.strftime("?%m%d%H%M%S#{rand(99)}")
+      Time.now.strftime("%m%d%H%M%S#{rand(99)}")
     end
 
   end
-end
+end
diff --git a/merb-gen/lib/generators/templates/application/common/Rakefile b/merb-gen/lib/generators/templates/application/common/Rakefile
@@ -26,7 +26,7 @@ end
 
 <% if testing_framework.to_sym == :rspec %>
 require 'spec/rake/spectask'
-require "merb-core/test/tasks/spectasks"
+require 'merb-core/test/tasks/spectasks'
 desc 'Default: run spec examples'
 task :default => 'spec'
 <% end %>

diff --git a/merb-slices/lib/generators/base.rb b/merb-slices/lib/generators/base.rb
@@ -19,6 +19,9 @@ class SliceGenerator < Generator
 
   class BaseSliceGenerator < NamedGenerator
 
+    option :testing_framework, :default => :rspec,
+                               :desc => 'Testing framework to use (one of: rspec, test_unit).'
+
     def self.common_template(name, template_source)
       common_base_dir = File.expand_path(File.dirname(__FILE__))
       template name do |t|

diff --git a/merb-slices/lib/generators/templates/common/Rakefile b/merb-slices/lib/generators/templates/common/Rakefile
@@ -47,4 +47,15 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end
+
+<% if testing_framework.to_sym == :rspec %>
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'
+<% end %>
+
+<% if testing_framework.to_sym == :test_unit %>
+require 'rake/testtask'
+<% end %>
diff --git a/merb-slices/lib/generators/templates/full/Rakefile b/merb-slices/lib/generators/templates/full/Rakefile
@@ -1,10 +1,8 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
 require 'merb-core'
 require 'merb-core/tasks/merb'
-require 'merb-core/test/tasks/spectasks'
 
 GEM_NAME = "<%= base_name %>"
 AUTHOR = "Your Name"
@@ -51,17 +49,13 @@ task :gemspec do
   end
 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
-end
-
+<% if testing_framework.to_sym == :rspec %>
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
 desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => 'spec'
+<% end %>
+
+<% if testing_framework.to_sym == :test_unit %>
+require 'rake/testtask'
+<% end %>
diff --git a/merb-slices/lib/generators/templates/full/spec/controllers/main_spec.rb b/merb-slices/lib/generators/templates/full/spec/controllers/main_spec.rb
@@ -48,7 +48,7 @@
     controller.slice_url(:index, :format => 'html').should == url
 
     url = controller.url(:<%= symbol_name %>_home)
-    url.should == "/<%= base_name %>"
+    url.should == "/<%= base_name %>/"
     controller.slice_url(:home).should == url
   end