ransack 1.8.8 → 1.8.9

data/lib/polyamorous/swapping_reflection_class.rb

@@ -0,0 +1,11 @@
+module Polyamorous
+  module SwappingReflectionClass
+    def swapping_reflection_klass(reflection, klass)
+      new_reflection = reflection.clone
+      new_reflection.instance_variable_set(:@options, reflection.options.clone)
+      new_reflection.options.delete(:polymorphic)
+      new_reflection.instance_variable_set(:@klass, klass)
+      yield new_reflection
+    end
+  end
+end

data/lib/polyamorous/tree_node.rb

@@ -0,0 +1,7 @@
+module Polyamorous
+  module TreeNode
+    def add_to_tree(hash)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/ransack/adapters/active_record/3.0/compat.rb

@@ -3,13 +3,7 @@ if Arel::Nodes::And < Arel::Nodes::Binary
   class Ransack::Visitor
     def visit_Ransack_Nodes_And(object)
       nodes = object.values.map { |o| accept(o) }.compact
-      return nil unless nodes.size > 0
-
-      if nodes.size > 1
-        nodes.inject(&:and)
-      else
-        nodes.first
-      end
+      nodes.inject(&:and)
     end
   end
 end

data/lib/ransack/adapters/mongoid/ransack/nodes/condition.rb

@@ -10,15 +10,10 @@ module Ransack
           )
         end
 
-        if predicates.size > 1
-          case combinator
-          when 'and'
-            Arel::Nodes::Grouping.new(Arel::Nodes::And.new(predicates))
-          when 'or'
-            predicates.inject(&:or)
-          end
+        if predicates.size > 1 && combinator == 'and'
+          Arel::Nodes::Grouping.new(Arel::Nodes::And.new(predicates))
         else
-          predicates.first
+          predicates.inject(&:or)
         end
       end
 

data/lib/ransack/adapters/mongoid/ransack/visitor.rb

@@ -2,13 +2,7 @@ module Ransack
   class Visitor
     def visit_and(object)
       nodes = object.values.map { |o| accept(o) }.compact
-      return nil unless nodes.size > 0
-
-      if nodes.size > 1
-        nodes.inject(&:and)
-      else
-        nodes.first
-      end
+      nodes.inject(&:and)
     end
 
     def quoted?(object)

data/lib/ransack/helpers/form_builder.rb

@@ -6,15 +6,21 @@ module ActionView::Helpers::Tags
   # https://github.com/rails/rails/commit/c1a118a
   class Base
     private
-    if ::ActiveRecord::VERSION::STRING < '5.2'
-      def value(object)
-        object.send @method_name if object # use send instead of public_send
-      end
-    else # rails/rails#29791
-      def value
-        @object.send @method_name if @object
+    if defined? ::ActiveRecord
+      if ::ActiveRecord::VERSION::STRING < '5.2'
+        def value(object)
+          object.send @method_name if object # use send instead of public_send
+        end
+      else # rails/rails#29791
+        def value
+          if @allow_method_names_outside_object
+            object.send @method_name if object && object.respond_to?(@method_name, true)
+          else
+            object.send @method_name if object
+          end
+        end
       end
-    end      
+    end
   end
 end
 

data/lib/ransack/locale/az.yml

@@ -0,0 +1,70 @@
+tr:
+  ransack:
+    search: "axtar"
+    predicate: "təsdiqlə"
+    and: "və"
+    or: "və ya"
+    any: "hər hansı"
+    all: "hamısı"
+    combinator: "birləşdirici"
+    attribute: "xüsusiyyət"
+    value: "dəyər"
+    condition: "şərt"
+    sort: "sırala"
+    asc: "artan"
+    desc: "azalan"
+    predicates:
+      eq: "bərabər"
+      eq_any: "hər hansı birinə bərabər"
+      eq_all: "hamısına bərabər"
+      not_eq: "bərabər deyil"
+      not_eq_any: "hər hansı birinə bərabər deyil"
+      not_eq_all: "heç birinə bərabər deyil"
+      matches: "uyğunlaşan"
+      matches_any: "hər hansı biri ilə uyğunlaşan"
+      matches_all: "hamısı ilə uyğunlaşan"
+      does_not_match: "uyğunlaşmayan"
+      does_not_match_any: "hər hansı biri ilə uyğunlaşmayan"
+      does_not_match_all: "heç biri ilə uyğunlaşmayan"
+      lt: "daha kiçik"
+      lt_any: "hər hansı birindən kiçik"
+      lt_all: "hamısından kiçik"
+      lteq: "daha kiçik və ya bərabər"
+      lteq_any: "daha kiçik və ya hər hansı birinə bərabər"
+      lteq_all: "daha kiçik və ya hamısına bərabər"
+      gt: "daha böyük "
+      gt_any: "hər hansı birindən daha böyük"
+      gt_all: "hamısından daha böyük"
+      gteq: "daha böyük və ya bərabər"
+      gteq_any: "daha böyük və ya hər hansı birine bərabər"
+      gteq_all: "daha böyük və ya hamısıne bərabər"
+      in: "içində"
+      in_any: "hər hansı birində"
+      in_all: "hamısında"
+      not_in: "içində deyil"
+      not_in_any: "hər hansı birində deyil"
+      not_in_all: "heç birində deyil"
+      cont: "ehtiva edən"
+      cont_any: "hər hansı birini ehtiva edən"
+      cont_all: "hamısını ehtiva edən"
+      not_cont: "ehtiva etməyən"
+      not_cont_any: "hər hansı birini ehtiva etməyən"
+      not_cont_all: "heç birini birini ehtiva etməyən"
+      start: "ilə başlayan"
+      start_any: "hər hansı biri ilə başlayan"
+      start_all: "hamısı ilə başlayan"
+      not_start: "ilə başlamayan"
+      not_start_any: "hər hansı biri ilə başlamayan"
+      not_start_all: "hiçbiri ilə başlamayan"
+      end: "ilə bitən"
+      end_any: "hər hansı biri ilə bitən"
+      end_all: "hamısı ilə bitən"
+      not_end: "ilə bitməyən"
+      not_end_any: "hər hansı biri ilə bitməyən"
+      not_end_all: "heç biri ilə bitməyən"
+      'true': "doğru"
+      'false': "yanlış"
+      present: "mövcüd"
+      blank: "boş"
+      'null': "keçərsiz"
+      not_null: "keçərli"

data/lib/ransack/nodes/grouping.rb

@@ -49,11 +49,7 @@ module Ransack
       alias :c= :conditions=
 
       def [](key)
-        if condition = conditions.detect { |c| c.key == key.to_s }
-          condition
-        else
-          nil
-        end
+        conditions.detect { |c| c.key == key.to_s }
       end
 
       def []=(key, value)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.8'
+  VERSION = '1.8.9'
 end

data/lib/ransack/visitor.rb

@@ -31,13 +31,7 @@ module Ransack
 
     def visit_or(object)
       nodes = object.values.map { |o| accept(o) }.compact
-      return nil unless nodes.size > 0
-
-      if nodes.size > 1
-        nodes.inject(&:or)
-      else
-        nodes.first
-      end
+      nodes.inject(&:or)
     end
 
     def quoted?(object)

data/ransack.gemspec

@@ -15,12 +15,10 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.rubyforge_project = "ransack"
-
-  s.add_dependency 'actionpack', '>= 3.0'
-  s.add_dependency 'activerecord', '>= 3.0'
-  s.add_dependency 'activesupport', '>= 3.0'
+  s.add_dependency 'actionpack', '>= 3.0', '<= 5.1.1'
+  s.add_dependency 'activerecord', '>= 3.0', '<= 5.1.1'
+  s.add_dependency 'activesupport', '>= 3.0', '<= 5.1.1'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', '~> 1.3.2'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'

data/spec/helpers/polyamorous_helper.rb

@@ -0,0 +1,26 @@
+module PolyamorousHelper
+  if ActiveRecord::VERSION::STRING >= "4.1"
+    def new_join_association(reflection, children, klass)
+      Polyamorous::JoinAssociation.new reflection, children, klass
+    end
+  else
+    def new_join_association(reflection, join_dependency, parent, klass)
+      Polyamorous::JoinAssociation.new reflection, join_dependency, parent, klass
+    end
+  end
+
+  if ActiveRecord::VERSION::STRING >= "5.2"
+    def new_join_dependency(klass, associations = {})
+      alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(klass.connection, klass.table_name, [])
+      Polyamorous::JoinDependency.new klass, klass.arel_table, associations, alias_tracker
+    end
+  else
+    def new_join_dependency(klass, associations = {})
+      Polyamorous::JoinDependency.new klass, associations, []
+    end
+  end
+
+  def new_join(name, type = Polyamorous::InnerJoin, klass = nil)
+    Polyamorous::Join.new name, type, klass
+  end
+end

data/spec/ransack/join_association_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+module Polyamorous
+  describe JoinAssociation do
+
+    join_base, join_association_args, polymorphic =
+      if ActiveRecord::VERSION::STRING >= '4.1'
+        [:join_root, 'parent.children', 'reflection.options[:polymorphic]']
+      else
+        [:join_base, 'join_dependency, parent', 'options[:polymorphic]']
+      end
+
+    let(:join_dependency) { new_join_dependency Note, {} }
+    let(:reflection) { Note.reflect_on_association(:notable) }
+    let(:parent) { join_dependency.send(join_base) }
+    let(:join_association) {
+      eval("new_join_association(reflection, #{join_association_args}, Article)")
+    }
+
+    subject {
+      join_dependency.build_join_association_respecting_polymorphism(
+        reflection, parent, Person
+      )
+    }
+
+    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
+      .swapping_reflection_klass(reflection, Person) do |new_reflection|
+        expect(new_reflection.options).not_to equal reflection.options
+        expect(new_reflection.options).not_to have_key(:polymorphic)
+        expect(new_reflection.klass).to eq(Person)
+        expect(reflection.klass).to eq(Article)
+      end
+    end
+
+    it 'sets the polymorphic option to true after initializing' do
+      expect(join_association.instance_eval(polymorphic)).to be true
+    end
+  end
+end

data/spec/ransack/join_dependency_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+module Polyamorous
+  describe JoinDependency do
+
+    method, join_associations, join_base =
+      if ActiveRecord::VERSION::STRING >= '4.1'
+        [:instance_eval, 'join_root.drop(1)', :join_root]
+      else
+        [:send, 'join_associations', :join_base]
+      end
+
+    context 'with symbol joins' do
+      subject { new_join_dependency Person, articles: :comments }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq(2) }
+      specify { expect(subject.send(method, join_associations).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)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).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)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).first.join_type)
+        .to eq Polyamorous::OuterJoin }
+    end
+
+    context 'with nested outer joins' do
+      subject { new_join_dependency Person,
+        new_join(:articles, :outer) => new_join(:comments, :outer) }
+
+      specify { expect(subject.send(method, join_associations).size)
+        .to eq 2 }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to eq [Polyamorous::OuterJoin, Polyamorous::OuterJoin] }
+      specify { expect(subject.send(method, join_associations).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)
+        .to eq 1 }
+      specify { expect(subject.send(method, join_associations).first.join_type)
+        .to eq Polyamorous::InnerJoin }
+      specify { expect(subject.send(method, join_associations).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)
+        .to eq 2 }
+      specify { expect(subject.send(method, join_associations).map(&:join_type))
+        .to be_all { Polyamorous::InnerJoin } }
+      specify { expect(subject.send(method, join_associations).first.table_name)
+        .to eq 'people' }
+      specify { expect(subject.send(method, join_associations)[1].table_name)
+        .to eq 'comments' }
+    end
+
+    context '#left_outer_join in Rails 5 overrides join type specified',
+            if: ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR < 2 do
+
+      let(:join_type_class) do
+        new_join_dependency(
+          Person,
+          new_join(:articles)
+        ).join_constraints(
+          [],
+          Arel::Nodes::OuterJoin
+        ).first.joins.map(&:class)
+      end
+
+      specify { expect(join_type_class).to eq [Arel::Nodes::OuterJoin] }
+    end
+  end
+end

data/spec/ransack/join_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Polyamorous
+  describe Join do
+    it 'is a tree node' do
+      join = new_join(:articles, :outer)
+      expect(join).to be_kind_of(TreeNode)
+    end
+
+    it 'can be added to a tree' do
+      join = new_join(:articles, :outer)
+
+      tree_hash = {}
+      join.add_to_tree(tree_hash)
+
+      expect(tree_hash[join]).to be {}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -44,6 +44,7 @@ RSpec.configure do |config|
   config.before(:each)  { Sham.reset(:before_each) }
 
   config.include RansackHelper
+  config.include PolyamorousHelper
 end
 
 RSpec::Matchers.define :be_like do |expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -20,6 +20,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,6 +30,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -34,6 +40,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,6 +50,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +60,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,6 +70,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -69,20 +87,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: polyamorous
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +204,27 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/polyamorous.rb
+- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_3_and_4.0_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_4.1_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_4.1_ruby_2/make_polyamorous_inner_joins.rb
+- lib/polyamorous/activerecord_4.2_ruby_1.9/join_association.rb
+- lib/polyamorous/activerecord_4.2_ruby_1.9/join_dependency.rb
+- lib/polyamorous/activerecord_4.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_4.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb
+- lib/polyamorous/join.rb
+- lib/polyamorous/swapping_reflection_class.rb
+- lib/polyamorous/tree_node.rb
 - lib/ransack.rb
 - lib/ransack/adapters.rb
 - lib/ransack/adapters/active_record.rb
@@ -235,6 +260,7 @@ files:
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
+- lib/ransack/locale/az.yml
 - lib/ransack/locale/cs.yml
 - lib/ransack/locale/da.yml
 - lib/ransack/locale/de.yml
@@ -273,6 +299,7 @@ files:
 - spec/blueprints/people.rb
 - spec/blueprints/tags.rb
 - spec/console.rb
+- spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
 - spec/mongoid/adapters/mongoid/base_spec.rb
 - spec/mongoid/adapters/mongoid/context_spec.rb
@@ -293,6 +320,9 @@ files:
 - spec/ransack/dependencies_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
+- spec/ransack/join_association_spec.rb
+- spec/ransack/join_dependency_spec.rb
+- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb
@@ -321,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).
@@ -332,6 +362,7 @@ test_files:
 - spec/blueprints/people.rb
 - spec/blueprints/tags.rb
 - spec/console.rb
+- spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
 - spec/mongoid/adapters/mongoid/base_spec.rb
 - spec/mongoid/adapters/mongoid/context_spec.rb
@@ -352,6 +383,9 @@ test_files:
 - spec/ransack/dependencies_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
+- spec/ransack/join_association_spec.rb
+- spec/ransack/join_dependency_spec.rb
+- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb