tracks-attributes 1.1.0 → 1.1.1

data/lib/tracks_attributes.rb

@@ -67,6 +67,8 @@ module TracksAttributes
     #
     # @see TracksAttributesInternal TracksAttributesInternal for full method list
     def tracks_attributes(options={})
+      return if respond_to? :attr_info_for  # prevent recursion
+      
       include TracksAttributesInternal
       enable_validations if options[:validates]
       self
@@ -76,10 +78,6 @@ module TracksAttributes
   module TracksAttributesInternal
     extend ActiveSupport::Concern
 
-    included do
-      @tracked_attrs ||= {}
-    end
-
     module ClassMethods
       
       # Override attr_accessor to track accessors for an TracksAttributes.
@@ -137,6 +135,8 @@ module TracksAttributes
       
       private
         def add_tracked_attrs(is_readable, is_writeable, *vars) #:nodoc:
+          @tracked_attrs ||= {}
+          
           attr_params = vars.extract_options!        
           klass = attr_params[:klass]
           vars.each do |var| 
@@ -213,11 +213,10 @@ module TracksAttributes
         
         attr_info = self.class.attr_info_for name
         klass     = attr_info && attr_info.klass
-        
-        if klass && klass.respond_to?(:create)
+
+        if klass && !value.kind_of?(klass) && klass.respond_to?(:create)
           value = value.kind_of?(Array)? set_array_values(value, klass) : klass.create(value)
         end
-        
         send("#{name}=", value)
       end
       

data/lib/tracks_attributes/base.rb

@@ -12,6 +12,7 @@ module TracksAttributes
   class Base
     extend ClassMethods
     include ActiveModel::Validations
+    tracks_attributes
     
     ##
     # The standard create class method needed by a class that implements
@@ -34,7 +35,6 @@ module TracksAttributes
     # @param [Hash] options to be passed onto the initialize method.
     #
     def initialize(attributes = {}, options = {})
-      self.class.tracks_attributes(options) unless self.class.respond_to? :attr_info_for
       self.all_attributes = attributes
     end
   end

data/lib/tracks_attributes/version.rb

@@ -1,3 +1,3 @@
 module TracksAttributes
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracks-attributes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails