actionpack 3.0.0.beta → 3.0.0.beta2

data/lib/action_view/template/text.rb

@@ -1,15 +1,12 @@
 module ActionView #:nodoc:
   class Template
     class Text < String #:nodoc:
-      HTML = Mime[:html]
+      attr_accessor :mime_type
 
-      def initialize(string, content_type = HTML)
+      def initialize(string, mime_type = nil)
         super(string.to_s)
-        @content_type = Mime[content_type] || content_type
-      end
-
-      def details
-        {:formats => [@content_type.to_sym]}
+        @mime_type   = Mime[mime_type] || mime_type if mime_type
+        @mime_type ||= Mime::TEXT
       end
 
       def identifier
@@ -24,12 +21,8 @@ module ActionView #:nodoc:
         to_s
       end
 
-      def mime_type
-        @content_type
-      end
-
       def formats
-        [mime_type]
+        [@mime_type.to_sym]
       end
 
       def partial?

data/lib/action_view/test_case.rb

@@ -1,29 +1,12 @@
+require 'active_support/core_ext/object/blank'
 require 'action_controller/test_case'
+require 'action_view'
 
 module ActionView
-  class Base
-    alias_method :initialize_without_template_tracking, :initialize
-    def initialize(*args)
-      @_rendered = { :template => nil, :partials => Hash.new(0) }
-      initialize_without_template_tracking(*args)
-    end
-
-    attr_internal :rendered
-  end
-
-  class Template
-    alias_method :render_without_tracking, :render
-    def render(view, locals, &blk)
-      rendered = view.rendered
-      rendered[:partials][self] += 1 if partial?
-      rendered[:template] ||= []
-      rendered[:template] << self
-      render_without_tracking(view, locals, &blk)
-    end
-  end
-
   class TestCase < ActiveSupport::TestCase
     class TestController < ActionController::Base
+      include ActionDispatch::TestProcess
+
       attr_accessor :request, :response, :params
 
       def self.controller_path
@@ -34,11 +17,14 @@ module ActionView
         @request = ActionController::TestRequest.new
         @response = ActionController::TestResponse.new
 
+        @request.env.delete('PATH_INFO')
+
         @params = {}
       end
     end
 
     include ActionDispatch::Assertions, ActionDispatch::TestProcess
+    include ActionController::TemplateAssertions
     include ActionView::Context
 
     include ActionController::PolymorphicRoutes
@@ -60,6 +46,10 @@ module ActionView
       make_test_case_available_to_view!
     end
 
+    def config
+      @controller.config if @controller.respond_to?(:config)
+    end
+
     def render(options = {}, local_assigns = {}, &block)
       @rendered << output = _view.render(options, local_assigns, &block)
       output
@@ -117,7 +107,8 @@ module ActionView
 
       def _view
         view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
-        view.class.send :include, _helpers
+        view.singleton_class.send :include, _helpers
+        view.singleton_class.send :include, @controller._router.url_helpers
         view.output_buffer = self.output_buffer
         view
       end
@@ -152,7 +143,7 @@ module ActionView
       end
 
       def method_missing(selector, *args)
-        if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+        if @controller._router.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 3.0.0.beta
+  prerelease: true
+  segments: 
+  - 3
+  - 0
+  - 0
+  - beta2
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,70 +15,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta2
+        version: 3.0.0.beta2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta2
+        version: 3.0.0.beta2
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack-mount
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: erubis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 5
         version: 2.6.5
-    version: 
-description: Web-flow and rendering framework putting the VC in MVC (part of Rails).
+  type: :runtime
+  version_requirements: *id006
+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: []
 
@@ -84,16 +116,16 @@ files:
 - CHANGELOG
 - README
 - MIT-LICENSE
+- lib/abstract_controller/assigns.rb
 - lib/abstract_controller/base.rb
 - lib/abstract_controller/callbacks.rb
 - lib/abstract_controller/collector.rb
-- lib/abstract_controller/compatibility.rb
 - lib/abstract_controller/helpers.rb
 - lib/abstract_controller/layouts.rb
-- lib/abstract_controller/localized_cache.rb
 - lib/abstract_controller/logger.rb
 - lib/abstract_controller/rendering.rb
 - lib/abstract_controller/translation.rb
+- lib/abstract_controller/view_paths.rb
 - lib/abstract_controller.rb
 - lib/action_controller/base.rb
 - lib/action_controller/caching/actions.rb
@@ -101,13 +133,13 @@ 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.rb
 - lib/action_controller/metal/compatibility.rb
 - lib/action_controller/metal/conditional_get.rb
-- lib/action_controller/metal/configuration.rb
 - lib/action_controller/metal/cookies.rb
 - lib/action_controller/metal/exceptions.rb
 - lib/action_controller/metal/flash.rb
@@ -115,6 +147,7 @@ files:
 - lib/action_controller/metal/helpers.rb
 - lib/action_controller/metal/hide_actions.rb
 - lib/action_controller/metal/http_authentication.rb
+- lib/action_controller/metal/implicit_render.rb
 - lib/action_controller/metal/instrumentation.rb
 - lib/action_controller/metal/mime_responds.rb
 - lib/action_controller/metal/rack_delegation.rb
@@ -133,10 +166,10 @@ files:
 - lib/action_controller/middleware.rb
 - lib/action_controller/polymorphic_routes.rb
 - lib/action_controller/railtie.rb
-- lib/action_controller/railties/subscriber.rb
+- lib/action_controller/railties/log_subscriber.rb
+- lib/action_controller/railties/url_helpers.rb
 - lib/action_controller/record_identifier.rb
 - lib/action_controller/test_case.rb
-- lib/action_controller/url_rewriter.rb
 - lib/action_controller/vendor/html-scanner/html/document.rb
 - lib/action_controller/vendor/html-scanner/html/node.rb
 - lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -162,6 +195,7 @@ files:
 - lib/action_dispatch/middleware/flash.rb
 - lib/action_dispatch/middleware/head.rb
 - lib/action_dispatch/middleware/params_parser.rb
+- lib/action_dispatch/middleware/remote_ip.rb
 - lib/action_dispatch/middleware/rescue.rb
 - lib/action_dispatch/middleware/session/abstract_store.rb
 - lib/action_dispatch/middleware/session/cookie_store.rb
@@ -182,6 +216,7 @@ files:
 - lib/action_dispatch/routing/mapper.rb
 - lib/action_dispatch/routing/route.rb
 - lib/action_dispatch/routing/route_set.rb
+- lib/action_dispatch/routing/url_for.rb
 - lib/action_dispatch/routing.rb
 - lib/action_dispatch/testing/assertions/dom.rb
 - lib/action_dispatch/testing/assertions/model.rb
@@ -225,9 +260,11 @@ files:
 - lib/action_view/helpers/url_helper.rb
 - lib/action_view/helpers.rb
 - lib/action_view/locale/en.yml
+- lib/action_view/lookup_context.rb
 - lib/action_view/paths.rb
 - lib/action_view/railtie.rb
-- lib/action_view/railties/subscriber.rb
+- lib/action_view/railties/log_subscriber.rb
+- lib/action_view/render/layouts.rb
 - lib/action_view/render/partials.rb
 - lib/action_view/render/rendering.rb
 - lib/action_view/template/error.rb
@@ -254,18 +291,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).

data/lib/abstract_controller/compatibility.rb

@@ -1,18 +0,0 @@
-module AbstractController
-  module Compatibility
-    extend ActiveSupport::Concern
-
-    def _find_layout(name, details)
-      details[:prefix] = nil if name =~ /\blayouts/
-      super
-    end
-
-    # Move this into a "don't run in production" module
-    def _default_layout(details, require_layout = false)
-      super
-    rescue ActionView::MissingTemplate
-      _find_layout(_layout({}), {})
-      nil
-    end
-  end
-end

data/lib/abstract_controller/localized_cache.rb

@@ -1,49 +0,0 @@
-module AbstractController
-  class HashKey
-    @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|sh,sk| sh[sk] = {} } }
-
-    def self.get(klass, formats, locale)
-      @hash_keys[klass][formats][locale] ||= new(klass, formats, locale)
-    end
-
-    attr_accessor :hash
-    def initialize(klass, formats, locale)
-      @formats, @locale = formats, locale
-      @hash = [formats, locale].hash
-    end
-
-    alias_method :eql?, :equal?
-
-    def inspect
-      "#<HashKey -- formats: #{@formats.inspect} locale: #{@locale.inspect}>"
-    end
-  end
-
-  module LocalizedCache
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def clear_template_caches!
-        ActionView::Partials::PartialRenderer::TEMPLATES.clear
-        template_cache.clear
-        super
-      end
-
-      def template_cache
-        @template_cache ||= Hash.new {|h,k| h[k] = {} }
-      end
-    end
-
-    def render(*args)
-      Thread.current[:format_locale_key] = HashKey.get(self.class, formats, I18n.locale)
-      super
-    end
-
-    private
-
-      def with_template_cache(name)
-        self.class.template_cache[Thread.current[:format_locale_key]][name] ||= super
-      end
-
-  end
-end

data/lib/action_controller/metal/configuration.rb

@@ -1,28 +0,0 @@
-module ActionController
-  module Configuration
-    extend ActiveSupport::Concern
-    
-    def config
-      @config ||= self.class.config
-    end
-    
-    def config=(config)
-      @config = config
-    end
-    
-    module ClassMethods
-      def default_config
-        @default_config ||= {}
-      end
-      
-      def config
-        self.config ||= default_config
-      end
-      
-      def config=(config)
-        @config = ActiveSupport::OrderedHash.new
-        @config.merge!(config)
-      end
-    end
-  end
-end