simple_model 1.2.2 → 1.2.3

data/lib/simple_model/attributes.rb

@@ -60,7 +60,7 @@ module SimpleModel
       (v[:default] && v[:initialize] && (d[k].blank? && (self.class.alias_attributes[k].blank? || d.key?(self.class.alias_attributes[k]) && d[self.class.alias_attributes[k]].blank?)))
     end
        
-    module ClassMethods    
+    module ClassMethods  
       # Creates a new instance where the attributes store is set to object
       # provided, which allows one to pass a session store hash or any other
       # hash-like object to be used for persistance. Typically used for modeling
@@ -80,11 +80,15 @@ module SimpleModel
         new.set(new.send(:attributes_with_for_init,session_hash))
         new
       end
-     
+      
       def alias_attributes
         @alias_attributes ||= {}.with_indifferent_access
       end
       
+      def alias_attributes=alias_attributes
+        @alias_attributes = alias_attributes
+      end
+      
       def defined_attributes
         @defined_attributes ||= {}.with_indifferent_access
       end
@@ -116,7 +120,7 @@ module SimpleModel
     
       def add_defined_attribute(attr,options)
         self.defined_attributes[attr] = options
-        define_attribute_methods self.defined_attributes.keys
+        define_attribute_methods [attr]
       end
       
       # builds the setter and getter methods
@@ -148,7 +152,10 @@ module SimpleModel
           val
         end
       end
-          
+      
+      # Creates setter methods for the provided attributes
+      # On set, it will mark the attribute as changed if the attributes has been 
+      # initialized.
       def define_setter_with_options(attr,options)
         add_defined_attribute(attr,options)
         options = default_attribute_settings.merge(options) if (options[:on_set].blank? || options[:after_set].blank?) 
@@ -160,7 +167,7 @@ module SimpleModel
             raise ArgumentError, "#{val} could not be set for #{attr}: #{e.message}"
           end
           will_change = "#{attr}_will_change!".to_sym
-          self.send(will_change) if (self.respond_to?(will_change) && val != self.attributes[attr])          
+          self.send(will_change) if (initialized?(attr) && val != self.attributes[attr])       
           self.attributes[attr] = val
           options[:after_set].call(self,val) if options[:after_set] 
         end
@@ -197,11 +204,41 @@ module SimpleModel
           self.send("#{attribute.to_s}=",*args, &block)
         end
       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 in inherits from a super that 
+      # has ActiveModel::Dirty included
+      def inherited(base)
+        # Rails 3.0 Hack
+        if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
+          base.send(:include, ActiveModel::Dirty)
+          base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
+          base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
+        end
+        
+        base.defined_attributes = self.defined_attributes.merge(base.defined_attributes)
+        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes ) 
+      end
     end
     
+    # 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)
-      base.send(:include, ActiveModel::Dirty) if base.is_a?(Class) # Add Dirty to the class
+      base.extend(Attributes::ClassMethods) 
+      base.send(:include, ActiveModel::Dirty) 
+      base.send(:include, ActiveModel::Validations)
+      base.send(:include, ActiveModel::Conversion)
+      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 == 0)
+          base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
+          base.attribute_method_affix :prefix => 'reset_', :suffix => '!'
+      end
     end
   end
 end

data/lib/simple_model/base.rb

@@ -1,20 +1,20 @@
-module SimpleModel  
+module SimpleModel
   # Require all that active support we know and love
-  require 'active_support/time'
-  require 'active_support/core_ext/class/attribute'
-  require 'active_support/core_ext/class/attribute_accessors'
-  require 'active_support/core_ext/class/delegating_attributes'
-  require 'active_support/core_ext/class/attribute'
-  require 'active_support/core_ext/array/extract_options'
-  require 'active_support/core_ext/hash/deep_merge'
-  require 'active_support/core_ext/hash/indifferent_access'
-  require 'active_support/core_ext/hash/slice'
-  require 'active_support/core_ext/string/behavior'
-  require 'active_support/core_ext/kernel/singleton_class'
-  require 'active_support/core_ext/module/delegation'
-  require 'active_support/core_ext/module/introspection'
-  require 'active_support/core_ext/object/duplicable'
-  require 'active_support/core_ext/object/blank'
+require 'active_support/time'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/delegating_attributes'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/introspection'
+require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/blank'
 
   # == SimpleModel::Base
   #
@@ -76,12 +76,8 @@ module SimpleModel
     include SimpleModel::Attributes
     include SimpleModel::ErrorHelpers
     #Use ActiveModel Resources
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    extend ActiveModel::Naming
-    extend ActiveModel::Callbacks
-    include ActiveModel::Validations::Callbacks
     
+
     define_model_callbacks :save, :update, :create, :destroy
     
     class << self
@@ -122,7 +118,7 @@ module SimpleModel
         if completed
           self.persisted = true
           @previously_changed = changes
-          @changed_attributes.clear    
+          @changed_attributes.clear   
         else
           self.send(options[:rollback]) unless options[:rollback].blank?
         end    

data/lib/simple_model/simple_model_railtie.rb

@@ -1,5 +1,5 @@
 module SimpleModel
-  class SimpleModelRailtie  < ::Rails::Railtie
+  class SimpleModelRailtie < ::Rails::Railtie
     initializer "simple_model.extend_core" do
       extend SimpleModel::ExtendCore
     end

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/attributes_spec.rb

@@ -60,6 +60,7 @@ describe SimpleModel::Attributes do
           "hop" if nap
         end
       end
+      
     end
     
     before(:each) do
@@ -154,30 +155,44 @@ describe SimpleModel::Attributes do
       
       lambda{TestThrow.new(:boo => [])}.should raise_error(SimpleModel::ArgumentError)
     end
-  context '#alias_attribute' do
-    it "should create alias for attribute" do
-      class TestAlias
+    context '#alias_attribute' do
+      it "should create alias for attribute" do
+        class TestAlias
+          include SimpleModel::Attributes
+          has_attribute :foo, :default => "bar"
+          alias_attribute(:bar,:foo)
+        end
+      
+        t = TestAlias.new(:bar => "foo")
+        t.bar.should eql("foo")
+        t.foo.should eql('foo')
+        t = TestAlias.new(:foo => "foo")
+        t.bar.should eql("foo")
+        t.foo.should eql('foo')
+      end
+    end   
+  end
+  
+  context "regression tests" do
+    it "should merge defined attributes when class are inhereted" do
+      class MyBase
         include SimpleModel::Attributes
-        has_attribute :foo, :default => "bar"
-        alias_attribute(:bar,:foo)
+        has_boolean :bar
       end
-      
-      t = TestAlias.new(:bar => "foo")
-      t.bar.should eql("foo")
-      t.foo.should eql('foo')
-      t = TestAlias.new(:foo => "foo")
-      t.bar.should eql("foo")
-      t.foo.should eql('foo')
+    
+      class NewerBase < MyBase
+        has_boolean :foo
+      end
+    
+      NewerBase.defined_attributes[:bar].blank?.should be_false
+      n = NewerBase.new
+      n.respond_to?(:bar_will_change!).should be_true
     end
   end
-        
-  end
-  
   
   after(:all) do
-    Object.send(:remove_const,:TestThrow)
-    Object.send(:remove_const,:OnGet)
-    Object.send(:remove_const,:TestDefault)
-    Object.send(:remove_const,:TestInit)
+    [:TestThrow,:OnGet,:TestDefault,:TestInit,:MyBase,:NewerBase].each do |test_klass|
+      Object.send(:remove_const,test_klass)
+    end
   end
 end

data/spec/simple_model_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe SimpleModel do
   
-  after(:each) do
-    Object.send(:remove_const,:TestStuff)
-  end
+  
   
   context 'action methods' do
     describe "save" do  
@@ -188,6 +186,7 @@ describe SimpleModel do
     class TestStuff < SimpleModel::Base
       save :my_save_method
       has_attributes :foo,:bar, :default => "def"
+      has_boolean :boo,:bad, :default => true
       def my_save_method
         true
       end
@@ -196,9 +195,39 @@ describe SimpleModel do
     t = TestStuff.new
     t.foo = "bar"
     t.foo_changed?.should be_true
+    t.respond_to?(:foo_will_change!).should be_true
+    t.respond_to?(:boo_will_change!).should be_true
     t.foo_change.should eql(["def","bar"])
     t.changed?.should be_true
     t.save
     t.changed?.should be_false
-  end  
+  end 
+  
+  context "regression tests" do
+    before(:each) do
+      class TestStuff < SimpleModel::Base
+        has_attribute :bar
+      end
+    
+      class NewTestStuff < TestStuff
+        has_boolean :foo
+      end
+    end
+    it "should merge defined attributes when class are inhereted" do
+      NewTestStuff.defined_attributes[:bar].blank?.should be_false
+      NewTestStuff.defined_attributes[:foo].blank?.should be_false
+    end
+    it "should merge defined attributes when class are inhereted" do
+      TestStuff.new.respond_to?(:bar_will_change!).should be_true
+      NewTestStuff.new.respond_to?(:bar_will_change!).should be_true
+      NewTestStuff.new.respond_to?(:foo_will_change!).should be_true
+    end
+    after(:each) do
+      Object.send(:remove_const,:NewTestStuff)
+    end
+  end
+  
+  after(:each) do
+    Object.send(:remove_const,:TestStuff)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport