merb-assets 0.9.8 → 0.9.9

data/Rakefile

@@ -4,6 +4,8 @@ require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
+
 ##############################################################################
 # Package && release
 ##############################################################################
@@ -17,7 +19,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.8") + PKG_BUILD
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +37,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.8')
+  s.add_dependency('merb-core', "= #{Merb::VERSION}")
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end

data/lib/merb-assets/assets_mixin.rb

@@ -114,7 +114,7 @@ module Merb
         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 @@ module Merb
 
       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 @@ module Merb
 
       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 @@ module Merb
     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

metadata

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