jquery_tag 0.2.3 → 0.2.4

data/README.markdown

@@ -16,7 +16,7 @@ Inside your views, you can just call the `jquery_tag` method.
 
 It accepts a some configuration options by using the following symbols:
 
-    :version          # Overrides the script version on the CDN URL. Defaults do '1.5.2'
+    :version          # Overrides the script version on the CDN URL. Defaults do '1.6.1'
     :file             # Path for the local script. Defaults do 'jquery.js'
     :ui               # Loads jQuery UI. Accepts a true value for loading a 'jquery-ui.js' file or a String for the local path.
 

data/lib/jquery_tag.rb

@@ -4,9 +4,9 @@ require 'jquery_tag/helpers/sinatra_helper'
 
 module JqueryTag # :nodoc:
   ## @return [String] the current (mostly latest) version of jQuery.
-  def self.version;    '1.6.0'; end
+  def self.version;    '1.6.1'; end
   ## @return [String] the current (mostly latest) version of jQuery UI.
-  def self.ui_version; '1.8.12'; end
+  def self.ui_version; '1.8.13'; end
 end
 
 ActionView::Base.send(:include, JqueryTag::RailsHelper) if defined? Rails

data/lib/jquery_tag/helpers/rails_helper.rb

@@ -15,8 +15,13 @@ module JqueryTag # :nodoc:
     ## @param [Hash] options any other option that should be delivered to +javascript_include_tag+.
     ## @return [String] the concatenated html tags
     def create_javascript_tags(paths_or_urls, options = {})
-      arguments = paths_or_urls + [options].flatten
-      javascript_include_tag(arguments)
+      arguments = [paths_or_urls, options].flatten
+      options = arguments.last.is_a?(Hash) ? arguments.pop : nil
+
+      arguments.map { |path_or_url|
+        arguments = [path_or_url, options].compact
+        javascript_include_tag(*arguments)
+      }.join.html_safe
     end
   end
 end

data/lib/jquery_tag/version.rb

@@ -1,3 +1,3 @@
 module JqueryTag #:nodoc:
-  VERSION = "0.2.3" # :nodoc:
+  VERSION = "0.2.4" # :nodoc:
 end

data/spec/rails_helper_spec.rb

@@ -7,32 +7,32 @@ describe JqueryTag::RailsHelper do
     before { development! }
 
     it "renders a local jquery.js file" do
-      expects_include_with ['jquery.js']
+      expects_includes_with ['jquery.js']
       jquery_tag
     end
 
     it "delegates any other arguments and options" do
-      expects_include_with ['jquery.js', {:cached => true}]
+      expects_includes_with ['jquery.js', {:cached => true}]
       jquery_tag :cached => true
     end
 
     it "delegates any other arguments" do
-      expects_include_with ['jquery.js', 'other.js', {:cached => true}]
+      expects_includes_with ['jquery.js', 'other.js', {:cached => true}]
       jquery_tag 'other.js', :cached => true
     end
 
     it "accepts a different path for the local jquery file" do
-      expects_include_with ['frameworks/jquery.min.js']
+      expects_includes_with ['frameworks/jquery.min.js']
       jquery_tag :file => "frameworks/jquery.min.js"
     end
 
     it "renders the jquery-ui.js file" do
-      expects_include_with ['jquery.js', 'jquery-ui.js']
+      expects_includes_with ['jquery.js', 'jquery-ui.js']
       jquery_tag :ui => true
     end
 
     it "receives a path to the jquery-ui.js file" do
-      expects_include_with ['jquery.js', 'frameworks/jquery-ui.js']
+      expects_includes_with ['jquery.js', 'frameworks/jquery-ui.js']
       jquery_tag :ui => 'frameworks/jquery-ui.js'
     end
   end
@@ -41,17 +41,17 @@ describe JqueryTag::RailsHelper do
     before { production! }
 
     it "uses the google CDN path" do
-      expects_include_with ['//ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js']
+      expects_includes_with ['//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js']
       jquery_tag
     end
 
     it "accepts a different version for the jquery script" do
-      expects_include_with ['//ajax.googleapis.com/ajax/libs/jquery/1.0.0/jquery.min.js']
+      expects_includes_with ['//ajax.googleapis.com/ajax/libs/jquery/1.0.0/jquery.min.js']
       jquery_tag :version => '1.0.0'
     end
 
     it "uses the google CDN path for the jquery ui script" do
-      expects_include_with ['//ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js']
+      expects_includes_with ['//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js']
       jquery_tag :ui => true
     end
   end

data/spec/sinatra_helper_spec.rb

@@ -33,7 +33,7 @@ describe JqueryTag::SinatraHelper do
     before { production! }
 
     it "uses the google CDN path" do
-      expected = %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>}
+      expected = %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>}
       jquery_tag.should == expected
     end
 
@@ -43,8 +43,8 @@ describe JqueryTag::SinatraHelper do
     end
 
     it "uses the google CDN path for the jquery ui script" do
-      expected = %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>}
-      expected << %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js"></script>}
+      expected = %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>}
+      expected << %Q{<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>}
       jquery_tag(:ui => true).should == expected
     end
   end

data/spec/spec_helper.rb

@@ -19,11 +19,19 @@ module SpecHelper
     Rails.stub_chain(:env, :production?) { false }
   end
 
-  def expects_include_with(*args)
-    should_receive(:javascript_include_tag).with(*args)
+  def expects_includes_with(args)
+    opts = args.last.is_a?(Hash) ? args.pop : nil
+    args.each do |value|
+      arguments = [value, opts].compact.flatten
+      should_receive(:javascript_include_tag).with(*arguments)
+    end
   end
 end
 
+class String
+  def html_safe; self; end
+end
+
 RSpec.configure do |config|
   config.include SpecHelper
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery_tag
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Lucas Mazza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -03:00
+date: 2011-05-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency