actionpack 3.1.0.rc1 → 3.1.0.rc2

data/lib/action_controller.rb

@@ -37,12 +37,13 @@ module ActionController
     autoload :UrlFor
   end
 
-  autoload :Integration,     'action_controller/deprecated/integration_test'
-  autoload :IntegrationTest, 'action_controller/deprecated/integration_test'
-  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
-  autoload :UrlWriter,       'action_controller/deprecated'
-  autoload :Routing,         'action_controller/deprecated'
-  autoload :TestCase,        'action_controller/test_case'
+  autoload :Integration,        'action_controller/deprecated/integration_test'
+  autoload :IntegrationTest,    'action_controller/deprecated/integration_test'
+  autoload :PerformanceTest,    'action_controller/deprecated/performance_test'
+  autoload :UrlWriter,          'action_controller/deprecated'
+  autoload :Routing,            'action_controller/deprecated'
+  autoload :TestCase,           'action_controller/test_case'
+  autoload :TemplateAssertions, 'action_controller/test_case'
 
   eager_autoload do
     autoload :RecordIdentifier

data/lib/action_controller/metal/http_authentication.rb

@@ -106,7 +106,7 @@ module ActionController
 
       module ControllerMethods
         extend ActiveSupport::Concern
-        
+
         module ClassMethods
           def http_basic_authenticate_with(options = {})
             before_filter(options.except(:name, :password, :realm)) do
@@ -116,7 +116,7 @@ module ActionController
             end
           end
         end
-        
+
         def authenticate_or_request_with_http_basic(realm = "Application", &login_procedure)
           authenticate_with_http_basic(&login_procedure) || request_http_basic_authentication(realm)
         end

data/lib/action_controller/metal/instrumentation.rb

@@ -19,7 +19,7 @@ module ActionController
         :controller => self.class.name,
         :action     => self.action_name,
         :params     => request.filtered_parameters,
-        :format     => request.format.ref,
+        :format     => request.format.try(:ref),
         :method     => request.method,
         :path       => (request.fullpath rescue "unknown")
       }

data/lib/action_controller/metal/params_wrapper.rb

@@ -64,7 +64,7 @@ module ActionController
   #     end
   #
   # will try to check if +Admin::User+ or +User+ model exists, and use it to
-  # determine the wrapper key respectively. If both of the model doesn't exists,
+  # determine the wrapper key respectively. If both models don't exist,
   # it will then fallback to use +user+ as the key.
   module ParamsWrapper
     extend ActiveSupport::Concern
@@ -88,14 +88,14 @@ module ActionController
       #     # wraps parameters into +params[:person]+ hash
       #
       #   wrap_parameters Person
-      #     # wraps parameters by determine the wrapper key from Person class
+      #     # wraps parameters by determining the wrapper key from Person class
       #     (+person+, in this case) and the list of attribute names
       #
       #   wrap_parameters :include => [:username, :title]
       #     # wraps only +:username+ and +:title+ attributes from parameters.
       #
       #   wrap_parameters false
-      #     # disable parameters wrapping for this controller altogether.
+      #     # disables parameters wrapping for this controller altogether.
       #
       # ==== Options
       # * <tt>:format</tt> - The list of formats in which the parameters wrapper

data/lib/action_controller/metal/request_forgery_protection.rb

@@ -96,7 +96,7 @@ module ActionController #:nodoc:
 
       # Sets the token value for the current session.
       def form_authenticity_token
-        session[:_csrf_token] ||= ActiveSupport::SecureRandom.base64(32)
+        session[:_csrf_token] ||= SecureRandom.base64(32)
       end
 
       # The form's authenticity parameter. Override to provide your own.

data/lib/action_controller/metal/streaming.rb

@@ -260,4 +260,3 @@ module ActionController #:nodoc:
     end
   end
 end
-      

data/lib/action_controller/test_case.rb

@@ -130,7 +130,7 @@ module ActionController
       super
 
       self.session = TestSession.new
-      self.session_options = TestSession::DEFAULT_OPTIONS.merge(:id => ActiveSupport::SecureRandom.hex(16))
+      self.session_options = TestSession::DEFAULT_OPTIONS.merge(:id => SecureRandom.hex(16))
     end
 
     class Result < ::Array #:nodoc:

data/lib/action_dispatch/middleware/cookies.rb

@@ -305,7 +305,7 @@ module ActionDispatch
 
         if secret.length < SECRET_MIN_LENGTH
           raise ArgumentError, "Secret should be something secure, " +
-            "like \"#{ActiveSupport::SecureRandom.hex(16)}\".  The value you " +
+            "like \"#{SecureRandom.hex(16)}\".  The value you " +
             "provided, \"#{secret}\", is shorter than the minimum length " +
             "of #{SECRET_MIN_LENGTH} characters"
         end

data/lib/action_dispatch/middleware/session/abstract_store.rb

@@ -29,7 +29,7 @@ module ActionDispatch
       end
 
       def generate_sid
-        sid = ActiveSupport::SecureRandom.hex(16)
+        sid = SecureRandom.hex(16)
         sid.encode!('UTF-8') if sid.respond_to?(:encode!)
         sid
       end

data/lib/action_dispatch/testing/assertions.rb

@@ -8,12 +8,11 @@ module ActionDispatch
 
     extend ActiveSupport::Concern
 
-    included do
-      include DomAssertions
-      include ResponseAssertions
-      include RoutingAssertions
-      include SelectorAssertions
-      include TagAssertions
-    end
+    include DomAssertions
+    include ResponseAssertions
+    include RoutingAssertions
+    include SelectorAssertions
+    include TagAssertions
   end
 end
+

data/lib/action_dispatch/testing/assertions/response.rb

@@ -6,13 +6,6 @@ module ActionDispatch
     module ResponseAssertions
       extend ActiveSupport::Concern
 
-      included do
-        # TODO: Need to pull in AV::Template monkey patches that track which
-        # templates are rendered. assert_template should probably be part
-        # of AV instead of AD.
-        require 'action_view/test_case'
-      end
-
       # Asserts that the response is one of the following types:
       #
       # * <tt>:success</tt>   - Status code was 200

data/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view/buffers.rb

@@ -35,9 +35,9 @@ module ActionView
     def html_safe?
       true
     end
-    
+
     def html_safe
       self
     end
   end
-end
+end

data/lib/action_view/helpers.rb

@@ -22,7 +22,6 @@ module ActionView #:nodoc:
     autoload :RecordTagHelper
     autoload :RenderingHelper
     autoload :SanitizeHelper
-    autoload :SprocketsHelper
     autoload :TagHelper
     autoload :TextHelper
     autoload :TranslationHelper
@@ -53,7 +52,6 @@ module ActionView #:nodoc:
     include RecordTagHelper
     include RenderingHelper
     include SanitizeHelper
-    include SprocketsHelper
     include TagHelper
     include TextHelper
     include TranslationHelper

data/lib/action_view/helpers/asset_paths.rb

@@ -44,7 +44,12 @@ module ActionView
         raise NotImplementedError
       end
 
+      def rewrite_relative_url_root(source, relative_url_root)
+        relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
+      end
+
       def rewrite_host_and_protocol(source, has_request)
+        source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
         host = compute_asset_host(source)
         if has_request && host && !is_uri?(host)
           host = "#{controller.request.protocol}#{host}"
@@ -75,4 +80,4 @@ module ActionView
     end
 
   end
-end
+end

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -274,11 +274,7 @@ module ActionView
       # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
       # plugin authors are encouraged to do so.
       def image_path(source)
-        if config.use_sprockets
-          asset_path(source)
-        else
-          asset_paths.compute_public_path(source, 'images')
-        end
+        asset_paths.compute_public_path(source, 'images')
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
@@ -293,11 +289,7 @@ module ActionView
       #   video_path("/trailers/hd.avi")                              # => /trailers/hd.avi
       #   video_path("http://www.example.com/vid/hd.avi")             # => http://www.example.com/vid/hd.avi
       def video_path(source)
-        if config.use_sprockets
-          asset_path(source)
-        else
-          asset_paths.compute_public_path(source, 'videos')
-        end
+        asset_paths.compute_public_path(source, 'videos')
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
@@ -312,11 +304,7 @@ module ActionView
       #   audio_path("/sounds/horse.wav")                                # => /sounds/horse.wav
       #   audio_path("http://www.example.com/sounds/horse.wav")          # => http://www.example.com/sounds/horse.wav
       def audio_path(source)
-        if config.use_sprockets
-          asset_path(source)
-        else
-          asset_paths.compute_public_path(source, 'audios')
-        end
+        asset_paths.compute_public_path(source, 'audios')
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 

data/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb

@@ -85,17 +85,8 @@ module ActionView
             end
           end
         end
-
-        def rewrite_relative_url_root(source, relative_url_root)
-          relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
-        end
-
-        def rewrite_host_and_protocol(source, has_request)
-          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
-          super(source, has_request)
-        end
       end
 
     end
   end
-end
+end

data/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

@@ -83,11 +83,7 @@ module ActionView
         #   javascript_path "http://www.example.com/js/xmlhr"    # => http://www.example.com/js/xmlhr
         #   javascript_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js
         def javascript_path(source)
-          if config.use_sprockets
-            asset_path(source, 'js')
-          else
-            asset_paths.compute_public_path(source, 'javascripts', 'js')
-          end
+          asset_paths.compute_public_path(source, 'javascripts', 'js')
         end
         alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
@@ -187,12 +183,8 @@ module ActionView
         #
         #   javascript_include_tag :all, :cache => true, :recursive => true
         def javascript_include_tag(*sources)
-          if config.use_sprockets
-            sprockets_javascript_include_tag(*sources)
-          else
-            @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
-            @javascript_include.include_tag(*sources)
-          end
+          @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
+          @javascript_include.include_tag(*sources)
         end
       end
     end

data/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

@@ -60,11 +60,7 @@ module ActionView
         #   stylesheet_path "http://www.example.com/css/style"       # => http://www.example.com/css/style
         #   stylesheet_path "http://www.example.com/css/style.css"   # => http://www.example.com/css/style.css
         def stylesheet_path(source)
-          if config.use_sprockets
-            asset_path(source, 'css')
-          else
-            asset_paths.compute_public_path(source, 'stylesheets', 'css')
-          end
+          asset_paths.compute_public_path(source, 'stylesheets', 'css')
         end
         alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
@@ -137,12 +133,8 @@ module ActionView
         #   stylesheet_link_tag :all, :concat => true
         #
         def stylesheet_link_tag(*sources)
-          if config.use_sprockets
-            sprockets_stylesheet_link_tag(*sources)
-          else
-            @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
-            @stylesheet_include.include_tag(*sources)
-          end
+          @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
+          @stylesheet_include.include_tag(*sources)
         end
 
       end

data/lib/action_view/helpers/form_helper.rb

@@ -202,13 +202,13 @@ module ActionView
       #
       # is equivalent to something like:
       #
-      #   <%= form_for @post, :as => :post, :url => post_path(@post), :html => { :class => "new_post", :id => "new_post" } do |f| %>
+      #   <%= form_for @post, :as => :post, :url => posts_path, :html => { :class => "new_post", :id => "new_post" } do |f| %>
       #     ...
       #   <% end %>
       #
       # You can also overwrite the individual conventions, like this:
       #
-      #   <%= form_for(@post, :url => super_post_path(@post)) do |f| %>
+      #   <%= form_for(@post, :url => super_posts_path) do |f| %>
       #     ...
       #   <% end %>
       #

data/lib/action_view/helpers/form_options_helper.rb

@@ -427,7 +427,7 @@ module ActionView
       #
       # Sample usage (Hash):
       #   grouped_options = {
-      #    'North America' => [['United States','US], 'Canada'],
+      #    'North America' => [['United States','US'], 'Canada'],
       #    'Europe' => ['Denmark','Germany','France']
       #   }
       #   grouped_options_for_select(grouped_options)

data/lib/action_view/helpers/number_helper.rb

@@ -342,7 +342,7 @@ module ActionView
         options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
 
         storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
-        
+
         base = options[:prefix] == :si ? 1000 : 1024
 
         if number.to_i < base

data/lib/action_view/lookup_context.rb

@@ -10,7 +10,7 @@ module ActionView
   # this key is generated just once during the request, it speeds up all cache accesses.
   class LookupContext #:nodoc:
     attr_accessor :prefixes
-    
+
     mattr_accessor :fallbacks
     @@fallbacks = FallbackFileSystemResolver.instances
 

data/lib/action_view/testing/resolvers.rb

@@ -34,7 +34,7 @@ module ActionView #:nodoc:
         templates << Template.new(source, _path, handler,
           :virtual_path => path.virtual, :format => format, :updated_at => updated_at)
       end
-      
+
       templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
     end
   end

data/lib/sprockets/helpers.rb

@@ -0,0 +1,5 @@
+module Sprockets
+  module Helpers
+    autoload :RailsHelper, "sprockets/helpers/rails_helper"
+  end
+end

data/lib/sprockets/helpers/rails_helper.rb

@@ -0,0 +1,107 @@
+require "action_view/helpers/asset_paths"
+require "action_view/helpers/asset_tag_helper"
+
+module Sprockets
+  module Helpers
+    module RailsHelper
+      extend ActiveSupport::Concern
+      include ActionView::Helpers::AssetTagHelper
+      
+      def asset_paths
+        @asset_paths ||= begin
+          config     = self.config if respond_to?(:config)
+          controller = self.controller if respond_to?(:controller)
+          RailsHelper::AssetPaths.new(config, controller)
+        end
+      end
+
+      def javascript_include_tag(source, options = {})
+        debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
+        body  = options.key?(:body)  ? options.delete(:body)  : false
+
+        if debug && asset = asset_paths.asset_for(source, 'js')
+          asset.to_a.map { |dep|
+            javascript_include_tag(dep, :debug => false, :body => true)
+          }.join("\n").html_safe
+        else
+          options = {
+            'type' => "text/javascript",
+            'src'  => asset_path(source, 'js', body)
+          }.merge(options.stringify_keys)
+
+          content_tag 'script', "", options
+        end
+      end
+
+      def stylesheet_link_tag(source, options = {})
+        debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
+        body  = options.key?(:body)  ? options.delete(:body)  : false
+
+        if debug && asset = asset_paths.asset_for(source, 'css')
+          asset.to_a.map { |dep|
+            stylesheet_link_tag(dep, :debug => false, :body => true)
+          }.join("\n").html_safe
+        else
+          options = {
+            'rel'   => "stylesheet",
+            'type'  => "text/css",
+            'media' => "screen",
+            'href'  => asset_path(source, 'css', body)
+          }.merge(options.stringify_keys)
+
+          tag 'link', options
+        end
+      end
+
+    private
+      def debug_assets?
+        params[:debug_assets] == '1' ||
+          params[:debug_assets] == 'true'
+      end
+
+      def asset_path(source, default_ext = nil, body = false)
+        source = source.logical_path if source.respond_to?(:logical_path)
+        path = asset_paths.compute_public_path(source, 'assets', default_ext, true)
+        body ? "#{path}?body=1" : path
+      end
+
+      class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
+        def compute_public_path(source, dir, ext=nil, include_host=true)
+          super(source, 'assets', ext, include_host)
+        end
+
+        def asset_for(source, ext)
+          source = source.to_s
+          return nil if is_uri?(source)
+          source = rewrite_extension(source, nil, ext)
+          assets[source]
+        end
+
+        def rewrite_asset_path(source, dir)
+          if source[0] == ?/
+            source
+          else
+            assets.path(source, performing_caching?, dir)
+          end
+        end
+
+        def rewrite_extension(source, dir, ext)
+          if ext && File.extname(source).empty?
+            "#{source}.#{ext}"
+          else
+            source
+          end
+        end
+
+        def assets
+          Rails.application.assets
+        end
+
+        # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
+        def performing_caching?
+          @config ?  @config.perform_caching : Rails.application.config.action_controller.perform_caching
+        end
+      end
+    end
+  end
+end

data/lib/sprockets/railtie.rb

@@ -1,5 +1,7 @@
 module Sprockets
-  class Railtie < Rails::Railtie
+  autoload :Helpers, "sprockets/helpers"
+
+  class Railtie < ::Rails::Railtie
     def self.using_coffee?
       require 'coffee-script'
       defined?(CoffeeScript)
@@ -7,15 +9,7 @@ module Sprockets
       false
     end
 
-    def self.using_scss?
-      require 'sass'
-      defined?(Sass)
-    rescue LoadError
-      false
-    end
-
     config.app_generators.javascript_engine :coffee if using_coffee?
-    config.app_generators.stylesheet_engine :scss   if using_scss?
 
     # Configure ActionController to use sprockets.
     initializer "sprockets.set_configs", :after => "action_controller.set_configs" do |app|
@@ -26,7 +20,8 @@ module Sprockets
 
     # We need to configure this after initialization to ensure we collect
     # paths from all engines. This hook is invoked exactly before routes
-    # are compiled.
+    # are compiled, and so that other Railties have an opportunity to
+    # register compressors.
     config.after_initialize do |app|
       assets = app.config.assets
       next unless assets.enabled
@@ -34,8 +29,10 @@ module Sprockets
       app.assets = asset_environment(app)
 
       ActiveSupport.on_load(:action_view) do
+        include ::Sprockets::Helpers::RailsHelper
+        
         app.assets.context_class.instance_eval do
-          include ::ActionView::Helpers::SprocketsHelper
+          include ::Sprockets::Helpers::RailsHelper
         end
       end
 
@@ -57,8 +54,8 @@ module Sprockets
       env.static_root = File.join(app.root.join("public"), assets.prefix)
       env.paths.concat assets.paths
       env.logger = Rails.logger
-      env.js_compressor = expand_js_compressor(assets.js_compressor)
-      env.css_compressor = expand_css_compressor(assets.css_compressor)
+      env.js_compressor = expand_js_compressor(assets.js_compressor) if assets.compress
+      env.css_compressor = expand_css_compressor(assets.css_compressor) if assets.compress
       env
     end
 
@@ -80,15 +77,6 @@ module Sprockets
 
     def expand_css_compressor(sym)
       case sym
-      when :scss
-        require 'sass'
-        compressor = Object.new
-        def compressor.compress(source)
-          Sass::Engine.new(source,
-            :syntax => :scss, :style => :compressed
-          ).render
-        end
-        compressor
       when :yui
         require 'yui/compressor'
         YUI::CssCompressor.new

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
+  hash: 15424097
   prerelease: 6
-  version: 3.1.0.rc1
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -21,7 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,6 +63,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id003
@@ -54,6 +79,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id004
@@ -65,7 +95,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0beta1
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,7 +110,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.0.beta2
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -87,6 +126,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id007
@@ -98,6 +142,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
   type: :runtime
   version_requirements: *id008
@@ -109,7 +158,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0.beta.5
+        hash: 62196471
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 10
+        version: 2.0.0.beta.10
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -120,6 +176,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 3
+        - 27
         version: 0.3.27
   type: :runtime
   version_requirements: *id010
@@ -131,6 +192,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
   type: :runtime
   version_requirements: *id011
@@ -296,7 +362,6 @@ files:
 - lib/action_view/helpers/record_tag_helper.rb
 - lib/action_view/helpers/rendering_helper.rb
 - lib/action_view/helpers/sanitize_helper.rb
-- lib/action_view/helpers/sprockets_helper.rb
 - lib/action_view/helpers/tag_helper.rb
 - lib/action_view/helpers/text_helper.rb
 - lib/action_view/helpers/translation_helper.rb
@@ -323,8 +388,9 @@ files:
 - lib/action_view/test_case.rb
 - lib/action_view/testing/resolvers.rb
 - lib/action_view.rb
+- lib/sprockets/helpers/rails_helper.rb
+- lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -338,17 +404,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).

data/lib/action_view/helpers/sprockets_helper.rb

@@ -1,69 +0,0 @@
-require 'uri'
-require 'action_view/helpers/asset_paths'
-
-module ActionView
-  module Helpers
-    module SprocketsHelper
-      def asset_path(source, default_ext = nil)
-        sprockets_asset_paths.compute_public_path(source, 'assets', default_ext, true)
-      end
-
-      def sprockets_javascript_include_tag(source, options = {})
-        options = {
-          'type' => "text/javascript",
-          'src'  => asset_path(source, 'js')
-        }.merge(options.stringify_keys)
-
-        content_tag 'script', "", options
-      end
-
-      def sprockets_stylesheet_link_tag(source, options = {})
-        options = {
-          'rel'   => "stylesheet",
-          'type'  => "text/css",
-          'media' => "screen",
-          'href'  => asset_path(source, 'css')
-        }.merge(options.stringify_keys)
-
-        tag 'link', options
-      end
-
-      private
-
-      def sprockets_asset_paths
-        @sprockets_asset_paths ||= begin
-          config     = self.config if respond_to?(:config)
-          controller = self.controller if respond_to?(:controller)
-          SprocketsHelper::AssetPaths.new(config, controller)
-        end
-      end
-
-      class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
-        def rewrite_asset_path(source, dir)
-          if source[0] == ?/
-            source
-          else
-            assets.path(source, performing_caching?, dir)
-          end
-        end
-
-        def rewrite_extension(source, dir, ext)
-          if ext && File.extname(source).empty?
-            "#{source}.#{ext}"
-          else
-            source
-          end
-        end
-
-        def assets
-          Rails.application.assets
-        end
-
-        # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
-        def performing_caching?
-          @config ?  @config.perform_caching : Rails.application.config.action_controller.perform_caching
-        end
-      end
-    end
-  end
-end