actionpack 3.0.20 → 3.1.0.beta1

data/lib/action_view/template/text.rb

@@ -25,10 +25,6 @@ module ActionView #:nodoc:
       def formats
         [@mime_type.to_sym]
       end
-
-      def partial?
-        false
-      end
     end
   end
 end

data/lib/action_view/test_case.rb

@@ -1,4 +1,6 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/remove_method'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_view'
@@ -20,12 +22,12 @@ module ActionView
       end
 
       def initialize
+        super
         self.class.controller_path = ""
         @request = ActionController::TestRequest.new
         @response = ActionController::TestResponse.new
 
         @request.env.delete('PATH_INFO')
-
         @params = {}
       end
     end
@@ -43,6 +45,7 @@ module ActionView
       include AbstractController::Helpers
       include ActionView::Helpers
 
+      delegate :lookup_context, :to => :controller
       attr_accessor :controller, :output_buffer, :rendered
 
       module ClassMethods
@@ -121,12 +124,13 @@ module ActionView
       # Support the selector assertions
       #
       # Need to experiment if this priority is the best one: rendered => output_buffer
-      def response_from_page_or_rjs
+      def response_from_page
         HTML::Document.new(@rendered.blank? ? @output_buffer : @rendered).root
       end
 
       def say_no_to_protect_against_forgery!
         _helpers.module_eval do
+          remove_possible_method :protect_against_forgery?
           def protect_against_forgery?
             false
           end
@@ -136,30 +140,42 @@ module ActionView
       def make_test_case_available_to_view!
         test_case_instance = self
         _helpers.module_eval do
-          define_method(:_test_case) { test_case_instance }
-          private :_test_case
+          unless private_method_defined?(:_test_case)
+            define_method(:_test_case) { test_case_instance }
+            private :_test_case
+          end
         end
       end
 
       module Locals
         attr_accessor :locals
 
-        def _render_partial(options)
-          locals[options[:partial]] = options[:locals]
-          super(options)
+        def render(options = {}, local_assigns = {})
+          case options
+          when Hash
+            if block_given?
+              locals[options[:layout]] = options[:locals]
+            elsif options.key?(:partial)
+              locals[options[:partial]] = options[:locals]
+            end
+          else
+            locals[options] = local_assigns
+          end
+
+          super
         end
       end
 
       # The instance of ActionView::Base that is used by +render+.
       def view
         @view ||= begin
-                     view = @controller.view_context
-                     view.singleton_class.send :include, _helpers
-                     view.extend(Locals)
-                     view.locals = self.locals
-                     view.output_buffer = self.output_buffer
-                     view
-                   end
+          view = @controller.view_context
+          view.singleton_class.send :include, _helpers
+          view.extend(Locals)
+          view.locals = self.locals
+          view.output_buffer = self.output_buffer
+          view
+        end
       end
 
       alias_method :_view, :view
@@ -198,7 +214,7 @@ module ActionView
       # frameworks.
       def view_assigns
         Hash[_user_defined_ivars.map do |var|
-          [var[1..-1].to_sym, instance_variable_get(var)]
+          [var[1, var.length].to_sym, instance_variable_get(var)]
         end]
       end
 
@@ -214,7 +230,7 @@ module ActionView
 
       def method_missing(selector, *args)
         if @controller.respond_to?(:_routes) &&
-        @controller._routes.named_routes.helpers.include?(selector)
+          @controller._routes.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super

data/lib/action_view/testing/resolvers.rb

@@ -8,32 +8,38 @@ module ActionView #:nodoc:
   class FixtureResolver < PathResolver
     attr_reader :hash
 
-    def initialize(hash = {})
-      super()
+    def initialize(hash = {}, pattern=nil)
+      super(pattern)
       @hash = hash
     end
 
+    def to_s
+      @hash.keys.join(', ')
+    end
+
   private
 
     def query(path, exts, formats)
-      query = Regexp.escape(path)
-      exts.each do |ext|
-        query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
+      query = ""
+      EXTENSIONS.each do |ext|
+        query << '(' << exts[ext].map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
       end
+      query = /^(#{Regexp.escape(path)})#{query}$/
 
       templates = []
-      @hash.each do |_path, source|
-        next unless _path =~ /^#{query}$/
+      @hash.each do |_path, array|
+        source, updated_at = array
+        next unless _path =~ query
         handler, format = extract_handler_and_format(_path, formats)
         templates << Template.new(source, _path, handler,
-          :virtual_path => _path, :format => format)
+          :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
 
-  class NullResolver < ActionView::PathResolver
+  class NullResolver < PathResolver
     def query(path, exts, formats)
       handler, format = extract_handler_and_format(path, formats)
       [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)]

data/lib/sprockets/railtie.rb

@@ -0,0 +1,100 @@
+module Sprockets
+  class Railtie < Rails::Railtie
+    def self.using_coffee?
+      require 'coffee-script'
+      defined?(CoffeeScript)
+    rescue LoadError
+      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|
+      ActiveSupport.on_load(:action_controller) do
+        self.use_sprockets = app.config.assets.enabled
+      end
+    end
+
+    # We need to configure this after initialization to ensure we collect
+    # paths from all engines. This hook is invoked exactly before routes
+    # are compiled.
+    config.after_initialize do |app|
+      assets = app.config.assets
+      next unless assets.enabled
+
+      app.assets = asset_environment(app)
+
+      ActiveSupport.on_load(:action_view) do
+        app.assets.context.instance_eval do
+          include ::ActionView::Helpers::SprocketsHelper
+        end
+      end
+
+      app.routes.append do
+        mount app.assets => assets.prefix
+      end
+
+      if config.action_controller.perform_caching
+        app.assets = app.assets.index
+      end
+    end
+
+    protected
+
+    def asset_environment(app)
+      require "sprockets"
+      assets = app.config.assets
+      env = Sprockets::Environment.new(app.root.to_s)
+      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
+    end
+
+    def expand_js_compressor(sym)
+      case sym
+      when :closure
+        require 'closure-compiler'
+        Closure::Compiler.new
+      when :uglifier
+        require 'uglifier'
+        Uglifier.new
+      when :yui
+        require 'yui/compressor'
+        YUI::JavaScriptCompressor.new
+      else
+        sym
+      end
+    end
+
+    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::JavaScriptCompressor.new(:munge => true)
+      else
+        sym
+      end
+    end
+  end
+end

metadata

@@ -1,148 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: actionpack
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack-cache
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: builder
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.5
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0beta1
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.7
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.0.beta
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.7
-- !ruby/object:Gem::Dependency
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rack-mount
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.14
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.14
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.23
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0.beta.2
   type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.23
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.6
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.27
   type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: erubis
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.6
-description: Web apps on Rails. Simple, battle-tested conventions for building and
-  testing MVC web applications. Works with any Rack-compatible server.
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.7.0
+  type: :runtime
+  version_requirements: *id011
+description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG
 - README.rdoc
 - MIT-LICENSE
@@ -153,8 +153,10 @@ files:
 - lib/abstract_controller/helpers.rb
 - lib/abstract_controller/layouts.rb
 - lib/abstract_controller/logger.rb
+- lib/abstract_controller/railties/routes_helpers.rb
 - lib/abstract_controller/rendering.rb
 - lib/abstract_controller/translation.rb
+- lib/abstract_controller/url_for.rb
 - lib/abstract_controller/view_paths.rb
 - lib/abstract_controller.rb
 - lib/action_controller/base.rb
@@ -163,18 +165,17 @@ files:
 - lib/action_controller/caching/pages.rb
 - lib/action_controller/caching/sweeping.rb
 - lib/action_controller/caching.rb
-- lib/action_controller/deprecated/base.rb
-- lib/action_controller/deprecated/dispatcher.rb
 - lib/action_controller/deprecated/integration_test.rb
 - lib/action_controller/deprecated/performance_test.rb
-- lib/action_controller/deprecated/url_writer.rb
 - lib/action_controller/deprecated.rb
 - lib/action_controller/log_subscriber.rb
 - lib/action_controller/metal/compatibility.rb
 - lib/action_controller/metal/conditional_get.rb
 - lib/action_controller/metal/cookies.rb
+- lib/action_controller/metal/data_streaming.rb
 - lib/action_controller/metal/exceptions.rb
 - lib/action_controller/metal/flash.rb
+- lib/action_controller/metal/force_ssl.rb
 - lib/action_controller/metal/head.rb
 - lib/action_controller/metal/helpers.rb
 - lib/action_controller/metal/hide_actions.rb
@@ -182,6 +183,7 @@ files:
 - lib/action_controller/metal/implicit_render.rb
 - lib/action_controller/metal/instrumentation.rb
 - lib/action_controller/metal/mime_responds.rb
+- lib/action_controller/metal/params_wrapper.rb
 - lib/action_controller/metal/rack_delegation.rb
 - lib/action_controller/metal/redirecting.rb
 - lib/action_controller/metal/renderers.rb
@@ -196,6 +198,7 @@ files:
 - lib/action_controller/metal.rb
 - lib/action_controller/middleware.rb
 - lib/action_controller/railtie.rb
