simple_record 1.3.11 → 1.4.0

data/lib/simple_record/errors.rb

@@ -14,34 +14,66 @@ module SimpleRecord
     end
 
 
+    class Error
+        attr_accessor :base, :attribute, :type, :message, :options
+
+        def initialize(base, attribute, message, options = {})
+          self.base      = base
+          self.attribute = attribute
+          self.message   = message
+        end
+
+        def message
+          # When type is a string, it means that we do not have to do a lookup, because
+          # the user already sent the "final" message.
+          generate_message
+        end
+
+        def full_message
+          attribute.to_s == 'base' ? message : generate_full_message()
+        end
+
+        alias :to_s :message
+
+        def generate_message(options = {})
+            @message
+        end
+
+        def generate_full_message(options = {})
+            "#{attribute.to_s} #{message}"
+        end
+    end
+
     class SimpleRecord_errors
+        attr_reader :errors
+
         def initialize(*params)
             super(*params)
-            @errors=[]
-        end
-
-        def add_to_base(value)
-            @errors+=[value]
+            @errors={}
         end
 
-        def add(attribute, value)
-            @errors+=["#{attribute.to_s} #{value}"]
+        def add_to_base(msg)
+            add(:base, msg)
         end
 
-        def count
-            return length
+        def add(attribute, message, options = {})
+            # options param note used; just for drop in compatibility with ActiveRecord
+            error, message = message, nil if message.is_a?(Error)
+            @errors[attribute.to_s] ||= []
+            @errors[attribute.to_s] << (error || Error.new(@base, attribute, message, options))
         end
 
         def length
             return @errors.length
         end
 
-        def size
-            return length
-        end
+        alias count length
+        alias size length
 
         def full_messages
-            return @errors
+            @errors.values.inject([]) do |full_messages, errors|
+                full_messages + errors.map { |error| error.full_message }
+            end
         end
 
         def clear
@@ -51,7 +83,20 @@ module SimpleRecord
         def empty?
             @errors.empty?
         end
+
+        def on(attribute)
+            attribute = attribute.to_s
+            return nil unless @errors.has_key?(attribute)
+            errors = @errors[attribute].map(&:to_s)
+            errors.size == 1 ? errors.first : errors
+        end
+
+        alias :[] :on
+
+        def on_base
+            on(:base)
+        end
     end
-    
+
 end
 

data/lib/simple_record.rb

@@ -297,6 +297,15 @@ module SimpleRecord
             set(:updated, Time.now)
         end
 
+        # an aliased method since many people use created_at/updated_at naming convention
+        def created_at
+            self.created
+        end
+
+        # an aliased method since many people use created_at/updated_at naming convention
+        def updated_at
+            self.updated
+        end
 
         def cache_store
             @@cache_store

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 11
-  version: 1.3.11
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency