headjs-rails 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -92,6 +92,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   bundler

data/README.md

@@ -35,7 +35,7 @@ I also suggest you take a look at the [smurf gem](https://github.com/thumblemonk
 
 ## Testing
 
-Clone the repo, run `bundle install` and `rake test`.
+Clone the repo, run `bundle install` and `bundle exec rake test`.
 
 ## Contributing to headjs-rails
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/headjs-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "headjs-rails"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Bittencourt"]
-  s.date = "2012-11-05"
+  s.date = "2013-11-19"
   s.description = "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 = "muitocomplicado@gmail.com"
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/muitocomplicado/headjs-rails"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Provides Rails 3 helper and generator for adding Head JS support."
 
   if s.respond_to? :specification_version then

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

@@ -10,9 +10,9 @@ module Headjs
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       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}"
+      class_option :version, :type => :string, :default => "1.0.0", :desc => "Which version of Head JS to fetch"
+      @@default_version = "1.0.0"
+      @@dist_url = "https://raw.github.com/headjs/headjs/master/dist/{version}/{file}"
 
       def remove_headjs
         %w(head.js head.min.js).each do |js|

data/lib/headjs-rails/tag_helper.rb

@@ -18,7 +18,8 @@ module Headjs
         scan(/src="([^"]+)"/).
         flatten.
         map do |src| 
-          key = 
+          cnt = 0
+          key = original_key = 
             URI.
             parse(src).
             path[%r{[^/]+\z}].
@@ -26,7 +27,7 @@ module Headjs
             gsub(/\.min$/,'').
             gsub(/-[0-9a-f]{32}$/,'')
           while keys.include?(key) do
-            key += '_' + key
+            key = "#{original_key}_#{(cnt = cnt.succ)}"
           end
           keys << key
           "{ '#{key}': '#{src}' }"

data/test/test_generator.rb

@@ -8,14 +8,14 @@ class Headjs::Generators::InstallGeneratorTest < Rails::Generators::TestCase
   
   context 'the Head JS install generator' do
     
-    should 'download the default master Head JS files' do
+    should 'download the default 1.0.0 files' do
       run_generator %w(headjs:install)
       assert_file 'public/javascripts/head.js'
       assert_file 'public/javascripts/head.min.js'
     end
     
-    should 'download the versioned Head JS files' do
-      run_generator %w(headjs:install --version master)
+    should 'download version 0.99 files' do
+      run_generator %w(headjs:install --version 0.99)
       assert_file 'public/javascripts/head.js'
       assert_file 'public/javascripts/head.min.js'
     end

data/test/test_tag_helper.rb

@@ -34,8 +34,8 @@ module Headjs
         assert_equal "<script type=\"text/javascript\">head.js( { 'jquery': '#{jquery}' } );</script>", @helpers.headjs_include_tag(jquery)
       end
       
-      should "concatenate labels to avoid overwriting (not that great)" do
-        assert_equal "<script type=\"text/javascript\">head.js( { 'comments': '/javascripts/products/comments.js' }, { 'comments_comments': '/javascripts/reviews/comments.js' } );</script>", @helpers.headjs_include_tag('products/comments', 'reviews/comments')
+      should "increase label counter to avoid overwriting" do
+        assert_equal "<script type=\"text/javascript\">head.js( { 'comments': '/javascripts/products/comments.js' }, { 'comments_1': '/javascripts/reviews/comments.js' } );</script>", @helpers.headjs_include_tag('products/comments', 'reviews/comments')
       end
       
       should "accept strings for local paths" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: headjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 981228764876150456
+      hash: -1302805054574789805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides Rails 3 helper and generator for adding Head JS support.