simple_model 0.1.2 → 0.1.3

data/README.md

@@ -1,4 +1,8 @@
 # SimpleModel
+A collection of convenience methods for building table-less models. If ActiveModel
+gem is installed, SimpleModel::Based will include ActiveModel::Validations,
+include ActiveModel::Conversion and extend ActiveModel::Naming. If ActiveModel
+gem is not available, SimpleModel::Base defaults to its own built-in Error and Validation modules.
 
 ## Installation
 

data/lib/simple_model/attributes.rb

@@ -1,16 +1,12 @@
 module SimpleModel
   module Attributes
     include ExtendCore
- 
 
     #Set attribute values to those supplied at initialization
     def initialize(*attrs)
-      attrs.extract_options!.each do |attr|
-        self.send(("#{attr[0]}=").to_sym, attr[1])
-      end
+      set_attributes(attrs.extract_options!)
     end
 
-    ############## Pseudo Rails Methods ###############
     def id
       @id
     end
@@ -19,29 +15,37 @@ module SimpleModel
       @id=id
     end
 
-    # Defaults to true so rails will create a "new" form
-    # Set to false and rails will produce an "edit" form
     def new_record
       @new_record = true if @new_record.nil?
       @new_record
     end
 
+    def persisted?
+      !new_record
+    end
+
     def new_record?
       new_record
     end
     
     def new_record=(new_record)
-      @new_record = new_record.to_b
+      @new_record = new_record
     end
 
-    ############### End Pseudo Rails Methods ##############
-
     # Place to store set attributes and their values
     def attributes
       @attributes ||= {}
       @attributes
     end
 
+    def set_attributes(attrs)
+      attrs.each do |attr|
+        self.send("#{attr[0].to_sym}=",attr[1])
+      end
+    end
+
+    alias :update_attributes :set_attributes
+
 
     def self.included(base)
       base.extend(ClassMethods)
@@ -164,9 +168,9 @@ module SimpleModel
 
       def fetch_alias_name(attr)
         alias_name = (attr.to_s << "_old=").to_sym
-         self.module_eval("alias #{alias_name} #{attr}")
+        self.module_eval("alias #{alias_name} #{attr}")
 
-         alias_name
+        alias_name
       end
 
       # Defines a reader method that returns a default value if current value

data/lib/simple_model/errors.rb

@@ -38,7 +38,7 @@ module SimpleModel
     end
 
     def errors_for_flash
-      error_string = ""
+      error_string = "<div id='smErrorExplanation'>#{errors.count} errors prevented saving.</div>"
       errors.full_messages.each do |m|
         error_string << "<div>#{m}</div>"
       end

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/simple_model.rb

@@ -5,9 +5,22 @@ module SimpleModel
   autoload :Errors, "simple_model/errors"
   autoload :Validation, "simple_model/validation"
 
+  # require active_model if available
+  begin
+    require 'active_model'
+  rescue LoadError
+    #Don't fail
+  end
+
   class Base
-    include SimpleModel::Errors
     include SimpleModel::Attributes
-    include SimpleModel::Validation   
+    begin
+      include ActiveModel::Validations
+      include ActiveModel::Conversion
+      extend ActiveModel::Naming
+    rescue NameError
+      include SimpleModel::Errors
+      include SimpleModel::Validation
+    end    
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joshua T Mckinney
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -06:00
+date: 2011-01-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency