wfl_simple_activity 0.1.12 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d248542cf09f993ae3a70c1e664f3ed17dd3d92c193d27241d916995ebcd9b93
-  data.tar.gz: a079b97f191c8a8e1f4ef655771e7f1390e2c908766a437b908c4346ccd97526
+  metadata.gz: d612ff1a75a2dfb0447f8a13b2dce86cf28207eb95b7e102c20514f23b2afdb6
+  data.tar.gz: edf9a5b0e70d5d7c0b08398310a7896197beaf309cc365a3d23e41e58f0503b0
 SHA512:
-  metadata.gz: 1e1d16e2e60a85c73655122991b1f004484d11f25364b441b484b2779ca9bffd38a6267bb58b74e0fcc089a6f168214c5b52cfd26e19bcd72cae1791da36e25e
-  data.tar.gz: e2cfbedc86f6d9d60d8e8f8720b18eabb6f13dc6a9ed24feb825351d5688a9e7df7164e008eb9a81ac7eb7432c5f201d79e39bd78f7210a74583701b73b14ac3
+  metadata.gz: 469a64f6a7cd7687e9284237a014ad6297046acf58b24b786ffff28779adc7c5e8f9c65017fad00a1950e4c9a6a8c2922e196c595673f837eb47a98d60d61aa2
+  data.tar.gz: e29b1fad8f7bf86c184ccfad85e4fb5f03bcf37d40d3889569d111d697607b12eeb8310b95e1fa13000366beac3f5add875c083d5ad9315dadde460897b3a42d

data/README.md

@@ -26,12 +26,24 @@ Or install it yourself as:
 ## 开发
 
 #### 单表记录
-* 执行上面两步之后,在需要记录数据变更的Model中 `include CommonActivity` ,这样便会记录该Model的数据变更日志,在
+* 执行上面两步之后,在需要记录数据变更的Model中 `include WflActivity` ,这样便会记录该Model的数据变更日志,在
     数据发生变化,将会创建 `activity`, 在项目中可以通过 `model_name.activities` 或者 `PublicActivity::Activity.where(condition)`来获取活动日志
 
 #### 关联表记录 或者 其余特殊情况
+
 * 如果需要在关联模型数据发生变更时记录当前模型的`activity`,需要自行在关联的模型中通过`model_name.create_activity key: 'article.commented_on', owner: current_user, recipient: recipientm`来创建`activity`,create_activity方法参数可参考 [PublicActivity::Common#create_activity](https://rubydoc.info/gems/public_activity/PublicActivity/Common:create_activity)
 
+#### 注意事项
+
+* 生成的migration文件中需自行migration版本指定对应的版本
+
+* 如果需要记录current_user 或者 调用其他在controller中的方法,需要在 `application_controller.rb`中 `include PublicActivity::StoreController`
+
+* 自行获取 controller 上下文: 
+    ```ruby 
+    PublicActivity.get_controller 
+    ```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/wfl_simple_activity.

data/lib/generators/wfl_simple_activity/install_generator.rb

@@ -16,11 +16,11 @@ module WflSimpleActivity
       end
 
       def create_migration_file
-        migration_template "create_activities.rb", "db/migrate/create_activities.rb"
+        migration_template "create_wfl_activities.rb", "db/migrate/create_wfl_activities.rb"
       end
 
       def copy_common_activity
-        copy_file "common_activity.rb", "app/models/concerns/common_activity.rb"
+        copy_file "wfl_activity.rb", "app/models/concerns/wfl_activity.rb"
       end
 
       def copy_activity_model

data/lib/generators/wfl_simple_activity/templates/activity.rb

@@ -1,3 +1,5 @@
+require "public_activity/orm/active_record/activity.rb"
+PublicActivity::ORM::ActiveRecord::Activity.table_name = "wfl_activities"
 module PublicActivity
   class Activity
     serialize :parameters, Hash

data/lib/generators/wfl_simple_activity/templates/{create_activities.rb → create_wfl_activities.rb}

@@ -1,23 +1,25 @@
 # Migration responsible for creating a table with activities
-class CreateActivities < ActiveRecord::Migration
+class CreateWflActivities < ActiveRecord::Migration
   # Create table
   def self.up
-    create_table :activities do |t|
+    create_table :wfl_activities do |t|
       t.belongs_to :trackable, :polymorphic => true
       t.belongs_to :owner, :polymorphic => true
       t.string  :key
       t.text    :parameters
       t.belongs_to :recipient, :polymorphic => true
       t.text :model_changes
+      t.integer :school_id
+      t.string :description
       t.timestamps
     end
 
-    add_index :activities, [:trackable_id, :trackable_type]
-    add_index :activities, [:owner_id, :owner_type]
-    add_index :activities, [:recipient_id, :recipient_type]
+    add_index :wfl_activities, [:trackable_id, :trackable_type]
+    add_index :wfl_activities, [:owner_id, :owner_type]
+    add_index :wfl_activities, [:recipient_id, :recipient_type]
   end
   # Drop table
   def self.down
-    drop_table :activities
+    drop_table :wfl_activities
   end
 end

data/lib/generators/wfl_simple_activity/templates/wfl_activity.rb

@@ -13,9 +13,15 @@ module WflActivity
 
     # 如果不需要删除记录
     # has_many :activities, as: :trackable, class_name: 'PublicActivity::Activity', dependent: :destroy
-
+    
     after_rollback proc {
-      self.create_activity key: "#{self.class.name.underscore}.failed", owner: User.find(Thread.current[:user_id]), recipient: self
+      # 由于after_rollback是ActiveRecord自带的回调,并不支持获取controller,所以需要借助PublicActivity
+      controller = PublicActivity.get_controller
+      if self.id.blank?
+        PublicActivity::Activity.create key: "#{self.class.name.underscore}.failed", owner: controller&.current_user, parameters: controller&.params&.to_h, model_changes: self.changes
+      else
+        self.create_activity key: "#{self.class.name.underscore}.failed", owner: User.find(Thread.current[:user_id]), recipient: self
+      end
     }
   end
 end

data/lib/wfl_simple_activity/version.rb

@@ -1,3 +1,3 @@
 module WflSimpleActivity
-  VERSION = "0.1.12"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wfl_simple_activity
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.18
 platform: ruby
 authors:
 - longhaoran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_activity
@@ -67,7 +67,7 @@ files:
 - bin/setup
 - lib/generators/wfl_simple_activity/install_generator.rb
 - lib/generators/wfl_simple_activity/templates/activity.rb
-- lib/generators/wfl_simple_activity/templates/create_activities.rb
+- lib/generators/wfl_simple_activity/templates/create_wfl_activities.rb
 - lib/generators/wfl_simple_activity/templates/wfl_activity.rb
 - lib/wfl_simple_activity.rb
 - lib/wfl_simple_activity/common_activity.rb