public_activity 0.5.1.1 → 0.5.2

data/lib/public_activity/common.rb

@@ -88,6 +88,7 @@ module PublicActivity
           :recipient  => options[:recipient],
           :parameters => options[:params]
         )
+        reset_activity_instance_options
       end
     end
 
@@ -106,12 +107,10 @@ module PublicActivity
       # key
       options = args.extract_options!
       action = (args.first || options[:action]).try(:to_s)
-      if action.nil? and !options.has_key?(:key)
-        raise NoKeyProvided, "No key provided for #{self.class.name}"
-      end
-      key = (options[:key] ||
-            self.activity_key ||
-            (self.class.name.parameterize('_') + "." + action.to_s)).to_s
+
+      key = extract_key(action, options)
+
+      raise NoKeyProvided, "No key provided for #{self.class.name}" unless key
 
       # user responsible for the activity
       owner = PublicActivity.resolve_value(self,
@@ -140,5 +139,22 @@ module PublicActivity
         :params     => params
       }
     end
+
+    def extract_key(action, options)
+      (options[:key] ||
+        self.activity_key ||
+        ((self.class.name.underscore + "." + action.to_s) if action)).try(:to_s)
+    end
+
+    # Resets all instance options on the object
+    # triggered by a successful #create_activity, should not be
+    # called from any other place, or from application code.
+    # @private
+    def reset_activity_instance_options
+      @activity_params = {}
+      @activity_key = nil
+      @activity_owner = nil
+      @activity_recipient = nil
+    end
   end
 end

data/lib/public_activity/version.rb

@@ -1,4 +1,4 @@
 module PublicActivity
   # A constant with gem's version
-  VERSION = '0.5.1.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_activity
 version: !ruby/object:Gem::Version
-  version: 0.5.1.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord