simple_model 1.2.8 → 1.2.9

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 
 # Specify your gem's dependencies in simple_model.gemspec

data/gemfiles/3.0.gemfile

@@ -5,4 +5,4 @@ gem 'activemodel','~> 3.0.1'
 gem 'debugger', :platform => 'ruby'
 gem 'ruby-debug', :platform => 'jruby'
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/3.1.gemfile

@@ -5,4 +5,4 @@ gem 'activemodel','~> 3.1.1'
 gem 'debugger', :platform => 'ruby'
 gem 'ruby-debug', :platform => 'jruby'
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/3.2.gemfile

@@ -5,4 +5,4 @@ gem 'activemodel','~> 3.2.1'
 gem 'debugger', :platform => 'ruby'
 gem 'ruby-debug', :platform => 'jruby'
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/simple_model/attributes.rb

@@ -2,32 +2,32 @@ module SimpleModel
   module Attributes
     include ExtendCore
     extend ActiveSupport::Concern
-    include ActiveModel::AttributeMethods 
-      
-    def initialize(*attrs)     
-      attrs = attrs.extract_options! 
+    include ActiveModel::AttributeMethods
+
+    def initialize(*attrs)
+      attrs = attrs.extract_options!
       attrs = attributes_with_for_init(attrs)
       attrs = self.class.before_initialize.call(self,attrs) if self.class.before_initialize
       set(attrs)
       self.class.after_initialize.call(self) if self.class.after_initialize
     end
-    
+
     # Returns true if attribute has been initialized
     def initialized?(attr)
       attributes.key?(attr.to_sym)
     end
-    
+
     def attributes
       @attributes ||= HashWithIndifferentAccess.new
     end
-      
+
     def attributes=attrs
       @attributes = attrs
     end
-  
+
     def get(attr)
       self.send(attr)
-    end 
+    end
     alias :read :get
 
     # Accepts a hash where the keys are methods and the values are values to be set.
@@ -38,14 +38,14 @@ module SimpleModel
       end
     end
     alias :set_attributes :set
-    
+
     private
-    
+
     def fetch_default_value(arg)
       return self.send(arg) if (arg.is_a?(Symbol) && self.respond_to?(arg))
       arg
     end
-    
+
     # Returns attribute that have defaults in a hash: {:attrbute => "default value"}
     # Checks for alias attributes to ensure they are not overwritten
     def attributes_with_for_init(attrs)
@@ -57,13 +57,13 @@ module SimpleModel
       end
       d
     end
-    
+
     def allow_set_default?(d,k,v)
       (v[:default] && v[:initialize] && (d[k].blank? && (self.class.alias_attributes[k].blank? || d.key?(self.class.alias_attributes[k]) && d[self.class.alias_attributes[k]].blank?)))
     end
-    
+
     private
-    
+
     def allow_attribute_action?(obj,val,options)
       return true if (options[:if].blank? && options[:unless].blank?)
       b = true
@@ -85,18 +85,18 @@ module SimpleModel
       b = (b && !options[:unless].call(obj,val)) if options[:unless].is_a?(Proc)
       b
     end
-    
+
     # Rails 3.2 + required when searching for attributes in from inherited classes/cmodles
     def attribute(name)
       attributes[name.to_sym]
     end
-       
-    module ClassMethods  
+
+    module ClassMethods
       # Creates a new instance where the attributes store is set to object
       # provided, which allows one to pass a session store hash or any other
       # hash-like object to be used for persistance. Typically used for modeling
       # session stores for authorization or shopping carts
-      # EX: 
+      # EX:
       #     class ApplicationController < ActionController::Base
       #       def session_user
       #         session[:user] ||= {}
@@ -111,23 +111,23 @@ module SimpleModel
         new.set(new.send(:attributes_with_for_init,session_hash))
         new
       end
-      
+
       def alias_attributes
         @alias_attributes ||= {}.with_indifferent_access
       end
-      
+
       def alias_attributes=alias_attributes
         @alias_attributes = alias_attributes
       end
-      
+
       def defined_attributes
         @defined_attributes ||= {}.with_indifferent_access
       end
-      
+
       def defined_attributes=defined_attributes
         @defined_attributes = defined_attributes
       end
-      
+
       # The default settings for a SimpeModel class
       # Options:
       # * :on_set - accepts a lambda that is run when an attribute is set
@@ -138,17 +138,17 @@ module SimpleModel
       # * :allow_blank - when set to false, if an attributes value is blank attempts to set the default value, defaults to true
       def default_attribute_settings
         @default_attribute_settings ||= {:attributes_method => :attributes,
-          :on_set => lambda {|obj,attr| attr},
-          :on_get => lambda {|obj,attr| attr},
-          :allow_blank => true,
-          :initialize => true
-        }
+                                         :on_set => lambda {|obj,attr| attr},
+                                         :on_get => lambda {|obj,attr| attr},
+                                         :allow_blank => true,
+                                         :initialize => true
+                                         }
       end
