simple_model 1.2.9 → 1.2.10

data/Gemfile

@@ -2,4 +2,6 @@ source "https://rubygems.org"
 
 
 # Specify your gem's dependencies in simple_model.gemspec
-gemspec
+gemspec
+
+#gem 'debugger'

data/lib/simple_model/attributes.rb

@@ -113,7 +113,7 @@ module SimpleModel
       end
 
       def alias_attributes
-        @alias_attributes ||= {}.with_indifferent_access
+        @alias_attributes ||= HashWithIndifferentAccess.new
       end
 
       def alias_attributes=alias_attributes
@@ -121,13 +121,17 @@ module SimpleModel
       end
 
       def defined_attributes
-        @defined_attributes ||= {}.with_indifferent_access
+        @defined_attributes ||= HashWithIndifferentAccess.new
       end
 
       def defined_attributes=defined_attributes
         @defined_attributes = defined_attributes
       end
 
+      def attribute_defined?(attr)
+        (self.defined_attributes[attr] || self.superclass.respond_to?(:attribute_defined?) && self.superclass.attribute_defined?(attr))
+      end
+
       # The default settings for a SimpeModel class
       # Options:
       # * :on_set - accepts a lambda that is run when an attribute is set
@@ -283,11 +287,6 @@ module SimpleModel
           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)
-        base.defined_attributes.each do |attr,options|
-          base.create_attribute_methods([attr],options) #unless base.instance_methods.include?(attr.to_sym)
-        end
       end
     end
 

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/spec/attributes_spec.rb

@@ -246,7 +246,7 @@ describe SimpleModel::Attributes do
       end
     end
     it "should merge defined attributes when class are inhereted" do
-      NewerBase.defined_attributes[:bar].should_not be_nil
+      NewerBase.attribute_defined?(:bar).should be_true
       n = NewerBase.new
       n.respond_to?(:bar_will_change!).should be_true
     end
@@ -254,6 +254,8 @@ describe SimpleModel::Attributes do
     it "should defaults that were not initialized should work from parent class" do
       n = NewerBase.new
       n.some.should eql(Date.today)
+      n.some = "2012-12-01"
+      n.some.should be_a(Date)
       n.thing.should eql(Date.today)
     end
 

data/spec/simple_model_spec.rb

@@ -218,8 +218,8 @@ describe SimpleModel do
            
     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
+      NewTestStuff.attribute_defined?(:bar).blank?.should be_false
+      NewTestStuff.attribute_defined?(: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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
   prerelease: 
 platform: ruby
 authors: