imyou 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b38b29a742bf9ef15a2bda1ad322ef395971bd85a857134209ade3ace47deb
-  data.tar.gz: 35c6ca2010311f274ce1ce34ac8c8dcd6b676b0d15079a4d740fafd12d1b8a73
+  metadata.gz: 2ea37cab3c8ce4f35113a47972b4936655a977040adee8ea2bd6b59f01ad5168
+  data.tar.gz: 7de5c7103f8e133355f0c08ad0fa6e7056e33c9101930c7326a965aa09083022
 SHA512:
-  metadata.gz: dd48854d5bd7ede79785ede0e2738229e500225a4c61a3b9e0e119e43e2b4b8b45fb68c48a29271d50b8aceaf50d0794e3bf9463aa4da581f8d545e9eec39429
-  data.tar.gz: be165ca2b9303be2664d647907f9b410c1b805227e9634ed75d6232a36281e54fabb7fb9af5e41c268c7b7d86c338699ca0b86ddab45bbeb6a9cf08949f0ba5c
+  metadata.gz: 1ddaf339b9c10bfb339280fd05eb4dc827b46ca6f163f3031a7e95e292ff8eea6624f5660f605f6ba3827f22a95bb60f8fc1348ec118843f3a2560059ca12861
+  data.tar.gz: 3f7a465be25dd666cab0aa6a3e427f9ed49b836f3329c3ab5ae96771a156b1e3334b5fd1d1ab9c445abdabcafa368bfe03ad435e07cea2fa6d94b182f5436dff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imyou (1.1.3)
+    imyou (1.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/imyou/models.rb

@@ -7,24 +7,32 @@ module Imyou
     def has_imyou(name_column=nil)
       class_eval do
 
-        has_many :imyou_nicknames, class_name: 'Imyou::Nickname', as: :model, dependent: :destroy
-        scope :with_nicknames, -> { eager_load(:imyou_nicknames) }
+        has_many :imyou_nicknames, -> { order(id: :asc) }, class_name: 'Imyou::Nickname', as: :model, dependent: :destroy
+        scope :with_nicknames, -> { preload(:imyou_nicknames) }
 
         scope :match_by_nickname, ->(nickname, with_name_column: true) do
           if Gem::Version.new(ActiveRecord.version) >= Gem::Version.new(5)
-            records = self.with_nicknames.where(Imyou::Nickname.arel_table[:name].eq(nickname))
+            records = self.left_outer_joins(:imyou_nicknames).where(Imyou::Nickname.arel_table[:name].eq(nickname))
             unless name_column.nil? || with_name_column == false
-              records.or!(self.with_nicknames.where(name_column => nickname))
+              records.or!(self.left_outer_joins(:imyou_nicknames).where(name_column => nickname))
             end
           else
+            joined_records = self.joins(<<~SQL
+              LEFT OUTER JOIN #{Imyou::Nickname.quoted_table_name}
+              ON
+                #{Imyou::Nickname.quoted_table_name}.#{connection.quote_column_name(:model_id)} = #{self.quoted_table_name}.#{connection.quote_column_name(:id)}
+                AND
+                #{Imyou::Nickname.quoted_table_name}.#{connection.quote_column_name(:model_type)} = #{connection.quote(self.name)}
+            SQL
+            )
             arel_nickname_column = Imyou::Nickname.arel_table[:name]
             records = if name_column.nil? || with_name_column == false
-                        self.with_nicknames.where(
+                        joined_records.where(
                             arel_nickname_column.eq(nickname)
                         )
                       else
                         arel_name_column = self.arel_table[name_column]
-                        self.with_nicknames.where(
+                        joined_records.where(
                             arel_nickname_column.eq(nickname).or(
                                 arel_name_column.eq(nickname)
                             )
@@ -36,21 +44,29 @@ module Imyou
 
         scope :partial_match_by_nickname, ->(nickname, with_name_column: true) do
           if Gem::Version.new(ActiveRecord.version) >= Gem::Version.new(5)
-            records = self.with_nicknames.where(Imyou::Nickname.arel_table[:name].matches("%#{sanitize_sql_like(nickname)}%"))
+            records = self.left_outer_joins(:imyou_nicknames).where(Imyou::Nickname.arel_table[:name].matches("%#{sanitize_sql_like(nickname)}%"))
             unless name_column.nil? || with_name_column == false
-              records.or!(self.with_nicknames.where(
+              records.or!(self.left_outer_joins(:imyou_nicknames).where(
                   self.arel_table[name_column].matches("%#{sanitize_sql_like(nickname)}%"))
               )
             end
           else
+            joined_records = self.joins(<<~SQL
+              LEFT OUTER JOIN #{Imyou::Nickname.quoted_table_name}
+              ON
+                #{Imyou::Nickname.quoted_table_name}.#{connection.quote_column_name(:model_id)} = #{self.quoted_table_name}.#{connection.quote_column_name(:id)}
+                AND
+                #{Imyou::Nickname.quoted_table_name}.#{connection.quote_column_name(:model_type)} = #{connection.quote(self.name)}
+            SQL
+            )
             arel_nickname_column = Imyou::Nickname.arel_table[:name]
             records = if name_column.nil? || with_name_column == false
-                        self.with_nicknames.where(
+                        joined_records.where(
                             arel_nickname_column.matches("%#{sanitize_sql_like(nickname)}%")
                         )
                       else
                         arel_name_column = self.arel_table[name_column]
-                        self.with_nicknames.where(
+                        joined_records.where(
                             arel_nickname_column.matches("%#{sanitize_sql_like(nickname)}%").or(
                                 arel_name_column.matches("%#{sanitize_sql_like(nickname)}%")
                             )

data/lib/imyou/version.rb

@@ -1,3 +1,3 @@
 module Imyou
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imyou
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - patorash