action-store 0.4.4 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5b51fa932124248255c6fd858b1030cdc27c0a7ec8a716147d68411d2b4d82
-  data.tar.gz: 838a6621072a34b97137d63eaed9b97da9182d497da32a51783588ad8cc2bd04
+  metadata.gz: 394f0ac4dd31e9c98ae5052769ef935f67f8de6ab25401b34a529fd79fb5c7fd
+  data.tar.gz: 2682434ea7b22e756d5e78e4f97afb1986b75fe15f128668f9ce863c9c862616
 SHA512:
-  metadata.gz: 0317b5ce5fc6119ed467292654bebf0c224a8892a29450f0ab9907062706df8e11728b610b4ed06ed5873ff2a049d922032b6134f91f3e6eec36af71fff18160
-  data.tar.gz: 99b359f4bcd545392c0d68eb8ff9444ccd7e35c14f9803755e884ba710055a06e311651f5fbb0f8fbb7a00abc96573e5772cd863c2d3ce5a9a8078e2bec1bc08
+  metadata.gz: 06d674a641954289d95e8aa192608fa05ca9040a9a7eea1256c13b0b9499891a2486277b39371c73288fcc2f50922033a80016a22eeb2f7282978ff786f2ee2b
+  data.tar.gz: c550135c83fa5ec9c71ae993f87c3b5f9344a6dcbe175448365eecbbaee1f38e490b808096a506ea7209b61a1ad1e4e297a94dd052db5234e7bcda1d58c2a583

data/CHANGELOG.md

@@ -1,5 +1,34 @@
-0.4.3
------
+## 1.1.1
+
+- Update Table column limit for fix MySQL max key length error. (#17)
+
+## 1.1.0
+
+- Allows to configure different Models / Tables for store actions. (#16)
+
+```rb
+# app/models/like.rb
+class Like < Action
+  self.table_name = "likes"
+end
+```
+
+```rb
+# app/models/user.rb
+class User < ActiveRecord::Base
+  action_store :like, :post, counter_cache: true, action_class_name: "Like"
+  action_store :like, :comment, counter_cache: true, action_class_name: "Like"
+end
+```
+
+## 1.0.0
+
+- Require Rails >= 5.2.
+- Fix primary key for use `bigint` column type.
+
+  0.4.3
+
+---
 
 - Auto reload `target`, when action/unaction target.
 
@@ -14,8 +43,7 @@ irb> post.likes_count
 => 0
 ```
 
-0.4.2
------
+## 0.4.2
 
 - Add `UNIQUE INDEX` on `:action_type, :target_type, :target_id, :user_type, :user_id` for makesure action uniqueness.
   > NOTE! If you already have actions in database, the new migration may have issue on `db:migrate`,
@@ -32,25 +60,27 @@ $ rails g action_store:install
 Overwrite config/initializers/action_store.rb? (enter "h" for help) [Ynaqdhm] n
         skip  config/initializers/action_store.rb
 Copied migration 20181121061544_add_unique_index_to_actions.action_store.rb from action_store
-````
+```
 
-0.3.3
------
+## 0.3.3
 
 - Fix for supports Rails 5.2;
 
-0.3.2
------
+  0.3.2
+
+---
 
 - Gem dependency for Rails 5.x.
 
-0.3.1
------
+  0.3.1
+
+---
 
 - Fix that `:user_counter_cache` was incorrect, it not count with target_type.
 
-0.3.0
------
+  0.3.0
+
+---
 
 - Fix for action_store in Model that not named `User`.
 - Fix has_many name when `User` model in a namespace.
@@ -72,8 +102,7 @@ end
 @blog_user.like_post(@post), @post.like_by_blog_users, @post.like_by_blog_user_actions
 ```
 
-0.2.2
------
+## 0.2.2
 
 - Fix #2 support Target that under a namespace.
 
@@ -81,18 +110,19 @@ end
 action_store :like, :blog_post, class_name: 'Blog::Post'
 ```
 
-0.2.1
------
+## 0.2.1
 
 - Use `ActiveSupport.on_load` to hook into Active Record.
 
-0.2.0
------
+  0.2.0
+
+---
 
 - New API, define action in User model.
 - Builtin Many-to-Many relations and methods.
 
-0.1.0
------
+  0.1.0
+
+---
 
 - First release.

data/README.md

@@ -1,7 +1,6 @@
-ActionStore
------------
+## ActionStore
 
-[![Gem Version](https://badge.fury.io/rb/action-store.svg)](https://badge.fury.io/rb/action-store) [![Build Status](https://travis-ci.org/rails-engine/action-store.svg)](https://travis-ci.org/rails-engine/action-store) [![codecov.io](https://codecov.io/github/rails-engine/action-store/coverage.svg?branch=master)](https://codecov.io/github/rails-engine/action-store?branch=master)
+[![Gem Version](https://badge.fury.io/rb/action-store.svg)](https://badge.fury.io/rb/action-store) [![build](https://github.com/rails-engine/action-store/workflows/build/badge.svg)](https://github.com/rails-engine/action-store/actions?query=workflow%3Abuild) [![codecov.io](https://codecov.io/github/rails-engine/action-store/coverage.svg?branch=master)](https://codecov.io/github/rails-engine/action-store?branch=master)
 
 Store different kinds of actions (Like, Follow, Star, Block, etc.) in a single table via ActiveRecord Polymorphic Associations.
 
@@ -17,11 +16,12 @@ And more and more.
 
 ## Basic table struct
 
-| Column | Description |
-| ----- | ----- |
-| `action_type` | The type of action [like, watch, follow, star, favorite] |
-| `action_option` | Secondary option for storing your custom status, or null if unneeded. |
-| `target_type`, `target_id` | Polymorphic Association for different `Target` models [User, Post, Comment] |
+| Column                     | Chars Limit | Description                                                                 |
+| -------------------------- | ----------- | --------------------------------------------------------------------------- |
+| `action_type`              | 64          | The type of action [like, watch, follow, star, favorite]                    |
+| `action_option`            | 64          | Secondary option for storing your custom status, or null if unneeded.       |
+| `target_type`, `target_id` | 64          | Polymorphic Association for different `Target` models [User, Post, Comment] |
+| `user_type`                | 64          | Polymorphic Association for different user model [User, Group, Member]      |
 
 ### Uniqueness
 
@@ -51,9 +51,8 @@ and run `rails db:migrate`.
 
 Use `action_store` to define actions:
 
-app/models/user.rb
-
 ```rb
+# app/models/user.rb
 class User < ActiveRecord::Base
   action_store <action_type>, <target>, opts
 end
@@ -61,18 +60,18 @@ end
 
 #### Convention Over Configuration:
 
-| action, target | Target Model | Target `counter_cache_field` | User `counter_cache_field` | Target has_many | User has_many |
-|----------------|--------------|------------------------------|----------------------------|-----------------|---------------|
-| `action_store :like, :post` | `Post` | | | `has_many :like_by_user_actions`, `has_many :like_by_users` | `has_many :like_post_actions`, `has_many :like_posts` |
-| `action_store :like, :post, counter_cache: true` | `Post` | `likes_count` |  | `has_many :like_by_user_actions`, `has_many :like_by_users` | `has_many :like_post_actions`, `has_many :like_posts` |
-| `action_store :star, :project, class_name: 'Repository'` | `Repository ` | `stars_count` | `star_projects_count` | `has_many :star_by_user_actions`, `has_many :star_by_users` |
-| `action_store :follow, :user` | `User` | `follows_count` | `follow_users_count` | `has_many :follow_by_user_actions`, `has_many :follow_by_users` | `has_many :follow_user_actions`, `has_many :follow_users` |
-| `action_store :follow, :user, counter_cache: 'followers_count', user_counter_cache: 'following_count'` | `User` | `followers_count ` | `following_count ` | `has_many :follow_by_user_actions`, `has_many :follow_by_users` | `has_many :follow_user_actions`, `has_many :follow_users` |
+| action, target                                                                                         | Target Model  | Target `counter_cache_field` | User `counter_cache_field` | Target has_many                                                 | User has_many                                             |
+| ------------------------------------------------------------------------------------------------------ | ------------- | ---------------------------- | -------------------------- | --------------------------------------------------------------- | --------------------------------------------------------- |
+| `action_store :like, :post`                                                                            | `Post`        |                              |                            | `has_many :like_by_user_actions`, `has_many :like_by_users`     | `has_many :like_post_actions`, `has_many :like_posts`     |
+| `action_store :like, :post, counter_cache: true`                                                       | `Post`        | `likes_count`                |                            | `has_many :like_by_user_actions`, `has_many :like_by_users`     | `has_many :like_post_actions`, `has_many :like_posts`     |
+| `action_store :star, :project, class_name: 'Repository'`                                               | `Repository ` | `stars_count`                | `star_projects_count`      | `has_many :star_by_user_actions`, `has_many :star_by_users`     |
+| `action_store :follow, :user`                                                                          | `User`        | `follows_count`              | `follow_users_count`       | `has_many :follow_by_user_actions`, `has_many :follow_by_users` | `has_many :follow_user_actions`, `has_many :follow_users` |
+| `action_store :follow, :user, counter_cache: 'followers_count', user_counter_cache: 'following_count'` | `User`        | `followers_count `           | `following_count `         | `has_many :follow_by_user_actions`, `has_many :follow_by_users` | `has_many :follow_user_actions`, `has_many :follow_users` |
 
 for example:
 
 ```rb
-# app/models/action.rb
+# app/models/user.rb
 class User < ActiveRecord::Base
   action_store :like, :post, counter_cache: true
   action_store :star, :post, counter_cache: true, user_counter_cache: true
@@ -137,7 +136,7 @@ true
 irb> @user1.create_action(:follow, target: @user2)
 irb> @user1.reload.following_count
 => 1
-irb> @user2.reload.followers_count_
+irb> @user2.reload.followers_count
 => 1
 irb> @user1.follow_user?(@user2)
 => true
@@ -181,6 +180,61 @@ irb> @issue.subscribe_by_user_actions.where(action_option: nil).count
 => 0
 ```
 
+## Use different tables for store actions.
+
+> since 1.1.0
+
+Sometimes, you may want to store actions into different table, for example, **Like** scenarios often have a lot of data, we wants store them into `likes` table.
+
+Create a migration and model
+
+```bash
+$ rails g migration create_likes
+```
+
+And then modify this migration file to let this table have same struct like the `actions`
+
+```rb
+class CreateLikes < ActiveRecord::Migration[6.1]
+  def change
+    create_table :likes do |t|
+      t.string :action_type, null: false
+      t.string :action_option
+      t.string :target_type
+      t.bigint :target_id
+      t.string :user_type
+      t.bigint :user_id
+
+      t.timestamps
+    end
+
+    add_index :likes, %i[user_type user_id action_type]
+    add_index :likes, %i[target_type target_id action_type]
+    add_index :likes, %i[action_type target_type target_id user_type user_id], unique: true, name: :uk_likes_target_user
+  end
+end
+```
+
+Create a `app/model/like.rb` model file:
+
+```rb
+class Like < Action
+  self.table_name = "likes"
+end
+```
+
+And then change you `action_store` define to special some case to use Like model:
+
+```rb
+# app/models/user.rb
+class User < ActiveRecord::Base
+  action_store :like, :post, counter_cache: true, action_class_name: "Like"
+  action_store :like, :comment, counter_cache: true, action_class_name: "Like"
+end
+```
+
+Now, `user.like_post`, `user.like_comment` will store the actions into `likes` table.
+
 ## Built-in relations and methods
 
 When you call `action_store`, ActionStore will define many-to-many relations for User and Target models.

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 begin
   require "bundler/setup"
 rescue LoadError
@@ -15,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 load "rails/tasks/statistics.rake"
 
@@ -29,5 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/models/action.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Auto generate with action-store gem.
 class Action < ActiveRecord::Base
   include ActionStore::Model

data/config/initializers/action_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # ActionStore Config
 ActionStore.configure do
 end

data/db/migrate/20170204035500_create_actions.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
-class CreateActions < ActiveRecord::Migration[5.0]
+
+class CreateActions < ActiveRecord::Migration[5.2]
   def change
     create_table :actions do |t|
-      t.string :action_type, null: false
-      t.string :action_option
-      t.string :target_type
-      t.integer :target_id
-      t.string :user_type
-      t.integer :user_id
+      t.string :action_type, null: false, limit: 64
+      t.string :action_option, limit: 64
+      t.string :target_type, limit: 64
+      t.bigint :target_id
+      t.string :user_type, limit: 64
+      t.bigint :user_id
 
       t.timestamps
     end
 
-    add_index :actions, [:user_type, :user_id, :action_type]
-    add_index :actions, [:target_type, :target_id, :action_type]
+    add_index :actions, %i[user_type user_id action_type]
+    add_index :actions, %i[target_type target_id action_type]
   end
 end

data/db/migrate/20181121052638_add_unique_index_to_actions.rb

@@ -1,5 +1,8 @@
-class AddUniqueIndexToActions < ActiveRecord::Migration[5.0]
+# frozen_string_literal: true
+
+class AddUniqueIndexToActions < ActiveRecord::Migration[5.2]
   def change
-    add_index :actions, [:action_type, :target_type, :target_id, :user_type, :user_id], unique: true, name: :uk_action_target_user
+    add_index :actions, %i[action_type target_type target_id user_type user_id], unique: true,
+                                                                                 name: :uk_action_target_user
   end
 end

data/lib/action-store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "action_store/version"
 require "action_store/configuration"
 require "action_store/engine"
@@ -9,6 +10,7 @@ module ActionStore
   class << self
     def config
       return @config if defined?(@config)
+
       @config = Configuration.new
       @config
     end

data/lib/action_store/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionStore
   class Configuration
   end

data/lib/action_store/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionStore
   class Engine < ::Rails::Engine
     isolate_namespace ActionStore

data/lib/action_store/mixin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionStore
   module Mixin
     extend ActiveSupport::Concern
@@ -32,32 +33,36 @@ module ActionStore
         end
       end
 
-      def action_store(action_type, name, opts = {})
-        opts ||= {}
-        klass_name = opts[:class_name] || name.to_s.classify
-        target_klass = klass_name.constantize
+      def action_store(action_type, name, class_name: nil, action_class_name: "Action", counter_cache: nil, user_counter_cache: nil)
+        name = name.to_s
+
+        class_name ||= name.classify
+        target_klass = class_name.constantize
+        action_klass = action_class_name.constantize
         action_type = action_type.to_s
-        if opts[:counter_cache] == true
+        if counter_cache == true
           # @post.stars_count
-          opts[:counter_cache] = "#{action_type.pluralize}_count"
+          counter_cache = "#{action_type.pluralize}_count"
         end
-        if opts[:user_counter_cache] == true
+        if user_counter_cache == true
           # @user.star_posts_count
-          opts[:user_counter_cache] = "#{action_type}_#{name.to_s.pluralize}_count"
+          user_counter_cache = "#{action_type}_#{name.pluralize}_count"
         end
 
         @defined_actions ||= []
         action = {
-          action_name: name.to_s,
+          action_name: name,
           action_type: action_type,
+          action_klass: action_klass,
           target_klass: target_klass,
           target_type: target_klass.name,
-          counter_cache: opts[:counter_cache],
-          user_counter_cache: opts[:user_counter_cache]
+          counter_cache: counter_cache,
+          user_counter_cache: user_counter_cache
         }
         @defined_actions << action
 
-        define_relations(action)
+        define_relations(action_klass: action_klass, target_klass: target_klass,
+                         action_type: action_type, action_name: name)
       end
 
       def find_action(action_type, opts)
@@ -69,7 +74,7 @@ module ActionStore
         defined_action = find_defined_action(opts[:action_type], opts[:target_type])
         return nil if defined_action.nil?
 
-        Action.find_by(where_opts(opts))
+        defined_action[:action_klass].find_by(where_opts(opts))
       end
 
       def create_action(action_type, opts)
@@ -83,11 +88,11 @@ module ActionStore
 
         # create! for raise RecordNotUnique
         begin
-          action = Action.find_or_create_by!(where_opts(opts))
+          action = defined_action[:action_klass].find_or_create_by!(where_opts(opts))
           action.update(action_option: opts[:action_option]) if opts.key?(:action_option)
         rescue ActiveRecord::RecordNotUnique
           # update action_option on exist
-          action = Action.where(where_opts(opts)).take
+          action = defined_action[:action_klass].where(where_opts(opts)).take
           action.update(action_option: opts[:action_option]) if opts.key?(:action_option)
         end
 
@@ -104,8 +109,9 @@ module ActionStore
         defined_action = find_defined_action(opts[:action_type], opts[:target_type])
         return false if defined_action.nil?
 
-        action = Action.where(where_opts(opts)).first
-        return true if !action
+        action = defined_action[:action_klass].where(where_opts(opts)).first
+        return true unless action
+
         action.destroy
         reset_counter_cache(action, defined_action)
         true
@@ -113,16 +119,18 @@ module ActionStore
 
       def reset_counter_cache(action, defined_action)
         return false if action.blank?
+
         if defined_action[:counter_cache] && action.target.present?
-          target_count = Action.where(
+          target_count = defined_action[:action_klass].where(
             action_type: defined_action[:action_type],
             target_type: action.target_type,
             target_id: action.target_id
           ).count
           action.target.update_attribute(defined_action[:counter_cache], target_count)
         end
+
         if defined_action[:user_counter_cache] && action.user.present?
-          user_count = Action.where(
+          user_count = defined_action[:action_klass].where(
             action_type: defined_action[:action_type],
             target_type: action.target_type,
             user_type: action.user_type,
@@ -134,105 +142,101 @@ module ActionStore
 
       private
 
-        def define_relations(action)
-          target_klass = action[:target_klass]
-          action_type = action[:action_type]
-          action_name = action[:action_name]
-
-          user_klass = self
-
-          # user, person
-          user_name = user_klass.table_name.underscore.singularize
-
-          # like_topic, follow_user
-          full_action_name = [action_type, action_name].join("_")
-          # like_user, follow_user
-          full_action_name_for_target = [action_type, "by", user_name].join("_")
-          # unlike_topic, unfollow_user
-          unaction_name = "un#{full_action_name}"
-
-          # @target.like_topic_actions, @target.follow_user_actions
-          has_many_name = [full_action_name, "actions"].join("_").to_sym
-          # @target.like_topics, @target.follow_users
-          has_many_through_name = full_action_name.pluralize.to_sym
-
-          # @user.like_by_user_actions, @user.follow_by_user_actions
-          has_many_name_for_target = [full_action_name_for_target, "actions"].join("_").to_sym
-          # @user.like_by_users, @user.follow_by_users
-          has_many_through_name_for_target = full_action_name_for_target.pluralize.to_sym
-
-          has_many_scope = -> {
-            where(action_type: action_type, target_type: target_klass.name, user_type: user_klass.name)
-          }
-
-          # User has_many :like_topic_actions
-          user_klass.send :has_many, has_many_name, has_many_scope,
-            class_name: "Action",
-            foreign_key: "user_id"
-          # User has_many :like_topics
-          user_klass.send :has_many, has_many_through_name,
-            through: has_many_name,
-            source: :target,
-            source_type: target_klass.name
-
-          # Topic has_many :like_user_actions
-          target_klass.send :has_many, has_many_name_for_target, has_many_scope,
-            foreign_key: :target_id,
-            class_name: "Action"
-          # Topic has_many :like_users
-          target_klass.send :has_many, has_many_through_name_for_target,
-            through: has_many_name_for_target,
-            source_type: user_klass.name,
-            source: :user
-
-          # @user.like_topic
-          user_klass.send(:define_method, full_action_name) do |target_or_id|
-            target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
-            result = user_klass.create_action(action_type, target_type: target_klass.name,
-                                                           target_id: target_id,
-                                                           user: self)
-            target_or_id.reload if target_or_id.is_a?(target_klass)
-            self.reload
-            result
-          end
-
-          # @user.like_topic?
-          user_klass.send(:define_method, "#{full_action_name}?") do |target_or_id|
-            target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
-            result = user_klass.find_action(action_type, target_type: target_klass.name,
+      def define_relations(target_klass:, action_klass:, action_type:, action_name:)
+        user_klass = self
+
+        # user, person
+        user_name = user_klass.table_name.underscore.singularize
+
+        # like_topic, follow_user
+        full_action_name = [action_type, action_name].join("_")
+        # like_user, follow_user
+        full_action_name_for_target = [action_type, "by", user_name].join("_")
+        # unlike_topic, unfollow_user
+        unaction_name = "un#{full_action_name}"
+
+        # @target.like_topic_actions, @target.follow_user_actions
+        has_many_name = [full_action_name, "actions"].join("_").to_sym
+        # @target.like_topics, @target.follow_users
+        has_many_through_name = full_action_name.pluralize.to_sym
+
+        # @user.like_by_user_actions, @user.follow_by_user_actions
+        has_many_name_for_target = [full_action_name_for_target, "actions"].join("_").to_sym
+        # @user.like_by_users, @user.follow_by_users
+        has_many_through_name_for_target = full_action_name_for_target.pluralize.to_sym
+
+        has_many_scope = lambda {
+          where(action_type: action_type, target_type: target_klass.name, user_type: user_klass.name)
+        }
+
+        # User has_many :like_topic_actions
+        user_klass.send :has_many, has_many_name, has_many_scope,
+                        class_name: action_klass.name,
+                        foreign_key: "user_id"
+        # User has_many :like_topics
+        user_klass.send :has_many, has_many_through_name,
+                        through: has_many_name,
+                        source: :target,
+                        source_type: target_klass.name
+
+        # Topic has_many :like_user_actions
+        target_klass.send :has_many, has_many_name_for_target, has_many_scope,
+                          foreign_key: :target_id,
+                          class_name: action_klass.name
+        # Topic has_many :like_users
+        target_klass.send :has_many, has_many_through_name_for_target,
+                          through: has_many_name_for_target,
+                          source_type: user_klass.name,
+                          source: :user
+
+        # @user.like_topic
+        user_klass.send(:define_method, full_action_name) do |target_or_id|
+          target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
+          result = user_klass.create_action(action_type, target_type: target_klass.name,
                                                          target_id: target_id,
                                                          user: self)
-            result.present?
-          end
-
-          # @user.unlike_topic
-          user_klass.send(:define_method, unaction_name) do |target_or_id|
-            target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
-            result = user_klass.destroy_action(action_type, target_type: target_klass.name,
-                                                            target_id: target_id,
-                                                            user: self)
-            target_or_id.reload if target_or_id.is_a?(target_klass)
-            self.reload
-            result
-          end
+          target_or_id.reload if target_or_id.is_a?(target_klass)
+          reload
+          result
         end
 
-        def safe_action_opts(opts)
-          opts ||= {}
-          if opts[:user]
-            opts[:user_id] = opts[:user].id
-            opts[:user_type] = opts[:user].class.name
-          end
-          if opts[:target]
-            opts[:target_type] = opts[:target].class.name
-            opts[:target_id] = opts[:target].id
-          end
-          opts
+        # @user.like_topic?
+        user_klass.send(:define_method, "#{full_action_name}?") do |target_or_id|
+          target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
+          result = user_klass.find_action(action_type, target_type: target_klass.name,
+                                                       target_id: target_id,
+                                                       user: self)
+          result.present?
         end
 
-        def where_opts(opts)
-          opts.extract!(:action_type, :target_type, :target_id, :user_id, :user_type)
+        # @user.unlike_topic
+        user_klass.send(:define_method, unaction_name) do |target_or_id|
+          target_id = target_or_id.is_a?(target_klass) ? target_or_id.id : target_or_id
+          result = user_klass.destroy_action(action_type, target_type: target_klass.name,
+                                                          target_id: target_id,
+                                                          user: self)
+          target_or_id.reload if target_or_id.is_a?(target_klass)
+          reload
+          result
+        end
+      end
+
+      def safe_action_opts(opts)
+        opts ||= {}
+        if opts[:user]
+          opts[:user_id] = opts[:user].id
+          opts[:user_type] = opts[:user].class.name
+        end
+        if opts[:target]
+          opts[:target_type] = opts[:target].class.name
+          opts[:target_id] = opts[:target].id
         end
+        opts
+      end
+
+      def where_opts(opts)
+        opts.extract!(:action_type, :target_type, :target_id, :user_id, :user_type)
+      end
     end
   end
 end

data/lib/action_store/model.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionStore
   module Model
     extend ActiveSupport::Concern

data/lib/action_store/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionStore
-  VERSION = "0.4.4"
+  VERSION = "1.1.2"
 end

data/lib/generators/action_store/install_generator.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require "rails/generators"
 module ActionStore
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Create ActionStore's base files"
-      source_root File.expand_path("../../../../", __FILE__)
+      source_root File.expand_path("../../..", __dir__)
 
       def add_initializer
         template "config/initializers/action_store.rb", "config/initializers/action_store.rb"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: action-store
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 1.1.2
 platform: ruby
 authors:
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-02-04 00:00:00.000000000 Z
@@ -16,22 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,7 +106,7 @@ homepage: https://github.com/rails-engine/action-store
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Store difference kind of actions (Like, Follow, Star, Block ...) in one table.
 test_files: []