activemodel 3.0.0.beta4 → 3.0.pre

data/lib/active_model/validations/presence.rb

@@ -2,13 +2,7 @@ require 'active_support/core_ext/object/blank'
 
 module ActiveModel
   module Validations
-    class PresenceValidator < EachValidator
-      def validate(record)
-        record.errors.add_on_blank(attributes, options[:message])
-      end
-    end
-
-    module HelperMethods
+    module ClassMethods
       # Validates that the specified attributes are not blank (as defined by Object#blank?). Happens by default on save. Example:
       #
       #   class Person < ActiveRecord::Base
@@ -34,7 +28,13 @@ module ActiveModel
       #   The method, proc or string should return or evaluate to a true or false value.
       #
       def validates_presence_of(*attr_names)
-        validates_with PresenceValidator, _merge_attributes(attr_names)
+        configuration = attr_names.extract_options!
+
+        # can't use validates_each here, because it cannot cope with nonexistent attributes,
+        # while errors.add_on_empty can
+        validate configuration do |record|
+          record.errors.add_on_blank(attr_names, configuration[:message])
+        end
       end
     end
   end

data/lib/active_model/validations/with.rb

@@ -1,25 +1,15 @@
 module ActiveModel
   module Validations
-    module HelperMethods
-      private
-        def _merge_attributes(attr_names)
-          options = attr_names.extract_options!
-          options.merge(:attributes => attr_names.flatten)
-        end
-    end
-
     module ClassMethods
 
-      # Passes the record off to the class or classes specified and allows them
-      # to add errors based on more complex conditions.
+      # Passes the record off to the class or classes specified and allows them to add errors based on more complex conditions.
       #
-      #   class Person
-      #     include ActiveModel::Validations
+      #   class Person < ActiveRecord::Base
       #     validates_with MyValidator
       #   end
       #
-      #   class MyValidator < ActiveModel::Validator
-      #     def validate(record)
+      #   class MyValidator < ActiveRecord::Validator
+      #     def validate
       #       if some_complex_logic
       #         record.errors[:base] << "This record is invalid"
       #       end
@@ -33,100 +23,42 @@ module ActiveModel
       #
       # You may also pass it multiple classes, like so:
       #
-      #   class Person
-      #     include ActiveModel::Validations
+      #   class Person < ActiveRecord::Base
       #     validates_with MyValidator, MyOtherValidator, :on => :create
       #   end
       #
       # Configuration options:
-      # * <tt>on</tt> - Specifies when this validation is active
-      #   (<tt>:create</tt> or <tt>:update</tt>
-      # * <tt>if</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
-      #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
+      # * <tt>on</tt> - Specifies when this validation is active (<tt>:create</tt> or <tt>:update</tt>
+      # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
       #   The method, proc or string should return or evaluate to a true or false value.
-      # * <tt>unless</tt> - Specifies a method, proc or string to call to
-      #   determine if the validation should not occur
-      #   (e.g. <tt>:unless => :skip_validation</tt>, or
-      #   <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
+      # * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
       #   The method, proc or string should return or evaluate to a true or false value.
       #
-      # If you pass any additional configuration options, they will be passed
-      # to the class and available as <tt>options</tt>:
+      # If you pass any additional configuration options, they will be passed to the class and available as <tt>options</tt>:
       #
-      #   class Person
-      #     include ActiveModel::Validations
+      #   class Person < ActiveRecord::Base
       #     validates_with MyValidator, :my_custom_key => "my custom value"
       #   end
       #
-      #   class MyValidator < ActiveModel::Validator
-      #     def validate(record)
+      #   class MyValidator < ActiveRecord::Validator
+      #     def validate
       #       options[:my_custom_key] # => "my custom value"
       #     end
       #   end
       #
-      def validates_with(*args, &block)
-        options = args.extract_options!
-        args.each do |klass|
-          validator = klass.new(options, &block)
-          validator.setup(self) if validator.respond_to?(:setup)
+      def validates_with(*args)
+        configuration = args.extract_options!
 
-          if validator.respond_to?(:attributes) && !validator.attributes.empty?
-            validator.attributes.each do |attribute|
-              _validators[attribute.to_sym] << validator
-            end
-          else
-            _validators[nil] << validator
+        validate configuration do |record|
+          args.each do |klass|
+            klass.new(record, configuration.except(:on, :if, :unless)).validate
           end
-
-          validate(validator, options)
         end
       end
     end
-
-    # Passes the record off to the class or classes specified and allows them
-    # to add errors based on more complex conditions.
-    #
-    #   class Person
-    #     include ActiveModel::Validations
-    #
-    #     validates :instance_validations
-    #
-    #     def instance_validations
-    #       validates_with MyValidator
-    #     end
-    #   end
-    #
-    # Please consult the class method documentation for more information on
-    # creating your own validator.
-    #
-    # You may also pass it multiple classes, like so:
-    #
-    #   class Person
-    #     include ActiveModel::Validations
-    #
-    #     validates :instance_validations, :on => :create
-    #
-    #     def instance_validations
-    #       validates_with MyValidator, MyOtherValidator
-    #     end
-    #   end
-    #
-    # Standard configuration options (:on, :if and :unless), which are
-    # available on the class version of validates_with, should instead be
-    # placed on the <tt>validates</tt> method as these are applied and tested
-    # in the callback
-    #
-    # If you pass any additional configuration options, they will be passed
-    # to the class and available as <tt>options</tt>, please refer to the
-    # class version of this method for more information
-    #
-    def validates_with(*args, &block)
-      options = args.extract_options!
-      args.each do |klass|
-        validator = klass.new(options, &block)
-        validator.validate(self)
-      end
-    end
   end
-end
+end
+
+

data/lib/active_model/validations_repair_helper.rb

@@ -0,0 +1,35 @@
+module ActiveModel
+  module ValidationsRepairHelper
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def repair_validations(*model_classes)
+        setup do
+          @_stored_callbacks = {}
+          model_classes.each do |k|
+            @_stored_callbacks[k] = k._validate_callbacks.dup
+          end
+        end
+        teardown do
+          model_classes.each do |k|
+            k._validate_callbacks = @_stored_callbacks[k]
+            k.__update_callbacks(:validate)
+          end
+        end
+      end
+    end
+
+    def repair_validations(*model_classes, &block)
+      @__stored_callbacks = {}
+      model_classes.each do |k|
+        @__stored_callbacks[k] = k._validate_callbacks.dup
+      end
+      return block.call
+    ensure
+      model_classes.each do |k|
+        k._validate_callbacks = @__stored_callbacks[k]
+        k.__update_callbacks(:validate)
+      end
+    end
+  end
+end

data/lib/active_model/version.rb

@@ -2,9 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 0
-    BUILD = "beta4"
+    TINY  = "pre"
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 3
-  - 0
-  - 0
-  - beta4
-  version: 3.0.0.beta4
+  version: 3.0.pre
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,53 +9,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  type: :runtime
-  version_requirements: *id003
-description: A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.
+        version: 3.0.pre
+    version: 
+description: Extracts common modeling concerns from ActiveRecord to share between similar frameworks like ActiveResource.
 email: david@loudthinking.com
 executables: []
 
@@ -74,7 +35,6 @@ files:
 - MIT-LICENSE
 - README
 - lib/active_model/attribute_methods.rb
-- lib/active_model/callbacks.rb
 - lib/active_model/conversion.rb
 - lib/active_model/deprecated_error_methods.rb
 - lib/active_model/dirty.rb
@@ -83,12 +43,15 @@ files:
 - lib/active_model/locale/en.yml
 - lib/active_model/naming.rb
 - lib/active_model/observing.rb
-- lib/active_model/railtie.rb
 - lib/active_model/serialization.rb
 - lib/active_model/serializers/json.rb
 - lib/active_model/serializers/xml.rb
+- lib/active_model/state_machine/event.rb
+- lib/active_model/state_machine/machine.rb
+- lib/active_model/state_machine/state.rb
+- lib/active_model/state_machine/state_transition.rb
+- lib/active_model/state_machine.rb
 - lib/active_model/test_case.rb
-- lib/active_model/translation.rb
 - lib/active_model/validations/acceptance.rb
 - lib/active_model/validations/confirmation.rb
 - lib/active_model/validations/exclusion.rb
@@ -97,10 +60,9 @@ files:
 - lib/active_model/validations/length.rb
 - lib/active_model/validations/numericality.rb
 - lib/active_model/validations/presence.rb
-- lib/active_model/validations/validates.rb
 - lib/active_model/validations/with.rb
 - lib/active_model/validations.rb
-- lib/active_model/validator.rb
+- lib/active_model/validations_repair_helper.rb
 - lib/active_model/version.rb
 - lib/active_model.rb
 has_rdoc: true
@@ -116,26 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: activemodel
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A toolkit for building modeling frameworks (part of Rails).
+summary: A toolkit for building other modeling frameworks like ActiveRecord
 test_files: []
 

data/lib/active_model/callbacks.rb

@@ -1,134 +0,0 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/callbacks'
-
-module ActiveModel
-  # == Active Model Callbacks
-  # 
-  # Provides an interface for any class to have Active Record like callbacks.
-  # 
-  # Like the Active Record methods, the call back chain is aborted as soon as
-  # one of the methods in the chain returns false.
-  #
-  # First, extend ActiveModel::Callbacks from the class you are creating:
-  # 
-  #   class MyModel
-  #     extend ActiveModel::Callbacks
-  #   end
-  # 
-  # Then define a list of methods that you want call backs attached to:
-  # 
-  #   define_model_callbacks :create, :update
-  # 
-  # This will provide all three standard callbacks (before, around and after) around
-  # both the :create and :update methods. To implement, you need to wrap the methods 
-  # you want call backs on in a block so that the call backs get a chance to fire:
-  # 
-  #   def create
-  #     _run_create_callbacks do
-  #       # Your create action methods here
-  #     end
-  #   end
-  # 
-  # The _run_<method_name>_callbacks methods are dynamically created when you extend
-  # the <tt>ActiveModel::Callbacks</tt> module.
-  # 
-  # Then in your class, you can use the +before_create+, +after_create+ and +around_create+
-  # methods, just as you would in an Active Record module.
-  # 
-  #   before_create :action_before_create
-  # 
-  #   def action_before_create
-  #     # Your code here
-  #   end
-  # 
-  # You can choose not to have all three callbacks by passing an hash to the 
-  # define_model_callbacks method.
-  # 
-  #   define_model_callbacks :create, :only => :after, :before
-  # 
-  # Would only create the after_create and before_create callback methods in your
-  # class.
-  module Callbacks
-    def self.extended(base)
-      base.class_eval do
-        include ActiveSupport::Callbacks
-      end
-    end
-
-    # define_model_callbacks accepts all options define_callbacks does, in case you
-    # want to overwrite a default. Besides that, it also accepts an :only option, 
-    # where you can choose if you want all types (before, around or after) or just some.
-    #
-    #   define_model_callbacks :initializer, :only => :after
-    # 
-    # Note, the <tt>:only => <type></tt> hash will apply to all callbacks defined on
-    # that method call.  To get around this you can call the define_model_callbacks
-    # method as many times as you need.
-    # 
-    #   define_model_callbacks :create, :only => :after
-    #   define_model_callbacks :update, :only => :before
-    #   define_model_callbacks :destroy, :only => :around
-    # 
-    # Would create +after_create+, +before_update+ and +around_destroy+ methods only.
-    # 
-    # You can pass in a class to before_<type>, after_<type> and around_<type>, in which
-    # case the call back will call that class's <action>_<type> method passing the object
-    # that the callback is being called on.
-    # 
-    #   class MyModel
-    #     extend ActiveModel::Callbacks
-    #     define_model_callbacks :create
-    # 
-    #     before_create AnotherClass
-    #   end
-    # 
-    #   class AnotherClass
-    #     def self.before_create( obj )
-    #       # obj is the MyModel instance that the callback is being called on
-    #     end
-    #   end
-    #     
-    def define_model_callbacks(*callbacks)
-      options = callbacks.extract_options!
-      options = { :terminator => "result == false", :scope => [:kind, :name] }.merge(options)
-
-      types = Array.wrap(options.delete(:only))
-      types = [:before, :around, :after] if types.empty?
-
-      callbacks.each do |callback|
-        define_callbacks(callback, options)
-
-        types.each do |type|
-          send(:"_define_#{type}_model_callback", self, callback)
-        end
-      end
-    end
-
-    def _define_before_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.before_#{callback}(*args, &block)
-          set_callback(:#{callback}, :before, *args, &block)
-        end
-      CALLBACK
-    end
-
-    def _define_around_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.around_#{callback}(*args, &block)
-          set_callback(:#{callback}, :around, *args, &block)
-        end
-      CALLBACK
-    end
-
-    def _define_after_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.after_#{callback}(*args, &block)
-          options = args.extract_options!
-          options[:prepend] = true
-          options[:if] = Array.wrap(options[:if]) << "!halted && value != false"
-          set_callback(:#{callback}, :after, *(args << options), &block)
-        end
-      CALLBACK
-    end
-  end
-end