headjs-rails 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/headjs-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{headjs-rails}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Bittencourt"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2011-01-17}
   s.description = %q{This gem adds a helper and generator to facilitate the use of Head JS in your Rails 3 projects the same way you would normally add javascript tags using Rails default helpers.}
   s.email = %q{muitocomplicado@gmail.com}
   s.extra_rdoc_files = [

data/lib/generators/headjs/install/install_generator.rb

@@ -4,6 +4,7 @@ module Headjs
       desc "This generator downloads and installs Head JS"
       class_option :version, :type => :string, :default => "master", :desc => "Which version of Head JS to fetch"
       @@default_version = "master"
+      @@dist_url = "https://github.com/headjs/headjs/raw/{version}/dist/{file}"
 
       def remove_headjs
         %w(head.js head.min.js).each do |js|
@@ -16,15 +17,25 @@ module Headjs
         get_headjs(options.version)
       rescue OpenURI::HTTPError
         say_status("warning", "could not find Head JS (#{options.version})", :yellow)
-        say_status("fetching", "Head JS (#{@@default_version})", :green)
-        get_headjs(@@default_version)
+        say_status("warning", headjs_url(options.version, 'head.js'), :yellow)
+        say_status("warning", headjs_url(options.version, 'head.min.js'), :yellow)
+        
+        if @@default_version != options.version
+          say_status("fetching", "Head JS (#{@@default_version})", :green)
+          get_headjs(@@default_version)
+        end
       end
 
     private
 
       def get_headjs(version)
-        get "https://github.com/headjs/headjs/raw/#{version}/dist/head.js",     "public/javascripts/head.js"
-        get "https://github.com/headjs/headjs/raw/#{version}/dist/head.min.js", "public/javascripts/head.min.js"
+        %w(head.js head.min.js).each do |js|
+          get headjs_url(version, js), "public/javascripts/#{js}"
+        end
+      end
+      
+      def headjs_url(version, file)
+        @@dist_url.gsub("{version}", version).gsub("{file}", file)
       end
 
     end

data/lib/headjs-rails/tag_helper.rb

@@ -4,14 +4,14 @@ module Headjs
 
     def headjs_include_tag(*sources)
       keys = []
-      content_tag :script, :type => Mime::JS do
+      content_tag :script, { :type => Mime::JS }, false do
         "head.js( #{javascript_include_tag(*sources).scan(/src="([^"]+)"/).flatten.map { |src| 
           key = URI.parse(src).path[%r{[^/]+\z}].gsub(/\.js$/,'').gsub(/\.min$/,'')
           while keys.include?(key) do
             key += '_' + key
           end
           keys << key
-          "{ '#{key}': '#{src}' }" 
+          "{ '#{key}': '#{src}' }"
         }.join(', ')} );"
       end
     end

data/test/test_tag_helper.rb

@@ -31,38 +31,42 @@ module Headjs
     context "The Head JS helper include tag" do
     
       should "return a valid script tag" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '#{jquery}' } );</script>", @helpers.headjs_include_tag(jquery)
+        assert_equal @helpers.headjs_include_tag(jquery), "<script type=\"text/javascript\">head.js( { 'jquery': '#{jquery}' } );</script>"
       end
     
       should "concatenate labels to avoid overwriting" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '#{jquery}' }, { 'jquery_jquery': '#{jquery}' } );</script>", @helpers.headjs_include_tag(jquery, jquery)
+        assert_equal @helpers.headjs_include_tag(jquery, jquery), "<script type=\"text/javascript\">head.js( { 'jquery': '#{jquery}' }, { 'jquery_jquery': '#{jquery}' } );</script>"
       end
       
       should "accept strings for local paths" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/other/rails.js' } );</script>", @helpers.headjs_include_tag('jquery', 'other/rails')
+        assert_equal @helpers.headjs_include_tag('jquery', 'other/rails'), "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/other/rails.js' } );</script>"
       end
       
       should "accept :defaults registered expansions" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/rails.js' } );</script>", @helpers.headjs_include_tag(:defaults)
+        assert_equal @helpers.headjs_include_tag(:defaults), "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/rails.js' } );</script>"
+      end
+      
+      should "accept :defaults mixed with other strings" do
+        assert_equal @helpers.headjs_include_tag(:defaults, 'modernizr'), "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/rails.js' }, { 'modernizr': '/javascripts/modernizr.js' } );</script>"
       end
       
       should "accept :all expansion" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/rails.js' }, { 'application': '/javascripts/application.js' } );</script>", @helpers.headjs_include_tag(:all)
+        assert_equal @helpers.headjs_include_tag(:all), "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js' }, { 'rails': '/javascripts/rails.js' }, { 'application': '/javascripts/application.js' } );</script>"
       end
       
       should "accept a :cache => true parameter" do
         @helpers.config.perform_caching = true
-        assert_equal "<script type=\"text/javascript\">head.js( { 'all': '/javascripts/all.js' } );</script>", @helpers.headjs_include_tag(:defaults, :cache => true)
+        assert_equal @helpers.headjs_include_tag(:defaults, :cache => true), "<script type=\"text/javascript\">head.js( { 'all': '/javascripts/all.js' } );</script>"
       end
       
       should "accept a :cache => bundle parameter" do
         @helpers.config.perform_caching = true
-        assert_equal "<script type=\"text/javascript\">head.js( { 'bundle': '/javascripts/bundle.js' } );</script>", @helpers.headjs_include_tag(:defaults, :cache => 'bundle')
+        assert_equal @helpers.headjs_include_tag(:defaults, :cache => 'bundle'), "<script type=\"text/javascript\">head.js( { 'bundle': '/javascripts/bundle.js' } );</script>"
       end
       
       should "work with random rails asset ids" do
         ENV["RAILS_ASSET_ID"] = '123456789'
-        assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js?#{ENV["RAILS_ASSET_ID"]}' }, { 'rails': '/javascripts/rails.js?#{ENV["RAILS_ASSET_ID"]}' } );</script>", @helpers.headjs_include_tag(:defaults)
+        assert_equal @helpers.headjs_include_tag(:defaults), "<script type=\"text/javascript\">head.js( { 'jquery': '/javascripts/jquery.js?#{ENV["RAILS_ASSET_ID"]}' }, { 'rails': '/javascripts/rails.js?#{ENV["RAILS_ASSET_ID"]}' } );</script>"
       end
       
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headjs-rails
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Bittencourt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -02:00
+date: 2011-01-17 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency