Change data-main formatting for RequireJS 2.0

Also remove dead _data_main code from earlier merges

Author: jwhitley

app/helpers/requirejs_helper.rb

@@ -11,7 +11,7 @@ def _requirejs_data(name, &block)
     {}.tap do |data|
       if name
         name += ".js" unless name =~ /\.js$/
-        data['main'] = _javascript_path(name)
+        data['main'] = _javascript_path(name).sub(/\.js$/,'')
       end
 
       data.merge!(yield controller) if block_given?
@@ -20,15 +20,6 @@ def _requirejs_data(name, &block)
     end.join(" ")
   end
 
-  def _data_main(name)
-    if name
-      name += ".js" unless name =~ /\.js$/
-      %Q{data-main="#{_javascript_path(name)}"}
-    else
-      ""
-    end
-  end
-
   def requirejs_include_tag(name=nil, &block)
     requirejs = Rails.application.config.requirejs
 

test/requirejs-rails_test.rb

@@ -129,7 +129,7 @@ def wrap(tag)
 
   test "requirejs_include_tag_with_param" do
     render :text => wrap(requirejs_include_tag("application"))
-    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=/javascripts/application.js]", :count => 1
+    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=/javascripts/application]", :count => 1
   end
 
   test "requirejs_include_tag_with_block" do
@@ -138,7 +138,7 @@ def wrap(tag)
     end
 
     render :text => wrap(requirejs_include_tag("application", &test_block))
-    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=/javascripts/application.js]", :count => 1
+    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=/javascripts/application]", :count => 1
     assert_select "script:last-of-type[src^=/javascripts/require.js][data-class^=TestController]", :count => 1
   end