actionpack 3.1.1.rc2 → 3.1.1.rc3

data/CHANGELOG

@@ -1,5 +1,41 @@
 *Rails 3.1.1 (unreleased)*
 
+* stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't
+throw Sprockets::FileOutsidePaths exception anymore [Santiago Pastorino]
+
+* Ensure default_asset_host_protocol is respected, closes #2980. [José Valim]
+
+  Changing rake db:schema:dump to run :environment as well as :load_config,
+  as running :load_config alone will lead to the dumper being run without
+  including extensions such as those included in foreigner and
+  spatial_adapter.
+
+  This reverses a change made here:
+  https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324
+
+  I'm assuming here that :load_config needs to be invoked
+  separately from :environment, as it is elsewhere in the
+  file for db operations, if not the alternative is to go
+  back to "task :dump => :environment do".
+
+  [Ben Woosley]
+
+* Update to rack-cache 1.1.
+
+  Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified
+  headers when config.action_controller.perform_caching is true. This has two
+  problems:
+    * unexpected inconsistent behaviour between development &
+      production environments
+    * breaks applications that use of these headers
+
+  [Brendan Ribera]
+
+* Ensure that enhancements to assets:precompile task are only run once [Sam Pohlenz]
+
+* TestCase should respect the view_assigns API instead of pulling variables on
+its own. [José Valim]
+
 * javascript_path and stylesheet_path now refer to /assets if asset pipelining
 is on. [Santiago Pastorino]
 

data/lib/abstract_controller/asset_paths.rb

@@ -3,7 +3,8 @@ module AbstractController
     extend ActiveSupport::Concern
 
     included do
-      config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir
+      config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir,
+        :stylesheets_dir, :default_asset_host_protocol
     end
   end
 end

data/lib/abstract_controller/rendering.rb

@@ -120,8 +120,6 @@ module AbstractController
       view_renderer.render(view_context, options)
     end
 
-    private
-
     DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
       @_action_name @_response_body @_formats @_prefixes @_config
       @_view_context_class @_view_renderer @_lookup_context
@@ -139,6 +137,8 @@ module AbstractController
       hash
     end
 
+    private
+
     # Normalize args and options.
     # :api: private
     def _normalize_render(*args, &block)

data/lib/action_dispatch/testing/test_process.rb

@@ -4,12 +4,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 module ActionDispatch
   module TestProcess
     def assigns(key = nil)
-      assigns = {}.with_indifferent_access
-      @controller.instance_variable_names.each do |ivar|
-        next if ActionController::Base.protected_instance_variables.include?(ivar)
-        assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar)
-      end
-
+      assigns = @controller.view_assigns.with_indifferent_access
       key.nil? ? assigns : assigns[key]
     end
 

data/lib/action_pack/version.rb

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

data/lib/action_view/asset_paths.rb

@@ -16,8 +16,6 @@ module ActionView
     # roots. Rewrite the asset path for cache-busting asset ids. Include
     # asset host, if configured, with the correct request protocol.
     #
-    # When include_host is true and the asset host does not specify the protocol
-    # the protocol parameter specifies how the protocol will be added.
     # When :relative (default), the protocol will be determined by the client using current protocol
     # When :request, the protocol will be the request protocol
     # Otherwise, the protocol is used (E.g. :http, :https, etc)
@@ -25,11 +23,10 @@ module ActionView
       source = source.to_s
       return source if is_uri?(source)
 
-      options[:include_host] ||= true
       source = rewrite_extension(source, dir, options[:ext]) if options[:ext]
       source = rewrite_asset_path(source, dir, options)
       source = rewrite_relative_url_root(source, relative_url_root)
-      source = rewrite_host_and_protocol(source, options[:protocol]) if options[:include_host]
+      source = rewrite_host_and_protocol(source, options[:protocol])
       source
     end
 
@@ -89,9 +86,7 @@ module ActionView
     end
 
     def default_protocol
