activitylog 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjVmMmJjZWJjNzkyZTkzNzYzMzYzM2I5MjRmNDczYWZhNDBmZTFjYw==
+    OGIyNDNjMzdkOWQ5MjQxNzhjYzJjN2UwN2M4MDI1NmRlZWZjNGRlOA==
   data.tar.gz: !binary |-
-    YzEwZjVjYzU3NDg4ZjJkZGYxZGZkZjk1MTBiY2M0ZjJjYjM0MGYzYg==
+    YjFmMzhhMzIzOGRhMWY4MjgwN2I1MWI3ZDQ3Y2U2MTAxNzU2NWMwMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODQ5YjFkMjhhOGIxMWU5ZTNmM2VlNGI5NzM2YzAxMjBhYTQ1YzIwZWZlOTU5
-    ZDk4ZDU0MGQ4MDhhYWNkNjMwMzU4MTcwMTQ0YzNkYmRkMzIyYTY5OTNkYjky
-    YzQ1OTE5ZGM4MmUxOTFkODEzZjQ2MDRhMDJhMjBhNWRlYWIzYzY=
+    ZTljOTMxZmQxMjMzYmQzNWJjOGUzMDgzYzJmMzI5ODU2OTExZmMzMjRmOTAy
+    NmE5MWY2ZThkMGVlOTM1YWFkMmUyOWRkZGM3NDBiMjkzZTc1MGMwYTA5NTIy
+    YzBkNjgzYWMwMDVmZmZjZjg3ZTkwYThlOGNmMGJlMmQ5NjhkMmE=
   data.tar.gz: !binary |-
-    MzRjNDA5ZWU5OGM0YjNjNzk3MmNhNTQwZTc1ZjBlNzBmM2EzNTI4NDdhMzY0
-    ODAxMTNhNWE3NjJjZmEzMzgzZjUwZWI0OTdjYzVjOTI2ZjQxMTgyYzE4YzJk
-    NGY1MjkzMmNiMjg4ZGM5YjkzOGZjYWE5NWFmOTllYmU2MDA0YTU=
+    Njk0MTIxOGY1ODM4OTI1MGU1NTM3OTQyOTI4NzFlZjI5NzNkNDQ3YWNkOGZl
+    OGE2ZWVkMTQzYWYyNTQwOWFiMDdiYTA5MWI5N2IyNjdkZDRmZDk5OGY5Y2Y3
+    ZjBjMmE2ZGRhYTM5YmMwOTlkNjQ3NWM4MWZjZTFhZjUyYjdkOWQ=

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/activitylog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "activitylog"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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

@@ -7,5 +7,5 @@ class ActivityLog < ActiveRecord::Base
   belongs_to :loggable, polymorphic: true
   belongs_to :user
 
-  validates :type, inclusion: {in: %w(model controller)}
+  validates :action_type, inclusion: {in: %w(model controller)}
 end

data/lib/activity_log/activity_logger.rb

@@ -12,7 +12,7 @@ module ActivityLogger
   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, type: 'model', stored_parent_activity_id: self.stored_parent_activity_id
+    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
@@ -21,7 +21,7 @@ module ActivityLogger
     object = controller_name.classify.constantize.find_by_id(params[:id])
     return unless object.present?
     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'
+    object.activity_logs.create user_id: current_user.try(:id), action: "#{params[:controller]}/#{params[:action]}", data: params, action_type: 'controller'
     self.stored_parent_activity_id = activity.id
   end
 

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

@@ -6,7 +6,7 @@ class CreateActivityLogs < ActiveRecord::Migration
       t.integer :loggable_type
       t.string :action
       t.integer :parent_activity_id
-      t.string :type
+      t.string :action_type
       t.binary :data, :limit => 10.megabyte
       t.timestamps
     end
@@ -14,6 +14,6 @@ class CreateActivityLogs < ActiveRecord::Migration
     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
+    add_index :activity_logs, :action_type
   end
 end

metadata

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