mongomatic 0.4.1 → 0.5.0

data/lib/mongomatic/base.rb

@@ -61,6 +61,12 @@ module Mongomatic
       def count
         find.count
       end
+
+      def drop
+        self.send(:before_drop) if self.respond_to?(:before_drop)
+        collection.drop
+        self.send(:after_drop) if self.respond_to?(:after_drop)
+      end
     end
 
     attr_accessor :removed, :is_new, :errors
@@ -211,4 +217,4 @@ module Mongomatic
       @doc = v
     end
   end
-end
+end

data/lib/mongomatic/errors.rb

@@ -3,5 +3,20 @@ module Mongomatic
     def full_messages(sep=" ")
       collect { |e| e.join(sep) }
     end
+    
+    def on(field, sep=" ")
+      ret = []
+      self.each do |err|
+        ret << err.join(sep) if err.first =~ /^#{field}/ 
+      end
+      case ret.size
+      when 0
+        nil
+      when 1
+        ret.first
+      else
+        ret
+      end
+    end
   end
 end

data/test/helper.rb

@@ -13,10 +13,23 @@ class Person < Mongomatic::Base
   include Mongomatic::Expectations::Helper
   attr_accessor :callback_tests
   
-  def self.create_indexes
-    collection.create_index("name", :unique => true)
+  class << self
+    attr_accessor :class_callbacks
+    def create_indexes
+      collection.create_index("name", :unique => true)
+    end
+
+    def before_drop
+      self.class_callbacks ||= []
+      self.class_callbacks << :before_drop
+    end
+
+    def after_drop
+      self.class_callbacks ||= []
+      self.class_callbacks << :after_drop
+    end
   end
-  
+
   def validate
     self.errors << ["Name", "can't be empty"] if self["name"].blank?
   end

data/test/test_mongomatic.rb

@@ -184,6 +184,9 @@ class TestMongomatic < Test::Unit::TestCase
     p.callback_tests = []
     p.remove
     assert_equal [:before_remove, :after_remove], p.callback_tests
+    Person.class_callbacks = []
+    Person.drop
+    assert_equal [:before_drop, :after_drop], Person.class_callbacks
   end
   
   should "raise an error on unique index dup insert" do
@@ -447,4 +450,74 @@ class TestMongomatic < Test::Unit::TestCase
       p.valid?
     end
   end
+  
+  should "be able to drop a collection" do
+    p = Person.new
+    p['name'] = "Jordan"
+    p.insert
+
+    assert !Person.empty?
+
+    Person.drop
+    assert Person.empty?
+  end
+  
+  should "be able to use errors.on with two part error messages" do
+    p = Person.new
+    class << p
+      def validate
+        expectations do 
+          be_expected self['name'], ['name', 'cannot be empty']
+          be_of_length self['name'], ['name', 'must be at least 3 characters long'], :minimum => 3
+          be_a_number self['age'], ['age', 'must be a number']
+        end
+      end
+    end
+
+    p.valid?
+    assert_equal ['name cannot be empty', 'name must be at least 3 characters long'], p.errors.on(:name)
+    assert_equal 'age must be a number', p.errors.on('age')
+    
+    p['name'] = 'Jo'
+    p['age'] = 21
+    
+    p.valid?
+    assert_equal 'name must be at least 3 characters long', p.errors.on('name')
+    assert_nil p.errors.on(:age)
+    
+    p['name'] = 'Jordan'
+    
+    p.valid?
+    assert_nil p.errors.on(:name)
+  end
+
+  should "be able to use errors.on with one part error messages" do
+    p = Person.new
+    class << p
+      def validate
+        expectations do 
+          be_expected self['name'], 'name cannot be empty' 
+          be_of_length self['name'], 'name must be at least 3 characters long', :minimum => 3
+          be_a_number self['age'],  'age must be a number'
+        end
+      end
+    end
+
+    p.valid?
+    assert_equal ['name cannot be empty', 'name must be at least 3 characters long'], p.errors.on(:name)
+    assert_equal 'age must be a number', p.errors.on('age')
+    
+    p['name'] = 'Jo'
+    p['age'] = 21
+    
+    p.valid?
+    assert_equal 'name must be at least 3 characters long', p.errors.on('name')
+    assert_nil p.errors.on(:age)
+    
+    p['name'] = 'Jordan'
+    
+    p.valid?
+    assert_nil p.errors.on(:name)
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
+date: 2010-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency