ransack 1.6.6 → 2.4.0

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
 require 'machinist/active_record'
+require 'polyamorous/polyamorous.rb'
 require 'sham'
 require 'faker'
 require 'ransack'
+require 'action_controller'
+require 'ransack/helpers'
 require 'pry'
+require 'simplecov'
+require 'byebug'
 
+SimpleCov.start
 I18n.enforce_available_locales = false
 Time.zone = 'Eastern Time (US & Canada)'
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'support', '*.yml')]
@@ -35,12 +41,14 @@ RSpec.configure do |config|
     line = '=' * message.length
     puts line, message, line
     Schema.create
+    SubDB::Schema.create
   end
 
   config.before(:all)   { Sham.reset(:before_all) }
   config.before(:each)  { Sham.reset(:before_each) }
 
   config.include RansackHelper
+  config.include PolyamorousHelper
 end
 
 RSpec::Matchers.define :be_like do |expected|

data/spec/support/schema.rb

@@ -13,7 +13,9 @@ when 'pg', 'postgres', 'postgresql'
   ActiveRecord::Base.establish_connection(
     adapter: 'postgresql',
     database: 'ransack',
-  # username: 'postgres', # Uncomment the username option if you have set one
+    username: ENV.fetch("DATABASE_USERNAME") { "postgres" },
+    password: ENV.fetch("DATABASE_PASSWORD") { "" },
+    host: ENV.fetch("DATABASE_HOST") { "localhost" },
     min_messages: 'warning'
   )
 else
@@ -25,18 +27,18 @@ else
 end
 
 class Person < ActiveRecord::Base
-  if ActiveRecord::VERSION::MAJOR == 3
-    default_scope order('id DESC')
-  else
-    default_scope { order(id: :desc) }
-  end
-  belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
-  has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
+  default_scope { order(id: :desc) }
+  belongs_to :parent, class_name: 'Person', foreign_key: :parent_id
+  has_many   :children, class_name: 'Person', foreign_key: :parent_id
   has_many   :articles
+  has_many   :story_articles
+
+  has_many :published_articles, ->{ where(published: true) },
+      class_name: "Article"
   has_many   :comments
-  has_many   :authored_article_comments, :through => :articles,
-             :source => :comments, :foreign_key => :person_id
-  has_many   :notes, :as => :notable
+  has_many   :authored_article_comments, through: :articles,
+             source: :comments, foreign_key: :person_id
+  has_many   :notes, as: :notable
 
   scope :restricted,  lambda { where("restricted = 1") }
   scope :active,      lambda { where("active = 1") }
@@ -45,30 +47,53 @@ class Person < ActiveRecord::Base
     of_age ? where("age >= ?", 18) : where("age < ?", 18)
   }
 
-  ransacker :reversed_name, :formatter => proc { |v| v.reverse } do |parent|
+  scope :sort_by_reverse_name_asc, lambda { order(Arel.sql("REVERSE(name) ASC")) }
+  scope :sort_by_reverse_name_desc, lambda { order("REVERSE(name) DESC") }
+
+  alias_attribute :full_name, :name
+
+  ransack_alias :term, :name_or_email
+  ransack_alias :daddy, :parent_name
+
+  ransacker :reversed_name, formatter: proc { |v| v.reverse } do |parent|
     parent.table[:name]
   end
 
-  ransacker :array_users,
+  ransacker :array_people_ids,
     formatter: proc { |v| Person.first(2).map(&:id) } do |parent|
     parent.table[:id]
   end
 
-  ransacker :array_names,
+  ransacker :array_where_people_ids,
+    formatter: proc { |v| Person.where(id: v).map(&:id) } do |parent|
+    parent.table[:id]
+  end
+
+  ransacker :array_people_names,
     formatter: proc { |v| Person.first(2).map { |p| p.id.to_s } } do |parent|
     parent.table[:name]
   end
 
+  ransacker :array_where_people_names,
+    formatter: proc { |v| Person.where(id: v).map { |p| p.id.to_s } } do |parent|
+    parent.table[:name]
+  end
+
   ransacker :doubled_name do |parent|
     Arel::Nodes::InfixOperation.new(
       '||', parent.table[:name], parent.table[:name]
       )
   end
 
+
   ransacker :sql_literal_id do
     Arel.sql('people.id')
   end
 
+  ransacker :name_case_insensitive, type: :string do
+    arel_table[:name].lower
+  end
+
   ransacker :with_arguments, args: [:parent, :ransacker_args] do |parent, args|
     min, max = args
     query = <<-SQL
@@ -79,14 +104,16 @@ class Person < ActiveRecord::Base
         GROUP BY articles.person_id
       )
     SQL
+    .squish
     Arel.sql(query)
   end
 
+
   def self.ransackable_attributes(auth_object = nil)
     if auth_object == :admin
-      column_names + _ransackers.keys - ['only_sort']
+      super - ['only_sort']
     else
-      column_names + _ransackers.keys - ['only_sort', 'only_admin']
+      super - ['only_sort', 'only_admin']
     end
   end
 
@@ -97,20 +124,23 @@ class Person < ActiveRecord::Base
       column_names + _ransackers.keys - ['only_search', 'only_admin']
     end
   end
+end
 
+class Musician < Person
 end
 
 class Article < ActiveRecord::Base
   belongs_to :person
   has_many :comments
   has_and_belongs_to_many :tags
-  has_many :notes, :as => :notable
+  has_many :notes, as: :notable
 
-  if ActiveRecord::VERSION::STRING >= '3.1'
-    default_scope { where("'default_scope' = 'default_scope'") }
-  else # Rails 3.0 does not accept a block
-    default_scope where("'default_scope' = 'default_scope'")
-  end
+  alias_attribute :content, :body
+
+  default_scope { where("'default_scope' = 'default_scope'") }
+end
+
+class StoryArticle < Article
 end
 
 class Recommendation < ActiveRecord::Base
@@ -134,6 +164,8 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :article
   belongs_to :person
+
+  default_scope { where(disabled: false) }
 end
 
 class Tag < ActiveRecord::Base
@@ -141,7 +173,7 @@ class Tag < ActiveRecord::Base
 end
 
 class Note < ActiveRecord::Base
-  belongs_to :notable, :polymorphic => true
+  belongs_to :notable, polymorphic: true
 end
 
 module Schema
@@ -149,7 +181,7 @@ module Schema
     ActiveRecord::Migration.verbose = false
 
     ActiveRecord::Schema.define do
-      create_table :people, :force => true do |t|
+      create_table :people, force: true do |t|
         t.integer  :parent_id
         t.string   :name
         t.string   :email
@@ -166,35 +198,38 @@ module Schema
         t.timestamps null: false
       end
 
-      create_table :articles, :force => true do |t|
+      create_table :articles, force: true do |t|
         t.integer  :person_id
         t.string   :title
         t.text     :subject_header
         t.text     :body
+        t.string   :type
+        t.boolean  :published, default: true
       end
 
-      create_table :comments, :force => true do |t|
+      create_table :comments, force: true do |t|
         t.integer  :article_id
         t.integer  :person_id
         t.text     :body
+        t.boolean  :disabled, default: false
       end
 
-      create_table :tags, :force => true do |t|
+      create_table :tags, force: true do |t|
         t.string   :name
       end
 
-      create_table :articles_tags, :force => true, :id => false do |t|
+      create_table :articles_tags, force: true, id: false do |t|
         t.integer  :article_id
         t.integer  :tag_id
       end
 
-      create_table :notes, :force => true do |t|
+      create_table :notes, force: true do |t|
         t.integer  :notable_id
         t.string   :notable_type
         t.string   :note
       end
 
-      create_table :recommendations, :force => true do |t|
+      create_table :recommendations, force: true do |t|
         t.integer  :person_id
         t.integer  :target_person_id
         t.integer  :article_id
@@ -203,22 +238,49 @@ module Schema
 
     10.times do
       person = Person.make
-      Note.make(:notable => person)
+      Note.make(notable: person)
       3.times do
-        article = Article.make(:person => person)
+        article = Article.make(person: person)
         3.times do
           article.tags = [Tag.make, Tag.make, Tag.make]
         end
-        Note.make(:notable => article)
+        Note.make(notable: article)
         10.times do
-          Comment.make(:article => article, :person => person)
+          Comment.make(article: article, person: person)
         end
       end
     end
 
     Comment.make(
-      :body => 'First post!',
-      :article => Article.make(:title => 'Hello, world!')
-      )
+      body: 'First post!',
+      article: Article.make(title: 'Hello, world!')
+    )
+  end
+end
+
+module SubDB
+  class Base < ActiveRecord::Base
+    self.abstract_class = true
+    establish_connection(
+      adapter: 'sqlite3',
+      database: ':memory:'
+    )
+  end
+
+  class OperationHistory < Base
+  end
+
+  module Schema
+    def self.create
+      s = ::ActiveRecord::Schema.new
+      s.instance_variable_set(:@connection, SubDB::Base.connection)
+      s.verbose = false
+      s.define({}) do
+        create_table :operation_histories, force: true do |t|
+          t.string  :operation_type
+          t.integer :people_id
+        end
+      end
+    end
   end
 end

metadata

@@ -1,59 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 2.4.0
 platform: ruby
 authors:
 - Ernie Miller
 - Ryan Bigg
 - Jon Atack
+- Sean Carroll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -68,124 +55,13 @@ 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.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: machinist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.14
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.12.2
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email:
 - ernie@erniemiller.org
 - radarlistener@gmail.com
 - jonnyatack@gmail.com
+- sfcarroll@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -198,48 +74,60 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
+- lib/polyamorous/join.rb
+- lib/polyamorous/polyamorous.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
-- lib/ransack/adapters/active_record/3.0/compat.rb
-- lib/ransack/adapters/active_record/3.0/context.rb
-- lib/ransack/adapters/active_record/3.1/context.rb
-- lib/ransack/adapters/active_record/3.2/context.rb
 - lib/ransack/adapters/active_record/base.rb
-- lib/ransack/adapters/active_record/compat.rb
 - lib/ransack/adapters/active_record/context.rb
 - lib/ransack/adapters/active_record/ransack/constants.rb
 - lib/ransack/adapters/active_record/ransack/context.rb
 - lib/ransack/adapters/active_record/ransack/nodes/condition.rb
 - lib/ransack/adapters/active_record/ransack/translate.rb
 - lib/ransack/adapters/active_record/ransack/visitor.rb
-- lib/ransack/adapters/mongoid.rb
-- lib/ransack/adapters/mongoid/3.2/.gitkeep
-- lib/ransack/adapters/mongoid/attributes/attribute.rb
-- lib/ransack/adapters/mongoid/attributes/order_predications.rb
-- lib/ransack/adapters/mongoid/attributes/predications.rb
-- lib/ransack/adapters/mongoid/base.rb
-- lib/ransack/adapters/mongoid/context.rb
-- lib/ransack/adapters/mongoid/inquiry_hash.rb
-- lib/ransack/adapters/mongoid/ransack/constants.rb
-- lib/ransack/adapters/mongoid/ransack/context.rb
-- lib/ransack/adapters/mongoid/ransack/nodes/condition.rb
-- lib/ransack/adapters/mongoid/ransack/translate.rb
-- lib/ransack/adapters/mongoid/ransack/visitor.rb
-- lib/ransack/adapters/mongoid/table.rb
 - lib/ransack/configuration.rb
 - lib/ransack/constants.rb
 - lib/ransack/context.rb
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
+- lib/ransack/locale/ar.yml
+- lib/ransack/locale/az.yml
+- lib/ransack/locale/bg.yml
+- lib/ransack/locale/ca.yml
 - lib/ransack/locale/cs.yml
+- lib/ransack/locale/da.yml
+- lib/ransack/locale/de.yml
+- lib/ransack/locale/el.yml
 - lib/ransack/locale/en.yml
 - lib/ransack/locale/es.yml
+- lib/ransack/locale/fa.yml
+- lib/ransack/locale/fi.yml
 - lib/ransack/locale/fr.yml
 - lib/ransack/locale/hu.yml
+- lib/ransack/locale/id.yml
+- lib/ransack/locale/it.yml
+- lib/ransack/locale/ja.yml
 - lib/ransack/locale/nl.yml
+- lib/ransack/locale/pt-BR.yml
 - lib/ransack/locale/ro.yml
-- lib/ransack/locale/zh.yml
+- lib/ransack/locale/ru.yml
+- lib/ransack/locale/sk.yml
+- lib/ransack/locale/tr.yml
+- lib/ransack/locale/zh-CN.yml
+- lib/ransack/locale/zh-TW.yml
 - lib/ransack/naming.rb
 - lib/ransack/nodes.rb
 - lib/ransack/nodes/attribute.rb
@@ -255,6 +143,12 @@ files:
 - lib/ransack/translate.rb
 - lib/ransack/version.rb
 - lib/ransack/visitor.rb
+- logo/ransack-h.png
+- logo/ransack-h.svg
+- logo/ransack-v.png
+- logo/ransack-v.svg
+- logo/ransack.png
+- logo/ransack.svg
 - ransack.gemspec
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -262,24 +156,14 @@ 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
-- spec/mongoid/configuration_spec.rb
-- spec/mongoid/dependencies_spec.rb
-- spec/mongoid/helpers/ransack_helper.rb
-- spec/mongoid/nodes/condition_spec.rb
-- spec/mongoid/nodes/grouping_spec.rb
-- spec/mongoid/predicate_spec.rb
-- spec/mongoid/search_spec.rb
-- spec/mongoid/support/mongoid.yml
-- spec/mongoid/support/schema.rb
-- spec/mongoid/translate_spec.rb
-- spec/mongoid_spec_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
-- spec/ransack/dependencies_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
 - spec/ransack/nodes/condition_spec.rb
@@ -302,18 +186,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ransack
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Object-based searching for ActiveRecord (currently).
+summary: Object-based searching for Active Record and Mongoid (currently).
 test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -321,24 +204,14 @@ 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
-- spec/mongoid/configuration_spec.rb
-- spec/mongoid/dependencies_spec.rb
-- spec/mongoid/helpers/ransack_helper.rb
-- spec/mongoid/nodes/condition_spec.rb
-- spec/mongoid/nodes/grouping_spec.rb
-- spec/mongoid/predicate_spec.rb
-- spec/mongoid/search_spec.rb
-- spec/mongoid/support/mongoid.yml
-- spec/mongoid/support/schema.rb
-- spec/mongoid/translate_spec.rb
-- spec/mongoid_spec_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
-- spec/ransack/dependencies_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
 - spec/ransack/nodes/condition_spec.rb