aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/lib/active_resource.rb12
-rw-r--r--activeresource/lib/active_resource/validations.rb203
-rw-r--r--activeresource/test/base_errors_test.rb10
3 files changed, 21 insertions, 204 deletions
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 720abee72e..b46801affc 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -25,6 +25,18 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
$:.unshift(activesupport_path) if File.directory?(activesupport_path)
require 'active_support'
+begin
+ require 'active_model'
+rescue LoadError
+ $:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib"
+ require 'active_model'
+end
+
+require 'active_resource/formats'
+require 'active_resource/base'
+require 'active_resource/validations'
+require 'active_resource/custom_methods'
+
module ActiveResource
autoload :Base, 'active_resource/base'
end
diff --git a/activeresource/lib/active_resource/validations.rb b/activeresource/lib/active_resource/validations.rb
index da6084fe9f..95c5467647 100644
--- a/activeresource/lib/active_resource/validations.rb
+++ b/activeresource/lib/active_resource/validations.rb
@@ -6,203 +6,8 @@ module ActiveResource
end
# Active Resource validation is reported to and from this object, which is used by Base#save
- # to determine whether the object is in a valid state to be saved. See usage example in Validations.
- class Errors
- include Enumerable
- attr_reader :errors
-
- delegate :empty?, :to => :errors
-
- def initialize(base) # :nodoc:
- @base, @errors = base, {}
- end
-
- # Adds an error to the base object instead of any particular attribute. This is used
- # to report errors that don't tie to any specific attribute, but rather to the object
- # as a whole. These error messages don't get prepended with any field name when iterating
- # with +each_full+, so they should be complete sentences.
- #
- # ==== Examples
- # my_folder = Folder.find(1)
- # my_folder.errors.add_to_base("You can't edit an existing folder")
- # my_folder.errors.on_base
- # # => "You can't edit an existing folder"
- #
- # my_folder.errors.add_to_base("This folder has been tagged as frozen")
- # my_folder.valid?
- # # => false
- # my_folder.errors.on_base
- # # => ["You can't edit an existing folder", "This folder has been tagged as frozen"]
- #
- def add_to_base(msg)
- add(:base, msg)
- end
-
- # Adds an error to an Active Resource object's attribute (named for the +attribute+ parameter)
- # with the error message in +msg+.
- #
- # ==== Examples
- # my_resource = Node.find(1)
- # my_resource.errors.add('name', 'can not be "base"') if my_resource.name == 'base'
- # my_resource.errors.on('name')
- # # => 'can not be "base"!'
- #
- # my_resource.errors.add('desc', 'can not be blank') if my_resource.desc == ''
- # my_resource.valid?
- # # => false
- # my_resource.errors.on('desc')
- # # => 'can not be blank!'
- #
- def add(attribute, msg)
- @errors[attribute.to_s] = [] if @errors[attribute.to_s].nil?
- @errors[attribute.to_s] << msg
- end
-
- # Returns true if the specified +attribute+ has errors associated with it.
- #
- # ==== Examples
- # my_resource = Disk.find(1)
- # my_resource.errors.add('location', 'must be Main') unless my_resource.location == 'Main'
- # my_resource.errors.on('location')
- # # => 'must be Main!'
- #
- # my_resource.errors.invalid?('location')
- # # => true
- # my_resource.errors.invalid?('name')
- # # => false
- def invalid?(attribute)
- !@errors[attribute.to_s].nil?
- end
-
- # Returns +nil+ if no errors are associated with the specified +attribute+.
- # Returns the error message if one error is associated with the specified +attribute+.
- # Returns an array of error messages if more than one error is associated with the specified +attribute+.
- #
- # ==== Examples
- # my_person = Person.new(params[:person])
- # my_person.errors.on('login')
- # # => nil
- #
- # my_person.errors.add('login', 'can not be empty') if my_person.login == ''
- # my_person.errors.on('login')
- # # => 'can not be empty'
- #
- # my_person.errors.add('login', 'can not be longer than 10 characters') if my_person.login.length > 10
- # my_person.errors.on('login')
- # # => ['can not be empty', 'can not be longer than 10 characters']
- def on(attribute)
- errors = @errors[attribute.to_s]
- return nil if errors.nil?
- errors.size == 1 ? errors.first : errors
- end
-
- alias :[] :on
-
- # Returns errors assigned to the base object through +add_to_base+ according to the normal rules of <tt>on(attribute)</tt>.
- #
- # ==== Examples
- # my_account = Account.find(1)
- # my_account.errors.on_base
- # # => nil
- #
- # my_account.errors.add_to_base("This account is frozen")
- # my_account.errors.on_base
- # # => "This account is frozen"
- #
- # my_account.errors.add_to_base("This account has been closed")
- # my_account.errors.on_base
- # # => ["This account is frozen", "This account has been closed"]
- #
- def on_base
- on(:base)
- end
-
- # Yields each attribute and associated message per error added.
- #
- # ==== Examples
- # my_person = Person.new(params[:person])
- #
- # my_person.errors.add('login', 'can not be empty') if my_person.login == ''
- # my_person.errors.add('password', 'can not be empty') if my_person.password == ''
- # messages = ''
- # my_person.errors.each {|attr, msg| messages += attr.humanize + " " + msg + "<br />"}
- # messages
- # # => "Login can not be empty<br />Password can not be empty<br />"
- #
- def each
- @errors.each_key { |attr| @errors[attr].each { |msg| yield attr, msg } }
- end
-
- # Yields each full error message added. So Person.errors.add("first_name", "can't be empty") will be returned
- # through iteration as "First name can't be empty".
- #
- # ==== Examples
- # my_person = Person.new(params[:person])
- #
- # my_person.errors.add('login', 'can not be empty') if my_person.login == ''
- # my_person.errors.add('password', 'can not be empty') if my_person.password == ''
- # messages = ''
- # my_person.errors.each_full {|msg| messages += msg + "<br/>"}
- # messages
- # # => "Login can not be empty<br />Password can not be empty<br />"
- #
- def each_full
- full_messages.each { |msg| yield msg }
- end
-
- # Returns all the full error messages in an array.
- #
- # ==== Examples
- # my_person = Person.new(params[:person])
- #
- # my_person.errors.add('login', 'can not be empty') if my_person.login == ''
- # my_person.errors.add('password', 'can not be empty') if my_person.password == ''
- # messages = ''
- # my_person.errors.full_messages.each {|msg| messages += msg + "<br/>"}
- # messages
- # # => "Login can not be empty<br />Password can not be empty<br />"
- #
- def full_messages
- full_messages = []
-
- @errors.each_key do |attr|
- @errors[attr].each do |msg|
- next if msg.nil?
-
- if attr == "base"
- full_messages << msg
- else
- full_messages << [attr.humanize, msg].join(' ')
- end
- end
- end
- full_messages
- end
-
- def clear
- @errors = {}
- end
-
- # Returns the total number of errors added. Two errors added to the same attribute will be counted as such
- # with this as well.
- #
- # ==== Examples
- # my_person = Person.new(params[:person])
- # my_person.errors.size
- # # => 0
- #
- # my_person.errors.add('login', 'can not be empty') if my_person.login == ''
- # my_person.errors.add('password', 'can not be empty') if my_person.password == ''
- # my_person.error.size
- # # => 2
- #
- def size
- @errors.values.inject(0) { |error_count, attribute| error_count + attribute.size }
- end
-
- alias_method :count, :size
- alias_method :length, :size
-
+ # to determine whether the object in a valid state to be saved. See usage example in Validations.
+ class Errors < ActiveModel::Errors
# Grabs errors from the XML response.
def from_xml(xml)
clear
@@ -215,7 +20,7 @@ module ActiveResource
end
end
- add_to_base message if attr_message.nil?
+ self[:base] << message if attr_message.nil?
end
end
end
@@ -236,7 +41,7 @@ module ActiveResource
# person.errors.empty? # => false
# person.errors.count # => 1
# person.errors.full_messages # => ["Last name can't be empty"]
- # person.errors.on(:last_name) # => "can't be empty"
+ # person.errors[:last_name] # => ["can't be empty"]
# person.last_name = "Halpert"
# person.save # => true (and person is now saved to the remote service)
#
diff --git a/activeresource/test/base_errors_test.rb b/activeresource/test/base_errors_test.rb
index 7ae92c7d98..28813821df 100644
--- a/activeresource/test/base_errors_test.rb
+++ b/activeresource/test/base_errors_test.rb
@@ -20,21 +20,21 @@ class BaseErrorsTest < Test::Unit::TestCase
end
def test_should_parse_errors_to_individual_attributes
- assert @person.errors.invalid?(:name)
- assert_equal "can't be blank", @person.errors.on(:age)
+ assert @person.errors[:name].any?
+ assert_equal ["can't be blank"], @person.errors[:age]
assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name]
- assert_equal "Person quota full for today.", @person.errors.on_base
+ assert_equal ["Person quota full for today."], @person.errors[:base]
end
def test_should_iterate_over_errors
errors = []
- @person.errors.each { |attribute, message| errors << [attribute, message] }
+ @person.errors.each { |attribute, message| errors << [attribute.to_s, message] }
assert errors.include?(["name", "can't be blank"])
end
def test_should_iterate_over_full_errors
errors = []
- @person.errors.each_full { |message| errors << message }
+ @person.errors.to_a.each { |message| errors << message }
assert errors.include?("Name can't be blank")
end