simple_model 1.2.20 → 1.2.21

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGE5MTUyZjlmNDkxYzE3MGU1MDFiNDE4YzM1NDBlNzEyYWE0MmUwNg==
-  data.tar.gz: !binary |-
-    NTc3ODA2NzI4YTZiNjE4YzQ0MGUzY2E3NzQ1ZTkxOWNjNjhkMDY4Yg==
+SHA1:
+  metadata.gz: dd528898a8977c244515a34000104c0d80e4887f
+  data.tar.gz: 5619f6e8fe9c70f71eb0250091696911493facaf
 SHA512:
-  metadata.gz: !binary |-
-    ODNlYmRlZTkyMGUyODI4MTRjYTg2ZWRlMjYwMjY3ZTgzNzlkNTkxNTBkNzdm
-    OWU0NTkxM2Q0YTdlYWViNjQ3NGM4NzIyMjliZDk2MzgxNzM4Y2U2Y2RmNDgy
-    YTJkZWMyN2ViZGY5Mjk2YjhlZGVhZWVkZTNiMzFmMTY4NTk0Njc=
-  data.tar.gz: !binary |-
-    NGIwZTY1YmY5YjY4MWRmZWYxMDNhMzY4NjMwZGYxODkyODQzMjZiOGRlZDUw
-    NjcwNGUzN2ZlZDQxMGQ4MzgxMzdlMDNhMmNhOGU3MTA3MGZkYWVmMWY0NjQw
-    NTg4YzNhMDcxYmRjYjI2MWFhNDNjZDlmYjhjY2QyNjBhYzhiYTY=
+  metadata.gz: ef573fdf146f4904f3333b1ddbb3f8fdef76738bc57f1594f3e0babcd0743afd13d06c0cf4c1b63be0402fafbea11937dc92e407ea2fb130b0873414b601f065
+  data.tar.gz: 351e61b6f752ae47f52067e3efd33be7a315061aaaf166dbc019c570036d83bc16c706b5b683ea598f253a956af161fe8a598c19c809203ca2ad4251cc9bc4cc

data/gemfiles/4.2.gemfile

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

data/lib/simple_model/attributes.rb

@@ -38,7 +38,7 @@ module SimpleModel
 
     def set_attribute(attr,val)
       options = self.class.defined_attributes[attr] || {}
-      if allow_attribute_action?(self,val,options)
+      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
@@ -87,8 +87,9 @@ module SimpleModel
     def attributes_with_for_init(attrs)
       d = attrs.with_indifferent_access
       self.class.defined_attributes.each do |k,v|
-        if allow_set_default?(d,k,v)
-          d[k] = fetch_default_value(v[:default])
+        key = k.to_sym
+        if allow_init_default?(d,key,v)
+          d[key] = fetch_default_value(v[:default])
         end
       end
       d
@@ -96,11 +97,15 @@ 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_set_default?(d,k,v)
-      (v[:default] && (v[:initialize] != false) && (!d.key?(k) && !d.key?(self.class.alias_attributes[k])))
+    def allow_init_default?(d,k,v)
+      (v[:default] && (v[:initialize] != false) && (!d.key?(k) && !attributes_have_alias?(d,k)))
     end
 
-    def allow_attribute_action?(obj,val,options)
+    def attributes_have_alias?(attrs,attr)
+      !(self.class.alias_attributes.select{ |a, m| (m == attr && attrs.key?(a.to_sym)) }).empty?
+    end
+
+    def allow_attribute_action?(val,options)
       return true if (options[:if].blank? && options[:unless].blank?)
       b = true
       if options[:if].is_a?(Symbol)
@@ -110,7 +115,7 @@ module SimpleModel
           b = (b && send(options[:if]))
         end
       end
-      b = (b && options[:if].call(obj,val)) if options[:if].is_a?(Proc)
+      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?)
@@ -118,7 +123,7 @@ module SimpleModel
           b = (b && !send(options[:unless]))
         end
       end
-      b = (b && !options[:unless].call(obj,val)) if options[:unless].is_a?(Proc)
+      b = (b && !options[:unless].call(self,val)) if options[:unless].is_a?(Proc)
       b
     end
 
@@ -256,16 +261,25 @@ module SimpleModel
 
       # Creates alias setter and getter for the supplied attribute using the supplied alias
       # See spec for example.
-      def alias_attribute(new_alias,attribute)
-        alias_attributes[attribute] = new_alias
+      def alias_attribute(new_alias,attr)
+        
+        # get to the base attribute
+        while alias_attributes[attr]
+          attr = alias_attributes[attr]
+        end
+
+        raise UndefinedAttribute, "#{attr} is not a defined attribute so it cannot be aliased" unless defined_attributes[attr]
+
+        alias_attributes[new_alias] = attr
+
         define_method(new_alias) do
-          self.send(attribute)
+          self.send(attr)
         end
         define_method("#{new_alias}?") do
-          self.send("#{attribute}?")
+          self.send("#{attr}?")
         end
         define_method("#{new_alias.to_s}=") do |*args, &block|
-          self.send("#{attribute.to_s}=",*args, &block)
+          self.send("#{attr.to_s}=",*args, &block)
         end
       end
 
@@ -305,8 +319,8 @@ module SimpleModel
       # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
-        base.defined_attributes = self.defined_attributes.dup
-        base.alias_attributes = self.alias_attributes.dup
+        base.defined_attributes = self.defined_attributes.merge(base.defined_attributes)
+        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
         super
         # Rails 3.0 Hack
         if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)

data/lib/simple_model/exceptions.rb

@@ -1,4 +1,5 @@
 module SimpleModel
   class ActionError < StandardError; end
   class ValidationError < StandardError; end
+  class UndefinedAttribute < StandardError; end
 end

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.20"
+  VERSION = "1.2.21"
 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','<= 4.2.0.beta4','>= 3.0'
-  s.add_runtime_dependency 'activemodel','<= 4.2.0.beta4','>= 3.0'
+  s.add_runtime_dependency 'activesupport','>= 3.0', '< 5.0'
+  s.add_runtime_dependency 'activemodel','>= 3.0', '< 5.0'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-autotest'

data/spec/attributes_spec.rb

@@ -232,9 +232,12 @@ describe SimpleModel::Attributes do
       class MyBase
         include SimpleModel::Attributes
         has_boolean :bar
-        has_attribute :str
+        has_attribute :str, :stuff
+        has_currency :amount, :default => BigDecimal("0.0"), :initialize => false
         has_dates :some, :thing, :default => :fetch_date, :allow_blank => false, :initialize => false
         alias_attribute :other, :bar
+        alias_attribute :other_amount, :amount
+
         def fetch_date
           Date.today
         end
@@ -244,6 +247,11 @@ describe SimpleModel::Attributes do
         has_boolean :foo
         has_int :str
       end
+
+      class NewestBase < NewerBase
+        alias_attribute :some_amount, :other_amount
+      end
+
     end
     it "should merge defined attributes when class are inherited" do
       NewerBase.attribute_defined?(:bar).should eql(true)
@@ -267,6 +275,12 @@ describe SimpleModel::Attributes do
       MyBase.new(:other => true).bar?.should eql(true)
       NewerBase.new(:other => true).bar?.should eql(true)
     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)
+    end
   end
 
   after(:all) do

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.21
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 4.2.0.beta4
-    - - ! '>='
+    - - ">="
       - !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: 4.2.0.beta4
-    - - ! '>='
+    - - ">="
       - !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: 4.2.0.beta4
-    - - ! '>='
+    - - ">="
       - !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: 4.2.0.beta4
-    - - ! '>='
+    - - ">="
       - !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,9 +100,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -137,17 +137,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.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices