simple_model 1.2.27 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzIwOThmYzg1NGI0ZGZjN2YwNTdhZTU3NGM2YzNmMDBlMGJkMzA2NA==
-  data.tar.gz: !binary |-
-    YWEwNDJjZDg4ZjExOTYxODYyMmQ0NjljZjNkY2VkOTg3Y2Q1ZjI5Nw==
+SHA1:
+  metadata.gz: fad8b6e06b4a604873dfe174617170dce71277ab
+  data.tar.gz: a9e8d432e3f3f7d1abff848bc6f022f186553e99
 SHA512:
-  metadata.gz: !binary |-
-    NDkyOTdlMDdmZTczMGI3MGQyZmZlNzliNDkzN2M2ZTY4NGU4MmNjNGZmZWI0
-    M2M3YmMzNWQ3Njg2ZjEwZWY4YTUzYzEwMjkwNDI2NTU5ZDc4MzdhNDdhZjYx
-    MzQ4OWRkZjY3MDczY2Q5Yzc4NTVjN2NiMjdiOWNlOGE4YzFlMGY=
-  data.tar.gz: !binary |-
-    YzhiNmE4MWU5ZDVhOWYzZTZlZGUyNmI1MzU1YmQxODY5MjdkMGRhNjg2MTJk
-    MWJhZDNiNDQyY2E1YTg1NzlmM2FkODViMmNlZTRiYzhlMWEwOWVjMmRhZDZi
-    ZDBhMzAwODQzYjM1MTBiYWIxNWI2YjNjYzBlM2Y0MGZjYzYyODc=
+  metadata.gz: 8e916c15d886c4c49530cf6ae29e66e93efde3532f3094cd654ff287a5b3ce8598c8947fdce2437f3b2dd5ebb16f9940c28070d595cb0f60f432bc9fc2b01e65
+  data.tar.gz: 2eccebd37cf6fd8909296c83cb4c0c501205364c2f029942ec7d367a72d2af5c50e2d2db0bf979314f9e34542cbf496cabb3cfc5abc9856072771efc6d3a9d83

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
+cache: bundler
 rvm:
-  - "2.1"
-  - "2.0.0"
-  - "1.9.3"
-  - jruby-19mode # JRuby in 1.9 mode
+  - 2.2
+  - 2.1
+  - 2.0.0
+  - 1.9.3
+  - jruby
 script: bundle exec rspec spec
 gemfile:
   - gemfiles/3.0.gemfile

data/Gemfile

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

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Joshua T. McKinney
+Copyright (c) 2010-2015 Joshua T. McKinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -35,7 +35,6 @@ SimpleModel is available through [Rubygems](http://rubygems.org/gems/simple_mode
           # Attributes
           has_booleans :active, :default => true
           has_booleans :paid
-          has_currency :price, :default => 10.0.to_currency
           has_times :created_at, :default => :now
           has_attribute :my_array, :default => []
           

data/benchmarks/simple_model.rb

@@ -79,17 +79,17 @@ end
 # ruby 2.1.5p273 (2014-11-13 revision 48405) [x86_64-darwin14.0]
 
 # Rehearsal ------------------------------------------------
-# init           1.360000   0.000000   1.360000 (  1.364654)
-# init w/attrs   2.510000   0.000000   2.510000 (  2.512509)
-# get            1.620000   0.000000   1.620000 (  1.619021)
-# get?           1.700000   0.000000   1.700000 (  1.697857)
-# set            2.720000   0.000000   2.720000 (  2.724271)
-# --------------------------------------- total: 9.910000sec
+# init           0.150000   0.000000   0.150000 (  0.149609)
+# init w/attrs   1.100000   0.000000   1.100000 (  1.101177)
+# get            0.490000   0.000000   0.490000 (  0.491134)
+# get?           0.600000   0.000000   0.600000 (  0.598875)
+# set            1.170000   0.000000   1.170000 (  1.171242)
+# --------------------------------------- total: 3.510000sec
 
 #                    user     system      total        real
-# init           1.350000   0.000000   1.350000 (  1.352561)
-# init w/attrs   2.530000   0.010000   2.540000 (  2.532518)
-# get            1.610000   0.000000   1.610000 (  1.613509)
-# get?           1.690000   0.000000   1.690000 (  1.693701)
-# set            2.700000   0.000000   2.700000 (  2.698375)
+# init           0.140000   0.000000   0.140000 (  0.140109)
+# init w/attrs   1.060000   0.000000   1.060000 (  1.055176)
+# get            0.490000   0.000000   0.490000 (  0.491473)
+# get?           0.600000   0.000000   0.600000 (  0.600557)
+# set            1.200000   0.010000   1.210000 (  1.196884)
 

data/lib/simple_model/attributes/default_value_helpers.rb

@@ -0,0 +1,16 @@
+module SimpleModel
+  module Attributes
+    module DefaultValueHelpers
+
+      private
+      
+      def new_empty_array
+        Array.new
+      end
+
+      def new_empty_hash
+        Hash.new
+      end
+    end
+  end
+end

data/lib/simple_model/attributes.rb

@@ -6,14 +6,12 @@ module SimpleModel
     include ActiveModel::Dirty
 
     DEFAULT_ATTRIBUTE_SETTINGS = {:attributes_method => :attributes,
-                                  :allow_blank => false,
-                                  :initialize => true
+                                  :allow_blank => false
                                   }.freeze
 
     AVAILABLE_ATTRIBUTE_METHODS = {
       :has_attribute => {:alias => :has_attributes, :options => {:allow_blank => true}},
       :has_boolean  => {:cast_to => :to_b, :alias => :has_booleans, :options =>  {:allow_blank => true, :boolean => true}},
-      :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},
@@ -21,23 +19,33 @@ module SimpleModel
       :has_time => {:cast_to => :to_time, :alias => :has_times}
     }.freeze
 
-    attr_accessor :attributes
-
     def initialize(*attrs)
       attrs = attrs.extract_options!
-      attrs = attributes_for_init(attrs)
       attrs = self.class.before_initialize.call(self,attrs) if self.class.before_initialize
       set(attrs)
+      defaults = default_attributes_for_init
+      set(defaults)
       self.class.after_initialize.call(self) if self.class.after_initialize
     end
 
     def attributes
-      @attributes ||= HashWithIndifferentAccess.new
+      @attributes ||= new_attribute_store
+    end
+
+    def attributes=attrs
+      if attrs.class.name == "Hash"
+        if config.attributes_store == :symbol
+          attrs.symbolize_keys!
+        else
+          attrs.stringify_keys!
+        end
+      end
+      @attributes = attrs 
     end
 
     # Returns true if attribute has been initialized
     def initialized?(attr)
-      attributes.key?(attr)
+      attributes.has_key?(to_attr_key(attr))
     end
 
     def get(attr)
@@ -56,27 +64,27 @@ module SimpleModel
 
     def set_attribute(attr,val,opts=nil)
       opts ||= fetch_attribute_options(attr)
+      attr_key = to_attr_key(attr)
       if allow_attribute_action?(val,opts)
-        allow_blank = opts[:allow_blank]
-        val = fetch_default_value(opts[:default]) unless skip_set_default?(attr,opts,val)
-        unless (opts[:boolean] ? (!allow_blank && val.blank? && (val != false)) : (!allow_blank && val.blank?))
-          val = opts[:on_set].call(self,val) if opts.key?(:on_set)
-          send("#{attr}_will_change!") if (initialized?(attr) && val != attributes[attr])
-          attributes[attr] = val
-          opts[:after_set].call(self,val) if opts[:after_set]
+        ab = opts[:allow_blank]
+        val = fetch_default_value(opts[:default]) unless skip_set_default?(attr,opts,val,ab)
+        unless (opts[:boolean] ? (!ab && val.blank? && (val != false)) : (!ab && val.blank?))
+          val = opts[:on_set].call(self,val) if opts.has_key?(:on_set)
+          send("#{attr}_will_change!") if initialized?(attr) && val != attributes[attr_key]
+          attributes[attr_key] = val
         end
+        val
       end
     end
 
