redcrumbs 0.1.0 → 0.1.3

data/README.md

@@ -86,7 +86,7 @@ Not too shabby. But crumbs can also track the user that made the change (creator
 => #<User id: 2, name: "Jon" ... >
 
 # and really cool, returns a limited (default 100) array of crumbs affecting a user in reverse order:
-> user.crumbs(:limit => 20)
+> user.crumbs_as_user(:limit => 20)
 => [#<Crumb id: 64 ... >, #<Crumb id: 53 ... >, #<Crumb id: 42 ... > ... ]
 
 # or if you just want the crumbs created by the user

data/app/models/redcrumbs/crumb.rb

@@ -18,19 +18,19 @@ module Redcrumbs
     DataMapper.setup(:default, {:adapter  => "redis"})
     
     property :id, Serial
-    property :subject_id, Integer, :index => true
-    property :subject_type, String, :index => true
-    property :modifications, Json, :default => "{}"
+    property :subject_id, Integer, :index => true, :lazy => false
+    property :subject_type, String, :index => true, :lazy => false
+    property :modifications, Json, :default => "{}", :lazy => false
     property :created_at, DateTime
     property :updated_at, DateTime
-    property :stored_creator, Json
-    property :stored_target, Json
-    property :stored_subject, Json
+    property :stored_creator, Json, :lazy => false
+    property :stored_target, Json, :lazy => false
+    property :stored_subject, Json, :lazy => false
     property :creator_id, Integer, :index => true
     property :target_id, Integer, :index => true
 
     DataMapper.finalize
-
+    
     after :save, :set_mortality
 
     attr_accessor :_subject, :_creator, :_target
@@ -43,8 +43,7 @@ module Redcrumbs
       self.modifications = params[:modifications] unless !params[:modifications]
     end
 
-    # Remember to change the respond_to? argument when moving from user/target class to dynamic with user as default
-    def self.build_from(subject)
+    def self.build_with_modifications(subject)
       unless subject.watched_changes.empty?
         params = {:modifications => subject.watched_changes}
         params.merge!({:subject => subject})
@@ -52,6 +51,12 @@ module Redcrumbs
       end
     end
     
+    def set_context_from(subject)
+      self.subject = subject unless !!subject_id
+      self.target ||= self.subject.target if self.subject.respond_to?(:target)
+      self.creator ||= self.subject.creator if self.subject.respond_to?(:creator)
+    end
+    
     def redis_key
       "redcrumbs_crumbs:#{id}"
     end

data/lib/redcrumbs/creation.rb

@@ -20,11 +20,10 @@ module Redcrumbs
       end
 
       def notify_changes
-        unless watched_changes.empty?
-          n = Crumb.build_from(self)
-          n.save
-        end
+        n = Crumb.build_with_modifications(self) unless watched_changes.empty?
         yield
+        n.set_context_from(self) unless !n
+        n.save unless !n
       end
     end
   end

data/lib/redcrumbs/options.rb

@@ -16,8 +16,8 @@ module Redcrumbs
         options[:only] = Array(options[:only])
         options[:store] = Array(options[:store])
         
-        class_inheritable_accessor :redcrumbs_options
-        class_inheritable_accessor :redcrumbs_callback_options
+        class_attribute :redcrumbs_options
+        class_attribute :redcrumbs_callback_options
         
         self.redcrumbs_options = options.dup
         self.redcrumbs_callback_options = options.dup.select {|k,v| [:if, :unless].include?(k.to_sym)}

data/lib/redcrumbs/users.rb

@@ -21,7 +21,7 @@ module Redcrumbs
         opts[:limit] ||= 100
         arr = crumbs_for 
         arr += crumbs_by
-        arr.all(:limit => opts[:limit])
+        arr.all(opts)
       end
       
       # Creator method defines who should be considered the creator when a model is updated. This

data/lib/redcrumbs/version.rb

@@ -1,3 +1,3 @@
 module Redcrumbs
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

metadata

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