redcrumbs 0.3.8 → 0.4.0

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

@@ -11,13 +11,17 @@ module Redcrumbs
     end
 
     def full_subject
-      self._subject ||= subject_type.classify.constantize.find(subject_id)
+      if self._subject.blank? || self._subject.new_record?
+        self._subject = subject_type.classify.constantize.find(subject_id)
+      else
+        self._subject
+      end
     end
     
     def subject_from_storage
-      new_subject = subject_type.constantize.new(self.stored_subject)
-      new_subject.id = self.stored_subject["id"] if self.stored_subject.has_key?("id")
-      new_subject
+      self._subject ||= new_subject = subject_type.constantize.new(self.stored_subject.reject {|attribute| [:id].include?(attribute.to_sym)})
+      self._subject.id ||= self.stored_subject["id"] if self._subject.has_attribute?(:id) && self.stored_subject.has_key?("id")
+      self._subject
     end
     
     def creator
@@ -38,8 +42,13 @@ module Redcrumbs
       self._creator
     end
     
-    def full_creator
-      self._creator = creator_class.where(Redcrumbs.creator_primary_key => self.creator_id).first
+    # grabbing full creator/target should cache the result. Check to see is it a new_record (i.e. from storage) first
+    def full_creator 
+      if self._creator.blank? || self._creator.new_record?
+        self._creator = creator_class.where(Redcrumbs.creator_primary_key => self.creator_id).first
+      else
+        self._creator
+      end
     end
     
     def target
@@ -61,7 +70,11 @@ module Redcrumbs
     end
 
     def full_target
-      target_class.where(Redcrumbs.target_primary_key => self.target_id).first
+      if self._target.blank? || self._target.new_record?
+        self._target = target_class.where(Redcrumbs.target_primary_key => self.target_id).first
+      else
+        self._target
+      end
     end
   end
 end

data/lib/redcrumbs/version.rb

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

metadata

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