imyou 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25adebb4c4bd3d882502f7cf737a510e269037e66b0d99739b708006558b45e3
-  data.tar.gz: bd3b45051b198b474f8d741d78404ebbbb89acb215afe188655a7bfe8be4df44
+  metadata.gz: 437f6453c5c674668419f8f5968eeb9d14836e4dac03b0894cf64c9b0f73fee4
+  data.tar.gz: 892461025e8a962f5d4738a10d56f768c3a2ed53dcf1641a53acc8ce9b6afd58
 SHA512:
-  metadata.gz: 96311348b980c930e1d4c94020a9ff8cec6d7a77c5abf263c015d7479bc70c69f06c2194e987a279021662564a0ba81e310183b6c024edfb7cc3ca9fd07b8cbd
-  data.tar.gz: 0b0bbaaaf2e240a6f78007e30f189fb4e3cddc38c3110e56912fa44de3350db927b48e4b3d155c30807e63552da2f30a13ee492de39447f31ea670d571d73567
+  metadata.gz: ad812533dff9b9265d46ef784f65c9f3035f8ddca8742ac3c02755e8c976bc408e7c64e49511135c03731c87d4f30e41520d85c46214d339178c3a8531c9e858
+  data.tar.gz: 360976116e0941de8f7d5e848096bf17bcc733aa0d0de20e4a256883da665e0ea0cd44d50e63d931962629b9d2b193defbc93cbe1f7fc15cbaa7c58d58a4f634

data/Gemfile.lock

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

data/lib/imyou/models.rb

@@ -4,22 +4,60 @@ module Imyou
       false
     end
 
-    def has_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) }
 
-        scope :match_by_nickname, ->(nickname) do
-          with_nicknames.merge(
-              Imyou::Nickname.where(Imyou::Nickname.arel_table[:name].eq(sanitize_sql_like(nickname)))
-          )
+        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))
+            unless name_column.nil? || with_name_column == false
+              records.or!(self.with_nicknames.where(name_column => nickname))
+            end
+          else
+            arel_nickname_column = Imyou::Nickname.arel_table[:name]
+            records = if name_column.nil? || with_name_column == false
+                        self.with_nicknames.where(
+                            arel_nickname_column.eq(nickname)
+                        )
+                      else
+                        arel_name_column = self.arel_table[name_column]
+                        self.with_nicknames.where(
+                            arel_nickname_column.eq(nickname).or(
+                                arel_name_column.eq(nickname)
+                            )
+                        )
+                      end
+          end
+          records
         end
 
-        scope :partial_match_by_nickname, ->(nickname) do
-          with_nicknames.merge(
-              Imyou::Nickname.where(Imyou::Nickname.arel_table[:name].matches("%#{sanitize_sql_like(nickname)}%"))
-          )
+        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)}%"))
+            unless name_column.nil? || with_name_column == false
+              records.or!(self.with_nicknames.where(
+                  self.arel_table[name_column].matches("%#{sanitize_sql_like(nickname)}%"))
+              )
+            end
+          else
+            arel_nickname_column = Imyou::Nickname.arel_table[:name]
+            records = if name_column.nil? || with_name_column == false
+                        self.with_nicknames.where(
+                            arel_nickname_column.matches("%#{sanitize_sql_like(nickname)}%")
+                        )
+                      else
+                        arel_name_column = self.arel_table[name_column]
+                        self.with_nicknames.where(
+                            arel_nickname_column.matches("%#{sanitize_sql_like(nickname)}%").or(
+                                arel_name_column.matches("%#{sanitize_sql_like(nickname)}%")
+                            )
+                        )
+                      end
+          end
+          records
         end
 
         def self.has_imyou?

data/lib/imyou/version.rb

@@ -1,3 +1,3 @@
 module Imyou
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

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