wfl_simple_activity 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c695fff52b625303bdd26c47fc3ca061a2bdf11e804f19f18df10e9f6226fb
-  data.tar.gz: ebfab69067ca298b6db7cddf5a637b66c43f3a2da7946715ad6612352b45dd65
+  metadata.gz: c141b35fb1b361c462e67dc5379ef1f83db47d6355ca1b59e7c433b62debf147
+  data.tar.gz: 64f29ebc950729d31182119894c800e3a69a1067f66614773203fad039ab5c48
 SHA512:
-  metadata.gz: c41f3ae3f24c6bd099b49b26523f93e02174581b5d8f5c816925d7f8c613c9efba9ff36ec2062f3bcc356bf61784116dcacd1519b8968ea982375488230b754b
-  data.tar.gz: edd719a3310ed9bedc1d521b2ccc3ba8dbc84c37eb53b08a288b4ef54a33c8c00c6779f9cf8a2879cc1f80fde0bf34cf4d6bd758ea9fee9d98fb5c7c5a2e7d23
+  metadata.gz: '0317108daeabb9009e9d06751f34cd96c808b3968426a1287286f0ab5804f9764135d1aa19a6163ddc00a93dbe65a8936d673547ac8db493f34bb7cb54574c20'
+  data.tar.gz: aef30148b5457d759bc0125d07bb0279dd4cb105b341cd70fbd636e1e69fad60600f4db6a6fea68a3f42a1701676c86338be8f0cf9b280032d4be359e57029a6

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -1,10 +1,8 @@
 # WflSimpleActivity
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/wfl_simple_activity`. To experiment with that code, run `bin/console` for an interactive prompt.
+一个用以记录用户数据操作日志的Gem
 
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
+## 安装
 
 Add this line to your application's Gemfile:
 
@@ -20,16 +18,19 @@ Or install it yourself as:
 
     $ gem install wfl_simple_activity
 
-## Usage
+## 用法
 
     $ rails g wfl_simple_activity:install
     $ rake db:migrate
 
-## Development
+## 开发
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+#### 单表记录
+* 执行上面两步之后,在需要记录数据变更的Model中 `include CommonActivity` ,这样便会记录该Model的数据变更日志,在
+    数据发生变化,将会创建 `activity`, 在项目中可以通过 `model_name.activities` 或者 `PublicActivity::Activity.where(condition)`来获取活动日志
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+#### 关联表记录 或者 其余特殊情况
+* 如果需要在关联模型数据发生变更时记录当前模型的`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)
 
 ## Contributing
 

data/lib/generators/wfl_simple_activity/install_generator.rb

@@ -20,7 +20,7 @@ module WflSimpleActivity
       end
 
       def copy_common_activity
-        copy_file "common_activity.rb", "app/models/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/{common_activity.rb → wfl_activity.rb}

@@ -1,4 +1,4 @@
-module CommonActivity
+module WflActivity
   extend ActiveSupport::Concern
   included do |base|
     include PublicActivity::Model
@@ -10,5 +10,12 @@ module CommonActivity
         request_params: proc {|controller, model| controller&.params&.to_h}
       }
     )
+
+    # 如果不需要删除记录
+    # 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
+    }
   end
 end

data/lib/wfl_simple_activity/common_activity.rb

@@ -11,5 +11,13 @@ module CommonActivity
         request_params: proc {|controller, model| controller&.params&.to_h}
       }
     )
+
+    has_many :activities, as: :trackable, class_name: 'PublicActivity::Activity', dependent: :destroy
+
+    after_rollback proc {
+      self.create_activity key: "#{self.class.name.underscore}.failed", recipient: self
+      # 由于这里无法获取controller,需要自行采用其他方式来获取current_user,比如: 在oa-saas中有个Thread.current保存了全局的变量
+      # self.create_activity key: "#{self.class.name.underscore}.failed", owner: User.find(Thread.current[:user_id]), recipient: self
+    }
   end
 end

data/lib/wfl_simple_activity/version.rb

@@ -1,3 +1,3 @@
 module WflSimpleActivity
-  VERSION = "0.1.8"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wfl_simple_activity
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - longhaoran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_activity
@@ -67,19 +67,11 @@ 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/common_activity.rb
 - lib/generators/wfl_simple_activity/templates/create_activities.rb
+- lib/generators/wfl_simple_activity/templates/wfl_activity.rb
 - lib/wfl_simple_activity.rb
 - lib/wfl_simple_activity/common_activity.rb
 - lib/wfl_simple_activity/version.rb
-- wfl_simple_activity-0.1.0.gem
-- wfl_simple_activity-0.1.1.gem
-- wfl_simple_activity-0.1.2.gem
-- wfl_simple_activity-0.1.3.gem
-- wfl_simple_activity-0.1.4.gem
-- wfl_simple_activity-0.1.5.gem
-- wfl_simple_activity-0.1.6.gem
-- wfl_simple_activity-0.1.7.gem
 - wfl_simple_activity.gemspec
 homepage: https://github.com/LongLonghaoran/wfl_simple_activity
 licenses: []