+    # TODO: Returning just val in Rails 3 HashWithIndifferentAccess causes weird issue where if value is an array the array is reset,
+    # revert to return to just val when Rails 3 support is dropped to improve performance
     def get_attribute(attr,opts=nil)
       opts ||= fetch_attribute_options(attr)
-      val = attributes[attr]
-      val = attributes[attr] ||= fetch_default_value(opts[:default]) unless skip_get_default?(attr,opts,val)
-      if opts[:on_get]
-        opts[:on_get].call(self,val)
-      else
-        val
-      end
+      attr_key = to_attr_key(attr)
+      val = attributes[attr_key]
+      attributes[attr_key] = fetch_default_value(opts[:default]) unless skip_get_default?(attr,opts,val)
+      val = attributes[attr_key]
     end
 
     def fetch_attribute_options(attr)
@@ -84,7 +92,7 @@ module SimpleModel
     end
 
     def get_attribute?(attr)
-      return false unless val = send(attr)
+      return false unless val = get_attribute(attr)
       if val.respond_to?(:blank?)
         return !val.blank?
       elsif val.respond_to?(:to_b)
@@ -102,52 +110,85 @@ module SimpleModel
       get_attribute(attr)
     end
 
+    def raw_attribute(attr)
+      attributes[to_attr_key(attr)]
+    end
+
+    def set_raw_attribute(attr,val)
+      attributes[to_attr_key(attr)] = val
+    end
+
+    def delete_attributes(*attrs)
+      clear_attribute_changes(attrs) if respond_to?(:clear_attribute_changes,true) # Rails 4.2 +
+      attrs.each do |attr|
+        attributes.delete(to_attr_key(attr))
+      end
+    end
+    alias :delete_attribute :delete_attributes
+
+    def reset_attributes
+      @attributes = new_attribute_store
+    end
+
     private
 
+    def new_attribute_store
+      (config.attributes_store == :indifferent ? HashWithIndifferentAccess.new : Hash.new)
+    end
+
+    def to_attr_key(attr)
+      @_attr_cast ||= config.attibutes_store_cast
+      attr.send(@_attr_cast)
+    end
+
+    def new_attibutes_store(attrs=nil)
+      config.attibutes_store_class.new(attrs)
+    end
+
     def skip_get_default?(attr,opts,val)
-      (val || !opts.key?(:default) || (opts[:boolean] && (val == false)))
+      (val || !opts.has_key?(:default) || (opts[:boolean] && (val == false)))
     end
 
-    def skip_set_default?(attr,opts,val)
-      return true if (!opts.key?(:default) ||
+    def skip_set_default?(attr,opts,val,ab=true)
+      return true if (!opts.has_key?(:default) ||
                       initialized?(attr) ||
                       (opts[:boolean] && (val == false)))
       blnk = val.blank?
-      (!blnk || (blnk && opts[:allow_blank]))
+      (!blnk || (blnk && ab))
     end
 
     def fetch_default_value(arg)
-      return send(arg) if (arg.is_a?(Symbol) && self.respond_to?(arg))
+      return send(arg) if (arg.is_a?(Symbol) && respond_to?(arg,true))
       arg
     end
 
     # Returns attribute that have defaults in a hash: {:attribute => "default value"}
     # Checks for alias attributes to ensure they are not overwritten
-    def attributes_for_init(attrs)
-      d = (attrs.is_a?(HashWithIndifferentAccess) ? attrs : attrs.with_indifferent_access )
-      self.class.defined_attributes.each do |k,v|
-        if allow_init_default?(d,k,v)
-          d[k] = fetch_default_value(v[:default])
+    def default_attributes_for_init
+      da = {}
+      self.class.defined_attributes.each do |attr,opts|
+        if allow_init_default?(attr,opts)
+          da[attr] = fetch_default_value(opts[:default])
         end
       end
-      d
+      da
     end
 
     # Only set default if there is a default value, initializing is allow and
     # new attributes do not have a value to set and
-    def allow_init_default?(d,k,v)
-      (v[:default] && v[:initialize] && (!d.key?(k) && !attributes_have_alias?(d,k)))
+    def allow_init_default?(attr,opts)
+      (opts.has_key?(:default) && (opts.has_key?(:initialize) ? opts[:initialize] : config.initialize_defaults?) && !initialized?(attr) && !initialized_alias?(attr))
     end
 
-    def attributes_have_alias?(attrs,attr)
-      base_meth = self.class.alias_attributes.rassoc(attr.to_sym)
-      base_meth && attrs.key?(base_meth[0])
-      #!(self.class.alias_attributes.select{ |a, m| (m == attr.to_sym && attrs.key?(a)) }).empty?
+    def initialized_alias?(attr)
+      base_meth = self.class.alias_attributes.rassoc(attr)
+      base_meth && attributes.has_key?(base_meth[0])
     end
 
     def allow_attribute_action?(val,options)
-      return true unless (options[:if] || options[:unless])
+      return true unless (options.has_key?(:if) || options.has_key?(:unless))
       b = true
+      opt = nil
       if opt = options[:if]
         if opt.is_a?(Symbol)
           if opt == :blank
@@ -173,7 +214,13 @@ module SimpleModel
       b
     end
 
+    def config
+      self.class.config
+    end
+
     module ClassMethods
+      attr_accessor :config
+
       AVAILABLE_ATTRIBUTE_METHODS.each do |method,method_options|
         define_method(method) do |*attributes|
           options = attributes.extract_options!
@@ -199,14 +246,11 @@ module SimpleModel
       #     end
       #
       def new_with_store(session_hash)
-        nw = self.new()
-        nw.attributes = session_hash
-        nw.set(nw.send(:attributes_for_init,session_hash))
-        nw
+        self.new(:attributes => session_hash)
       end
 
       def alias_attributes
-        @alias_attributes ||= HashWithIndifferentAccess.new
+        @alias_attributes ||= Hash.new
       end
 
       def alias_attributes=alias_attributes
@@ -214,7 +258,7 @@ module SimpleModel
       end
 
       def defined_attributes
-        @defined_attributes ||= HashWithIndifferentAccess.new
+        @defined_attributes ||= Hash.new
       end
 
       def defined_attributes=defined_attributes
@@ -222,7 +266,15 @@ module SimpleModel
       end
 
       def attribute_defined?(attr)
-        defined_attributes.key?(attr)
+        defined_attributes.has_key?(attr.to_sym)
+      end
+
+      # The current intent of the config is allow the managing of features at the global level and overrides options
+      # set at attribute definition, which may not be the most flexible and may require re-thinking for future options
+      # Options:
+      # * config.initialize_defaults default is true, if false prevents attributes with default values from auto-initializing
+      def config
+        @config ||= (superclass.respond_to?(:config) ? superclass.config.dup : SimpleModel.config.dup)
       end
 
       # The default settings for a SimpeModel class
@@ -230,7 +282,8 @@ module SimpleModel
       # * :on_set - accepts a lambda that is run when an attribute is set
       # * :on_get - accepts a lambda that is run when you get/read an attribute
       # * :default - the default value for the attribute, can be a symbol that is sent for a method
-      # * :initialize - informations the object whether or not it should initialize the attribute with :default value, defaults to true
+      # * :initialize - informations the object whether or not it should initialize the attribute with :default value, defaults to true,
+      #                  and is overridden by config.initialzie_defaults
       # ** If :initialize is set to false you must set :allow_blank to false or it will never set the default value
       # * :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
@@ -258,9 +311,9 @@ module SimpleModel
       end
 
       # builds the setter and getter methods
-      def create_attribute_methods(attributes,options)
-        unless attributes.blank?
-          attributes.each do |attr|
+      def create_attribute_methods(attrs,options)
+        unless attrs.blank?
+          attrs.each do |attr|
             define_setter_with_options(attr,options)
             define_reader_with_options(attr,options)
             add_defined_attribute(attr,options)

data/lib/simple_model/base.rb

@@ -15,6 +15,8 @@ module SimpleModel
   require 'active_support/core_ext/module/introspection'
   require 'active_support/core_ext/object/duplicable'
   require 'active_support/core_ext/object/blank'
+  require 'simple_model/attributes/default_value_helpers'
+
 
   # == SimpleModel::Base
   #
@@ -75,6 +77,7 @@ module SimpleModel
   class Base
     include SimpleModel::Attributes
     include SimpleModel::ErrorHelpers
+    include SimpleModel::Attributes::DefaultValueHelpers
 
     define_model_callbacks :save, :update, :create, :destroy
 

data/lib/simple_model/config.rb

@@ -0,0 +1,29 @@
+module SimpleModel
+  class Config
+    DEFAULTS = {
+      :initialize_defaults  => false,
+      :attributes_store     => :string # OPTIONS => :string, :symbol, :indifferent
+    }.freeze
+
+    ATTRIBUTE_STORES = {
+      :symbol => :to_sym,
+      :string => :to_s,
+      :indifferent => :to_s
+    }.freeze
+
+    attr_accessor :initialize_defaults
+    alias :initialize_defaults? :initialize_defaults
+
+    attr_accessor :attributes_store
+
+    def initialize
+      DEFAULTS.each do |setting, val|
+        self.send("#{setting}=", val)
+      end
+    end
+
+    def attibutes_store_cast
+      ATTRIBUTE_STORES[attributes_store]
+    end
+  end
+end

data/lib/simple_model/extend_core.rb

@@ -40,11 +40,6 @@ module SimpleModel
         (((((self)*mulitplier).round).to_f)/mulitplier)
       end
 
-      # Returns a BigDecimal object rounded to the nearest hundredth
-      # Why decimal?..because precision matters when dealing with money ;)
-      def to_currency
-        self.to_d.round(2)
-      end
       
       def to_time
         Time.at(self)
@@ -120,8 +115,6 @@ module SimpleModel
       def to_d
         gsub(/[^0-9\.\+\-]/, '').core_to_d
       end
-      alias :to_currency :to_d
-
     end
 
     BigDecimal.class_eval do

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.27"
+  VERSION = "1.3.0"
 end

data/lib/simple_model.rb

@@ -1,49 +1,34 @@
-#--
-# Copyright (c) 2010-2014 Joshua Thomas Mckinney
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+require 'active_support'
+require 'active_support/i18n'
+require 'active_support/time'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/delegating_attributes'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/introspection'
+require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/blank'
+require 'active_model'
+require "simple_model/extend_core"
+require 'simple_model/exceptions'
+require 'simple_model/config'
+require "simple_model/attributes/default_value_helpers"
+require "simple_model/attributes"
+require "simple_model/error_helpers"
+require "simple_model/base"
+require 'simple_model/simple_model_railtie.rb' if defined?(Rails)
+
 module SimpleModel
-  require 'active_support'
-  require 'active_support/i18n'
-  require 'active_support/time'
-  require 'active_support/core_ext/class/attribute'
-  require 'active_support/core_ext/class/attribute_accessors'
-  require 'active_support/core_ext/class/delegating_attributes'
-  require 'active_support/core_ext/class/attribute'
-  require 'active_support/core_ext/array/extract_options'
-  require 'active_support/core_ext/hash/deep_merge'
-  require 'active_support/core_ext/hash/indifferent_access'
-  require 'active_support/core_ext/hash/slice'
-  require 'active_support/core_ext/string/behavior'
-  require 'active_support/core_ext/kernel/singleton_class'
-  require 'active_support/core_ext/module/delegation'
-  require 'active_support/core_ext/module/introspection'
-  require 'active_support/core_ext/object/duplicable'
-  require 'active_support/core_ext/object/blank'
-  require 'active_model'
-  require "simple_model/extend_core"
-  require 'simple_model/exceptions'
-  require "simple_model/attributes"
-  require "simple_model/error_helpers"
-  require "simple_model/validation"
-  require "simple_model/base"
-  require 'simple_model/simple_model_railtie.rb' if defined?(Rails)
+  class << self
+    def config
+      @config ||= SimpleModel::Config.new
+    end
+  end
 end

data/spec/{attributes_spec.rb → simple_model/attributes_spec.rb}

@@ -1,9 +1,4 @@
 require 'spec_helper.rb'
-
-class AttributesTest
-  include SimpleModel::Attributes
-end
-
 describe SimpleModel::Attributes do
 
   # We need a clean class for each spec
@@ -19,6 +14,10 @@ describe SimpleModel::Attributes do
 
   context "class methods" do
 
+    describe '#config' do
+      it { expect(AttributesTest.config).to be_a(SimpleModel::Config) }
+    end
+
     describe '#create_attribute_methods' do
       context "no options" do
         before(:each) do
@@ -58,7 +57,16 @@ describe SimpleModel::Attributes do
             let(:attributes_test) { AttributesTest.new() }
 
             it "should work" do
-              expect(attributes_test.attributes[:with_default]).to eql('foo')
+              expect(attributes_test.raw_attribute(:with_default)).to eql('foo')
+            end
+
+            context 'should override config setting' do
+              it "should still work" do
+                AttributesTest.config.initialize_defaults = false
+                expect(attributes_test.initialized?(:with_default)).to eql(true)
+              end
+
+              it {expect(attributes_test.with_default).to eql('foo')}
             end
 
           end
@@ -70,13 +78,20 @@ describe SimpleModel::Attributes do
 
             let(:attributes_test) { AttributesTest.new() }
 
-            it "should work" do
-              expect(attributes_test.attributes).to_not have_key(:with_default_no_init)
-            end
+            it { expect(attributes_test.attributes).to_not have_key(:with_default_no_init) }
 
             it "should set on get" do
               expect(attributes_test.with_default_no_init).to eql('foo')
             end
+
+            context 'config.initialize_defaults? == false' do
+
+              it "should override config setting" do
+                AttributesTest.config.initialize_defaults = true
+                expect(attributes_test.attributes.key?(:with_default)).to eql(false)
+              end
+
+            end
           end
 
           context "set to a symbol for a method" do
@@ -379,7 +394,45 @@ describe SimpleModel::Attributes do
 
   end # end class methods
 
+  describe '#attributes' do
+    it { expect(AttributesTest.new).to respond_to(:attributes) }
+    it { expect(AttributesTest.new.attributes).to be_a(Hash)}
+    context "set hash with string keys" do
+      let(:attrs) do
+        {'test1' => '2', 'test2' => '2'}
+      end
+      let(:set_attrs) {AttributesTest.new(:attributes => attrs)}
+      it {expect(set_attrs.raw_attribute(:test1)).to eql('2')}
+      it {expect(set_attrs.raw_attribute('test1')).to eql('2')}
+    end
+    context "set hash with string keys" do
+      let(:attrs) do
+        {:test1 => '2', :test2 => '2'}
+      end
+      let(:set_attrs) {AttributesTest.new(:attributes => attrs)}
+      it {expect(set_attrs.raw_attribute(:test1)).to eql('2')}
+      it {expect(set_attrs.raw_attribute('test1')).to eql('2')}
+    end
+    context "set with HashWithIndifferentAccess" do
+      let(:attrs) do
+        {:test1 => '2', :test2 => '2'}.with_indifferent_access
+      end
+      let(:set_attrs) {AttributesTest.new(:attributes => attrs)}
+      it {expect(set_attrs.raw_attribute(:test1)).to eql('2')}
+      it {expect(set_attrs.raw_attribute('test1')).to eql('2')}
+    end
+  end
 
+  describe '#delete_attributes' do
+    it "should work" do
+      AttributesTest.has_attributes(:foo, :bar,:fred)
+      test_attr = AttributesTest.new(:foo => "foo", :bar => "bar", :fred => 'stone')
+      test_attr.delete_attributes(:foo, :bar)
+      expect(test_attr).to_not be_initialized(:foo)
+      expect(test_attr).to_not be_initialized(:bar)
+      expect(test_attr).to be_initialized(:fred)
+    end
+  end
 
   context "initializing" do
 
@@ -389,17 +442,9 @@ describe SimpleModel::Attributes do
 
     let(:init_test) { AttributesTest.new(:test1 => '1', :test2 => '2') }
 
-
     it { expect(init_test.test1).to eql('1') }
     it { expect(init_test.test2).to eql('2') }
 
-    describe '#attributes' do
-      it { expect(init_test).to respond_to(:attributes) }
-      it { expect(init_test.attributes).to be_a(HashWithIndifferentAccess)}
-    end
-
-
-
     describe '#before_initialize' do
 
       context "before_initialize is not a Proc" do
@@ -445,6 +490,31 @@ describe SimpleModel::Attributes do
       end
     end
 
+    context "defaults" do
+      before(:each) do
+        AttributesTest.config.initialize_defaults = true
+        AttributesTest.has_attribute :has_def, :default => "Test"
+        AttributesTest.has_attribute :has_other, :default => "Other"
+        AttributesTest.has_attribute :has_derived, :default => :default_derived
+
+        class AttributesTest
+          def default_derived
+            val = "Derived" if has_def == "Test"
+          end
+        end
+      end
+
+      let(:defaults_test) { AttributesTest.new(:has_other => 'Foo') }
+
+      it { expect(defaults_test.initialized?(:has_def)).to eql(true)}
+      it { expect(defaults_test.has_def).to eql("Test")}
+
+      it { expect(defaults_test.initialized?(:has_other)).to eql(true)}
+      it { expect(defaults_test.has_other).to eql("Foo")}
+
+      it { expect(defaults_test.initialized?(:has_derived)).to eql(true)}
+      it { expect(defaults_test.has_derived).to eql("Derived")}
+    end
   end
 
   context "inheritance" do
@@ -452,7 +522,7 @@ describe SimpleModel::Attributes do
       include SimpleModel::Attributes
       has_boolean :bar
       has_attribute :str, :stuff
-      has_currency :amount, :default => BigDecimal("0.0"), :initialize => false
+      has_decimal :amount, :default => BigDecimal("0.0"), :initialize => false
       has_dates :some, :thing, :default => :fetch_date, :allow_blank => false, :initialize => false
       alias_attribute :other, :bar
       alias_attribute :other_amount, :amount
@@ -500,4 +570,30 @@ describe SimpleModel::Attributes do
       expect(newer_base.amount).to eql(1.0.to_d)
     end
   end
+  context 'REGRESSION' do
+    context 'default is an array that is not initialized (ONlY FAILS IN RAILS ~> 3.0)' do
+      before(:each) do
+        class InitArray < SimpleModel::Base
+          self.config.attributes_store = :indifferent
+          has_attribute :conditions, :default => :new_array
+
+          def new_array
+            [[]]
+          end
+
+          def add_one
+            conditions << 1
+          end
+        end
+      end
+
+      it "should not rest amount to default" do
+        test_array = InitArray.new
+        expect(test_array.attributes).to be_a(HashWithIndifferentAccess)
+        expect(test_array).to_not be_initialized(:conditions)
+        test_array.add_one
+        expect(test_array.conditions).to eql([[],1])
+      end
+    end
+  end
 end

data/spec/{base_spec.rb → simple_model/base_spec.rb}

@@ -25,7 +25,7 @@ describe SimpleModel::Base do
         base_test = BaseTest.new()
 
         base_test.save
-        base_test.foo.should eql("test")
+        expect(base_test.foo).to eql("test")
       end
 
       it "should be false if validation fails" do
@@ -36,7 +36,6 @@ describe SimpleModel::Base do
           return true
         end
 
-
         base_test = BaseTest.new()
         expect(base_test).to_not be_valid
         expect(base_test.save).to eql(false)
@@ -137,6 +136,7 @@ describe SimpleModel::Base do
     before(:each) do
       class TestStuff < SimpleModel::Base
         has_attribute :bar
+        has_attribute :my_array, :default => :new_empty_array
         validates_presence_of :bar
       end
 

data/spec/{extend_core_spec.rb → simple_model/extend_core_spec.rb}

@@ -89,10 +89,4 @@ describe SimpleModel::ExtendCore, 'String.rb' do
       it { expect("$5,000.006".to_f).to eql(5000.006) }
     end
   end
-
-  describe '#to_currency' do
-    context "contains non-numeric values" do
-      it { expect("$5,000.006".to_currency).to eql(BigDecimal("5000.006")) }
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,93 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-#$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'simple_model'
+require 'rubygems'
 require 'rspec'
-require 'bundler/setup'
+require 'rspec/autotest'
+require 'simple_model'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
 
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
 
-RSpec.configure do |config|
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
 
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
-end
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.27
+  version: 1.3.0
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simpifies building tableless models or models backed by webservices.
@@ -100,9 +100,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,18 +116,19 @@ files:
 - gemfiles/4.2.gemfile
 - lib/simple_model.rb
 - lib/simple_model/attributes.rb
+- lib/simple_model/attributes/default_value_helpers.rb
 - lib/simple_model/base.rb
+- lib/simple_model/config.rb
 - lib/simple_model/error_helpers.rb
 - lib/simple_model/exceptions.rb
 - lib/simple_model/extend_core.rb
 - lib/simple_model/simple_model_railtie.rb
-- lib/simple_model/validation.rb
 - lib/simple_model/version.rb
 - simple_model.gemspec
-- spec/attributes_spec.rb
-- spec/base_spec.rb
-- spec/error_helpers_spec.rb
-- spec/extend_core_spec.rb
+- spec/simple_model/attributes_spec.rb
+- spec/simple_model/base_spec.rb
+- spec/simple_model/error_helpers_spec.rb
+- spec/simple_model/extend_core_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -138,23 +139,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: simple_model
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices
 test_files:
-- spec/attributes_spec.rb
-- spec/base_spec.rb
-- spec/error_helpers_spec.rb
-- spec/extend_core_spec.rb
+- spec/simple_model/attributes_spec.rb
+- spec/simple_model/base_spec.rb
+- spec/simple_model/error_helpers_spec.rb
+- spec/simple_model/extend_core_spec.rb
 - spec/spec_helper.rb

data/lib/simple_model/validation.rb

@@ -1,66 +0,0 @@
-module SimpleModel
-  module Validation
-    def validates_presence_of(*attr_names)
-      options = attr_names.extract_options!
-      #set defaults
-      options[:message] = "cannot be blank." if options[:message].blank?
-      attr_names.each do |attr|
-        break if conditional?(options)
-
-        errors.add(attr, options[:message]) if send(attr).blank?
-      end
-    end
-
-    def validates_format_of(*attr_names)
-      options = attr_names.extract_options!
-      #set defaults
-      options[:message] = "is an invalid format." if options[:message].blank?
-
-      attr_names.each do |attr|
-        break if conditional?(options)
-
-        method = send(attr)
-        unless method.blank?
-          errors.add(attr, options[:message]) unless method.to_s.match(options[:with])
-        end
-      end
-    end
-
-    def validates_length_of(*attr_names)
-      options = attr_names.extract_options!
-
-      attr_names.each do |attr|
-        break if conditional?(options)
-
-        att_method = send(attr)
-        unless att_method.blank?
-          errors.add(attr,(options[:message].blank? ? "must equal #{options[:is]} characters in length." : options[:message]))  if options[:is] && att_method.to_s.length != options[:is]
-          errors.add(attr,(options[:message].blank? ? "cannot have more than #{options[:maximum]} characters in length." : options[:message]))  if options[:maximum] && att_method.to_s.length > options[:maximum]
-          errors.add(attr,(options[:message].blank? ? "cannot have less than #{options[:minimum]} characters in length." : options[:message]))  if options[:minimum] && att_method.to_s.length < options[:minimum]
-        end
-      end
-    end
-
-    def validates_inclusion_of(*attr_names)
-      options = attr_names.extract_options!
-
-      first = options[:in].first
-      last = options[:in].last
-      options[:message] = "must be greater than or equal to #{first} and less than or equal to #{last}" if options[:message].blank?
-      attr_names.each do |attr|
-        break if conditional?(options)
-        attr_method = send(attr).to_f
-        unless attr_method.blank?
-          errors.add(attr,options[:message]) if attr_method < first  || attr_method > last
-        end
-      end
-    end
-
-    private
-    def conditional?(options)
-      return true unless ((options[:if].blank? && options[:unless].blank?) ||
-      !options[:if].blank? && send(options[:if])) ||
-        (!options[:unless].blank? && !send(options[:unless]))
-    end
-  end
-end