simple_model 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    simple_model (0.2.0)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    simple_model (0.2.2)
+      activemodel (~> 3.0.5)
+      activesupport (~> 3.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
+      i18n (~> 0.5.0)
+    activesupport (3.0.8)
     builder (2.1.2)
     diff-lcs (1.1.2)
     i18n (0.5.0)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -20,11 +20,7 @@ SimpleModel is available through [Rubygems](http://rubygems.org/gems/simple_mode
           has_booleans :paid
           has_currency :price, :default => 10.0
           has_dates :created_at
-
-          private
-          def validate
-            validates_inclusion_of :price, :in => 10..25
-          end
+          validates_inclusion_of :price, :in => 10..25
         end
         
         item = Item.new(:created_at => "12/30/2010")
@@ -34,45 +30,9 @@ SimpleModel is available through [Rubygems](http://rubygems.org/gems/simple_mode
         item.paid?      # => false
         item.price      # => 10.0
         item.price = '$1,024.00'
-        item.price      # => 1024.0
+        item.price      # => #<BigDecimal:100c989d8,'0.1024E4',9(27)>
         item.valid?     # => false
 
-### Validation and Errors only
-
-     require 'simple_model'
-
-        class Item
-          include SimpleModel::Validation
-          include SimpleModel::Errors
-
-          attr_accessor :foo
-
-          private
-          def validate
-            validates_presence_of :foo
-          end
-        end
-
-        item = Item.new
-        item.valid? # => false
-
-### Validation Only - helpful if your class already has an errors object, but lacks built in validation
-
-     require 'simple_model'
-
-        class Item < SimpleRecord::Base
-          include SimpleModel::Validation
-
-          attr_accessor :foo
-
-          private
-          def validate
-            validates_presence_of :foo
-          end
-        end
-
-        item = Item.new
-        item.valid? # => false
 
 ## Contributing to simple_model
  

data/lib/simple_model/error_helpers.rb

@@ -2,27 +2,61 @@ module SimpleModel
   module ErrorHelpers
 
     def errors?
-      !self.errors.nil? && !self.errors.empty?
+      !self.errors.blank?
     end
 
+
     def errors_for_flash(options={})
-      options[:failed_action] ||= "saving"
-      options[:id] ||= 'errorExplanation'
-      options[:classes] ||= ''
-      error_string = "<div id='#{options[:id]}' class='#{options[:classes]}'><h2>#{self.errors.count}"
-      if self.errors.length > 1
-        error_string << " errors"
-      else
-        error_string << " error"
+      #set defaults and overwrite
+      options = {
+        :failed_action => "saving",
+       :id => 'errorExplanation',
+       :classes =>  ''}.merge!(options)
+    
+      error_list  = ""
+      
+      # The active_model errors object is not a normal hash and the each method
+      # for the active_mode errors object does not perform as expected
+      # so make it a plain hash
+      {}.merge!(self.errors).each do |error,message|
+        error_list << create_error_list(error,message)
       end
+      error_string = "<div id='#{options[:id]}' class='#{options[:classes]}'><h2>#{self.errors_count}"
+      error_string << " #{puralize_errors_string(self.errors)}"
       error_string << " prevented #{options[:failed_action]}.</h2><ul>"
-
-      self.errors.full_messages.each do |m|
-        error_string << "<li>#{m}</li>"
-      end
+      error_string << error_list
       error_string << "</ul></div>"
       error_string
     end
+
+    # Allow for nested errors like one might see in nested assets when using
+    # accepts_nested_attributes and nested forms
+    def create_error_list(key,value)
+      error_items = ""
+      if value.is_a?(Array)
+        error_items << "<li><ul>#{key.to_s.titleize} #{puralize_errors_string(value)}:"
+        value.each do |item|
+         new_value = item.to_a[0]
+         error_items << create_error_list(new_value[0],new_value[1])
+        end
+        error_items << "</ul></li>"
+      elsif value.is_a?(Hash)
+        error_items << "<li><ul>#{key.to_s.titleize} error:"
+        error_items << create_error_list(value[0],value[1])
+        error_items << "</ul></li>"
+      else
+        self.errors_count = (self.errors_count.to_i + 1)
+        error_items << "<li>#{key.to_s.titleize} #{value}</li>"
+      end
+      error_items
+    end
+
+    def puralize_errors_string(array)
+      s = "error"
+      s << "s" if array.length > 1
+      s
+    end
+
   
     def errors_to_s
       error_string = ""

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/simple_model.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.email       = ["joshmckin@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{Simpifies building tableless models or models backed by webservices}
-  s.description = %q{Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values. Also, provides a simple error and validation api for non-rails 3 apps.}
+  s.description = %q{Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values.}
 
-  s.add_runtime_dependency 'activesupport','3.0.5'
-  s.add_runtime_dependency 'activemodel',"3.0.5"
+  s.add_runtime_dependency 'activesupport','~> 3.0.5'
+  s.add_runtime_dependency 'activemodel',"~> 3.0.5"
 
   s.add_development_dependency 'rspec'
 

metadata

@@ -2,7 +2,7 @@
 name: simple_model
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Joshua T Mckinney
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -05:00
+date: 2011-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.5
   type: :runtime
@@ -30,7 +30,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.5
   type: :runtime
@@ -46,7 +46,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values. Also, provides a simple error and validation api for non-rails 3 apps.
+description: Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values.
 email: 
 - joshmckin@gmail.com
 executables: []
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: simple_model
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simpifies building tableless models or models backed by webservices