action-store 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b80762a43d47ccf77400612e0ec4840e1ab5f1
-  data.tar.gz: 3cb456ca8cfc16739c8fbb3cb1a1feb81691e5cc
+  metadata.gz: 26301184cdf3a950440f0d0c565943abdc8db2ef
+  data.tar.gz: df943444fc2af10a16eb54a76ea0174035f05258
 SHA512:
-  metadata.gz: 7de4c8111d3b7b92a14be4e041f079edce3dd011a81bcf2305f2c6fda7bf6ed8eeb8ad1173d25776a400458fbc9fdf1898ea7ed46b6bd8330cc0dcf673f78692
-  data.tar.gz: 34686b4ceea1480b6aba7708be7e0ebd6a0dd26680edf79d7b4c85883c990826584d8b2a28eb44255f83b093d8d89e747e3eec6cad81ee8129dcd2c11810c960
+  metadata.gz: 3cde2d271a90c35adbf0bb7ec046536e2e2c86349ef71e3d647e46b4c0a16d644eb37e168fb16e1ce488e1e7e78053da05ca5f01e1896b4a0fb1ebabe1b56d25
+  data.tar.gz: ec5998dff944bac6dbd5ebba2717e902eff60dd760013e34ab062f23840d5f3cd8c342880e52b9e445abd9fda0fd55980084fae63c9bc2351cbb8ba48c2490fc

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+0.3.0
+-----
+
+- Fix for action_store in Model that not named `User`.
+- Fix has_many name when `User` model in a namespace.
+
+For example:
+
+```rb
+class Person
+  action_store :like, :post
+end
+
+module Blog
+  class User
+    action_store :like, :post
+  end
+end
+
+@post.like_by_people, @post.like_by_person_actions
+@blog_user.like_post(@post), @post.like_by_blog_users, @post.like_by_blog_user_actions
+```
+
 0.2.2
 -----
 

data/lib/action_store/mixin.rb

@@ -33,8 +33,9 @@ module ActionStore
 
       def action_store(action_type, name, opts = {})
         opts ||= {}
-        klass_name = opts[:class_name] || name
-        target_klass = klass_name.to_s.classify.constantize
+        target_type = name
+        klass_name = opts[:class_name] || name.to_s.classify
+        target_klass = klass_name.constantize
         action_type = action_type.to_s
         if opts[:counter_cache] == true
           # @post.stars_count
@@ -50,7 +51,7 @@ module ActionStore
           action_name: name.to_s,
           action_type: action_type,
           target_klass: target_klass,
-          target_type: klass_name,
+          target_type: target_klass.name,
           counter_cache: opts[:counter_cache],
           user_counter_cache: opts[:user_counter_cache]
         }
@@ -126,7 +127,7 @@ module ActionStore
         user_klass = self
 
         # user, person
-        user_name = user_klass.name.underscore.singularize
+        user_name = user_klass.table_name.underscore.singularize
 
         # like_topic, follow_user
         full_action_name = [action_type, action_name].join('_')
@@ -150,7 +151,9 @@ module ActionStore
         }
 
         # User has_many :like_topic_actions
-        user_klass.send :has_many, has_many_name, has_many_scope, class_name: 'Action'
+        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,

data/lib/action_store/version.rb

@@ -1,3 +1,3 @@
 module ActionStore
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action-store
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee