activitylog 1.3.2 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWI1MmMyNWY0YzRjODYwZTRhYjAxZjFkMjIxYTQwMGQxYjY5MzM3NA==
+    ZDg3OGU1NGY0OTQ0NTk1ZWFiMjNkNjJlYTJkMDQ3ZGRkMWEyYjQ1ZA==
   data.tar.gz: !binary |-
-    YzI0ZjM4NDAwM2EzYmM3NjViODc1NGZkNjI0YTY1MmQ3MzAxODllOA==
+    N2UxOWNmNmIyMGNiMjY2NTg3MGMxYTM1YzNhNDFkZmQxYTkxNTgyMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTZiMWQ3MWMyODQzNWY3NGI2Njk2YjFiM2NlODY5N2Y5OGU3MDg5ZjRhYzdi
-    ZDcxMDhjMGMxYzI5Y2RhMWQwZjg4N2M4NDNmZmE2MGJlYzlhMDhmNDk1MTdl
-    N2VmZmNkMWRmYWFkNTE4MTgxYWNlMTBjNGE1ZGEwMjY0YWQwOWI=
+    YzMyOGQ0ZDdkZTE4NzNiMGRlZGQ0M2M5NTQ1Y2FiYzc3ZjQ3NjJlODFiOWZi
+    MWIxNTYyMzEwZmJkYjQ0OWJjZjliYzJlOWU1NDZlMTU5YmZjYjM1ZGM4Mzhi
+    Zjg5NTA1MDg5NTdkYjM4ZjRlYmY1Y2FlMjQwMmQ0NmZjMDAxM2E=
   data.tar.gz: !binary |-
-    NmE2Yzk5OWFiY2VlODhlNWE1M2EzN2EwZWFjOTY5OTA3MGY5NThkNTM1NDk4
-    YjI0NTU0Y2JmMWRiZWFhY2JlZjlhM2FkYzMyYzc5MWU2YWE4NDJhN2FmN2Rj
-    YmVjODY4NzViYWQ1MzQwOWQyYWEyZDYyNzFhMzUwY2IzMTNlY2M=
+    OGUyMWIwMmVhNjQ1ODQ1NTMxYTU4NDkxNmFiNTMyZGFkMzQ5YzMxMDRjYTQ4
+    MDEwMTcxMmRlZmU5NGU4Njk1MzliNjJkMjRlMzlhN2U0MmQ4NDE4MzMyYTg4
+    OTQ1NjUzNGY3MDJhMDdjNDEyZjYwZGE5MGRhYjYwZjUwMDZmMzg=

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/activitylog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "activitylog"
-  s.version = "1.3.2"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Erik Suero", "Elan Dubrofsky"]
@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
     "activitylog.gemspec",
     "init.rb",
     "lib/activity_log/activity_log.rb",
-    "lib/activity_log/activity_logger.rb",
+    "lib/activity_log/controller_activity_logger.rb",
+    "lib/activity_log/model_activity_logger.rb",
     "lib/activitylog.rb",
     "lib/generators/activity_log/activity_log_generator.rb",
     "lib/generators/activity_log/templates/create_activity_logs.rb",

data/lib/activity_log/controller_activity_logger.rb

@@ -0,0 +1,24 @@
+module ControllerActivityLogger
+  include ModelActivityLogger
+
+  def clear_parent_activity_id
+    ModelActivityLogger.current_parent_activity_id = nil
+  end
+
+  def record_activity_log
+    return unless params[:id].present?
+    return if request.get? #exit if it's a get
+    object = controller_name.classify.constantize.find_by_id(params[: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
+  end
+
+  # CLASS METHODS (self.)
+  module ClassMethods
+    def log_activity(options = {})
+      send :before_filter, :record_controller_activity_log, options
+      send :after_filter, :clear_parent_activity_id, options
+    end
+  end
+end

data/lib/activity_log/model_activity_logger.rb

@@ -0,0 +1,19 @@
+module ModelActivityLogger
+
+  mattr_accessor :current_parent_activity_id
+
+  def record_activity_log(action)
+    # if current_user_id == nil, then the User is in the process of Logging In
+    current_id = defined?(current_user_id) ? current_user_id : nil
+    activity_logs.create user_id: current_id, action: action, data: changes, action_type: 'model', parent_activity_id: current_parent_activity_id
+  end
+
+  module ClassMethods
+    def log_activity
+      self.has_many :activity_logs, as: :loggable
+      self.after_create {record_activity_log("create")}
+      self.after_update {record_activity_log("update")}
+      self.before_destroy {record_activity_log("destroy")}
+    end
+  end
+end

data/lib/activitylog.rb

@@ -1,4 +1,4 @@
 require 'activity_log/activity_log'
 require 'activity_log/activity_logger.rb'
-ActiveRecord::Base.send(:include, ActivityLogger)
-ActionController::Base.send(:include, ActivityLogger)
+ActiveRecord::Base.send(:include, ModelActivityLogger)
+ActionController::Base.send(:include, ControllerActivityLogger)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activitylog
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Jon Erik Suero
@@ -71,7 +71,8 @@ files:
 - activitylog.gemspec
 - init.rb
 - lib/activity_log/activity_log.rb
-- lib/activity_log/activity_logger.rb
+- lib/activity_log/controller_activity_logger.rb
+- lib/activity_log/model_activity_logger.rb
 - lib/activitylog.rb
 - lib/generators/activity_log/activity_log_generator.rb
 - lib/generators/activity_log/templates/create_activity_logs.rb

data/lib/activity_log/activity_logger.rb

@@ -1,41 +0,0 @@
-module ActivityLogger
-
-  extend ActiveSupport::Concern
-
-  mattr_accessor :stored_parent_activity_id
-
-  # INSTANCE METHODS
-  def clear_parent_activity_id
-    self.stored_parent_activity_id = nil
-  end
-
-  def record_model_activity_log(action)
-    # if current_user_id == nil, then the User is in the process of Logging In
-    current_id = defined?(current_user_id) ? current_user_id : nil
-    activity_logs.create user_id: current_id, action: action, data: changes, action_type: 'model', stored_parent_activity_id: self.stored_parent_activity_id
-  end
-
-  def record_controller_activity_log
-    return unless params[:id].present?
-    return if request.get? #exit if it's a get
-    object = controller_name.classify.constantize.find_by_id(params[:id])
-    return unless object.present?
-    return unless object.respond_to? :activity_logs
-    self.stored_parent_activity_id = object.activity_logs.create(user_id: current_user.try(:id), action: "#{params[:controller]}/#{params[:action]}", data: params, action_type: 'controller').id
-  end
-
-  # CLASS METHODS (self.)
-  module ClassMethods
-    def log_model_activity
-      self.has_many :activity_logs, as: :loggable
-      self.after_create {record_model_activity_log("create")}
-      self.after_update {record_model_activity_log("update")}
-      self.before_destroy {record_model_activity_log("destroy")}
-    end
-
-    def log_controller_activity(options = {})
-      send :before_filter, :record_controller_activity_log, options
-      send :after_filter, :clear_parent_activity_id, options
-    end
-  end
-end