From 5ffaaa71d149c9807260c950c9a61d01fe734827 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Mon, 20 Jul 2009 00:27:04 +0900
Subject: Define ActiveModel API Compliance

  - Define to_model on AR
  - Define to_model on ActiveModel::APICompliant
  - Update test fixtures to be API Compliant
  - Start using to_model in AP
---
 .../routing/generation/polymorphic_routes.rb       |  1 +
 .../action_view/helpers/active_record_helper.rb    | 24 +++++++++++++++++-----
 actionpack/lib/action_view/helpers/form_helper.rb  | 13 ++++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
index c6f7de17bd..159d869a54 100644
--- a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
+++ b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
@@ -77,6 +77,7 @@ module ActionController
       end
 
       record    = extract_record(record_or_hash_or_array)
+      record    = record.to_model if record.respond_to?(:to_model)
       namespace = extract_namespace(record_or_hash_or_array)
 
       args = case record_or_hash_or_array
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb
index 75cc651968..8dffd3bc91 100644
--- a/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -77,6 +77,7 @@ module ActionView
       # * <tt>:submit_value</tt> - The text of the submit button (default: "Create" if a new record, otherwise "Update").
       def form(record_name, options = {})
         record = instance_variable_get("@#{record_name}")
+        record = record.to_model if record.respond_to?(:to_model)
 
         options = options.symbolize_keys
         options[:action] ||= record.new_record? ? "create" : "update"
@@ -121,6 +122,8 @@ module ActionView
         end
         options.reverse_merge!(:prepend_text => '', :append_text => '', :css_class => 'formError')
 
+        object = object.to_model if object.respond_to?(:to_model)
+
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
           (errors = obj.errors[method])
           content_tag("div",
@@ -179,6 +182,8 @@ module ActionView
           objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
         end
 
+        objects.map! {|o| o.respond_to?(:to_model) ? o.to_model : o }
+
         count  = objects.inject(0) {|sum, object| sum + object.errors.count }
         unless count.zero?
           html = {}
@@ -226,7 +231,14 @@ module ActionView
         end
     end
 
-    class InstanceTag #:nodoc:
+    module ActiveRecordInstanceTag
+      def object
+        @active_model_object ||= begin
+          object = super
+          object.respond_to?(:to_model) ? object.to_model : object
+        end
+      end
+
       def to_tag(options = {})
         case column_type
           when :string
@@ -248,11 +260,9 @@ module ActionView
       end
 
       %w(tag content_tag to_date_select_tag to_datetime_select_tag to_time_select_tag).each do |meth|
-        without = "#{meth}_without_error_wrapping"
-        define_method "#{meth}_with_error_wrapping" do |*args|
-          error_wrapping(send(without, *args))
+        define_method meth do |*|
+          error_wrapping(super)
         end
-        alias_method_chain meth, :error_wrapping
       end
 
       def error_wrapping(html_tag)
@@ -267,5 +277,9 @@ module ActionView
         object.send(:column_for_attribute, @method_name).type
       end
     end
+
+    class InstanceTag
+      include ActiveRecordInstanceTag
+    end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index a74709e98a..ecbdcd8e7a 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -626,8 +626,8 @@ module ActionView
 
       # Returns a checkbox tag tailored for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). This object must be an instance object (@object) and not a local object.
-      # It's intended that +method+ returns an integer and if that integer is above zero, then the checkbox is checked. 
-      # Additional options on the input tag can be passed as a hash with +options+. The +checked_value+ defaults to 1 
+      # It's intended that +method+ returns an integer and if that integer is above zero, then the checkbox is checked.
+      # Additional options on the input tag can be passed as a hash with +options+. The +checked_value+ defaults to 1
       # while the default +unchecked_value+ is set to 0 which is convenient for boolean values.
       #
       # ==== Gotcha
@@ -709,7 +709,8 @@ module ActionView
       end
     end
 
-    class InstanceTag #:nodoc:
+    module InstanceTagMethods #:nodoc:
+      extend ActiveSupport::Concern
       include Helpers::TagHelper, Helpers::FormTagHelper
 
       attr_reader :method_name, :object_name
@@ -832,7 +833,7 @@ module ActionView
         self.class.value_before_type_cast(object, @method_name)
       end
 
-      class << self
+      module ClassMethods
         def value(object, method_name)
           object.send method_name unless object.nil?
         end
@@ -918,6 +919,10 @@ module ActionView
         end
     end
 
+    class InstanceTag
+      include InstanceTagMethods
+    end
+
     class FormBuilder #:nodoc:
       # The methods which wrap a form helper call.
       class_inheritable_accessor :field_helpers
-- 
cgit v1.2.3