simple_model 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: dd528898a8977c244515a34000104c0d80e4887f
-  data.tar.gz: 5619f6e8fe9c70f71eb0250091696911493facaf
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjQyN2Y0MzE5YjZkODA2MGIwOGYyNzRiNzk5NmUyMjYzYmEwNTExZg==
+  data.tar.gz: !binary |-
+    YzVjNGU4MGI2ZDFlYmE5M2ExODYyZWZkODUwYTZlMzhhMGU4YWE5NQ==
 SHA512:
-  metadata.gz: ef573fdf146f4904f3333b1ddbb3f8fdef76738bc57f1594f3e0babcd0743afd13d06c0cf4c1b63be0402fafbea11937dc92e407ea2fb130b0873414b601f065
-  data.tar.gz: 351e61b6f752ae47f52067e3efd33be7a315061aaaf166dbc019c570036d83bc16c706b5b683ea598f253a956af161fe8a598c19c809203ca2ad4251cc9bc4cc
+  metadata.gz: !binary |-
+    MjAyM2JkMDRhMjdkMjc4NzRiMjE1OTI5MDlmNTJjMGMyNDQwM2E3ZjdhYTcz
+    YWQwY2RhMmVmNDliYzY0ZmQ5NjhlM2Y1MWVlMzljODQ4MWU5ZTc0OWRiZTgw
+    MTcwNmNmYjA5NWYyNzhmMjMwZDU0YTkzNGIzMmNlZGRkODU3ZTE=
+  data.tar.gz: !binary |-
+    YWQ2M2MzYTRmNjI5NmQwZWFmNTQ0ODAzZjM1NDdkNGEwNThhMWFjMjRiMzBk
+    ZTA5ZDhlZjVjNDExYWY0ZTIwMDdmNTVjZDdjOTIzZTZkMmJmMjVkNGRkMjYz
+    ZjYzY2QyYTI1NDg2OWEyODIzMDY3MGI4OTQzOTYwNzEyZWFiZWY=

data/benchmarks/simple_model.rb

@@ -0,0 +1,39 @@
+class BenchClass < SimpleModel::Base
+  has_int :num
+  has_date :date, :default => :today
+  has_decimal :dec
+
+  def today
+    Date.today
+  end
+end
+Benchmark.bm do |b|
+  b.report("initialize") do
+    30000.times.each  do
+      BenchClass.new()
+    end
+  end
+  BenchClass.new()
+  b.report("initialize with attrs") do
+    30000.times.each  do
+      BenchClass.new(:num => 1, :dec => "12.4")
+    end
+  end
+  b.report("get") do
+    30000.times.each  do
+      klass = BenchClass.new
+      klass.num
+      klass.dec
+      klass.date
+    end
+  end
+
+  b.report("set") do
+    30000.times.each  do
+      klass = BenchClass.new
+      klass.num = 1
+      klass.dec = '12.4'
+      klass.date = "2014-12-25"
+    end
+  end
+end

data/lib/simple_model/attributes.rb

@@ -40,9 +40,8 @@ module SimpleModel
       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) 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])
+        val = options[:on_set].call(self,val) if options[:on_set] #(!options.key?(:on_set) || (val.blank? && !options[:allow_blank]) )
+        self.send("#{attr}_will_change!") if (initialized?(attr) && val != self.attributes[attr])
         self.attributes[attr] = val
         options[:after_set].call(self,val) if options[:after_set]
       end
@@ -98,7 +97,7 @@ module SimpleModel
     # 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] != false) && (!d.key?(k) && !attributes_have_alias?(d,k)))
+      (v[:default] && v[:initialize] && (!d.key?(k) && !attributes_have_alias?(d,k)))
     end
 
     def attributes_have_alias?(attrs,attr)
@@ -106,24 +105,28 @@ module SimpleModel
     end
 
     def allow_attribute_action?(val,options)
-      return true if (options[:if].blank? && options[:unless].blank?)
+      return true unless (options[:if] || options[:unless])
       b = true
-      if options[:if].is_a?(Symbol)
-        if options[:if] == :blank
-          b =  (b && val.blank?)
+      opt = options[:if]
+      if opt.is_a?(Symbol)
+        if opt == :blank
+          b = val.blank?
         else
-          b = (b && send(options[:if]))
+          b = send(opt)
         end
+      elsif opt.is_a?(Proc)
+        b = opt.call(self,val)
       end
-      b = (b && options[:if].call(self,val)) if options[:if].is_a?(Proc)
-      if options[:unless].is_a?(Symbol)
-        if options[:unless] == :blank
-          b = (b && !val.blank?)
+      opt = options[:unless]
+      if opt.is_a?(Symbol)
+        if opt == :blank
+          b = !val.blank?
         else
-          b = (b && !send(options[:unless]))
+          b = !send(opt)
         end
+      elsif opt.is_a?(Proc)
+        b = !opt.call(self,val)
       end
-      b = (b && !options[:unless].call(self,val)) if options[:unless].is_a?(Proc)
       b
     end
 

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.21"
+  VERSION = "1.2.22"
 end

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 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,13 +100,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/simple_model.rb
 - gemfiles/3.0.gemfile
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
@@ -137,17 +138,17 @@ 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.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices