redcrumbs 0.3.5 → 0.3.8

data/app/models/redcrumbs/crumb/getters.rb

@@ -22,7 +22,7 @@ module Redcrumbs
     
     def creator
       if !self.stored_creator.blank?
-        creator_class.new(self.stored_creator)
+        initialize_creator_from_hash_of_attributes
       elsif !self.creator_id.blank?
         full_creator
       end
@@ -32,18 +32,30 @@ module Redcrumbs
       Redcrumbs.creator_class_sym.to_s.classify.constantize
     end
     
+    def initialize_creator_from_hash_of_attributes
+      self._creator ||= creator_class.new(self.stored_creator.reject {|attribute| [:id].include?(attribute.to_sym)})
+      self._creator.id ||= self.stored_creator["id"] if self._creator.has_attribute?(:id) && self.stored_creator.has_key?("id")
+      self._creator
+    end
+    
     def full_creator
       self._creator = creator_class.where(Redcrumbs.creator_primary_key => self.creator_id).first
     end
     
     def target
       if !self.stored_target.blank?
-        target_class.new(self.stored_target)
+        initialize_target_from_hash_of_attributes
       elsif !self.target_id.blank?
         full_target
       end
     end
     
+    def initialize_target_from_hash_of_attributes
+      self._target ||= target_class.new(self.stored_target.reject {|attribute| [:id].include?(attribute.to_sym)})
+      self._target.id ||= self.stored_target["id"] if self._target.has_attribute?(:id) && self.stored_target.has_key?("id")
+      self._target
+    end
+    
     def target_class
       self._target ||= Redcrumbs.target_class_sym.to_s.classify.constantize
     end

data/lib/redcrumbs/version.rb

@@ -1,3 +1,3 @@
 module Redcrumbs
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcrumbs
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 +01:00
+date: 2012-09-12 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &2152028680 !ruby/object:Gem::Requirement
+  requirement: &2152263540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152028680
+  version_requirements: *2152263540
 - !ruby/object:Gem::Dependency
   name: dm-redis-adapter
-  requirement: &2152021800 !ruby/object:Gem::Requirement
+  requirement: &2152263040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152021800
+  version_requirements: *2152263040
 description: Fast and unobtrusive activity tracking of ActiveRecord models using DataMapper
   and Redis
 email: