@@ -14,7 +14,6 @@ Example: body_has_length :below => 256 end - ==Predicates ===aliased @@ -50,10 +49,12 @@ Example: ===blacklisted Use when you need to make sure some value is NOT saved. Maybe you've reserved some for yourself? +By default this is not case sensitive. Which means that by default this assumes you only have strings. If you need to blacklist other data types, set :case_sensitive => false. + Example: class User < ActiveRecord::Base - username_is_blacklisted :options => %w(admin superadmin god user anonymous) + username_is_blacklisted :restricted => %w(admin superadmin god user anonymous) end ===domain @@ -77,13 +78,15 @@ Example: ===enumerated aka whitelisted Use when you want to limit the values a field may have. Useful for constraining polymorphic associations! Note that because of how required-ness is handled, if a field is empty this predicate will not be evaluated. +Note that this predicate implies required-ness. + Example: class Favorite < ActiveRecord::Base belongs_to :favoritable, :polymorphic => true # only allow favoriting of a User or Project - favoritable_is_enumerated :options => %w(User Project) + favoritable_type_is_enumerated :options => %w(User Project) end ===hex_color @@ -95,8 +98,8 @@ Example: background_is_hex_color end -===length -Use when you need to set an upper or lower boundary on the length of a field. +===length aka size +Use when you need to set an upper or lower boundary on the length of a field. Note that this also works on arrays and hashes. Example: @@ -114,7 +117,7 @@ Example: class Auction < ActiveRecord::Base buyout_is_number :integer => true - bid_increment_is_number :above => 5, :inclusive => true + bid_increment_is_number :at_least => 5 quantity_is_number :range => 1..10 end @@ -151,9 +154,19 @@ Example: end ===time -Use when you have a time field that needs to be constrained on the timeline. +Use when you have a time field that needs to be constrained on the timeline. You may set your constraint either absolutely (e.g. after Jan 1, 2005) or relatively (e.g. no older than 5 minutes from now). + +Example: -This one needs to be more useful. It needs to compare times vs now, e.g. :before => :now or :after => "2.days.ago". + class Project < ActiveRecord::Base + # this deadline must be after Jan 1, 2005 + deadline_is_time :after => Time.parse("2005-01-01 00:00:00") + end + + class Project < ActiveRecord::Base + # this deadline must be no older than 5 days and no further in the future than 1 week, as of the time of validation. + deadline_is_time :distance => (-5.days)..(1.week) + end ===unique Use when you need an attribute to be unique, possibly in the scope of some other attributes. By default this is not case sensitive. gist.rdoc @@ -11,4 +11,4 @@ class Predicates::Aliased < Predicates::Enumerated def normalize(v) options.index(v) end -end \ No newline at end of file +end lib/predicates/aliased.rb @@ -25,7 +25,7 @@ module Predicates end def error - I18n.t(error_message, error_binds.merge(:scope => 'semantic-attributes.errors.messages')) + error_message.is_a?(Symbol) ? I18n.t(error_message, error_binds.merge(:scope => 'semantic-attributes.errors.messages')) : error_message end # a condition to restrict when validation should occur. if it returns false, the validation will not happen. lib/predicates/base.rb @@ -28,4 +28,4 @@ class Predicates::Domain < Predicates::Base def with_protocol(value) !value or value.include?("://") ? value : "http://#{value}" end -end \ No newline at end of file +end lib/predicates/domain.rb @@ -39,4 +39,4 @@ class Predicates::Email < Predicates::Base Regexp::EXTENDED | Regexp::IGNORECASE ) end -end \ No newline at end of file +end lib/predicates/email.rb @@ -20,4 +20,4 @@ class Predicates::Enumerated < Predicates::Base def validate(value, record) self.options.include? value end -end \ No newline at end of file +end lib/predicates/enumerated.rb @@ -21,4 +21,4 @@ class Predicates::HexColor < Predicates::Pattern value end -end \ No newline at end of file +end lib/predicates/hex_color.rb @@ -101,4 +101,4 @@ class Predicates::Number < Predicates::Base # if it has no endpoints :not_a_number end -end \ No newline at end of file +end lib/predicates/number.rb @@ -19,4 +19,4 @@ class Predicates::Pattern < Predicates::Base value = value.to_s if [Symbol, Fixnum].include?(value.class) value.match(self.like) end -end \ No newline at end of file +end lib/predicates/pattern.rb @@ -58,4 +58,4 @@ class Predicates::PhoneNumber < Predicates::Base class Patterns NANP = /\A\+1([2-9][0-8][0-9])([2-9][0-9]{2})([0-9]{4})\Z/ end -end \ No newline at end of file +end lib/predicates/phone_number.rb @@ -19,4 +19,4 @@ class Predicates::Required < Predicates::Base def validate(value, record) !value.blank? end -end \ No newline at end of file +end lib/predicates/required.rb @@ -10,8 +10,8 @@ class Predicates::SameAs < Predicates::Base def error_message @error_message ||= :same_as end - + def validate(value, record) value == record.send(self.method) end -end \ No newline at end of file +end lib/predicates/same_as.rb @@ -40,4 +40,4 @@ class Predicates::Time < Predicates::Base valid end -end \ No newline at end of file +end lib/predicates/time.rb @@ -65,7 +65,7 @@ class Predicates::Unique < Predicates::Base end else # non-text comparison - ["#{quoted_field} #{klass.send(:attribute_condition, value)}", value] + [klass.send(:attribute_condition, quoted_field, value), value] end end lib/predicates/unique.rb @@ -59,4 +59,4 @@ class Predicates::Url < Predicates::Base rescue URI::InvalidURIError v end -end \ No newline at end of file +end lib/predicates/url.rb @@ -84,4 +84,4 @@ class Predicates::UsaState < Predicates::Aliased 'Wisconsin' => 'WI', 'Wyoming' => 'WY' } -end \ No newline at end of file +end lib/predicates/usa_state.rb @@ -22,4 +22,4 @@ class Predicates::UsaZipCode < Predicates::Pattern def error_message @error_message || :us_zip_code end -end \ No newline at end of file +end lib/predicates/usa_zip_code.rb @@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test" # load the support libraries require 'test/unit' require 'rubygems' -gem 'rails', '2.3.0' +gem 'rails', '2.3.2' require 'active_record' require 'active_record/fixtures' require 'mocha' test/test_helper.rb @@ -44,4 +44,10 @@ class BasePredicateTest < SemanticAttributes::TestCase predicate.message = "another thing" assert_equal "another thing", predicate.error_message end + + def test_string_errors_are_preserved + predicate = Predicates::Base.new(:foo) + predicate.error_message = "something" + assert_equal "something", predicate.error + end end test/unit/predicates/base_test.rb fecaddfe7804cacedf40f17e20bca6d3e5470b4a Edwin Moss edwin.moss@gmail.com http://github.com/edwinmoss/semantic-attributes/commit/a2ab241b7a7f079202fe41ca1c3967de67f4dc42 a2ab241b7a7f079202fe41ca1c3967de67f4dc42 2009-04-11T22:41:15-07:00 2009-04-11T22:41:15-07:00 Merge with root. e413e94fb428e9ae42eebdcdca797ec09bdcb2a1 Edwin Moss edwin.moss@gmail.com