simple_model 1.2.17 → 1.2.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDliYTcyNmJiYmY1YjdkMGRlMTE1ODUwODcyYmNlYTQwNzgxZDIwYg==
+    ZGI2YjA2MjE0MTA1YTgyYjQyOTg4ZTk2YjI5MmE1MThlNjY4NDFjOA==
   data.tar.gz: !binary |-
-    MmUzNGJhNDg1ZjFmZTc5NDcwZjdlYzY2ODI0ZDI5MzIzNGNjNDYwMA==
+    YWIxNDkwOTRkNjhjM2UxN2Q0ODQzY2JlN2VjMGE2ODAzOTQ5YmNjMg==
 SHA512:
   metadata.gz: !binary |-
-    ODNlODE4MGQwNDcxZjZkODI5NzNhYjBmOGVlMGY4NTQ5MjM5NjNjNzkzNTcx
-    NTA4NGExMzhmNjIyMDAxM2ZjZmNjNDMzNDU4Yjk3YzFkYmJiNDc3NTU2MzNl
-    MGMyNTY0MmNiYmU2OWU1OTVjYzk3NjA5YWYzODUyZjMzYmM4OWM=
+    YzFhZTg3ZGZiNTJhMTkwMjEwZjFlOTIwMzRlNWVlMDExYmY2NjYzYzdjYTk3
+    M2IzM2M1NzFjNWU1NGY4ZTk4NDBkMGI2N2FkYzhmN2M2NjRhZDgzMDZlN2Ji
+    MzY5MjY0MGQxMjAxYjg4ZWUzMTgzZjYwYWQ4MmU0N2Q1NjJlNjI=
   data.tar.gz: !binary |-
-    ZDhlZDhmNzlhMjFlZTBmMDA2MThjYzlkZmFhZjcyZWZmZDU0YzM1NDljNDgx
-    M2E1YjY0MTE1MjJhZjJiZDcxOWU1YzRkNTZhNzlkNjBiOWRhZjg3ZGVjODIx
-    MTNlYmIxM2ZkNGJhZDYzMjE0YjBhZDQzZTliNTQ2ZDVkN2EzZmE=
+    MGIzMThlMGJlNzZkOGVhNDZlZTgwMTc4MWRmMTVjNzBiYmY0YTZiZDdkNzRh
+    M2JhNWI3NmJlODFjNjZiNjgxOWUzMmEyMjA2ZjY0YjM5ODYzNTBlNDJhOTli
+    NDg4N2E0ZmI4ZTczNTY4NWQzNTM3ZWY5ODUyOGUyNTgxMmRkM2I=

data/Gemfile

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

data/gemfiles/3.0.gemfile

@@ -2,7 +2,5 @@ source "http://rubygems.org"
 
 gem 'activesupport','~> 3.0.1'
 gem 'activemodel','~> 3.0.1'
-gem 'debugger', :platform => 'ruby'
-gem 'ruby-debug', :platform => 'jruby'
 
 gemspec :path => "../"

data/gemfiles/3.1.gemfile

@@ -2,7 +2,5 @@ source "http://rubygems.org"
 
 gem 'activesupport','~> 3.1.1'
 gem 'activemodel','~> 3.1.1'
-gem 'debugger', :platform => 'ruby'
-gem 'ruby-debug', :platform => 'jruby'
 
 gemspec :path => "../"

data/gemfiles/3.2.gemfile

@@ -2,7 +2,5 @@ source "http://rubygems.org"
 
 gem 'activesupport','~> 3.2.1'
 gem 'activemodel','~> 3.2.1'
-gem 'debugger', :platform => 'ruby'
-gem 'ruby-debug', :platform => 'jruby'
 
 gemspec :path => "../"

data/lib/simple_model/attributes.rb

@@ -3,7 +3,8 @@ module SimpleModel
     include ExtendCore
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
-
+    attr_accessor :attributes
+    
     def initialize(*attrs)
       attrs = attrs.extract_options!
       attrs = attributes_with_for_init(attrs)
@@ -12,17 +13,13 @@ module SimpleModel
       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
+    # Returns true if attribute has been initialized
+    def initialized?(attr)
+      self.attributes.key?(attr.to_sym)
     end
 
     def get(attr)
@@ -39,8 +36,47 @@ module SimpleModel
     end
     alias :set_attributes :set
 
+    def set_attribute(attr,val)
+      options = self.class.defined_attributes[attr] || {}
+      if allow_attribute_action?(self,val,options)
+        val = fetch_default_value(options[:default]) if (!options[:allow_blank] && options.key?(:default) && val.blank?)
+        val = options[:on_set].call(self,val) unless (!options.key?(:on_set) || (val.blank? && !options[:allow_blank]) )
+        will_change = "#{attr}_will_change!".to_sym
+        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]
+      end
+    end
+
+    def get_attribute(attr)
+      val = self.attributes[attr]
+      options = self.class.defined_attributes[attr] || {}
+      if (options.key?(:default) && (!self.initialized?(attr) || (!options[:allow_blank] && val.blank?)))
+        val = self.attributes[attr] = fetch_default_value(options[:default])
+      end
+      if options[:on_get]
+        options[:on_get].call(self,val)
+      else
+        val
+      end
+    end
+
+    def get_attribute?(attr)
+      val = get_attribute(attr)
+      if val.respond_to?(:to_b)
+        val = val.to_b
+      else
+        val = !val.blank? if val.respond_to?(:blank?)
+      end
+      val
+    end
+
     private
 
+    def attribute_defined?(attr)
+      self.class.attribute_defined?(attr)
+    end
+
     def fetch_default_value(arg)
       return self.send(arg) if (arg.is_a?(Symbol) && self.respond_to?(arg))
       arg
@@ -58,12 +94,12 @@ module SimpleModel
       d
     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_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?)))
+      (v[:default] && (v[:initialize] != false) && (!d.key?(k) && !d.key?(self.class.alias_attributes[k])))
     end
 
-    private
-
     def allow_attribute_action?(obj,val,options)
       return true if (options[:if].blank? && options[:unless].blank?)
       b = true
@@ -92,6 +128,31 @@ module SimpleModel
     end
 
     module ClassMethods
+      DEFAULT_ATTRIBUTE_SETTINGS = {:attributes_method => :attributes,
+                                    :allow_blank => true,
+                                    :initialize => true
+                                    }.freeze
+
+      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_int => {:cast_to => :to_i, :alias => :has_ints},
+        :has_time => {:cast_to => :to_time, :alias => :has_times}
+      }.freeze
+
+      AVAILABLE_ATTRIBUTE_METHODS.each do |method,method_options|
+        define_method(method) do |*attributes|
+          options = default_attribute_settings.merge(attributes.extract_options!)
+          options[:on_set] = lambda {|obj,val| val.send(method_options[:cast_to]) } if method_options[:cast_to]
+          create_attribute_methods(attributes,options)
+        end
+        module_eval("alias #{method_options[:alias]} #{method}")
+      end
+
       # 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 persistence. Typically used for modeling
@@ -106,10 +167,10 @@ module SimpleModel
       #     end
       #
       def new_with_store(session_hash)
-        new = self.new()
-        new.attributes = session_hash
-        new.set(new.send(:attributes_with_for_init,session_hash))
-        new
+        nw = self.new()
+        nw.attributes = session_hash
+        nw.set(nw.send(:attributes_with_for_init,session_hash))
+        nw
       end
 
       def alias_attributes
@@ -141,12 +202,7 @@ module SimpleModel
       # ** 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
-        @default_attribute_settings ||= {:attributes_method => :attributes,
-                                         :on_set => lambda {|obj,attr| attr},
-                                         :on_get => lambda {|obj,attr| attr},
-                                         :allow_blank => true,
-                                         :initialize => true
-                                         }
+        @default_attribute_settings ||= DEFAULT_ATTRIBUTE_SETTINGS
       end
 
       def default_attribute_settings=default_attribute_settings
@@ -159,38 +215,33 @@ module SimpleModel
       def add_defined_attribute(attr,options)
         self.defined_attributes[attr] = options
         @attribute_methods_generated = nil #if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
-        define_attribute_methods(self.defined_attributes.keys)
+        define_attribute_methods(defined_attributes_keys)
+      end
+
+      # We don't want to call define_attribute_methods on methods defined in the parent class
+      def defined_attributes_keys
+        dak = self.defined_attributes.keys
+        dak = dak - self.superclass.defined_attributes.keys if self.superclass.respond_to?(:defined_attributes)
+        dak
       end
 
       # builds the setter and getter methods
       def create_attribute_methods(attributes,options)
         unless attributes.blank?
           attributes.each do |attr|
-            define_reader_with_options(attr,options)
             define_setter_with_options(attr,options)
+            define_reader_with_options(attr,options)
+            add_defined_attribute(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?
         define_method(attr) do
-          val = self.attributes[attr]
-          if (options.key?(:default) && (!self.initialized?(attr) || (!options[:allow_blank] && val.blank?)))
-            val = self.attributes[attr] = fetch_default_value(options[:default])
-          end
-          options[:on_get].call(self,val)
+          get_attribute(attr)
         end
         define_method("#{attr.to_s}?") do
-          # return false unless initialized?(attr) THIS BROKE STUFF
-          val = self.send(attr)
-          if val.respond_to?(:to_b)
-            val = val.to_b
-          else
-            val = !val.blank? if val.respond_to?(:blank?)
-          end
-          val
+          get_attribute?(attr)
         end
       end
 
@@ -198,38 +249,9 @@ module SimpleModel
       # 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?)
         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 = 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.attributes[attr] = val
-            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_int => {:cast_to => :to_i, :alias => :has_ints},
-        :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!)
-          options[:on_set] = lambda {|obj,val| val.send(method_options[:cast_to]) } if method_options[:cast_to]
-          create_attribute_methods(attributes,options)
+          set_attribute(attr,val)
         end
-        module_eval("alias #{method_options[:alias]} #{method}")
       end
 
       # Creates alias setter and getter for the supplied attribute using the supplied alias
@@ -239,6 +261,9 @@ module SimpleModel
         define_method(new_alias) do
           self.send(attribute)
         end
+        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
@@ -280,7 +305,8 @@ module SimpleModel
       # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
-        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
+        base.defined_attributes = self.defined_attributes.dup
+        base.alias_attributes = self.alias_attributes.dup
         super
         # Rails 3.0 Hack
         if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
@@ -288,7 +314,7 @@ module SimpleModel
           base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
         end
       end
-    end
+    end # end ClassMethods
 
     # 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

data/lib/simple_model/extend_core.rb

@@ -60,7 +60,8 @@ module SimpleModel
 
       # returns boolean value for common boolean string values
       def to_b
-        ['1',"true", "t"].include?(self.downcase)
+        return true if self =~ (/^(true|t|yes|y|1)$/i)
+        false
       end
 
       # Takes known US formatted date/time strings (MM/DD/YYYY TIME) and converts

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.17"
+  VERSION = "1.2.18"
 end

data/spec/attributes_spec.rb

@@ -67,10 +67,10 @@ describe SimpleModel::Attributes do
   context '#new_with_store'do
     it "should use the provided object as the attribute store" do
       my_store = {:test1 => 1,:test2 => 2}
-      new = TestInit.new_with_store(my_store)
-      new.test1 = 3
-      new.test1.should eql(3)
-      my_store[:test1].should eql(new.test1)
+      nw = TestInit.new_with_store(my_store)
+      nw.test1 = 3
+      nw.test1.should eql(3)
+      my_store[:test1].should eql(nw.test1)
     end
   end
 
@@ -251,12 +251,10 @@ describe SimpleModel::Attributes do
       n.respond_to?(:bar_will_change!).should eql(true)
     end
 
-    it "should defaults that were not initialized should work from parent class" do
+    it "should set defaults that were not initialized should work from parent class" do
       n = NewerBase.new
-      n.some.should eql(Date.today)
-      n.some = "2012-12-01"
-      n.some.should be_a(Date)
-      n.thing.should eql(Date.today)
+      n.some.should eql(n.send(:fetch_date))
+      n.thing.should eql(n.send(:fetch_date))
     end
 
     it "should allow redefining methods in child classes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport