activitylog 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmFhNGFkYTZkOTY0YTBlZDhjYjk1NTk2NDU0OGVkMTFiZGM4ZjA3Yg==
+    MDU3NTY3MmYyNmUwNTFlOWM4NjhmYzM4NDY1NGNlZmFjNjdjYzE4Nw==
   data.tar.gz: !binary |-
-    MWIwYmU3MDI3MDBhYTJkYzcyZGU5Y2ZiZTBhOWMyZTg2ZjI0ZjZlYw==
-!binary "U0hBNTEy":
+    MWM2MjZlOTVlNDU1ZWMyMDdkMDgyMjA3M2NjZDk4ZGYzNTg1YzQ5Mw==
+SHA512:
   metadata.gz: !binary |-
-    ZWIzZDFkYjRhMzhiMmUyNDNlMTU2NTcwMDIzMGZkMThlYjA4ODRlMDJiOTVi
-    ZWU2Y2JkOTE5NzJhYzIyNWM2OGE1NjU1NTYzMGI3NTEyNzYzMDk0MzhiYjI4
-    MzliN2IxMGVlNzY2YThlMjFmMGEzNjJiNTNhNzQwOGVhZWZlMmY=
+    NmQ1NGRiMDY2YzZiZmQ0MzRhYzM2OThkNDcxNzdmNWRkM2QwN2UzNTI3NGJl
+    MTdkNGY5ODQ5ZjZjNGZmZjY1Y2NlZjdjYmUwOWFhZjI0ZWIxYTg1ODAxNjY3
+    ZjYyMjc5ZjZlZjRiOTIzZDJjMjI0MDA2ZmVlYjZmZGQ5MjFmNjY=
   data.tar.gz: !binary |-
-    ZTk5MTE2NDkwZjJlMzRmMTM0NjY0M2IwZmJmMTk1OWZjMWYzMGMxMzI5N2Mz
-    NjI1NmFjNmMwZTljMTg5NzY3MDM4Y2NhOWJhMzU0NjhiNTIwM2YxMWQ4Njkw
-    OTRhNzViODdhZjUwMzlmYjZkYTRkZmJlMjE2NmU1ZWQwNDBlZDU=
+    YWNjZWY1N2U1MzU1M2YxM2RhZDdjZGRhMGQ1ZDIxMTQzZGJiNDE2NmRmMDQx
+    Y2Y0MDgzYTAwZTg4YzdmODIxNDA0MjRhNzU4MzJkYWJlZGQ0MTJiNTZlMTdi
+    YWQ3ZDhmYmFiMjY5ZTdiYjI0NGJiMGNlZGRmNzFmZjc4M2NhMTg=

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/activitylog.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: activitylog 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activitylog"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Erik Suero", "Elan Dubrofsky"]
-  s.date = "2013-10-17"
+  s.date = "2013-11-11"
   s.description = "Coming soon"
   s.email = "jonerikdsuero@gmail.com"
   s.extra_rdoc_files = [
@@ -38,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/JonErikDSuero/activitylog"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.1.10"
   s.summary = "Provides Activity Log functionality to your code"
 
   if s.respond_to? :specification_version then

data/lib/activity_log/controller_activity_logger.rb

@@ -3,14 +3,14 @@ require 'activity_log/model_activity_logger'
 module ControllerActivityLogger
   extend ActiveSupport::Concern
 
-  def clear_parent_activity_id
+  def clear_parent_activity_id(options = {})
     ModelActivityLogger.current_parent_activity_id = nil
   end
 
-  def record_activity_log
-    return unless params[:id].present?
+  def record_activity_log(options = {})
+    return unless params[options[:key] || :id].present?
     return if request.get? #exit if it's a get
-    object = controller_name.classify.constantize.find_by_id(params[:id])
+    object = (options[:class] || controller_name).classify.constantize.find_by_id(params[options[:key] || :id])
     return unless object.present?
     return unless object.respond_to? :activity_logs
     ModelActivityLogger.current_parent_activity_id = object.activity_logs.create(user_id: current_user.try(:id), action: "#{params[:controller]}/#{params[:action]}", data: params, action_type: 'controller').id
@@ -19,8 +19,8 @@ module ControllerActivityLogger
   # CLASS METHODS (self.)
   module ClassMethods
     def log_activity(options = {})
-      send :before_filter, :record_activity_log, options
-      send :after_filter, :clear_parent_activity_id, options
+      self.before_filter {record_activity_log(options)}
+      self.after_filter {clear_parent_activity_id(options)}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activitylog
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jon Erik Suero
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Provides Activity Log functionality to your code