motion_model 0.3.0 → 0.3.1

data/README.md

@@ -128,6 +128,46 @@ a_task = Task.create(:name => 'joe-bob', :due_date => '2012-09-15')     # due_da
 a_task.due_date = '2012-09-19'    # due_date is cast to NSDate
 ```
 
+Currently supported types are:
+
+* `:string`
+* `:boolean`, `:bool`
+* `:int`, `:integer`
+* `:float`, `:double`
+* `:date`
+* `:array`
+
+You are really not encouraged to stuff big things in your models, which is why a blob type
+is not implemented. The smaller your data, the less overhead involved in saving/loading.
+
+What Validation Methods Exist
+-----------------
+
+    validate :field_name, :presence => true
+    validate :field_name, :length => 5..8 # specify a range
+    validate :field_name, :email
+    validate :field_name, :format
+
+The framework is sufficiently flexible that you can add in custom validators like so:
+
+```ruby
+module MotionModel
+  module Validatable
+    def validate_foo(field, value, setting)
+      # do whatever you need to make sure that the value
+      # denoted by *value* for the field corresponds to
+      # whatever is passed in setting.
+    end
+  end
+end
+
+validate  :my_field, :foo => 42
+```
+
+In the above example, your new `validate_foo` method will get the arguments
+pretty much as you expect. The value of the
+last hash is passed intact via the `settings` argument.
+
 Model Instances and Unique IDs
 -----------------
 

data/lib/motion_model/model/column.rb

@@ -13,16 +13,6 @@ module MotionModel
         @destroy = options[:dependent]
       end
 
-      # REVIEW: Dead code?
-      def add_attr(name, type, options)
-        @name = name
-        @type = type
-        @default = options[:default]
-        @destroy = options[:dependent]
-      end
-
-      alias_method :add_attribute, :add_attr
-
       def classify
         case @type
         when :belongs_to

data/lib/motion_model/model/finder_query.rb

@@ -7,7 +7,7 @@ module MotionModel
       @collection = args.last
     end
     
-    def belongs_to(obj, klass = nil)
+    def belongs_to(obj, klass = nil) #nodoc
       @related_object = obj
       @klass          = klass
       self
@@ -18,8 +18,6 @@ module MotionModel
     # Task.find(:name => 'bob').and(:gender).eq('M')
     # Task.asignees.where(:assignee_name).eq('bob')
     def and(field_name)
-      # TODO: Allow for Task.assignees.where(:assignee_name => 'bob')
-
       @field_name = field_name
       self
     end
@@ -40,7 +38,6 @@ module MotionModel
       self
     end
     
-    ######## relational operators ########
     def translate_case(item, case_sensitive)#nodoc
       item = item.underscore if case_sensitive === false && item.respond_to?(:underscore)
       item
@@ -204,6 +201,7 @@ module MotionModel
       new_obj
     end
     
+    # Returns number of objects (rows) in collection
     def length
       @collection.length
     end
@@ -223,7 +221,5 @@ module MotionModel
       result
     end
     alias_method :<<, :push
-    
-    
   end
-end
+end

data/lib/motion_model/model/model.rb

@@ -16,9 +16,6 @@
 #
 # Now, you can write code like:
 #
-#    Task.create :task_name => 'Walk the dog',
-#                :details   => 'Pick up after yourself',
-#                :due_date  => '2012-09-17'
 #
 # Recognized types are:
 #
@@ -36,7 +33,6 @@
 #    tasks_this_week = Task.where(:due_date).ge(beginning_of_week).and(:due_date).le(end_of_week)
 #    ordered_tasks_this_week = tasks_this_week.order(:due_date)
 #
-
 module MotionModel
   class PersistFileError < Exception; end
   class RelationIsNilError < Exception; end
@@ -81,8 +77,6 @@ module MotionModel
       def columns(*fields)
         return @_columns.map{|c| c.name} if fields.empty?
 
-        # col = Column.new    # REVIEW: Dead code?
-
         case fields.first
         when Hash
           column_from_hash fields
@@ -164,12 +158,6 @@ module MotionModel
       # returns the object created or false.
       def create(options = {})
         row = self.new(options)
-        row.before_create if row.respond_to?(:before_create)
-        row.before_save   if row.respond_to?(:before_save)
-
-        # TODO: Check for Validatable and if it's
-        # present, check valid? before saving.
-
         row.save
         row
       end
@@ -409,26 +397,40 @@ module MotionModel
     # databases, this inserts a row if it's a new one, or updates
     # in place if not.
     def save
-      @dirty = false
-
-      # Existing object implies update in place
-      # TODO: Optimize location of existing id
-      action = 'add'
-      if obj = collection.find{|o| o.id == @data[:id]}
-        obj = self
-        action = 'update'
-      else
-        collection << self
+      call_hooks 'save' do
+        @dirty = false
+
+        # Existing object implies update in place
+        action = 'add'
+        if obj = collection.find{|o| o.id == @data[:id]}
+          obj = self
+          action = 'update'
+        else
+          collection << self
+        end
+        self.class.issue_notification(self, :action => action)
       end
-      self.class.issue_notification(self, :action => action)
     end
 
     # Deletes the current object. The object can still be used.
 
+    def call_hook(hook_name, postfix)
+      hook = "#{hook_name}_#{postfix}"
+      self.send(hook, self) if respond_to? hook.to_sym
+    end
+
+    def call_hooks(hook_name, &block)
+      call_hook('before', hook_name)
+      block.call
+      call_hook('after', hook_name)
+    end
+
     def delete
-      target_index = collection.index{|item| item.id == self.id}
-      collection.delete_at(target_index)
-      self.class.issue_notification(self, :action => 'delete')
+      call_hooks('delete') do
+        target_index = collection.index{|item| item.id == self.id}
+        collection.delete_at(target_index)
+        self.class.issue_notification(self, :action => 'delete')
+      end
     end
 
     # Destroys the current object. The difference between delete
@@ -437,8 +439,10 @@ module MotionModel
     # into related objects, deleting them if they are related
     # using <tt>:delete => :destroy</tt> in the <tt>has_many</tt>
     # declaration
+    #
+    # Note: lifecycle hooks are only called when individual objects
+    # are deleted.
     def destroy
-      before_delete if respond_to? :before_delete
       has_many_columns.each do |col|
         delete_candidates = self.send(col.name)
 
@@ -448,7 +452,6 @@ module MotionModel
         end
       end
       delete
-      after_delete if respond_to? :after_delete
     end
 
     # Undelete does pretty much as its name implies. However,
@@ -515,22 +518,6 @@ module MotionModel
       @data[column] = cast_value
     end
 
-    def cast_to_type(column_name, arg) #nodoc
-      return nil if arg.nil?
-
-      return case type(column_name)
-      when :string then arg.to_s
-      when :int, :integer, :belongs_to_id
-        arg.is_a?(Integer) ? arg : arg.to_i
-      when :float, :double
-        arg.is_a?(Float) ? arg : arg.to_f
-      when :date
-        arg.is_a?(NSDate) ? arg : NSDate.dateWithNaturalLanguageString(arg, locale:NSUserDefaults.standardUserDefaults.dictionaryRepresentation)
-      else
-        raise ArgumentError.new("type #{column_name} : #{type(column_name)} is not possible to cast.")
-      end
-    end
-
     def collection #nodoc
       self.class.instance_variable_get('@collection')
     end
@@ -561,19 +548,8 @@ module MotionModel
       end
     end
 
-
-    # Handle attribute retrieval
-    #
-    # Gets and sets work as expected, and type casting occurs
-    # For example:
-    #
-    #     Task.date = '2012-09-15'
-    #
-    # This creates a real Date object in the data store.
-    #
-    #     date = Task.date
-    #
-    # Date is a real date object.
+    # Any way you reach this means you've tried to access a method
+    # not defined on this model.
     def method_missing(method, *args, &block) #nodoc
       if self.respond_to? method
         return method(args, &block)

data/lib/motion_model/model/model_casts.rb

@@ -0,0 +1,44 @@
+module MotionModel
+  class Model
+    def cast_to_bool(arg)
+      case arg
+        when NilClass then false
+        when TrueClass, FalseClass then arg
+        when Integer then arg != 0
+        when String then (arg =~ /^true/i) != nil
+        else raise ArgumentError.new("type #{column_name} : #{type(column_name)} is not possible to cast.")
+      end
+    end
+
+    def cast_to_integer(arg)
+      arg.is_a?(Integer) ? arg : arg.to_i
+    end
+
+    def cast_to_float(arg)
+      arg.is_a?(Float) ? arg : arg.to_f
+    end
+
+    def cast_to_date(arg)
+      arg.is_a?(NSDate) ? arg : NSDate.dateWithNaturalLanguageString(arg, locale:NSUserDefaults.standardUserDefaults.dictionaryRepresentation)
+    end
+
+    def cast_to_array(arg)
+      arg.is_a?(Array) ? arg : arg.to_a
+    end
+
+    def cast_to_type(column_name, arg) #nodoc
+      return nil if arg.nil? && ![ :boolean, :bool ].include?(type(column_name))
+
+      return case type(column_name)
+      when :string then arg.to_s
+      when :boolean, :bool then cast_to_bool(arg)
+      when :int, :integer, :belongs_to_id then cast_to_integer(arg)
+      when :float, :double then cast_to_float(arg)
+      when :date then cast_to_date(arg)
+      when :array then cast_to_array(arg)
+      else
+        raise ArgumentError.new("type #{column_name} : #{type(column_name)} is not possible to cast.")
+      end
+    end
+  end
+end

data/lib/motion_model/validatable.rb

@@ -1,5 +1,7 @@
 module MotionModel
   module Validatable
+    class ValidationSpecificationError < RuntimeError;  end
+
     def self.included(base)
       base.extend(ClassMethods)
       base.instance_variable_set('@validations', [])
@@ -12,53 +14,140 @@ module MotionModel
           raise ex
         end
     
-        if validation_type == {} # || !(validation_type is_a?(Hash))
+        if validation_type == {}
           ex = ValidationSpecificationError.new('validation type not present or not a hash')
           raise ex
         end
     
         @validations << {field => validation_type}
-      end      
+      end
+      alias_method :validates, :validate
+
+      def validations
+        @validations
+      end
     end
   
+    # This has two functions:
+    # 
+    # * First, it triggers validations.
+    #
+    # * Second, it returns the result of performing the validations.
     def valid?
       @messages = []
       @valid = true
-      self.class.instance_variable_get(@validations).each do |validations|
+      self.class.validations.each do |validations|
         validate_each(validations)
       end
       @valid
     end
 
-    def validate_each(validations)
+    # Raw array of hashes of error messages.
+    def error_messages
+      @messages
+    end
+
+    # Array of messages for a given field. Results are always an array
+    # because a field can fail multiple validations.
+    def error_messages_for(field)
+      key = field.to_sym
+      error_messages.select{|message| message.has_key?(key)}.map{|message| message[key]}
+    end
+
+    def validate_each(validations) #nodoc
       validations.each_pair do |field, validation|
-        validate_one field, validation
+        @valid &&= validate_one field, validation
+      end
+    end
+
+    def validation_method(validation_type) #nodoc
+      validation_method = "validate_#{validation_type}".to_sym
+    end
+
+    def each_validation_for(field) #nodoc
+      self.class.validations.select{|validation| validation.has_key?(field)}.each do |validation|
+        validation.each_pair do |field, validation_hash|
+          yield validation_hash
+        end
+      end
+    end
+
+    # Validates an arbitrary string against a specific field's validators.
+    # Useful before setting the value of a model's field. I.e., you get data
+    # from a form, do a <tt>validate_for(:my_field, that_data)</tt> and
+    # if it succeeds, you do <tt>obj.my_field = that_data</tt>.
+    def validate_for(field, value)
+      @messages = []
+      key = field.to_sym
+      result = true
+      each_validation_for(key) do |validation|
+        validation.each_pair do |validation_type, setting|
+          method = validation_method(validation_type)
+          if self.respond_to? method
+            value.strip! if value.is_a?(String)
+            result &&= self.send(method, field, value, setting)
+          end
+        end
       end
+      result
     end
   
-    def validate_one(field, validation)
+    def validate_one(field, validation) #nodoc
+      result = true
       validation.each_pair do |validation_type, setting|
-        case validation_type
-        when :presence
-          @valid &&= validate_presence(field)
-          if setting
-            additional_message = "non-empty"
-          else
-            additional_message = "empty"
-          end
-          @valid = !@valid if setting == false
-          @messages << {field => "incorrect value supplied for #{field.to_s} -- should be #{additional_message}"}
+        if self.respond_to? validation_method(validation_type)
+          value = self.send(field)
+          value.strip! if value.is_a?(String)
+          result &&= self.send(validation_method(validation_type), field, value, setting)
         else
-          @valid = false
           ex = ValidationSpecificationError.new("unknown validation type :#{validation_type.to_s}")
         end
       end
+      result
     end
-  
-    def validate_presence(field)
-      value = self.send(field.to_s)
-      return false if value.nil?
-      return value.strip.length > 0
+
+    # Validates that something has been entered in a field
+    def validate_presence(field, value, setting)
+      if value.is_a?(String) || value.nil?
+        result = value.nil? || ((value.length == 0) == setting)
+        additional_message = setting ? "non-empty" : "non-empty"
+        add_message(field, "incorrect value supplied for #{field.to_s} -- should be #{additional_message}.") if result
+        return !result
+      end
+      return false
+    end
+
+    # Validates that the length is in a given range of characters. E.g.,
+    #
+    #     validate :name,   :length => 5..8
+    def validate_length(field, value, setting)
+      if value.is_a?(String) || value.nil?
+        result = value.nil? || (value.length < setting.first || value.length > setting.last)
+        add_message(field, "incorrect value supplied for #{field.to_s} -- should be between #{setting.first} and #{setting.last} characters long.") if result
+        return !result
+      end
+      return false
+    end
+
+    def validate_email(field, value, setting)
+      if value.is_a?(String) || value.nil?
+        result = value.nil? || value.match(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i).nil?
+        add_message(field, "#{field.to_s} does not appear to be an email address.") if result
+      end
+      return !result
+    end
+
+    # Validates contents of field against a given Regexp. This can be tricky because you need
+    # to anchor both sides in most cases using \A and \Z to get a reliable match.
+    def validate_format(field, value, setting)
+      result = value.nil? || setting.match(value).nil?
+      add_message(field, "#{field.to_s} does not appear to be in the proper format.") if result
+      return !result
+    end
+
+    # Add a message for <tt>field</tt> to the messages collection.
+    def add_message(field, message)
+      @messages.push({field.to_sym => message})
     end
   end
 end

data/lib/motion_model/version.rb

@@ -1,3 +1,3 @@
 module MotionModel
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/model_casting_spec.rb

@@ -0,0 +1,122 @@
+class TypeCast
+  include MotionModel::Model
+  columns :a_boolean => :boolean,
+          :an_int => {:type => :int, :default => 3},
+          :an_integer => :integer,
+          :a_float => :float,
+          :a_double => :double,
+          :a_date => :date,
+          :a_time => :time,
+          :an_array => :array
+end
+
+describe 'Type casting' do
+  before do
+    @convertible = TypeCast.new
+    @convertible.a_boolean = 'false'
+    @convertible.an_int = '1'
+    @convertible.an_integer = '2'
+    @convertible.a_float = '3.7'
+    @convertible.a_double = '3.41459'
+    @convertible.a_date = '2012-09-15'
+    @convertible.an_array = 1..10
+  end
+  
+  it 'does the type casting on instantiation' do
+    @convertible.a_boolean.should.is_a FalseClass
+    @convertible.an_int.should.is_a Integer
+    @convertible.an_integer.should.is_a Integer
+    @convertible.a_float.should.is_a Float
+    @convertible.a_double.should.is_a Float
+    @convertible.a_date.should.is_a NSDate
+    @convertible.an_array.should.is_a Array
+  end
+
+  it 'returns a boolean for a boolean field' do
+    @convertible.a_boolean.should.is_a(FalseClass)
+  end
+
+  it 'the boolean field should be the same as it was in string form' do
+    @convertible.a_boolean.to_s.should.equal('false')
+  end
+
+  it 'the boolean field accepts a non-zero integer as true' do
+    @convertible.a_boolean = 1
+    @convertible.a_boolean.should.is_a(TrueClass)
+  end
+
+  it 'the boolean field accepts a zero valued integer as false' do
+    @convertible.a_boolean = 0
+    @convertible.a_boolean.should.is_a(FalseClass)
+  end
+
+  it 'the boolean field accepts a string that starts with "true" as true' do
+    @convertible.a_boolean = 'true'
+    @convertible.a_boolean.should.is_a(TrueClass)
+  end
+
+  it 'the boolean field treats a string with "true" not at the start as false' do
+    @convertible.a_boolean = 'something true'
+    @convertible.a_boolean.should.is_a(FalseClass)
+  end
+
+  it 'the boolean field accepts a string that does not contain "true" as false' do
+    @convertible.a_boolean = 'something'
+    @convertible.a_boolean.should.is_a(FalseClass)
+  end
+
+  it 'the boolean field accepts nil as false' do
+    @convertible.a_boolean = nil
+    @convertible.a_boolean.should.is_a(FalseClass)
+  end
+
+  it 'returns an integer for an int field' do
+    @convertible.an_int.should.is_a(Integer)
+  end
+
+  it 'the int field should be the same as it was in string form' do
+    @convertible.an_int.to_s.should.equal('1')
+  end
+
+  it 'returns an integer for an integer field' do
+    @convertible.an_integer.should.is_a(Integer)
+  end
+
+  it 'the integer field should be the same as it was in string form' do
+    @convertible.an_integer.to_s.should.equal('2')
+  end
+
+  it 'returns a float for a float field' do
+    @convertible.a_float.should.is_a(Float)
+  end
+
+  it 'the float field should be the same as it was in string form' do
+    @convertible.a_float.should.>(3.6)
+    @convertible.a_float.should.<(3.8)
+  end
+
+  it 'returns a double for a double field' do
+    @convertible.a_double.should.is_a(Float)
+  end
+
+  it 'the double field should be the same as it was in string form' do
+    @convertible.a_double.should.>(3.41458)
+    @convertible.a_double.should.<(3.41460)
+  end
+
+  it 'returns a NSDate for a date field' do
+    @convertible.a_date.should.is_a(NSDate)
+  end
+  
+  it 'the date field should be the same as it was in string form' do
+    @convertible.a_date.to_s.should.match(/^2012-09-15/)
+  end
+
+  it 'returns an Array for an array field' do
+    @convertible.an_array.should.is_a(Array)
+  end
+
+  it 'the array field should be the same as the range form' do
+    (@convertible.an_array.first..@convertible.an_array.last).should.equal(1..10)
+  end
+end

data/spec/model_hook_spec.rb

@@ -0,0 +1,60 @@
+class Task
+  attr_reader :before_delete_called, :after_delete_called
+  attr_reader :before_save_called, :after_save_called
+
+  include MotionModel::Model
+  columns       :name => :string, 
+                :details => :string,
+                :some_day => :date
+
+  def before_delete(object)
+    @before_delete_called = true
+  end
+
+  def after_delete(object)
+    @after_delete_called = true
+  end
+
+  def before_save(object)
+    @before_save_called = true
+  end
+
+  def after_save(object)
+    @after_save_called = true
+  end
+
+end
+
+describe "lifecycle hooks" do
+  describe "delete and destroy" do
+    before{@task = Task.create(:name => 'joe')}
+
+    it "calls the before delete hook when delete is called" do
+      lambda{@task.delete}.should.change{@task.before_delete_called}
+    end
+
+    it "calls the after delete hook when delete is called" do
+      lambda{@task.delete}.should.change{@task.after_delete_called}
+    end
+
+   it "calls the before delete hook when destroy is called" do
+      lambda{@task.destroy}.should.change{@task.before_delete_called}
+    end
+
+    it "calls the after delete hook when destroy is called" do
+      lambda{@task.destroy}.should.change{@task.after_delete_called}
+    end
+  end
+
+  describe "create and save" do
+    before{@task = Task.new(:name => 'joe')}
+
+    it "calls before_save hook on save" do
+      lambda{@task.save}.should.change{@task.before_save_called}
+    end
+
+    it "calls after_save hook on save" do
+      lambda{@task.save}.should.change{@task.after_save_called}
+    end
+  end
+end

data/spec/model_spec.rb

@@ -16,12 +16,14 @@ end
 
 class TypeCast
   include MotionModel::Model
-  columns :an_int => {:type => :int, :default => 3},
+  columns :a_boolean => :boolean,
+          :an_int => {:type => :int, :default => 3},
           :an_integer => :integer,
           :a_float => :float,
           :a_double => :double,
           :a_date => :date,
-          :a_time => :time
+          :a_time => :time,
+          :an_array => :array
 end
 
 describe "Creating a model" do
@@ -231,67 +233,6 @@ describe "Creating a model" do
     end
   end
   
-  describe 'Type casting' do
-    before do
-      @convertible = TypeCast.new
-      @convertible.an_int = '1'
-      @convertible.an_integer = '2'
-      @convertible.a_float = '3.7'
-      @convertible.a_double = '3.41459'
-      @convertible.a_date = '2012-09-15'
-    end
-    
-    it 'does the type casting on instantiation' do
-      @convertible.an_int.should.is_a Integer
-      @convertible.an_integer.should.is_a Integer
-      @convertible.a_float.should.is_a Float
-      @convertible.a_double.should.is_a Float
-      @convertible.a_date.should.is_a NSDate
-    end
-    
-    it 'returns an integer for an int field' do
-      @convertible.an_int.should.is_a(Integer)
-    end
-
-    it 'the int field should be the same as it was in string form' do
-      @convertible.an_int.to_s.should.equal('1')
-    end
-
-    it 'returns an integer for an integer field' do
-      @convertible.an_integer.should.is_a(Integer)
-    end
-
-    it 'the integer field should be the same as it was in string form' do
-      @convertible.an_integer.to_s.should.equal('2')
-    end
-
-    it 'returns a float for a float field' do
-      @convertible.a_float.should.is_a(Float)
-    end
-
-    it 'the float field should be the same as it was in string form' do
-      @convertible.a_float.should.>(3.6)
-      @convertible.a_float.should.<(3.8)
-    end
-
-    it 'returns a double for a double field' do
-      @convertible.a_double.should.is_a(Float)
-    end
-
-    it 'the double field should be the same as it was in string form' do
-      @convertible.a_double.should.>(3.41458)
-      @convertible.a_double.should.<(3.41460)
-    end
-
-    it 'returns a NSDate for a date field' do
-      @convertible.a_date.should.is_a(NSDate)
-    end
-    
-    it 'the date field should be the same as it was in string form' do
-      @convertible.a_date.to_s.should.match(/^2012-09-15/)
-    end
-  end
-
   describe 'defining custom attributes' do
     before do
       Task.delete_all

data/spec/validation_spec.rb

@@ -0,0 +1,110 @@
+class Hash
+  def except(keys)
+    self.dup.reject{|k, v| keys.include?(k)}
+  end
+end
+
+class ValidatableTask
+  include MotionModel::Model
+  include MotionModel::Validatable
+  columns       :name => :string, 
+                :email => :string,
+                :some_day => :string
+
+  validate      :name, :presence => true
+  validate      :name, :length => 2..10
+  validate      :email, :email => true
+  validate      :some_day, :format => /\A\d?\d-\d?\d-\d\d\Z/
+  validate      :some_day, :length => 8..10
+end
+
+describe "validations" do
+  before do
+    @valid_tasks = {
+      :name => 'bob',
+      :email => 'bob@domain.com',
+      :some_day => '12-12-12'
+    }
+  end
+
+  describe "presence" do
+    it "is initially false if name is blank" do
+      task = ValidatableTask.new(@valid_tasks.except(:name))
+      task.valid?.should === false
+    end
+
+    it "contains correct error message if name is blank" do
+      task = ValidatableTask.new(@valid_tasks.except(:name))
+      task.valid?
+      task.error_messages_for(:name).first.should == 
+        "incorrect value supplied for name -- should be non-empty."
+    end
+
+    it "is true if name is filled in" do
+      task = ValidatableTask.create(@valid_tasks.except(:name))
+      task.name = 'bob'
+      task.valid?.should === true
+    end
+  end
+
+  describe "length" do
+    it "succeeds when in range of 2-10 characters" do
+      task = ValidatableTask.create(@valid_tasks.except(:name))
+      task.name = '123456'
+      task.valid?.should === true
+    end
+
+    it "fails when length less than two characters" do
+      task = ValidatableTask.create(@valid_tasks.except(:name))
+      task.name = '1'
+      task.valid?.should === false
+      task.error_messages_for(:name).first.should == 
+        "incorrect value supplied for name -- should be between 2 and 10 characters long."
+    end
+
+    it "fails when length greater than 10 characters" do
+      task = ValidatableTask.create(@valid_tasks.except(:name))
+      task.name = '123456709AB'
+      task.valid?.should === false
+      task.error_messages_for(:name).first.should == 
+        "incorrect value supplied for name -- should be between 2 and 10 characters long."
+    end
+  end
+
+  describe "email" do
+    it "succeeds when a valid email address is supplied" do
+      ValidatableTask.new(@valid_tasks).should.be.valid?
+    end
+
+    it "fails when an empty email address is supplied" do
+      ValidatableTask.new(@valid_tasks.except(:email)).should.not.be.valid?
+    end
+
+    it "fails when a bogus email address is supplied" do
+      ValidatableTask.new(@valid_tasks.except(:email).merge({:email => 'bogus'})).should.not.be.valid?
+    end
+  end
+
+  describe "format" do
+    it "succeeds when date is in the correct format" do
+      ValidatableTask.new(@valid_tasks).should.be.valid?
+    end
+
+    it "fails when date is in incorrect format" do
+      ValidatableTask.new(@valid_tasks.except(:some_day).merge({:some_day => 'a-12-12'})).should.not.be.valid?
+    end
+  end
+
+  describe "validating one element" do
+    it "validates any properly formatted arbitrary string and succeeds" do
+      task = ValidatableTask.new
+      task.validate_for(:some_day, '12-12-12').should == true
+    end
+
+    it "validates any improperly formatted arbitrary string and fails" do
+      task = ValidatableTask.new
+      task.validate_for(:some_day, 'a-12-12').should == false
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -46,6 +46,7 @@ files:
 - lib/motion_model/model/column.rb
 - lib/motion_model/model/finder_query.rb
 - lib/motion_model/model/model.rb
+- lib/motion_model/model/model_casts.rb
 - lib/motion_model/model/persistence.rb
 - lib/motion_model/validatable.rb
 - lib/motion_model/version.rb
@@ -53,10 +54,13 @@ files:
 - spec/cascading_delete_spec.rb
 - spec/ext_spec.rb
 - spec/finder_spec.rb
+- spec/model_casting_spec.rb
+- spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
 - spec/persistence_spec.rb
 - spec/relation_spec.rb
+- spec/validation_spec.rb
 homepage: https://github.com/sxross/MotionModel
 licenses: []
 post_install_message: 
@@ -85,7 +89,10 @@ test_files:
 - spec/cascading_delete_spec.rb
 - spec/ext_spec.rb
 - spec/finder_spec.rb
+- spec/model_casting_spec.rb
+- spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
 - spec/persistence_spec.rb
 - spec/relation_spec.rb
+- spec/validation_spec.rb