where-or 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f9b066d1de2204206334bd09620eb5d2f48153
-  data.tar.gz: e08eaff0f6245b9e14f46a17f09a215ac9d457ca
+  metadata.gz: 570e1bbf0c33343e297c3c359928edebf9b0979e
+  data.tar.gz: 8add070663225de7bab2a8a3786fa944b9c77ea4
 SHA512:
-  metadata.gz: f9855f971b1e406b405e556f06a0882eaf582ac344c010ab47c68999a99dec03401b9b44ea534650c7697433a16e7795dea76d4199de829a2c3fa886f3980380
-  data.tar.gz: 415af9190110cee119358e4b9d64ef9ce141ea0c01d3a49d2fd76d03f13245dff41ac5885370d6831d679dffe40c110b5666b2a83c8876dee8ad8624a7ac17b4
+  metadata.gz: deb95ae420bfeb2bd809d9a70fab3113215800149f77823e846ea4019309c102b61f02925c03f4a781a04703adb95c045b5979ce7be10bba4a2af60304e58363
+  data.tar.gz: 4a079a3599ba1e0da29f8b8cf889f00ede75c467bc0702aa4c030afe918879eeb860659026f7fa6b1f8f0e548687a5bb596ceb9024b842e58e8d9a54b015bb8e

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Eric Guo
+Copyright (c) 2015 Benjamin Fleischer, Eric Guo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,6 +2,8 @@
 
 [Where or](https://github.com/rails/rails/pull/16052) function backport from Rails 5 for Rails 4.2
 
+Confirm works from Rails 4.2.3 to 4.2.5. [with some issues](https://github.com/Eric-Guo/where-or/issues?utf8=%E2%9C%93&q=is%3Aissue)
+
 [![Gem Version](https://badge.fury.io/rb/where-or.svg)](https://badge.fury.io/for/rb/where-or)
 
 Installation:

data/lib/where-or.rb

@@ -1,6 +1,6 @@
-abort "Congrats for being on Rails 5. Now please remove this patch" if Rails::VERSION::MAJOR > 4
+abort "Congrats for being on Rails 5. Now please remove this patch" if ActiveRecord::VERSION::MAJOR > 4
 # Tested on Rails Rails 4.2.3
-warn "Patching ActiveRecord::Relation#or.  This might blow up" if Rails.version < '4.2.3'
+warn "Patching ActiveRecord::Relation#or.  This might blow up" if ActiveRecord.version.to_s < '4.2.3'
 # https://github.com/rails/rails/commit/9e42cf019f2417473e7dcbfcb885709fa2709f89.patch
 # CHANGELOG.md
 # *   Added the `#or` method on ActiveRecord::Relation, allowing use of the OR
@@ -64,7 +64,7 @@ ActiveSupport.on_load(:active_record) do
     #
     # The two relations must be structurally compatible: they must be scoping the same model, and
     # they must differ only by +where+ (if no +group+ has been defined) or +having+ (if a +group+ is
-    # present). Neither relation may have a +limit+, +offset+, or +uniq+ set.
+    # present). Neither relation may have a +limit+, +offset+, or +distinct+ set.
     #
     #    Post.where("id = 1").or(Post.where("id = 2"))
     #    # SELECT `posts`.* FROM `posts`  WHERE (('id = 1' OR 'id = 2'))

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: where-or
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
+- Benjamin Fleischer
 - Eric Guo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails