Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 92 insertions, 23 deletions

diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 26f6ec2d0c..59fb6819ed 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -1,35 +1,104 @@
 module ActionView #:nodoc:
-  class FixtureTemplate < Template
-    class FixturePath < Template::Path
-      def initialize(hash = {})
-        @hash = {}
-        
-        hash.each do |k, v|
-          @hash[k.sub(/\.\w+$/, '')] = FixtureTemplate.new(v, k.split("/").last, self)
+class Template
+  class FixturePath < Path
+    def initialize(hash = {}, options = {})
+      super(options)
+      @hash = hash
+    end
+    
+    def find_templates(name, details, prefix, partial)
+      if regexp = details_to_regexp(name, details, prefix, partial)
+        cached(regexp) do
+          templates = []
+          @hash.select { |k,v| k =~ regexp }.each do |path, source|
+            templates << Template.new(source, path, *path_to_details(path))
+          end
+          templates
         end
-        
-        super("fixtures://root")
-      end
-      
-      def find_template(path)
-        @hash[path]
       end
     end
     
-    def initialize(body, *args)
-      @body = body
-      super(*args)
+  private
+  
+    def formats_regexp
+      @formats_regexp ||= begin
+        formats = Mime::SET.map { |m| m.symbol }
+        '(?:' + formats.map { |l| "\\.#{Regexp.escape(l.to_s)}" }.join('|') + ')?'
+      end
     end
     
-    def source
-      @body
+    def handler_regexp
+      e = TemplateHandlers.extensions.map{|h| "\\.#{Regexp.escape(h.to_s)}"}.join("|")
+      "(?:#{e})?"
     end
   
-  private
-  
-    def find_full_path(path, load_paths)
-      return '/', path
+    def details_to_regexp(name, details, prefix, partial)
+      path = ""
+      path << "#{prefix}/" unless prefix.empty?
+      path << (partial ? "_#{name}" : name)
+    
+      extensions = ""
+      [:locales, :formats].each do |k|
+        extensions << if exts = details[k]
+          '(?:' + exts.map {|e| "\\.#{Regexp.escape(e.to_s)}"}.join('|') + ')?'
+        else
+          k == :formats ? formats_regexp : ''
+        end
+      end
+      
+      %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$'
+    end
+    
+    # TODO: fix me
+    # :api: plugin
+    def path_to_details(path)
+      # [:erb, :format => :html, :locale => :en, :partial => true/false]
+      if m = path.match(%r'(_)?[\w-]+(\.[\w-]+)*\.(\w+)$')
+        partial = m[1] == '_'
+        details = (m[2]||"").split('.').reject { |e| e.empty? }
+        handler = Template.handler_class_for_extension(m[3])
+    
+        format  = Mime[details.last] && details.pop.to_sym
+        locale  = details.last && details.pop.to_sym
+        
+        return handler, :format => format, :locale => locale, :partial => partial
+      end
     end
-  
   end
+  
+  
+  # class FixtureTemplate < Template
+  #   class FixturePath < Template::Path
+  #     def initialize(hash = {})
+  #       @hash = {}
+  #       
+  #       hash.each do |k, v|
+  #         @hash[k.sub(/\.\w+$/, '')] = FixtureTemplate.new(v, k.split("/").last, self)
+  #       end
+  #       
+  #       super("fixtures://root")
+  #     end
+  #     
+  #     def find_template(path)
+  #       @hash[path]
+  #     end
+  #   end
+  #   
+  #   def initialize(body, *args)
+  #     @body = body
+  #     super(*args)
+  #   end
+  #   
+  #   def source
+  #     @body
+  #   end
+  # 
+  # private
+  # 
+  #   def find_full_path(path, load_paths)
+  #     return '/', path
+  #   end
+  # 
+  # end
+end
 end
\ No newline at end of file