rails_or 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a3d6f309ba263303a6f91b8d48c7bf42993cf95
-  data.tar.gz: 6aee8e9dba7f4759fe3051459f2a4304e6aa5ecb
+  metadata.gz: 56c4f804332574c8c5417b2350f7d7cf027e6b61
+  data.tar.gz: a1ddd0de0517011145406f4b93a0451c3b678669
 SHA512:
-  metadata.gz: d05d9db91ffff004ddc800dab34591fdca483a5e70a5162c32e00a548d7af00ccf7189f1e268f62bf9f8aca4a38b8d4142a15ed4777b13cfa212667ea190a02f
-  data.tar.gz: 81860c5c123712aae0e6cb2226888077bd4d2415bce0579912c8fe83b1d965b8b2cd3e54ec2a0ec738d74e66201db42141e1e96b45f518308ea32b56706f39ed
+  metadata.gz: f1cd03c1f89e4f47138edd99edcac8c9fde233a1801fb1ea38f2d1af513a8c60cc8d14acdb765fd52e094da4ba08f2a214e20e1d6045bac4085e9676666086bb
+  data.tar.gz: 38a7943e85c4a8fb585d26ba3b7477d407d84f7a6bdbc7fa2373e1f6e294e69179fa29b138907a9d42332447cb0dedd5e2b65054a3aa4103044b964818e9f3f4

data/README.md

@@ -25,6 +25,21 @@ Or install it yourself as:
 
 ## Usage
 
+### Same as Rails 5's #or method
+```rb
+Person.where(:name => 'Pearl').or(Person.where(:age => 24))
+# is the same as
+Person.where("name = ? OR age = ?", 'Pearl', 24)
+```
+
+### Support using Hash/Array/String as arguments
+```rb
+Person.where(:name => 'Pearl').or(:age => 24)
+Person.where(:name => 'Pearl').or(['age = ?', 24])
+Person.where(:name => 'Pearl').or('age = ?', 24)
+Person.where(:name => 'Pearl').or('age = 24')
+```
+
 
 ## Development
 

data/lib/rails_or.rb

@@ -5,22 +5,20 @@ require 'active_record'
 class ActiveRecord::Relation
   if method_defined?(:or)
     alias rails5_or or
-    def or(other)
-      other = self.except(:where).where(other) if other.class == Hash
-      return rails5_or(other)
+    def or(*other)
+      return rails5_or(parse_or_parameter(*other))
     end
   else
-    def or(other)
-      other = self.except(:where).where(other) if other.class == Hash
-      combining = group_values.any? ? :having : :where
-      left_values = send("#{combining}_values")
-      right_values = other.send("#{combining}_values")
-      common = left_values & right_values
-      mine = left_values - common
-      theirs = right_values - common
+    def or(*other)
+      combining    = group_values.any? ? :having : :where
+      left_values  = send("#{combining}_values")
+      right_values = parse_or_parameter(*other).send("#{combining}_values")
+      common       = left_values & right_values
+      mine         = left_values - common
+      theirs       = right_values - common
       if mine.any? && theirs.any?
-        mine = mine.map { |x| String === x ? Arel.sql(x) : x }
-        theirs = theirs.map { |x| String === x ? Arel.sql(x) : x }
+        mine.map!{|x| String === x ? Arel.sql(x) : x }
+        theirs.map!{ |x| String === x ? Arel.sql(x) : x }
         mine = [Arel::Nodes::And.new(mine)] if mine.size > 1
         theirs = [Arel::Nodes::And.new(theirs)] if theirs.size > 1
         common << Arel::Nodes::Or.new(mine.first, theirs.first)
@@ -29,6 +27,16 @@ class ActiveRecord::Relation
       return self  
     end
   end
+private
+  def parse_or_parameter(*other)
+    other = other.first if other.size == 1
+    case other
+    when Hash   ; self.except(:where).where(other.to_a.map{|s| s[0] = "#{s[0]} = ?" ; next s}.flatten) #TODO why hash is not working?
+    when Array  ; self.except(:where).where(other)
+    when String ; self.except(:where).where(other)
+    else        ; other
+    end
+  end
 end
 class ActiveRecord::Base
   def self.or(*args)

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
 module RailsOr
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/rails_or.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
 
   spec.summary       = %q{Support #or query method in Rails 3, 4, 5}
-  spec.description   = %q{#or query is support only in new comming Rails 5. We want to support it in Rails 3 and 4.}
+  spec.description   = %q{#or query is support only in new-coming Rails 5. This gem support it in Rails 3 and 4, too.}
   spec.homepage      = "https://github.com/khiav223577/rails_or"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,8 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: "#or query is support only in new comming Rails 5. We want to support
-  it in Rails 3 and 4."
+description: "#or query is support only in new-coming Rails 5. This gem support it
+  in Rails 3 and 4, too."
 email:
 - mrtmrt15xn@yahoo.com.tw
 executables: []