rails_or 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d5dd12cf0c23251f01c2b591bf8f313e3e99e8
-  data.tar.gz: 936f18b090e9f5b56bc483ce353aa347190d3956
+  metadata.gz: dcae3f6e02afc8e2b8f4d8924a0ee5f27d1faa47
+  data.tar.gz: c12eab9c2692aec32299f88a2bd1ea55fd100144
 SHA512:
-  metadata.gz: f01e2a4d78a54f9d318088ca27d3c534ab149bebd53566df64b9cd84121f67ce994b8719f282766b029f0bc104919cb82405ccdd615968dc11059ea3021b776c
-  data.tar.gz: 4420743158b6612111c00af6dd03e98fbb129aa0f20d70fe7b4cbc5ff30366de41101448b56de049cf8b512c0282b3ff93711cad0fd3aa1e99147856bd86402a
+  metadata.gz: 9e3aba494f94ac1445b54d00fe65770bd7864614d2a1c707e517e8bb64306d2f2bfe19aae3f3be29766e39c8c70c968b97202bfc486bfdf1632d6dce0663b62f
+  data.tar.gz: 719bc7b6cfcddb536f086f49d534ba3a5fbcefdde9f309743255477c946e6e91ea25f5f5982248525dee7ea4e7cbf21e8e299a1c86eda86cd246ef5b1a5a349e

data/.travis.yml

@@ -12,6 +12,7 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
 addons:
     code_climate:
         repo_token: 4be4fd5792acf886a179e8ebff97d155dc19858816d7179f2bf5002bae874818

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 
 - No changes.
 
+### RailsOr [1.1.8] - (March 14, 2018)
+
+- Fix missing from_clause when using #from and #none together [[#23](https://github.com/khiav223577/rails_or/pull/23)] @khiav223577
+
 ### RailsOr [1.1.7] - (September 12, 2017)
 
 - Better Rails 5 Support. [[#21](https://github.com/khiav223577/rails_or/pull/21)] @khiav223577
@@ -59,7 +63,8 @@
 - Add #or method [[#1](https://github.com/khiav223577/rails_or/pull/1)] @khiav223577
 <br><br>
 
-[Unreleased]: https://github.com/khiav223577/rails_or/compare/v1.1.7...HEAD
+[Unreleased]: https://github.com/khiav223577/rails_or/compare/v1.1.8...HEAD
+[1.1.8]: https://github.com/khiav223577/rails_or/compare/v1.1.7...v1.1.8
 [1.1.7]: https://github.com/khiav223577/rails_or/compare/v1.1.6...v1.1.7
 [1.1.6]: https://github.com/khiav223577/rails_or/compare/v1.1.5...v1.1.6
 [1.1.5]: https://github.com/khiav223577/rails_or/compare/v1.1.4...v1.1.5

data/gemfiles/5.1.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails_or.gemspec
+
+gem "activerecord", "~> 5.1"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/lib/rails_or.rb

@@ -2,9 +2,24 @@ require "rails_or/version"
 require "rails_or/where_binding_mixs"
 require 'active_record'
 
+if defined?(ActiveRecord::NullRelation)
+  module ActiveRecord::NullRelation
+    if method_defined?(:or)
+      if not method_defined?(:rails5_or)
+        alias_method :rails5_or, :or
+        def or(*other)
+          rails5_or(rails_or_parse_parameter(*other))
+        end
+      end
+    end
+  end
+end
+
 class ActiveRecord::Relation
   IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
   IS_RAILS5_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.0.0')
+  FROM_VALUE_METHOD = %i[from_value from_clause].find{|s| method_defined?(s) }
+  ASSIGN_FROM_VALUE = :"#{FROM_VALUE_METHOD}="
   if method_defined?(:or)
     if not method_defined?(:rails5_or)
       alias_method :rails5_or, :or
@@ -84,6 +99,7 @@ class ActiveRecord::Relation
 
   def rails_or_spwan_relation(method, condition)
     relation = klass.send(method, condition)
+    relation.send(ASSIGN_FROM_VALUE, send(FROM_VALUE_METHOD))
     rails_or_copy_values_to(relation) if IS_RAILS5_FLAG
     return relation
   end

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
 module RailsOr
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - gemfiles/3.2.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - lib/rails_or.rb
 - lib/rails_or/version.rb
 - lib/rails_or/where_binding_mixs.rb