ransack 1.7.0 → 1.8.0

data/spec/support/schema.rb

@@ -25,23 +25,30 @@ else
 end
 
 class Person < ActiveRecord::Base
-  if ActiveRecord::VERSION::MAJOR == 3
+  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
+  belongs_to :parent, class_name: 'Person', foreign_key: :parent_id
+  has_many   :children, class_name: 'Person', foreign_key: :parent_id
   has_many   :articles
   if ActiveRecord::VERSION::MAJOR == 3
-    has_many :published_articles, conditions: { published: true }, class_name: "Article"
+    if RUBY_VERSION >= '2.3'
+      has_many :published_articles, class_name: "Article",
+        conditions: "published = 't'"
+    else
+      has_many :published_articles, class_name: "Article",
+        conditions: { published: true }
+    end
   else
-    has_many :published_articles, ->{ where(published: true) }, class_name: "Article"
+    has_many :published_articles, ->{ where(published: true) },
+      class_name: "Article"
   end
   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") }
@@ -50,7 +57,12 @@ class Person < ActiveRecord::Base
     of_age ? where("age >= ?", 18) : where("age < ?", 18)
   }
 
-  ransacker :reversed_name, :formatter => proc { |v| v.reverse } do |parent|
+  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
 
@@ -84,14 +96,15 @@ 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
 
@@ -102,16 +115,17 @@ class Person < ActiveRecord::Base
       column_names + _ransackers.keys - ['only_search', 'only_admin']
     end
   end
-
 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'
+  alias_attribute :content, :body
+
+  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'")
@@ -146,7 +160,7 @@ class Tag < ActiveRecord::Base
 end
 
 class Note < ActiveRecord::Base
-  belongs_to :notable, :polymorphic => true
+  belongs_to :notable, polymorphic: true
 end
 
 module Schema
@@ -154,7 +168,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
@@ -171,7 +185,7 @@ 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
@@ -179,28 +193,28 @@ module Schema
         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
       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
@@ -209,22 +223,22 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -74,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
@@ -158,28 +158,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: '0.10'
 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:
@@ -234,14 +234,19 @@ files:
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
 - lib/ransack/locale/cs.yml
+- lib/ransack/locale/da.yml
 - lib/ransack/locale/de.yml
 - lib/ransack/locale/en.yml
 - lib/ransack/locale/es.yml
 - lib/ransack/locale/fr.yml
 - lib/ransack/locale/hu.yml
+- lib/ransack/locale/id.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/zh-CN.yml
+- lib/ransack/locale/zh-TW.yml
 - lib/ransack/naming.rb
 - lib/ransack/nodes.rb
 - lib/ransack/nodes/attribute.rb
@@ -312,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).