+- lib/action_controller/railties/paths.rb
 - lib/action_controller/record_identifier.rb
 - lib/action_controller/test_case.rb
 - lib/action_controller/vendor/html-scanner/html/document.rb
@@ -214,16 +217,19 @@ files:
 - lib/action_dispatch/http/mime_types.rb
 - lib/action_dispatch/http/parameter_filter.rb
 - lib/action_dispatch/http/parameters.rb
+- lib/action_dispatch/http/rack_cache.rb
 - lib/action_dispatch/http/request.rb
 - lib/action_dispatch/http/response.rb
 - lib/action_dispatch/http/upload.rb
 - lib/action_dispatch/http/url.rb
 - lib/action_dispatch/middleware/best_standards_support.rb
 - lib/action_dispatch/middleware/callbacks.rb
+- lib/action_dispatch/middleware/closed_error.rb
 - lib/action_dispatch/middleware/cookies.rb
 - lib/action_dispatch/middleware/flash.rb
 - lib/action_dispatch/middleware/head.rb
 - lib/action_dispatch/middleware/params_parser.rb
+- lib/action_dispatch/middleware/reloader.rb
 - lib/action_dispatch/middleware/remote_ip.rb
 - lib/action_dispatch/middleware/rescue.rb
 - lib/action_dispatch/middleware/session/abstract_store.rb
@@ -241,11 +247,12 @@ files:
 - lib/action_dispatch/middleware/templates/rescues/template_error.erb
 - lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
 - lib/action_dispatch/railtie.rb
-- lib/action_dispatch/routing/deprecated_mapper.rb
 - lib/action_dispatch/routing/mapper.rb
 - lib/action_dispatch/routing/polymorphic_routes.rb
+- lib/action_dispatch/routing/redirection.rb
 - lib/action_dispatch/routing/route.rb
 - lib/action_dispatch/routing/route_set.rb
+- lib/action_dispatch/routing/routes_proxy.rb
 - lib/action_dispatch/routing/url_for.rb
 - lib/action_dispatch/routing.rb
 - lib/action_dispatch/testing/assertions/dom.rb
@@ -263,12 +270,20 @@ files:
 - lib/action_pack/version.rb
 - lib/action_pack.rb
 - lib/action_view/base.rb
+- lib/action_view/buffers.rb
 - lib/action_view/context.rb
+- lib/action_view/flows.rb
 - lib/action_view/helpers/active_model_helper.rb
+- lib/action_view/helpers/asset_paths.rb
 - lib/action_view/helpers/asset_tag_helper.rb
+- lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
+- lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+- lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+- lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
 - lib/action_view/helpers/atom_feed_helper.rb
 - lib/action_view/helpers/cache_helper.rb
 - lib/action_view/helpers/capture_helper.rb
+- lib/action_view/helpers/controller_helper.rb
 - lib/action_view/helpers/csrf_helper.rb
 - lib/action_view/helpers/date_helper.rb
 - lib/action_view/helpers/debug_helper.rb
@@ -277,11 +292,11 @@ files:
 - lib/action_view/helpers/form_tag_helper.rb
 - lib/action_view/helpers/javascript_helper.rb
 - lib/action_view/helpers/number_helper.rb
-- lib/action_view/helpers/prototype_helper.rb
-- lib/action_view/helpers/raw_output_helper.rb
+- lib/action_view/helpers/output_safety_helper.rb
 - 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/scriptaculous_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
@@ -290,16 +305,17 @@ files:
 - lib/action_view/locale/en.yml
 - lib/action_view/log_subscriber.rb
 - lib/action_view/lookup_context.rb
-- lib/action_view/paths.rb
+- lib/action_view/path_set.rb
 - lib/action_view/railtie.rb
-- lib/action_view/render/layouts.rb
-- lib/action_view/render/partials.rb
-- lib/action_view/render/rendering.rb
+- lib/action_view/renderer/abstract_renderer.rb
+- lib/action_view/renderer/partial_renderer.rb
+- lib/action_view/renderer/renderer.rb
+- lib/action_view/renderer/streaming_template_renderer.rb
+- lib/action_view/renderer/template_renderer.rb
 - lib/action_view/template/error.rb
 - lib/action_view/template/handler.rb
 - lib/action_view/template/handlers/builder.rb
 - lib/action_view/template/handlers/erb.rb
-- lib/action_view/template/handlers/rjs.rb
 - lib/action_view/template/handlers.rb
 - lib/action_view/template/resolver.rb
 - lib/action_view/template/text.rb
@@ -307,28 +323,34 @@ files:
 - lib/action_view/test_case.rb
 - lib/action_view/testing/resolvers.rb
 - lib/action_view.rb
+- lib/sprockets/railtie.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
+requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
+