-      protocol = @config.action_controller.default_asset_host_protocol if @config.action_controller.present?
-      protocol ||= @config.default_asset_host_protocol
-      protocol || (has_request? ? :request : :relative)
+      @config.default_asset_host_protocol || (has_request? ? :request : :relative)
     end
 
     def invalid_asset_host!(help_message)
@@ -120,19 +115,11 @@ module ActionView
     end
 
     def relative_url_root
-      if config.action_controller.present?
-        config.action_controller.relative_url_root
-      else
-        config.relative_url_root
-      end
+      config.relative_url_root
     end
 
     def asset_host_config
-      if config.action_controller.present?
-        config.action_controller.asset_host
-      else
-        config.asset_host
-      end
+      config.asset_host
     end
 
     # Returns the current request if one exists.

data/lib/action_view/test_case.rb

@@ -65,7 +65,7 @@ module ActionView
           methods.flatten.each do |method|
             _helpers.module_eval <<-end_eval
               def #{method}(*args, &block)                    # def current_user(*args, &block)
-                _test_case.send(%(#{method}), *args, &block)  #   test_case.send(%(current_user), *args, &block)
+                _test_case.send(%(#{method}), *args, &block)  #   _test_case.send(%(current_user), *args, &block)
               end                                             # end
             end_eval
           end

data/lib/sprockets/assets.rake

@@ -1,60 +1,95 @@
+require "fileutils"
+
 namespace :assets do
+  def ruby_rake_task(task)
+    env    = ENV['RAILS_ENV'] || 'production'
+    groups = ENV['RAILS_GROUPS'] || 'assets'
+    args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
+    args << "--trace" if Rake.application.options.trace
+    ruby *args
+  end
+
+  # We are currently running with no explicit bundler group
+  # and/or no explicit environment - we have to reinvoke rake to
+  # execute this task.
+  def invoke_or_reboot_rake_task(task)
+    if ENV['RAILS_GROUPS'].to_s.empty? || ENV['RAILS_ENV'].to_s.empty?
+      ruby_rake_task task
+    else
+      Rake::Task[task].invoke
+    end
+  end
+
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile do
-    # We need to do this dance because RAILS_GROUPS is used
-    # too early in the boot process and changing here is already too late.
-    if ENV["RAILS_GROUPS"].to_s.empty? || ENV["RAILS_ENV"].to_s.empty?
-      ENV["RAILS_GROUPS"] ||= "assets"
-      ENV["RAILS_ENV"]    ||= "production"
-      ruby $0, *ARGV
-    else
-      require "fileutils"
-      Rake::Task["tmp:cache:clear"].invoke
-      Rake::Task["assets:environment"].invoke
+    invoke_or_reboot_rake_task "assets:precompile:all"
+  end
 
+  namespace :precompile do
+    def internal_precompile(digest=nil)
       unless Rails.application.config.assets.enabled
-        raise "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
+        warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
+        exit
       end
 
-      # Ensure that action view is loaded and the appropriate sprockets hooks get executed
-      ActionView::Base
+      # Ensure that action view is loaded and the appropriate
+      # sprockets hooks get executed
+      _ = ActionView::Base
 
       config = Rails.application.config
       config.assets.compile = true
-      config.assets.digest = false if ENV["RAILS_ASSETS_NONDIGEST"]
-
-      env    = Rails.application.assets
-
-      # Always compile files and avoid use of existing precompiled assets
-      config.assets.compile = true
+      config.assets.digest  = digest unless digest.nil?
       config.assets.digests = {}
 
-      target = File.join(Rails.public_path, config.assets.prefix)
-      static_compiler = Sprockets::StaticCompiler.new(env, target, :digest => config.assets.digest)
+      env      = Rails.application.assets
+      target   = File.join(Rails.public_path, config.assets.prefix)
+      compiler = Sprockets::StaticCompiler.new(env,
+                                               target,
+                                               config.assets.precompile,
+                                               :manifest_path => config.assets.manifest,
+                                               :digest => config.assets.digest,
+                                               :manifest => digest.nil?)
+      compiler.compile
+    end
 
-      manifest = static_compiler.precompile(config.assets.precompile)
-      manifest_path = config.assets.manifest || target
-      FileUtils.mkdir_p(manifest_path)
+    task :all do
+      Rake::Task["assets:precompile:primary"].invoke
+      # We need to reinvoke in order to run the secondary digestless
+      # asset compilation run - a fresh Sprockets environment is
+      # required in order to compile digestless assets as the
+      # environment has already cached the assets on the primary
+      # run.
+      ruby_rake_task "assets:precompile:nondigest" if Rails.application.config.assets.digest
+    end
 
-      unless ENV["RAILS_ASSETS_NONDIGEST"]
-        File.open("#{manifest_path}/manifest.yml", 'wb') do |f|
-          YAML.dump(manifest, f)
-        end
-        ENV["RAILS_ASSETS_NONDIGEST"] = "true"
-        ruby $0, *ARGV
-      end
+    task :primary => ["assets:environment", "tmp:cache:clear"] do
+      internal_precompile
+    end
+
+    task :nondigest => ["assets:environment", "tmp:cache:clear"] do
+      internal_precompile(false)
     end
   end
 
   desc "Remove compiled assets"
-  task :clean => ['assets:environment', 'tmp:cache:clear'] do
-    config = Rails.application.config
-    public_asset_path = File.join(Rails.public_path, config.assets.prefix)
-    rm_rf public_asset_path, :secure => true
+  task :clean do
+    invoke_or_reboot_rake_task "assets:clean:all"
+  end
+
+  namespace :clean do
+    task :all => ["assets:environment", "tmp:cache:clear"] do
+      config = Rails.application.config
+      public_asset_path = File.join(Rails.public_path, config.assets.prefix)
+      rm_rf public_asset_path, :secure => true
+    end
   end
 
   task :environment do
-    Rails.application.initialize!(:assets)
-    Sprockets::Bootstrap.new(Rails.application).run
+    if Rails.application.config.assets.initialize_on_precompile
+      Rake::Task["environment"].invoke
+    else
+      Rails.application.initialize!(:assets)
+      Sprockets::Bootstrap.new(Rails.application).run
+    end
   end
 end

data/lib/sprockets/helpers.rb

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

data/lib/sprockets/helpers/isolated_helper.rb

@@ -0,0 +1,13 @@
+module Sprockets
+  module Helpers
+    module IsolatedHelper
+      def controller
+        nil
+      end
+
+      def config
+        Rails.application.config.action_controller
+      end
+    end
+  end
+end

data/lib/sprockets/helpers/rails_helper.rb

@@ -8,9 +8,6 @@ module Sprockets
 
       def asset_paths
         @asset_paths ||= begin
-          config     = self.config if respond_to?(:config)
-          config   ||= Rails.application.config
-          controller = self.controller if respond_to?(:controller)
           paths = RailsHelper::AssetPaths.new(config, controller)
           paths.asset_environment = asset_environment
           paths.asset_digests     = asset_digests
@@ -131,6 +128,8 @@ module Sprockets
           return nil if is_uri?(source)
           source = rewrite_extension(source, nil, ext)
           asset_environment[source]
+        rescue Sprockets::FileOutsidePaths
+          nil
         end
 
         def digest_for(logical_path)

data/lib/sprockets/railtie.rb

@@ -1,3 +1,5 @@
+require "action_controller/railtie"
+
 module Sprockets
   autoload :Bootstrap,      "sprockets/bootstrap"
   autoload :Helpers,        "sprockets/helpers"
@@ -7,13 +9,13 @@ module Sprockets
 
   # TODO: Get rid of config.assets.enabled
   class Railtie < ::Rails::Railtie
-    config.default_asset_host_protocol = :relative
+    config.action_controller.default_asset_host_protocol = :relative
 
     rake_tasks do
       load "sprockets/assets.rake"
     end
 
-    initializer "sprockets.environment", :group => :assets do |app|
+    initializer "sprockets.environment", :group => :all do |app|
       config = app.config
       next unless config.assets.enabled
 
@@ -40,8 +42,8 @@ module Sprockets
 
       ActiveSupport.on_load(:action_view) do
         include ::Sprockets::Helpers::RailsHelper
-
         app.assets.context_class.instance_eval do
+          include ::Sprockets::Helpers::IsolatedHelper
           include ::Sprockets::Helpers::RailsHelper
         end
       end

data/lib/sprockets/static_compiler.rb

@@ -2,41 +2,50 @@ require 'fileutils'
 
 module Sprockets
   class StaticCompiler
-    attr_accessor :env, :target, :digest
+    attr_accessor :env, :target, :paths
 
-    def initialize(env, target, options = {})
+    def initialize(env, target, paths, options = {})
       @env = env
       @target = target
+      @paths = paths
       @digest = options.key?(:digest) ? options.delete(:digest) : true
+      @manifest = options.key?(:manifest) ? options.delete(:manifest) : true
+      @manifest_path = options.delete(:manifest_path) || target
     end
 
-    def precompile(paths)
-      Rails.application.config.assets.digest = digest
+    def compile
       manifest = {}
-
       env.each_logical_path do |logical_path|
-        next unless precompile_path?(logical_path, paths)
+        next unless compile_path?(logical_path)
         if asset = env.find_asset(logical_path)
-          manifest[logical_path] = compile(asset)
+          manifest[logical_path] = write_asset(asset)
         end
       end
-      manifest
+      write_manifest(manifest) if @manifest
     end
 
-    def compile(asset)
-      asset_path = digest_asset(asset)
-      filename = File.join(target, asset_path)
-      FileUtils.mkdir_p File.dirname(filename)
-      asset.write_to(filename)
-      asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
-      asset_path
+    def write_manifest(manifest)
+      FileUtils.mkdir_p(@manifest_path)
+      File.open("#{@manifest_path}/manifest.yml", 'wb') do |f|
+        YAML.dump(manifest, f)
+      end
+    end
+
+    def write_asset(asset)
+      path_for(asset).tap do |path|
+        filename = File.join(target, path)
+        FileUtils.mkdir_p File.dirname(filename)
+        asset.write_to(filename)
+        asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/
+      end
     end
 
-    def precompile_path?(logical_path, paths)
+    def compile_path?(logical_path)
       paths.each do |path|
-        if path.is_a?(Regexp)
+        case path
+        when Regexp
           return true if path.match(logical_path)
-        elsif path.is_a?(Proc)
+        when Proc
           return true if path.call(logical_path)
         else
           return true if File.fnmatch(path.to_s, logical_path)
@@ -45,8 +54,8 @@ module Sprockets
       false
     end
 
-    def digest_asset(asset)
-      digest ? asset.digest_path : asset.logical_path
+    def path_for(asset)
+      @digest ? asset.digest_path : asset.logical_path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 977940595
+  hash: 977940592
   prerelease: true
   segments: 
   - 3
   - 1
   - 1
-  - rc2
-  version: 3.1.1.rc2
+  - rc3
+  version: 3.1.1.rc3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 -03:00
+date: 2011-10-05 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940595
+        hash: 977940592
         segments: 
         - 3
         - 1
         - 1
-        - rc2
-        version: 3.1.1.rc2
+        - rc3
+        version: 3.1.1.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940595
+        hash: 977940592
         segments: 
         - 3
         - 1
         - 1
-        - rc2
-        version: 3.1.1.rc2
+        - rc3
+        version: 3.1.1.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -61,12 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 1
-        - 0
-        - 3
-        version: 1.0.3
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -156,12 +155,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 2
+        version: 2.0.2
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -388,6 +387,7 @@ files:
 - lib/sprockets/assets.rake
 - lib/sprockets/bootstrap.rb
 - lib/sprockets/compressors.rb
+- lib/sprockets/helpers/isolated_helper.rb
 - lib/sprockets/helpers/rails_helper.rb
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb