socialization 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61ca6903bc5188ade02e94d8b2b8bdc974d9153dfd96729a4742036b5020a4f
-  data.tar.gz: e773f8ef9a1eaea46e81920ab79ff6f0432a45790e3d200f79f03f182a26ec7d
+  metadata.gz: 6bb2c1347bb2975c9a229366e60e2f1552f95e28b2c4ac27ab7e48edd963caaf
+  data.tar.gz: a2a9d47da210368463afa8c56cc943548f4765f350c762ede7f84c9e942e2c01
 SHA512:
-  metadata.gz: e934d16150b977dee6ed8051674eb48c1d7d88607552a2cf95bb06a02c196cd760138219f3b6cf41ee18bbc318009b00d9c3646c0f3216718938ac9bb63c03aa
-  data.tar.gz: 9c1747627c2fabccc5e12d644d5dec60897c6a4a0fc2fd93b6bc8144d2736c1da29e78b9c3d8d84cf2a32690201a7a665b0964769ef5ba78bfa2791b59a513b2
+  metadata.gz: b903ff8c62263cf0f4f9f4a748b77c508f0d81065584a867a7c21aea2990d38873d9eb08321ceb782e733d979f985a07c0be708a8a2beac33372da4d2ce4bad0
+  data.tar.gz: a7ac541cbf6de510aa841a622086d869406050a21dc41580c7e5ab74a0127eb18e01c6e55ba47f004ecfcc703850bb7f723ff9292fa72a9b969b5f7124e25c28

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3 (April 17, 2019)
+
+* Rename "victim" methods to "subject" internally. Thanks to @jdugarte for the suggestion.
+
 ## 1.2.2 (April 17, 2019)
 
 * Drop support for some old Ruby versions

data/lib/socialization.rb

@@ -10,7 +10,7 @@
   stores/redis/base.rb
   stores/redis/**/*.rb
   actors/**/*.rb
-  victims/**/*.rb
+  subjects/**/*.rb
   helpers/**/*.rb
   config/**/*.rb
 ).each do |path|

data/lib/socialization/stores/mixins/base.rb

@@ -2,9 +2,9 @@ module Socialization
   module Stores
     module Mixins
       module Base
-        def touch_dependents(actor, victim)
+        def touch_dependents(actor, subject)
           actor.touch if touch_actor?(actor)
-          victim.touch if touch_victim?(victim)
+          subject.touch if touch_subject?(subject)
         end
 
         def touch_actor?(actor)
@@ -12,10 +12,11 @@ module Socialization
           touch == :all || touch.to_s =~ /er$/i
         end
 
-        def touch_victim?(victim)
-          return false unless victim.respond_to?(:touch)
+        def touch_subject?(subject)
+          return false unless subject.respond_to?(:touch)
           touch == :all || touch.to_s =~ /able$/i
         end
+        alias touch_victim? touch_subject?
       end
     end
   end

data/lib/socialization/stores/redis/base.rb

@@ -4,83 +4,86 @@ module Socialization
 
       class << self
       protected
-        def actors(victim, klass, options = {})
+        def actors(subject, klass, options = {})
           if options[:pluck]
-            Socialization.redis.smembers(generate_forward_key(victim)).inject([]) do |result, element|
+            Socialization.redis.smembers(generate_forward_key(subject)).inject([]) do |result, element|
               result << element.match(/\:(\d+)$/)[1] if element.match(/^#{klass}\:/)
               result
             end
           else
-            actors_relation(victim, klass, options).to_a
+            actors_relation(subject, klass, options).to_a
           end
         end
 
-        def actors_relation(victim, klass, options = {})
-          ids = actors(victim, klass, :pluck => :id)
+        def actors_relation(subject, klass, options = {})
+          ids = actors(subject, klass, :pluck => :id)
           klass.where("#{klass.table_name}.id IN (?)", ids)
         end
 
-        def victims_relation(actor, klass, options = {})
-          ids = victims(actor, klass, :pluck => :id)
+        def subjects_relation(actor, klass, options = {})
+          ids = subjects(actor, klass, :pluck => :id)
           klass.where("#{klass.table_name}.id IN (?)", ids)
         end
+        alias victims_relation subjects_relation
 
-        def victims(actor, klass, options = {})
+        def subjects(actor, klass, options = {})
           if options[:pluck]
             Socialization.redis.smembers(generate_backward_key(actor)).inject([]) do |result, element|
               result << element.match(/\:(\d+)$/)[1] if element.match(/^#{klass}\:/)
               result
             end
           else
-            victims_relation(actor, klass, options).to_a
+            subjects_relation(actor, klass, options).to_a
           end
         end
+        alias victims subjects
 
-        def relation!(actor, victim, options = {})
-          unless options[:skip_check] || relation?(actor, victim)
-            Socialization.redis.sadd generate_forward_key(victim), generate_redis_value(actor)
-            Socialization.redis.sadd generate_backward_key(actor), generate_redis_value(victim)
-            call_after_create_hooks(actor, victim)
+        def relation!(actor, subject, options = {})
+          unless options[:skip_check] || relation?(actor, subject)
+            Socialization.redis.sadd generate_forward_key(subject), generate_redis_value(actor)
+            Socialization.redis.sadd generate_backward_key(actor), generate_redis_value(subject)
+            call_after_create_hooks(actor, subject)
             true
           else
             false
           end
         end
 
-        def unrelation!(actor, victim, options = {})
-          if options[:skip_check] || relation?(actor, victim)
-            Socialization.redis.srem generate_forward_key(victim), generate_redis_value(actor)
-            Socialization.redis.srem generate_backward_key(actor), generate_redis_value(victim)
-            call_after_destroy_hooks(actor, victim)
+        def unrelation!(actor, subject, options = {})
+          if options[:skip_check] || relation?(actor, subject)
+            Socialization.redis.srem generate_forward_key(subject), generate_redis_value(actor)
+            Socialization.redis.srem generate_backward_key(actor), generate_redis_value(subject)
+            call_after_destroy_hooks(actor, subject)
             true
           else
             false
           end
         end
 
-        def relation?(actor, victim)
-          Socialization.redis.sismember generate_forward_key(victim), generate_redis_value(actor)
+        def relation?(actor, subject)
+          Socialization.redis.sismember generate_forward_key(subject), generate_redis_value(actor)
         end
 
-        def remove_actor_relations(victim)
-          forward_key = generate_forward_key(victim)
+        def remove_actor_relations(subject)
+          forward_key = generate_forward_key(subject)
           actors = Socialization.redis.smembers forward_key
           Socialization.redis.del forward_key
           actors.each do |actor|
-            Socialization.redis.srem generate_backward_key(actor), generate_redis_value(victim)
+            Socialization.redis.srem generate_backward_key(actor), generate_redis_value(subject)
           end
           true
         end
 
-        def remove_victim_relations(actor)
+        def remove_subject_relations(actor)
           backward_key = generate_backward_key(actor)
-          victims = Socialization.redis.smembers backward_key
+          subjects = Socialization.redis.smembers backward_key
           Socialization.redis.del backward_key
-          victims.each do |victim|
-            Socialization.redis.srem generate_forward_key(victim), generate_redis_value(actor)
+          subjects.each do |subject|
+            Socialization.redis.srem generate_forward_key(subject), generate_redis_value(actor)
           end
           true
         end
+        alias remove_victim_relations remove_subject_relations
 
 
       private
@@ -96,12 +99,12 @@ module Socialization
           end
         end
 
-        def generate_forward_key(victim)
+        def generate_forward_key(subject)
           keys = key_type_to_type_names(self)
-          if victim.is_a?(String)
-            "#{keys[0].pluralize.capitalize}:#{victim}"
+          if subject.is_a?(String)
+            "#{keys[0].pluralize.capitalize}:#{subject}"
           else
-            "#{keys[0].pluralize.capitalize}:#{victim.class}:#{victim.id}"
+            "#{keys[0].pluralize.capitalize}:#{subject.class}:#{subject.id}"
           end
         end
 

data/lib/socialization/stores/redis/follow.rb

@@ -6,15 +6,15 @@ module Socialization
       extend Socialization::RedisStores::Mixins::Base
 
       class << self
-        alias_method :follow!, :relation!;                          public :follow!
-        alias_method :unfollow!, :unrelation!;                      public :unfollow!
-        alias_method :follows?, :relation?;                         public :follows?
-        alias_method :followers_relation, :actors_relation;         public :followers_relation
-        alias_method :followers, :actors;                           public :followers
-        alias_method :followables_relation, :victims_relation;      public :followables_relation
-        alias_method :followables, :victims;                        public :followables
-        alias_method :remove_followers, :remove_actor_relations;    public :remove_followers
-        alias_method :remove_followables, :remove_victim_relations; public :remove_followables
+        alias_method :follow!, :relation!;                           public :follow!
+        alias_method :unfollow!, :unrelation!;                       public :unfollow!
+        alias_method :follows?, :relation?;                          public :follows?
+        alias_method :followers_relation, :actors_relation;          public :followers_relation
+        alias_method :followers, :actors;                            public :followers
+        alias_method :followables_relation, :subjects_relation;      public :followables_relation
+        alias_method :followables, :subjects;                        public :followables
+        alias_method :remove_followers, :remove_actor_relations;     public :remove_followers
+        alias_method :remove_followables, :remove_subject_relations; public :remove_followables
       end
 
     end

data/lib/socialization/stores/redis/like.rb

@@ -6,15 +6,15 @@ module Socialization
       extend Socialization::RedisStores::Mixins::Base
 
       class << self
-        alias_method :like!, :relation!;                          public :like!
-        alias_method :unlike!, :unrelation!;                      public :unlike!
-        alias_method :likes?, :relation?;                         public :likes?
-        alias_method :likers_relation, :actors_relation;          public :likers_relation
-        alias_method :likers, :actors;                            public :likers
-        alias_method :likeables_relation, :victims_relation;      public :likeables_relation
-        alias_method :likeables, :victims;                        public :likeables
-        alias_method :remove_likers, :remove_actor_relations;     public :remove_likers
-        alias_method :remove_likeables, :remove_victim_relations; public :remove_likeables
+        alias_method :like!, :relation!;                           public :like!
+        alias_method :unlike!, :unrelation!;                       public :unlike!
+        alias_method :likes?, :relation?;                          public :likes?
+        alias_method :likers_relation, :actors_relation;           public :likers_relation
+        alias_method :likers, :actors;                             public :likers
+        alias_method :likeables_relation, :subjects_relation;      public :likeables_relation
+        alias_method :likeables, :subjects;                        public :likeables
+        alias_method :remove_likers, :remove_actor_relations;      public :remove_likers
+        alias_method :remove_likeables, :remove_subject_relations; public :remove_likeables
       end
 
     end

data/lib/socialization/stores/redis/mention.rb

@@ -11,10 +11,10 @@ module Socialization
         alias_method :mentions?, :relation?;                         public :mentions?
         alias_method :mentioners_relation, :actors_relation;         public :mentioners_relation
         alias_method :mentioners, :actors;                           public :mentioners
-        alias_method :mentionables_relation, :victims_relation;      public :mentionables_relation
-        alias_method :mentionables, :victims;                        public :mentionables
+        alias_method :mentionables_relation, :subjects_relation;      public :mentionables_relation
+        alias_method :mentionables, :subjects;                        public :mentionables
         alias_method :remove_mentioners, :remove_actor_relations;    public :remove_mentioners
-        alias_method :remove_mentionables, :remove_victim_relations; public :remove_mentionables
+        alias_method :remove_mentionables, :remove_subject_relations; public :remove_mentionables
       end
 
     end

data/lib/socialization/version.rb

@@ -1,3 +1,3 @@
 module Socialization
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialization
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Carl Mercier
@@ -270,10 +270,10 @@ files:
 - lib/socialization/stores/redis/like.rb
 - lib/socialization/stores/redis/mention.rb
 - lib/socialization/stores/redis/mixins/base.rb
+- lib/socialization/subjects/followable.rb
+- lib/socialization/subjects/likeable.rb
+- lib/socialization/subjects/mentionable.rb
 - lib/socialization/version.rb
-- lib/socialization/victims/followable.rb
-- lib/socialization/victims/likeable.rb
-- lib/socialization/victims/mentionable.rb
 - socialization.gemspec
 - spec/actors/follower_spec.rb
 - spec/actors/liker_spec.rb