-      
+
       def default_attribute_settings=default_attribute_settings
         @default_attribute_settings = default_attribute_settings
       end
-    
+
       # We want to re-run define_attribute_methods since attributes are not all defined
       # at once, so we must set @attribute_methods_generated to nil to allow the
       # re-run to occur ONLY IN RAILS 3.0.
@@ -157,17 +157,17 @@ module SimpleModel
         @attribute_methods_generated = nil #if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
         define_attribute_methods(self.defined_attributes.keys)
       end
-      
+
       # builds the setter and getter methods
       def create_attribute_methods(attributes,options)
-        unless attributes.blank?  
+        unless attributes.blank?
           attributes.each do |attr|
             define_reader_with_options(attr,options)
             define_setter_with_options(attr,options)
           end
         end
       end
-      
+
       def define_reader_with_options(attr,options)
         add_defined_attribute(attr,options)
         options = default_attribute_settings.merge(options) if options[:on_get].blank?
@@ -181,43 +181,43 @@ module SimpleModel
         define_method("#{attr.to_s}?") do
           val = self.send(attr)
           if val.respond_to?(:to_b)
-            val = val.to_b 
+            val = val.to_b
           else
             val = !val.blank? if val.respond_to?(:blank?)
           end
           val
         end
       end
-      
+
       # Creates setter methods for the provided attributes
-      # On set, it will mark the attribute as changed if the attributes has been 
+      # On set, it will mark the attribute as changed if the attributes has been
       # initialized.
       def define_setter_with_options(attr,options)
         add_defined_attribute(attr,options)
-        options = default_attribute_settings.merge(options) if (options[:on_set].blank? || options[:after_set].blank?) 
+        options = default_attribute_settings.merge(options) if (options[:on_set].blank? || options[:after_set].blank?)
         define_method("#{attr.to_s}=") do |val|
           if allow_attribute_action?(self,val,options)
-            val = fetch_default_value(options[:default]) if (!options[:allow_blank] && options.key?(:default) && val.blank?)   
+            val = fetch_default_value(options[:default]) if (!options[:allow_blank] && options.key?(:default) && val.blank?)
             val = options[:on_set].call(self,val) unless (val.blank? && !options[:allow_blank] )
             will_change = "#{attr}_will_change!".to_sym
-            self.send(will_change) if (initialized?(attr) && val != self.attributes[attr])       
+            self.send(will_change) if (initialized?(attr) && val != self.attributes[attr])
             self.attributes[attr] = val
-            options[:after_set].call(self,val) if options[:after_set] 
+            options[:after_set].call(self,val) if options[:after_set]
           end
         end
       end
-    
+
       AVAILABLE_ATTRIBUTE_METHODS = {
         :has_attribute => {:alias => :has_attributes},
         :has_boolean  => {:cast_to => :to_b, :alias => :has_booleans},
         :has_currency => {:cast_to => :to_d, :alias => :has_currencies},
-        :has_date => {:cast_to => :to_date, :alias => :has_dates} , 
-        :has_decimal  => {:cast_to => :to_d, :alias => :has_decimals},    
-        :has_float => {:cast_to => :to_f, :alias => :has_floats}, 
+        :has_date => {:cast_to => :to_date, :alias => :has_dates} ,
+        :has_decimal  => {:cast_to => :to_d, :alias => :has_decimals},
+        :has_float => {:cast_to => :to_f, :alias => :has_floats},
         :has_int => {:cast_to => :to_i, :alias => :has_ints},
-        :has_time => {:cast_to => :to_time, :alias => :has_times}  
+        :has_time => {:cast_to => :to_time, :alias => :has_times}
       }
-      
+
       AVAILABLE_ATTRIBUTE_METHODS.each do |method,method_options|
         define_method(method) do |*attributes|
           options = default_attribute_settings.merge(attributes.extract_options!)
@@ -226,19 +226,19 @@ module SimpleModel
         end
         module_eval("alias #{method_options[:alias]} #{method}")
       end
-      
+
       # Creates alias setter and getter for the supplied attribute using the supplied alias
       # See spec for example.
       def alias_attribute(new_alias,attribute)
         alias_attributes[attribute] = new_alias
-        define_method(new_alias) do 
+        define_method(new_alias) do
           self.send(attribute)
         end
         define_method("#{new_alias.to_s}=") do |*args, &block|
           self.send("#{attribute.to_s}=",*args, &block)
         end
       end
-      
+
       # A hook to perform actions on the pending attributes or the object before
       # the pending attributes have been initialized.
       # Expects an lambda that accept the object, the pending attributes hash and
