ransack 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35bd0ff11964ff0c0308e7b663a3284510e7f5da71f6799bf061992b6515b616
-  data.tar.gz: 415ef127b34f85c7fdcf48e1f66f764d060cefacfa3a9a3d013688ecc38a07da
+  metadata.gz: 1e44db6020449735b694bd18943195f6e7cdd3597a8dc776d22a54114b4b9273
+  data.tar.gz: cdcb6ef8b863873fcaa7c2067cb20636c4e856e27f431488978201a310023f45
 SHA512:
-  metadata.gz: 56239015bf48bc38842fa9f09325a04dc047299c0f17da8429a9a1ea95cf3aedf9d07117da157cc036a8fb8280d2925cf318b62a7b66b8a99acaa8d8a48e4b30
-  data.tar.gz: 574ac22523e67dddce34c18a929a9624cde30de3c14e2c53d6476c8136f48541879c1fd4b89467786e3f128327f79f4b6617561de7d11d5fbf6f6e888d37a212
+  metadata.gz: ded22ffb680b2a358ee72ab348b8f9debc7f2c927c878ec5a4ad872b552b715e561e9b0aac188d874c67cce70f6463d62b3be7655e46900a706214d58d69fa88
+  data.tar.gz: 6f45114a54ef6f83cbd99780ba432069cf4111c4b9d2294141f238526655edc1cb035422705565389e4c60f75666716d8fd201887f7ca9fd90c92314bbb3b9e6

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Version 2.0.1 - 2018-08-18
+
+* Don't return association if table is nil
+  PR [952](https://github.com/activerecord-hackery/ransack/pull/952)
+
+  *Christian Gregg*
+
 ## Version 2.0.0 - 2018-08-09
 
 * Add support for Active Record 5.2.1

data/README.md

@@ -27,11 +27,12 @@ instead.
 If you're viewing this at
 [github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
 you're reading the documentation for the master branch with the latest features.
-[View documentation for the last release (1.8.8).](https://github.com/activerecord-hackery/ransack/tree/v1.8.8)
+[View documentation for the last release (2.0.0).](https://github.com/activerecord-hackery/ransack/tree/v2.0.0)
 
 ## Getting started
 
-Ransack is compatible with Rails 4.2 and 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
+Ransack is compatible with Rails 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
+If you are using Rails <5.0 use the 1.8 line of Ransack.
 If you are using Ruby 1.8 or an earlier JRuby and run into compatibility
 issues, you can use an earlier version of Ransack, say, up to 1.3.0.
 

data/lib/polyamorous/activerecord_5.1_ruby_2/join_association.rb

@@ -20,13 +20,6 @@ module Polyamorous
       end
     end
 
-    # Reference: https://github.com/rails/rails/commit/9b15db5
-    # NOTE: Not sure we still need it?
-    #
-    def ==(other)
-      base_klass == other.base_klass
-    end
-
     def build_constraint(klass, table, key, foreign_table, foreign_key)
       if reflection.polymorphic?
         super(klass, table, key, foreign_table, foreign_key)

data/lib/polyamorous/activerecord_5.1_ruby_2/join_dependency.rb

@@ -30,24 +30,6 @@ module Polyamorous
       end
     end
 
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = parent.children.find { |j| j.reflection == reflection }
-        unless reflection.polymorphic?
-          association
-        else
-          association if association.base_klass == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass)
-      if reflection.polymorphic? && klass
-        JoinAssociation.new(reflection, self, klass)
-      else
-        JoinAssociation.new(reflection, self)
-      end
-    end
-
     # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
     #
     # This internal method was changed in Rails 5.0 by commit

data/lib/polyamorous/activerecord_5.2.0_ruby_2/join_association.rb

@@ -20,13 +20,6 @@ module Polyamorous
       end
     end
 
-    # Reference: https://github.com/rails/rails/commit/9b15db5
-    # NOTE: Not sure we still need it?
-    #
-    def ==(other)
-      base_klass == other.base_klass
-    end
-
     def build_constraint(klass, table, key, foreign_table, foreign_key)
       if reflection.polymorphic?
         super(klass, table, key, foreign_table, foreign_key)

data/lib/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb

@@ -30,24 +30,6 @@ module Polyamorous
       end
     end
 
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = parent.children.find { |j| j.reflection == reflection }
-        unless reflection.polymorphic?
-          association
-        else
-          association if association.base_klass == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass)
-      if reflection.polymorphic? && klass
-        JoinAssociation.new(reflection, self, alias_tracker, klass)
-      else
-        JoinAssociation.new(reflection, self, alias_tracker)
-      end
-    end
-
     # Replaces ActiveRecord::Associations::JoinDependency#join_constraints
     #
     # This internal method was changed in Rails 5.0 by commit

data/lib/polyamorous/activerecord_5.2.1_ruby_2/join_association.rb

@@ -19,13 +19,6 @@ module Polyamorous
       end
     end
 
-    # Reference: https://github.com/rails/rails/commit/9b15db5
-    # NOTE: Not sure we still need it?
-    #
-    def ==(other)
-      base_klass == other.base_klass
-    end
-
     def build_constraint(klass, table, key, foreign_table, foreign_key)
       if reflection.polymorphic?
         super(klass, table, key, foreign_table, foreign_key)

data/lib/polyamorous/activerecord_5.2.1_ruby_2/join_dependency.rb

@@ -30,24 +30,6 @@ module Polyamorous
       end
     end
 
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = parent.children.find { |j| j.reflection == reflection }
-        unless reflection.polymorphic?
-          association
-        else
-          association if association.base_klass == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass)
-      if reflection.polymorphic? && klass
-        JoinAssociation.new(reflection, self, klass)
-      else
-        JoinAssociation.new(reflection, self)
-      end
-    end
-
     module ClassMethods
       # Prepended before ActiveRecord::Associations::JoinDependency#walk_tree
       #

data/lib/ransack/adapters/active_record/context.rb

@@ -268,7 +268,7 @@ module Ransack
 
         def find_association(name, parent = @base, klass = nil)
           @join_dependency.instance_variable_get(:@join_root).children.detect do |assoc|
-            assoc.reflection.name == name &&
+            assoc.reflection.name == name && assoc.table &&
             (@associations_pot.empty? || @associations_pot[assoc] == parent || !@associations_pot.key?(assoc)) &&
             (!klass || assoc.reflection.klass == klass)
           end

data/lib/ransack/locale/ru.yml

@@ -0,0 +1,70 @@
+ru:
+  ransack:
+    search: "Поиск"
+    predicate: "predicate"
+    and: "и"
+    or: "или"
+    any: "любое"
+    all: "все"
+    combinator: "combinator"
+    attribute: "аттрибут"
+    value: "значение"
+    condition: "условие"
+    sort: "сортировка"
+    asc: "по возрастанию"
+    desc: "по убыванию"
+    predicates:
+      eq: "равный"
+      eq_any: "равный любому"
+      eq_all: "равный всем"
+      not_eq: "не равный любому"
+      not_eq_any: "не равный любому"
+      not_eq_all: "не равный всем"
+      matches: "совпадение"
+      matches_any: "совпадение любому"
+      matches_all: "совпадение всем"
+      does_not_match: "не совпадение"
+      does_not_match_any: "не совпадение любому"
+      does_not_match_all: "не совпадение всем"
+      lt: "меньше чем"
+      lt_any: "меньше чем любое"
+      lt_all: "меньше чем все"
+      lteq: "меньше чем или равен"
+      lteq_any: "меньше чем или равен любому"
+      lteq_all: "меньше чем или равен всем"
+      gt: "больше чем"
+      gt_any: "больше чем любое"
+      gt_all: "больше чем все"
+      gteq: "больше чем или равен"
+      gteq_any: "больше чем или равен любому"
+      gteq_all: "больше чем или равен всем"
+      in: "в"
+      in_any: "в любом из"
+      in_all: "во всех"
+      not_in: "нет в"
+      not_in_any: "не в каком из"
+      not_in_all: "нет во всех"
+      cont: "содержит"
+      cont_any: "содержит любое"
+      cont_all: "содержит все"
+      not_cont: "не содержит"
+      not_cont_any: "не содержит любое"
+      not_cont_all: "не содержит все"
+      start: "начинается с"
+      start_any: "начинается с любого"
+      start_all: "начинается с всего"
+      not_start: "не начинается с"
+      not_start_any: "не начинается с любого"
+      not_start_all: "не начинается со всего"
+      end: "кончается с"
+      end_any: "кончается с любого"
+      end_all: "кончается со всего"
+      not_end: "не кончается с"
+      not_end_any: "не кончается с любого"
+      not_end_all: "не кончается со всего"
+      'true': "верно"
+      'false': "не верно"
+      present: "настоящее"
+      blank: "пусто"
+      'null': "нулевой"
+      not_null: "не нулевой"

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/ransack/join_association_spec.rb

@@ -3,34 +3,13 @@ require 'spec_helper'
 module Polyamorous
   describe JoinAssociation do
 
-    join_base, join_association_args, polymorphic = [:join_root, 'parent.children', 'reflection.options[:polymorphic]']
-
     let(:join_dependency) { new_join_dependency Note, {} }
     let(:reflection) { Note.reflect_on_association(:notable) }
-    let(:parent) { join_dependency.send(join_base) }
+    let(:parent) { join_dependency.send(:join_root) }
     let(:join_association) {
-      eval("new_join_association(reflection, #{join_association_args}, Article)")
-    }
-
-    subject {
-      join_dependency.build_join_association_respecting_polymorphism(
-        reflection, parent, Person
-      )
+      new_join_association(reflection, parent.children, Article)
     }
 
-    it 'respects polymorphism on equality test' do
-      expect(subject).to eq(
-        join_dependency.build_join_association_respecting_polymorphism(
-          reflection, parent, Person
-        )
-      )
-      expect(subject).not_to eq(
-        join_dependency.build_join_association_respecting_polymorphism(
-          reflection, parent, Article
-        )
-      )
-    end
-
     it 'leaves the orginal reflection intact for thread safety' do
       reflection.instance_variable_set(:@klass, Article)
       join_association
@@ -43,7 +22,7 @@ module Polyamorous
     end
 
     it 'sets the polymorphic option to true after initializing' do
-      expect(join_association.instance_eval(polymorphic)).to be true
+      expect(join_association.reflection.options[:polymorphic]).to be true
     end
   end
 end

data/spec/ransack/join_dependency_spec.rb

@@ -3,32 +3,30 @@ require 'spec_helper'
 module Polyamorous
   describe JoinDependency do
 
-    method, join_associations, join_base = :instance_eval, 'join_root.drop(1)', :join_root
-
     context 'with symbol joins' do
       subject { new_join_dependency Person, articles: :comments }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq(2) }
-      specify { expect(subject.send(method, join_associations).map(&:join_type))
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
         .to be_all { Polyamorous::InnerJoin } }
     end
 
     context 'with has_many :through association' do
       subject { new_join_dependency Person, :authored_article_comments }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 1 }
-      specify { expect(subject.send(method, join_associations).first.table_name)
+      specify { expect(subject.send(:join_root).drop(1).first.table_name)
         .to eq 'comments' }
     end
 
     context 'with outer join' do
       subject { new_join_dependency Person, new_join(:articles, :outer) }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 1 }
-      specify { expect(subject.send(method, join_associations).first.join_type)
+      specify { expect(subject.send(:join_root).drop(1).first.join_type)
         .to eq Polyamorous::OuterJoin }
     end
 
@@ -36,45 +34,36 @@ module Polyamorous
       subject { new_join_dependency Person,
         new_join(:articles, :outer) => new_join(:comments, :outer) }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 2 }
-      specify { expect(subject.send(method, join_associations).map(&:join_type))
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
         .to eq [Polyamorous::OuterJoin, Polyamorous::OuterJoin] }
-      specify { expect(subject.send(method, join_associations).map(&:join_type))
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
         .to be_all { Polyamorous::OuterJoin } }
     end
 
     context 'with polymorphic belongs_to join' do
       subject { new_join_dependency Note, new_join(:notable, :inner, Person) }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 1 }
-      specify { expect(subject.send(method, join_associations).first.join_type)
+      specify { expect(subject.send(:join_root).drop(1).first.join_type)
         .to eq Polyamorous::InnerJoin }
-      specify { expect(subject.send(method, join_associations).first.table_name)
+      specify { expect(subject.send(:join_root).drop(1).first.table_name)
         .to eq 'people' }
-
-      it 'finds a join association respecting polymorphism' do
-        parent = subject.send(join_base)
-        reflection = Note.reflect_on_association(:notable)
-
-        expect(subject.find_join_association_respecting_polymorphism(
-          reflection, parent, Person))
-          .to eq subject.send(method, join_associations).first
-      end
     end
 
     context 'with polymorphic belongs_to join and nested symbol join' do
       subject { new_join_dependency Note,
         new_join(:notable, :inner, Person) => :comments }
 
-      specify { expect(subject.send(method, join_associations).size)
+      specify { expect(subject.send(:join_root).drop(1).size)
         .to eq 2 }
-      specify { expect(subject.send(method, join_associations).map(&:join_type))
+      specify { expect(subject.send(:join_root).drop(1).map(&:join_type))
         .to be_all { Polyamorous::InnerJoin } }
-      specify { expect(subject.send(method, join_associations).first.table_name)
+      specify { expect(subject.send(:join_root).drop(1).first.table_name)
         .to eq 'people' }
-      specify { expect(subject.send(method, join_associations)[1].table_name)
+      specify { expect(subject.send(:join_root).drop(1)[1].table_name)
         .to eq 'comments' }
     end
 

data/spec/ransack/search_spec.rb

@@ -316,6 +316,11 @@ module Ransack
         .to eq s.result(distinct: true).send(all_or_load)
       end
 
+      it 'evaluates joins with belongs_to join' do
+        s = Person.joins(:parent).ransack(parent_name_eq: 'Ernie').result(distinct: true)
+        expect(s).to be_an ActiveRecord::Relation
+      end
+
       private
 
         def remove_quotes_and_backticks(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -229,6 +229,7 @@ files:
 - lib/ransack/locale/nl.yml
 - lib/ransack/locale/pt-BR.yml
 - lib/ransack/locale/ro.yml
+- lib/ransack/locale/ru.yml
 - lib/ransack/locale/tr.yml
 - lib/ransack/locale/zh-CN.yml
 - lib/ransack/locale/zh-TW.yml