jwhitley · Jul 15, 2012 · Aug 13, 2012 · Sep 10, 2012 · Nov 2, 2012 · Dec 28, 2012
diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.9.1)
+    requirejs-rails (0.9.1.1)
       railties (>= 3.1.1, < 4.1)
 
 GEM

diff --git a/app/helpers/requirejs_helper.rb b/app/helpers/requirejs_helper.rb
@@ -23,52 +23,53 @@ def _requirejs_data(name, &block)
     end.join(" ")
   end
 
-  def requirejs_include_tag(name=nil, &block)
+  def requirejs_include_tag(name = nil, options = {}, &block)
     requirejs = Rails.application.config.requirejs
 
     if requirejs.loader == :almond
       name = requirejs.module_name_for(requirejs.build_config['modules'][0])
       return _almond_include_tag(name, &block)
     end
 
-    html = ""
-
     _once_guard do
-      unless requirejs.run_config.empty?
-        run_config = requirejs.run_config.dup
-        unless _priority.empty?
-          run_config = run_config.dup
-          run_config[:priority] ||= []
-          run_config[:priority].concat _priority
-        end
-        if Rails.application.config.assets.digest
-          modules = requirejs.build_config['modules'].map { |m| requirejs.module_name_for m }
+      html = ActiveSupport::SafeBuffer.new
+      html.safe_concat "<script>#{requirejs_config_js(name)}</script>\n" unless options[:skip_config]
+      html.safe_concat %Q|<script #{_requirejs_data(name, &block)} src="#{_javascript_path requirejs.bootstrap_file}" data-turbolinks-track></script>|
+      html
+    end
+  end
 
-          # Generate digestified paths from the modules spec
-          paths = {}
-          modules.each { |m| paths[m] = _javascript_path(m).sub /\.js$/,'' }
+  def requirejs_config_js(name = nil, config_data = {})
+    requirejs = Rails.application.config.requirejs
+
+    unless requirejs.run_config.empty?
+      run_config = requirejs.run_config.dup
+      unless _priority.empty?
+        run_config = run_config.dup
+        run_config[:priority] ||= []
+        run_config[:priority].concat _priority
+      end
+      if Rails.application.config.assets.digest
+        modules = requirejs.build_config['modules'].map { |m| requirejs.module_name_for m }
 
-          if run_config.has_key? 'paths'
-            # Add paths for assets specified by full URL (on a CDN)
-            run_config['paths'].each { |k,v| paths[k] = v if v =~ /^https?:/ }
-          end
+        # Generate digestified paths from the modules spec
+        paths = {}
+        modules.each { |m| paths[m] = _javascript_path(m).sub /\.js$/,'' }
 
-          # Override user paths, whose mappings are only relevant in dev mode
-          # and in the build_config.
-          run_config['paths'] = paths
+        if run_config.has_key? 'paths'
+          # Add paths for assets specified by full URL (on a CDN)
+          run_config['paths'].each { |k,v| paths[k] = v if v =~ %r{\A(https?:|//)} }
         end
 
-        run_config['baseUrl'] = baseUrl(name)
-        html.concat <<-HTML
-        <script>var require = #{run_config.to_json};</script>
-        HTML
+        # Override user paths, whose mappings are only relevant in dev mode
+        # and in the build_config.
+        run_config['paths'] = paths
       end
+      run_config['config'] ||= {}
+      run_config['config'].merge! config_data
 
-      html.concat <<-HTML
-      <script #{_requirejs_data(name, &block)} src="#{_javascript_path 'require.js'}"></script>
-      HTML
-
-      html.html_safe
+      run_config['baseUrl'] = baseUrl(name)
+      "var require = #{run_config.to_json};".html_safe
     end
   end
 
@@ -98,7 +99,7 @@ def _javascript_path(name)
   def baseUrl(js_asset)
     js_asset_path = javascript_path(js_asset)
     uri = URI.parse(js_asset_path)
-    asset_host = uri.host && js_asset_path.sub(uri.request_uri, '')
+    asset_host = uri.host && js_asset_path.sub(uri.path, '')
     [asset_host, Rails.application.config.assets.prefix].join
   end
 end