@@ -247,66 +247,62 @@ module SimpleModel
       def before_initialize
         @before_initialize
       end
-      
+
       # Expects an lambda that accept the object, the pending attributes hash and
       # should return a hash to be set
-      # EX: lambda {|obj,attrs| attrs.select{|k,v| !v.blank?}}  
+      # EX: lambda {|obj,attrs| attrs.select{|k,v| !v.blank?}}
       def before_initialize=before_initialize
         raise TypeError "before_initialize must be a lambda that accepts the attirbutes to be initialize" unless before_initialize.is_a?(Proc)
         @before_initialize = before_initialize
       end
-    
+
       # A hook to perform actions after all attributes have been initialized
       # Expects an lambda that accept the object and the pending attributes hash
       # EX: lambda{|obj| puts "initialized"}
       def after_initialize
         @after_initialize
       end
-      
+
       # Expects an lambda that accept the object and the pending attributes hash
       # EX: lambda{|obj| puts "initialized"}
       def after_initialize=after_initialize
         raise TypeError "after_initalize must be a Proc" unless after_initialize.is_a?(Proc)
         @after_initialize = after_initialize
       end
-      
-      
-      
+
+
+
       # Must inherit super's defined_attributes and alias_attributes
       # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a
-      # hack to keep things working when a class in inherits from a super that 
+      # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
+        super
         # Rails 3.0 Hack
-        if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)    
+        if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
           base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
           base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
         end
-        base.send(:include, ActiveModel::Dirty)
-
-        unless (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
-          self.defined_attributes.each do |attr,options|
-            base.create_attribute_methods([attr],options)
-          end
+        base.defined_attributes = self.defined_attributes.merge(base.defined_attributes)
+        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
+        base.defined_attributes.each do |attr,options|
+          base.create_attribute_methods([attr],options) #unless base.instance_methods.include?(attr.to_sym)
         end
-        
-        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes ) 
-        super
       end
     end
-    
-    # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a 
-    # hack to keep things working when a class includes a module that has 
+
+    # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a
+    # hack to keep things working when a class includes a module that has
     # ActiveModel::Dirty included
     def self.included(base)
-      base.extend(Attributes::ClassMethods) 
-      base.send(:include, ActiveModel::Dirty) 
+      base.extend(Attributes::ClassMethods)
+      base.send(:include, ActiveModel::Dirty)
       base.send(:include, ActiveModel::Validations)
       base.send(:include, ActiveModel::Conversion)
       base.extend ActiveModel::Naming
       base.extend ActiveModel::Callbacks
       base.send(:include, ActiveModel::Validations::Callbacks)
-      
+
       # Rails 3.0 Hack
       if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
         base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
@@ -314,4 +310,4 @@ module SimpleModel
       end
     end
   end
-end
+end

data/lib/simple_model/error_helpers.rb

@@ -64,6 +64,7 @@ module SimpleModel
     end
 
     def puralize_errors_string(array)
+      array = array.to_a if array.is_a?(ActiveModel::Errors)
       s = "error"
       s << "s" if array.length > 1
       s

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/spec/attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
+require 'spec_helper.rb'
 
 describe SimpleModel::Attributes do
   before(:all) do
@@ -246,7 +246,7 @@ describe SimpleModel::Attributes do
       end
     end
     it "should merge defined attributes when class are inhereted" do
-      NewerBase.defined_attributes[:bar].blank?.should be_false
+      NewerBase.defined_attributes[:bar].should_not be_nil
       n = NewerBase.new
       n.respond_to?(:bar_will_change!).should be_true
     end

data/spec/error_helpers_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper.rb'
+
+class FooErrorClass < SimpleModel::Base
+end
+
+describe SimpleModel::ErrorHelpers do
+  describe '#errors_for_flash' do
+    it "should not raise error" do
+      f = FooErrorClass.new
+      f.errors.add(:foo, "something not great")
+      f.errors.add(:bar, "doh")
+      lambda {f.errors_for_flash}.should_not raise_error
+    end
+  end
+end

data/spec/simple_model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper.rb'
 
 describe SimpleModel do 
   context 'action methods' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,6 +104,7 @@ files:
 - lib/simple_model/version.rb
 - simple_model.gemspec
 - spec/attributes_spec.rb
+- spec/error_helpers_spec.rb
 - spec/extend_core_spec.rb
 - spec/simple_model_spec.rb
 - spec/spec_helper.rb
@@ -133,6 +134,7 @@ specification_version: 3
 summary: Simpifies building tableless models or models backed by webservices
 test_files:
 - spec/attributes_spec.rb
+- spec/error_helpers_spec.rb
 - spec/extend_core_spec.rb
 - spec/simple_model_spec.rb
 - spec/spec_helper.rb