simple_model 1.2.25 → 1.2.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDRhM2I3NjM1YThmYzJkOTU5YzNlMTVkNjVmMDE3Y2E4OGRmOTMzOQ==
+    NDZkZTQzYzExYjM5MWRiMzhmZjViZGRkYjA5NDQ1MjcxY2M1NDE4YQ==
   data.tar.gz: !binary |-
-    ZmRjNDE4M2MyZTI2M2VmZDQwNTczNmFjMjc5MGFiYmY2NmViYTc2MQ==
+    ODU0YTMzMWM4OTA0NGRlYWVkM2U1YTA2MTJhY2Q4MTQxNzc5YTE1NQ==
 SHA512:
   metadata.gz: !binary |-
-    NjNmMDVjYzIzYTcxMzUwYzFlZjcwNzgxYzgyZjU0NTg1ODk5NTZhYWM5OTJk
-    NmE5ZGU1ZDAxZDBhMmNjZDU1NmE3YzcwMzRiZWM3OGFjMGVjMTY3YTQwM2M1
-    ZDc1ZjI4ZDAwMGZmYWM3NWJmNmQwODZlZDc0ODBiNDFhYTEwN2E=
+    ZGM5YTJlY2I2NjU2Y2RkMmQ5MWY2MWJmNmMxNTQyOTdhZWQ1MzYxY2U0NGUy
+    OTQzZWZmN2RkNjg5NWIzMzUzZGM0YzBhYTMxNjk3ZTBhYWRmNjVkZmQwYjcz
+    YzFlY2VhZDE0ODM2YTExZmM0ODZlZDAyZTUzNzQ4OTc3MWQxYjU=
   data.tar.gz: !binary |-
-    MDM4NTljY2IzOTRlNmVjMmZkNTM1NzJjNmI0NzA2Njc0OWVmMDBmMjlmMTk3
-    YTczZTJjOGQ2ODQ0OTMxMWEwOTc5MzAyM2JkMjYxNDFlZWQ1MzY0Mjk3OTBh
-    NTU2ZmU3NDlmMWJjYjRiNWM4MmIyZDJiZDYwNDY0ZDUxZjljZDU=
+    NGViMDY2YzUwYzhlYzdiZWNiMDFkNjg4NmY2MmY0NTc3YzMxN2QzN2E2ODgx
+    MDJlODJkM2VlMjkzYmY4MzJhNGQ4MzgyY2E4ZDZiYjcwZWU2Yzk3ZWIyOTFj
+    ZmZlMDgzYWQ5MDExNWUxZDYwMDE5ZGMzZDNiMWM3MzI3Y2EzNDQ=

data/lib/simple_model/attributes.rb

@@ -39,11 +39,15 @@ module SimpleModel
     def set_attribute(attr,val)
       options = self.class.defined_attributes[attr] || {}
       if allow_attribute_action?(val,options)
-        val = fetch_default_value(options[:default]) if (!options[:allow_blank] && options.key?(:default) && val.blank?)
-        val = options[:on_set].call(self,val) if options[:on_set] #(!options.key?(:on_set) || (val.blank? && !options[:allow_blank]) )
-        send("#{attr}_will_change!") if (initialized?(attr) && val != attributes[attr])
-        attributes[attr] = val
-        options[:after_set].call(self,val) if options[:after_set]
+        allow_blank = options[:allow_blank]
+        default = options[:default]
+        val = fetch_default_value(default) if (!allow_blank && default && val.blank?)
+        unless (val.blank? && !allow_blank)
+          val = options[:on_set].call(self,val) if options.key?(:on_set)
+          send("#{attr}_will_change!") if (initialized?(attr) && val != attributes[attr])
+          attributes[attr] = val
+          options[:after_set].call(self,val) if options[:after_set]
+        end
       end
     end
 
@@ -136,13 +140,13 @@ module SimpleModel
 
     module ClassMethods
       DEFAULT_ATTRIBUTE_SETTINGS = {:attributes_method => :attributes,
-                                    :allow_blank => true,
+                                    :allow_blank => false,
                                     :initialize => true
                                     }.freeze
 
       AVAILABLE_ATTRIBUTE_METHODS = {
-        :has_attribute => {:alias => :has_attributes},
-        :has_boolean  => {:cast_to => :to_b, :alias => :has_booleans},
+        :has_attribute => {:alias => :has_attributes, :options => {:allow_blank => true}},
+        :has_boolean  => {:cast_to => :to_b, :alias => :has_booleans, :options =>  {:allow_blank => 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},
@@ -153,7 +157,9 @@ module SimpleModel
 
       AVAILABLE_ATTRIBUTE_METHODS.each do |method,method_options|
         define_method(method) do |*attributes|
-          options = default_attribute_settings.merge(attributes.extract_options!)
+          options = attributes.extract_options!
+          options = method_options[:options].merge(options) if method_options[:options]
+          options = default_attribute_settings.merge(options)
           options[:on_set] = lambda {|obj,val| val.send(method_options[:cast_to]) } if method_options[:cast_to]
           create_attribute_methods(attributes,options)
         end

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.25"
+  VERSION = "1.2.26"
 end

data/spec/attributes_spec.rb

@@ -170,6 +170,50 @@ describe SimpleModel::Attributes do
     end
   end
 
+  context 'number and date/time attributes' do
+    before(:all) do
+      class NumDateTime
+        include SimpleModel::Attributes
+        has_date :my_date
+        has_time :my_time
+        has_int :my_int
+        has_int :blank_int, :allow_blank => true
+        has_decimal :my_decimal
+        has_decimal :blank_decimal, :allow_blank => true
+        has_float :my_float
+        has_attribute :my_attr
+        has_boolean :my_boolean
+      end
+    end
+    context "default options for number attributes" do
+      context "set with blank value" do
+        it "should not initialize" do
+          num_date_time = NumDateTime.new(:my_date => nil, :my_time => "", :my_int => " ", :my_decimal => nil, :my_float => '')
+          expect(num_date_time.initialized?(:my_date)).to eql(false)
+          expect(num_date_time.initialized?(:my_time)).to eql(false)
+          expect(num_date_time.initialized?(:my_int)).to eql(false)
+          expect(num_date_time.initialized?(:my_decimal)).to eql(false)
+          expect(num_date_time.initialized?(:my_float)).to eql(false)
+        end
+      end
+      context "override to allow_blank" do
+        it "should not initialize" do
+          num_date_time = NumDateTime.new(:blank_int => nil, :blank_decimal => "")
+          expect(num_date_time.initialized?(:blank_int)).to eql(true)
+          expect(num_date_time.initialized?(:blank_decimal)).to eql(true)
+        end
+      end
+    end
+
+    context "set with blank value" do
+      it "should not initialize" do
+        num_date_time = NumDateTime.new(:my_attr => nil, :my_boolean => "")
+        expect(num_date_time.initialized?(:my_attr)).to eql(true)
+        expect(num_date_time.initialized?(:my_boolean)).to eql(true)
+      end
+    end
+  end
+
   context 'options with conditional' do
     before(:all) do
       class WithConditional
@@ -277,9 +321,9 @@ describe SimpleModel::Attributes do
     end
 
     it "should properly alias attributes from parent class" do
-     nb =  NewestBase.new(:some_amount => 1.0)
-     nb.other_amount.should eql(1.0.to_d)
-     nb.amount.should eql(1.0.to_d)
+      nb =  NewestBase.new(:some_amount => 1.0)
+      nb.other_amount.should eql(1.0.to_d)
+      nb.amount.should eql(1.0.to_d)
     end
   end
 

metadata

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