activitylog 1.1.2 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGU5Mjc4N2FhZTU3YWFiY2E5M2JmNDM0YTQ3MjRiZTlmOGExMDRmYg==
+    YjVmMmJjZWJjNzkyZTkzNzYzMzYzM2I5MjRmNDczYWZhNDBmZTFjYw==
   data.tar.gz: !binary |-
-    NzlmYTYyNjJhZTA5MzNkN2MyNDA2YWM1MGZjMWM5M2QwYzA1N2NjZA==
+    YzEwZjVjYzU3NDg4ZjJkZGYxZGZkZjk1MTBiY2M0ZjJjYjM0MGYzYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjdkMTU5M2ExZGJhMDExZGM2M2MzNWExOGU3MzQ0ZTA3OTNlYmU0OGJhMDYw
-    OTkyNDAyMjkxZTdiZTNiMmM1ZWRjMDYwNzNmMzk5NjJhNDUyMmI5OGUxNjg2
-    ZDgwZDFhZWE2MjdiYzEwOTZmZTRhMTI2N2M0ZDIyYWQyNWQwNTc=
+    ODQ5YjFkMjhhOGIxMWU5ZTNmM2VlNGI5NzM2YzAxMjBhYTQ1YzIwZWZlOTU5
+    ZDk4ZDU0MGQ4MDhhYWNkNjMwMzU4MTcwMTQ0YzNkYmRkMzIyYTY5OTNkYjky
+    YzQ1OTE5ZGM4MmUxOTFkODEzZjQ2MDRhMDJhMjBhNWRlYWIzYzY=
   data.tar.gz: !binary |-
-    YWMwNmI0MTk4N2M3ZWVjMzViNmYxN2IzODhiYWZhMDFiNmYwNDUwZGE0NTU1
-    NTY3NjRiMzNlMWM4OGMyZmVmMmExMzgyMDk0MzFkNTM3MWQzYWU4YmI5MDBm
-    Y2NjZThkZWY5ZDRlYTI1MjgwZmNmN2Q0ZTk0YmU4YWYyYjY5NjU=
+    MzRjNDA5ZWU5OGM0YjNjNzk3MmNhNTQwZTc1ZjBlNzBmM2EzNTI4NDdhMzY0
+    ODAxMTNhNWE3NjJjZmEzMzgzZjUwZWI0OTdjYzVjOTI2ZjQxMTgyYzE4YzJk
+    NGY1MjkzMmNiMjg4ZGM5YjkzOGZjYWE5NWFmOTllYmU2MDA0YTU=

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/activitylog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "activitylog"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Erik Suero", "Elan Dubrofsky"]

data/lib/activity_log/activity_log.rb

@@ -2,26 +2,10 @@ class ActivityLog < ActiveRecord::Base
 
   serialize :data, Hash
 
-  belongs_to :parent, :class_name => 'ActivityLog', :foreign_key => 'parent_activity_id'
-  has_many :children, :class_name => 'ActivityLog', :foreign_key => 'parent_activity_id'
+  belongs_to :parent, class_name: 'ActivityLog', foreign_key: 'parent_activity_id'
+  has_many :children, class_name: 'ActivityLog', foreign_key: 'parent_activity_id'
+  belongs_to :loggable, polymorphic: true
+  belongs_to :user
 
-  def self.create_new(user, action, object, data={}, parent_activity_id=nil)
-
-    options = {
-        "user_id" => user.id,
-        "object_id" => object.id,
-        "object_type" => object.class.name,
-        "action" => action,
-        "data" => data,
-        "parent_activity_id" => parent_activity_id
-    }
-    log = ActivityLog.create(options)
-
-    if log.save
-      log
-    else
-      raise "ActivityLog failed to be saved" # TODO: this is just temporary
-    end
-
-  end
+  validates :type, inclusion: {in: %w(model controller)}
 end

data/lib/activity_log/activity_logger.rb

@@ -9,25 +9,26 @@ module ActivityLogger
     self.stored_parent_activity_id = nil
   end
 
-  def record_model_activity_log(action_to_store)
+  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 || id) : id
-    ActivityLog.create_new(User.find(current_id), action_to_store, self, changes, self.stored_parent_activity_id)
+    current_id = defined?(current_user_id) ? current_user_id : nil
+    activity_logs.create user_id: current_id, action: action, data: changes, 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]) #TODO: mk-- change find for LoanStep if searching by step name and loan_id
+    object = controller_name.classify.constantize.find_by_id(params[:id])
     return unless object.present?
-    activity = ActivityLog.create_new(User.find(current_user.try(:id) || id), params[:controller]+"/"+params[:action], object, params)
+    return unless object.respond_to? :activity_logs
+    object.activity_logs.create user_id: current_user.try(:id), action: "#{params[:controller]}/#{params[:action]}", data: params, type: 'controller'
     self.stored_parent_activity_id = activity.id
   end
 
   # CLASS METHODS (self.)
   module ClassMethods
     def log_model_activity
-      self.has_many :object_activity_logs, :foreign_key => 'object_id', :class_name => 'ActivityLog', :conditions => {:object_type => self.class.name}
+      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")}

data/lib/activitylog.rb

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

data/lib/generators/activity_log/templates/create_activity_logs.rb

@@ -2,12 +2,18 @@ class CreateActivityLogs < ActiveRecord::Migration
   def change
     create_table :activity_logs do |t|
       t.integer :user_id
-      t.integer :object_id
-      t.string :object_type
+      t.integer :loggable_id
+      t.integer :loggable_type
       t.string :action
       t.integer :parent_activity_id
+      t.string :type
       t.binary :data, :limit => 10.megabyte
       t.timestamps
     end
+
+    add_index :activity_logs, [:loggable_id, :loggable_type]
+    add_index :activity_logs, :user_id
+    add_index :activity_logs, :parent_activity_id
+    add_index :activity_logs, :type
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activitylog
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Erik Suero