simple_model 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad8b6e06b4a604873dfe174617170dce71277ab
-  data.tar.gz: a9e8d432e3f3f7d1abff848bc6f022f186553e99
+  metadata.gz: 4a8ba23df5889853f9ad2166692f109b20091bfc
+  data.tar.gz: a8aee80ab3a098d528ba4b8028267edd4e34de5f
 SHA512:
-  metadata.gz: 8e916c15d886c4c49530cf6ae29e66e93efde3532f3094cd654ff287a5b3ce8598c8947fdce2437f3b2dd5ebb16f9940c28070d595cb0f60f432bc9fc2b01e65
-  data.tar.gz: 2eccebd37cf6fd8909296c83cb4c0c501205364c2f029942ec7d367a72d2af5c50e2d2db0bf979314f9e34542cbf496cabb3cfc5abc9856072771efc6d3a9d83
+  metadata.gz: a8968daba7cc06a8be4d3b98670fd15d9c857dfdc18dc16fedc2c3a6fe7c6f3ce1fdcc6f7e0e0fe9eb85ff64b47253c65c753bf2c05ffeca3e9060e261f6e07d
+  data.tar.gz: 83f31f449c53ea75bac4f14ba57a827c72130ae2eebd36675e6f9e84fa2bba6d8b13874aca613ae6283167411e357591c04fed95187d9e74c75b768cb48245d4

data/.travis.yml

@@ -8,8 +8,6 @@ rvm:
   - jruby
 script: bundle exec rspec spec
 gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile

data/lib/simple_model/attributes.rb

@@ -19,8 +19,8 @@ module SimpleModel
       :has_time => {:cast_to => :to_time, :alias => :has_times}
     }.freeze
 
-    def initialize(*attrs)
-      attrs = attrs.extract_options!
+    def initialize(attrs={})
+      attrs ||= {}
       attrs = self.class.before_initialize.call(self,attrs) if self.class.before_initialize
       set(attrs)
       defaults = default_attributes_for_init
@@ -69,7 +69,7 @@ module SimpleModel
         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)
+          val = process_on_set(opts[:on_set],val) if opts.has_key?(:on_set)
           send("#{attr}_will_change!") if initialized?(attr) && val != attributes[attr_key]
           attributes[attr_key] = val
         end
@@ -77,6 +77,14 @@ module SimpleModel
       end
     end
 
+    def process_on_set(on_set,val)
+      if on_set.is_a?(Symbol)
+        val.__send__(on_set)
+      else
+        on_set.call(self,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)
@@ -226,8 +234,8 @@ module SimpleModel
           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)
+          options[:on_set] = method_options[:cast_to] if method_options[:cast_to]
+          create_attribute_methods(attributes,options.freeze)
         end
         module_eval("alias #{method_options[:alias]} #{method}") if method_options[:alias]
       end
@@ -395,23 +403,13 @@ module SimpleModel
       end
 
       # Must inherit super's defined_attributes and alias_attributes
-      # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a
-      # hack to keep things working when a class inherits from a super that
-      # has ActiveModel::Dirty included
       def inherited(base)
         base.defined_attributes = defined_attributes.merge(base.defined_attributes)
         base.alias_attributes = alias_attributes.merge(base.alias_attributes)
         super
-        # Rails 3.0 Hack
-        if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR < 1)
-          base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
-          base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
-        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
     # ActiveModel::Dirty included
     def self.included(base)
       base.extend(Attributes::ClassMethods)
@@ -420,12 +418,6 @@ module SimpleModel
       base.extend ActiveModel::Naming
       base.extend ActiveModel::Callbacks
       base.send(:include, ActiveModel::Validations::Callbacks)
-
-      # Rails 3.0 Hack
-      if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR < 1)
-        base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
-        base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
-      end
     end
   end
 end

data/lib/simple_model/version.rb

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

data/simple_model.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.summary     = %q{Simpifies building tableless models or models backed by webservices}
   s.description = %q{Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values.}
 
-  s.add_runtime_dependency 'activesupport','>= 3.0', '< 5.0'
-  s.add_runtime_dependency 'activemodel','>= 3.0', '< 5.0'
+  s.add_runtime_dependency 'activesupport','>= 3.2', '< 5.0'
+  s.add_runtime_dependency 'activemodel','>= 3.2', '< 5.0'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-autotest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -108,8 +108,6 @@ files:
 - README.md
 - Rakefile
 - benchmarks/simple_model.rb
-- gemfiles/3.0.gemfile
-- gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
@@ -149,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_model
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices

data/gemfiles/3.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'activesupport','~> 3.0.1'
-gem 'activemodel','~> 3.0.1'
-
-gemspec :path => "../"

data/gemfiles/3.1.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'activesupport','~> 3.1.1'
-gem 'activemodel','~> 3.1.1'
-
-gemspec :path => "../"