simple_model 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8ba23df5889853f9ad2166692f109b20091bfc
-  data.tar.gz: a8aee80ab3a098d528ba4b8028267edd4e34de5f
+  metadata.gz: 4ed17a81c487856f929ab1d5bc05a8c89414b93c
+  data.tar.gz: dc64ef73dfd207421014127616a13e4d55fc9e04
 SHA512:
-  metadata.gz: a8968daba7cc06a8be4d3b98670fd15d9c857dfdc18dc16fedc2c3a6fe7c6f3ce1fdcc6f7e0e0fe9eb85ff64b47253c65c753bf2c05ffeca3e9060e261f6e07d
-  data.tar.gz: 83f31f449c53ea75bac4f14ba57a827c72130ae2eebd36675e6f9e84fa2bba6d8b13874aca613ae6283167411e357591c04fed95187d9e74c75b768cb48245d4
+  metadata.gz: 79b0a3d2342b150e50c5dc176da157469fde7196effe529fc04ad2759edebbb6ba427e5de318c266fafaf2651ed4cd5585a9be06f24e479f30ed2f3d1f9d39ae
+  data.tar.gz: 5cfca5c5954df4e38fde878ba77cadda5fcdc60108181faca997f10df5d9874c7392368df384caecdb3622c3b3ee99b7d657ca91144e5f62645a4f29ed858b94

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.2
   - 2.1
   - 2.0.0
-  - 1.9.3
   - jruby
 script: bundle exec rspec spec
 gemfile:

data/benchmarks/simple_model.rb

@@ -76,20 +76,20 @@ Benchmark.bmbm do |b|
   end
 end
 
-# ruby 2.1.5p273 (2014-11-13 revision 48405) [x86_64-darwin14.0]
+# ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-darwin13]
 
 # Rehearsal ------------------------------------------------
-# 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
+# init           0.140000   0.000000   0.140000 (  0.141798)
+# init w/attrs   1.050000   0.000000   1.050000 (  1.050091)
+# get            0.440000   0.000000   0.440000 (  0.449112)
+# get?           0.560000   0.000000   0.560000 (  0.551089)
+# set            0.920000   0.000000   0.920000 (  0.924776)
+# --------------------------------------- total: 3.110000sec
 
 #                    user     system      total        real
-# 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)
+# init           0.130000   0.000000   0.130000 (  0.127565)
+# init w/attrs   1.050000   0.010000   1.060000 (  1.050821)
+# get            0.450000   0.000000   0.450000 (  0.453590)
+# get?           0.560000   0.000000   0.560000 (  0.560942)
+# set            0.950000   0.000000   0.950000 (  0.949407)
 

data/lib/simple_model/attributes.rb

@@ -40,7 +40,7 @@ module SimpleModel
           attrs.stringify_keys!
         end
       end
-      @attributes = attrs 
+      @attributes = attrs
     end
 
     # Returns true if attribute has been initialized
@@ -67,6 +67,7 @@ module SimpleModel
       attr_key = to_attr_key(attr)
       if allow_attribute_action?(val,opts)
         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 = process_on_set(opts[:on_set],val) if opts.has_key?(:on_set)
@@ -194,6 +195,7 @@ module SimpleModel
     end
 
     def allow_attribute_action?(val,options)
+      return false if !options[:boolean] && !options[:allow_blank] && val.blank?
       return true unless (options.has_key?(:if) || options.has_key?(:unless))
       b = true
       opt = nil

data/lib/simple_model/config.rb

@@ -2,7 +2,7 @@ module SimpleModel
   class Config
     DEFAULTS = {
       :initialize_defaults  => false,
-      :attributes_store     => :string # OPTIONS => :string, :symbol, :indifferent
+      :attributes_store     => (RUBY_VERSION =~ /^2.2/ ? :symbol : :string) # OPTIONS => :string, :symbol, :indifferent
     }.freeze
 
     ATTRIBUTE_STORES = {

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_model
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices