actionpack 3.0.0.beta3 → 3.0.0.beta4

data/lib/action_view/testing/resolvers.rb

@@ -0,0 +1,43 @@
+require 'action_view/template/resolver'
+
+module ActionView #:nodoc:
+  # Use FixtureResolver in your tests to simulate the presence of files on the
+  # file system. This is used internally by Rails' own test suite, and is
+  # useful for testing extensions that have no way of knowing what the file
+  # system will look like at runtime.
+  class FixtureResolver < PathResolver
+    attr_reader :hash
+
+    def initialize(hash = {})
+      super()
+      @hash = hash
+    end
+
+  private
+
+    def query(path, exts, formats)
+      query = Regexp.escape(path)
+      exts.each do |ext|
+        query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
+      end
+
+      templates = []
+      @hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source|
+        handler, format = extract_handler_and_format(path, formats)
+        templates << Template.new(source, path, handler,
+          :virtual_path => path, :format => format)
+      end
+
+      templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
+    end
+  end
+
+  class NullResolver < ActionView::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)]
+    end
+  end
+  
+end
+

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,14 +44,42 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -61,39 +89,53 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 4
+        version: 0.5.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-mount
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 6
+        - 3
+        version: 0.6.3
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
         - 0
-        version: 0.6.0
+        - 3
+        - 16
+        version: 0.3.16
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: erubis
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -103,7 +145,7 @@ dependencies:
         - 5
         version: 2.6.5
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id009
 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: []
@@ -116,7 +158,7 @@ files:
 - CHANGELOG
 - README
 - MIT-LICENSE
-- lib/abstract_controller/assigns.rb
+- lib/abstract_controller/asset_paths.rb
 - lib/abstract_controller/base.rb
 - lib/abstract_controller/callbacks.rb
 - lib/abstract_controller/collector.rb
@@ -189,7 +231,6 @@ files:
 - lib/action_dispatch/http/upload.rb
 - lib/action_dispatch/http/url.rb
 - lib/action_dispatch/middleware/callbacks.rb
-- lib/action_dispatch/middleware/cascade.rb
 - lib/action_dispatch/middleware/cookies.rb
 - lib/action_dispatch/middleware/flash.rb
 - lib/action_dispatch/middleware/head.rb
@@ -276,6 +317,7 @@ files:
 - lib/action_view/template/text.rb
 - lib/action_view/template.rb
 - lib/action_view/test_case.rb
+- lib/action_view/testing/resolvers.rb
 - lib/action_view.rb
 has_rdoc: true
 homepage: http://www.rubyonrails.org

data/lib/abstract_controller/assigns.rb

@@ -1,21 +0,0 @@
-module AbstractController
-  module Assigns
-    # This method should return a hash with assigns.
-    # You can overwrite this configuration per controller.
-    # :api: public
-    def view_assigns
-      hash = {}
-      variables  = instance_variable_names
-      variables -= protected_instance_variables if respond_to?(:protected_instance_variables)
-      variables.each { |name| hash[name] = instance_variable_get(name) }
-      hash
-    end
-
-    # This method assigns the hash specified in _assigns_hash to the given object.
-    # :api: private
-    # TODO Ideally, this should be done on AV::Base.new initialization.
-    def _evaluate_assigns(object)
-      view_assigns.each { |k,v| object.instance_variable_set(k, v) }
-    end
-  end
-end

data/lib/action_dispatch/middleware/cascade.rb

@@ -1,29 +0,0 @@
-module ActionDispatch
-  class Cascade
-    def self.new(*apps)
-      apps = apps.flatten
-
-      case apps.length
-      when 0
-        raise ArgumentError, "app is required"
-      when 1
-        apps.first
-      else
-        super(apps)
-      end
-    end
-
-    def initialize(apps)
-      @apps = apps
-    end
-
-    def call(env)
-      result = nil
-      @apps.each do |app|
-        result = app.call(env)
-        break unless result[1]["X-Cascade"] == "pass"
-      end
-      result
-    end
-  end
-end