rails_or 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7b1ec771bf9f285557e672b4ef9f35c373d3e8f
-  data.tar.gz: a7e535164ba64cb7e162acd5913e7691a6e10154
+  metadata.gz: 9ba1866dbfc59514dc65d0f0f52d88622fc53c89
+  data.tar.gz: 5e3c3b5676508f3c7460eb0c111ea19fd7179a5c
 SHA512:
-  metadata.gz: 87a9ee331fccfe976f1cd71206bbee456b339a8f0125441b79d95b0457a129547e492db033188baa58c4b57e309c8217833438daf23a85b2dcd091bf9481d354
-  data.tar.gz: 14b69f148cab20a19821484b8204295faefa98652a62aa4397d175d62d08e5494a3f86b877b80c9a48ab1e74d04945fe994b116b4dd540701a8be474fb4d1559
+  metadata.gz: 4c734ab55e58e714824a6c47c4b88232da7d16a87eae00e80bc46e55c43c125b6330fb2a6c6561297290c43f594297f311e13b4c634b84d8b26fd29af30f0669
+  data.tar.gz: ff5bd8170ce892c420b833e44b624f55dc8078bb50ff8ec372cb27fec558eabbe37edaf19ca9d1ca83debe5d9c6ee76d9a70b5b1db5a4475d890e17131ac1d84

data/README.md

@@ -6,7 +6,7 @@
 
 # RailsOr
 
-Support #or query method in Rails 3, 4, 5
+Support && Add syntax sugar to #or query method in Rails 3, 4, 5.
 
 ## Installation
 
@@ -28,18 +28,31 @@ Or install it yourself as:
 
 ### Same as Rails 5's #or method
 ```rb
-Person.where(:name => 'Pearl').or(Person.where(:age => 24))
+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
+### More Easy to use 
+No need to repeat writing `Model.joins(XXX).where(...)`
 ```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')
+# before
+User.joins(:posts).where(id: 2)
+                  .or(User.joins(:posts).where('posts.title = ?',"title"))
+                  .or(User.joins(:posts).where('posts.created_at > ?', 1.day.ago))
+# after
+User.joins(:posts).where(id: 2)
+                  .or('posts.title': "title")
+                  .or('posts.created_at > ?', 1.day.ago)
 ```
+Support passing `Hash` / `Array` / `String` as parameters
+```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

@@ -29,6 +29,18 @@ class ActiveRecord::Relation
       return self  
     end
   end
+  if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('4.0.0')
+    def or_not(*args)
+      raise 'This method is not support in Rails 3'
+    end
+  else
+    def or_not(*args)
+      return self.or(klass.where.not(*args))
+    end
+  end
+  def or_having(*args)
+    self.or(klass.having(*args))
+  end
 private
   def parse_or_parameter(*other)
     other = other.first if other.size == 1

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
 module RailsOr
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/rails_or.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["khiav reoy"]
   spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
 
-  spec.summary       = %q{Support and entend #or query method.}
-  spec.description   = %q{Support and entend #or query method in Rails 3, 4, 5.}
+  spec.summary       = %q{Support && Add syntax sugar to #or query method.}
+  spec.description   = %q{Support && Add syntax sugar to #or query method in Rails 3, 4, 5.}
   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: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description: 'Support and entend #or query method in Rails 3, 4, 5.'
+description: 'Support && Add syntax sugar to #or query method in Rails 3, 4, 5.'
 email:
 - mrtmrt15xn@yahoo.com.tw
 executables: []
@@ -125,5 +125,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: 'Support and entend #or query method.'
+summary: 'Support && Add syntax sugar to #or query method.'
 test_files: []