acts_as_activitable 0.0.4 → 0.0.5

data/lib/acts_as_activitable.rb

@@ -12,11 +12,13 @@ module ActsAsActivitable
 
     module ClassMethods
       def acts_as_activitable
-        cattr_accessor :exclude_from_activities
-        cattr_accessor :methods_for_activities
+        
+        attr_accessor :skip_activity
         has_many :activities, :as => :activitable, :dependent => :destroy
       
-        after_create :create_activity
+        after_create :create_create_activity
+        after_update :create_update_activity
+        after_destroy :create_destroy_activity
       
         include ActsAsActivitable::Extensions::InstanceMethods
         extend  ActsAsActivitable::Extensions::SingletonMethods
@@ -24,7 +26,13 @@ module ActsAsActivitable
     end
 
     module SingletonMethods
+      def exclude_from_activities
+        []
+      end
       
+      def methods_for_activities
+        []
+      end
     end
 
     module InstanceMethods
@@ -32,21 +40,50 @@ module ActsAsActivitable
       def activity_owner
         user
       end
+      
+      def create_activity?(data)
+        true
+      end
+      
+      def create_create_activity
+        create_activity(:create)
+      end
+      
+      def create_update_activity
+        create_activity(:update)
+      end
+      
+      def create_destroy_activity
+        create_activity(:destroy)
+      end
     
-      def create_activity
-        self.activities.create(:user => activity_owner, :data => self.to_activity_data)
+      def create_activity(activity_action)
+        unless skip_activity
+          data = self.to_activity_data
+          
+          if data
+            data.delete(:updated_at)
+            data.delete(:birth_date)
+            unless data.keys.empty? || !create_activity?(data)
+              data[:activity_action] = activity_action
+              self.activities.create(:user => activity_owner, :data => data) rescue nil
+            end
+          end
+        end
       end
     
       def to_activity_data
-        attrs = self.attributes.symbolize_keys
-        attrs.delete(:id)
-        (self.class.exclude_from_activities||[]).each do |attribute|
-          attrs.delete(attribute.to_sym)
-        end
-        (self.class.methods_for_activities||[]).each do |method_name|
-          attrs[method_name.so_sym] = self.send(method_name.to_sym)
+        attrs = nil
+        if self.changed?
+          attrs = self.changes.symbolize_keys
+          #attrs.delete(:id)
+          (self.class.exclude_from_activities||[]).each do |attribute|
+            attrs.delete(attribute.to_sym)
+          end
+          (self.class.methods_for_activities||[]).each do |method_name|
+            attrs[method_name.to_sym] = self.send(method_name.to_sym)
+          end
         end
-      
         attrs
       end
     end

data/lib/acts_as_activitable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsActivitable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: acts_as_activitable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Gunner Technology, Cody Swann
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: []