ransack 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab38816eaa6fefc0b47ab0814d69ddf4f9dfbbf8
-  data.tar.gz: ed98ed6e4ede9c729fb05cc4ddfb00d646a79149
+  metadata.gz: 3d0f75469674a840fd6677c3e2cea940c84e4438
+  data.tar.gz: 6ab05dd928c897263c629de60c06dfb10fc74ea5
 SHA512:
-  metadata.gz: 837ce300a188d1e7cf59eff19548d4dc1b1c817276249d83326b9b776b8ba3ae49072ebf1850e3437a54d70a1fafbf3473165856d88afdbb5f139d505ea4309d
-  data.tar.gz: d1cbcb0ec2d6876511b4624a93c9a85f3d5500705305faf8dc566e54c16c3d5572b5838882723d9ee3fc6df696dd5b3ccfe8dfbb73ed47008f782d42983e496c
+  metadata.gz: a46b017f203b3581ba2349417891e6f3733f3a49aa2c843daa748d69fd1b9a6f7f0daf0ec7ad72ae56e6f8b724b3c886447fdc532f2a79254b2651353d148ed0
+  data.tar.gz: a835c33713bcc0dd9269c12e1dbe80f20a922ca8ceaf2e5ce3955b360f80c4a42a478d0e72de9d7df9bc2f0b34f29853eb6fb75c919a64ecfdad9eb41d678612

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Change Log
 
+## Version 1.6.6 - 2015-04-05
+### Changed
+
+*   Upgrade Polyamorous dependency to version 1.2.0, which uses Module#prepend instead of monkey-patching for hooking into Active Record (with Ruby 2.x).
+
+    *Jon Atack*
+
+### Fixed
+
+*   An improved fix for the "undefined method `model_name` for Ransack::Search"
+    issue [#518](https://github.com/activerecord-hackery/ransack/issues/518)
+    affecting Rails 4.2.1 and 5.0.0. This fix allows us to remove the
+    ActionView patch in Ransack version 1.6.4.
+
+    *Gleb Mazovetskiy*
+
+*   Fix an erroneous reference in `ActiveRecord::Associations::JoinDependency`
+    to a version-dependent Active Record reference, and replace it with a
+    better, more reliable one defined in Polyamorous. As this class lives
+    inside an `ActiveRecord` module, the reference needs to be absolute in
+    order to properly point to the AR class.
+
+    *Nahuel Cuesta Luengo*
+
+*   Fix RubyGems YARD rendering of the README docs.
+
+    *Jon Atack*
+
+### Added
+
+*   Add the Ruby version to the the header message that shows the database,
+    Active Record and Arel versions when running tests.
+
+*   Add Code Climate analysis.
+
+    *Jon Atack*
+
+
 ## Version 1.6.5 - 2015-03-28 - Rails 5.0.0 update
 ### Added
 

data/Gemfile

@@ -7,10 +7,11 @@ rails = ENV['RAILS'] || '4-2-stable'
 
 if rails == 'master'
   gem 'arel', github: 'rails/arel'
+  gem 'polyamorous', github: 'activerecord-hackery/polyamorous'
+else
+  gem 'polyamorous', '~> 1.2'
 end
 
-gem 'polyamorous', '~> 1.1'
-
 gem 'pry'
 
 # Provide timezone information on Windows

data/README.md

@@ -4,6 +4,8 @@
 (https://travis-ci.org/activerecord-hackery/ransack)
 [![Gem Version](https://badge.fury.io/rb/ransack.svg)]
 (http://badge.fury.io/rb/ransack)
+[![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)]
+(https://codeclimate.com/github/activerecord-hackery/ransack)
 
 Ransack is a rewrite of [MetaSearch]
 (https://github.com/activerecord-hackery/meta_search)
@@ -27,20 +29,20 @@ 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.6.5).]
-(https://github.com/activerecord-hackery/ransack/tree/v1.6.5)
+[View documentation for the last release (1.6.6).]
+(https://github.com/activerecord-hackery/ransack/tree/v1.6.6)
 
 ## Getting started
 
 Ransack is compatible with Rails 3 and 4 (including 4.2.1) on Ruby 1.9 and
-later. It currently works with Rails 5 as well, though changes in Arel and
-Active Record keep that a moving target. If you are using Ruby 1.8, you can use
-an earlier version of Ransack up to v1.3.0.
+later (Ruby 2.2 recommended). Ransack currently works with Rails master (5.0.0)
+too! If you are using Ruby 1.8, you can use an earlier version of Ransack up to
+1.3.0.
 
 Ransack works out-of-the-box with Active Record and also features experimental
 support for Mongoid 4.0 (without associations, further details below).
 
-In your Gemfile, for the last officially released Ransack gem:
+In your Gemfile, for the last officially released gem:
 
 ```ruby
 gem 'ransack'
@@ -120,7 +122,7 @@ The two primary Ransack view helpers are `search_form_for` and `sort_link`,
 which are defined in
 [Ransack::Helpers::FormHelper](lib/ransack/helpers/form_helper.rb).
 
-#####Ransack's `search_form_for` helper replaces `form_for` for creating the view search form:
+####Ransack's `search_form_for` helper replaces `form_for` for creating the view search form
 
 ```erb
 <%= search_form_for @q do |f| %>
@@ -142,20 +144,21 @@ which are defined in
 ```
 
 `cont` (contains) and `start` (starts with) are just two of the available
-search predicates. See [Constants]
-(https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/constants.rb)
-for a full list and the [wiki]
-(https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching)
+search predicates. See
+[Constants](https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/constants.rb)
+for a full list and the
+[wiki](https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching)
 for more information.
 
 The `search_form_for` answer format can be set like this:
+
 ```erb
 <%= search_form_for(@q, format: :pdf) do |f| %>
 
 <%= search_form_for(@q, format: :json) do |f| %>
 ```
 
-#####Ransack's `sort_link` helper creates table headers that are sortable links:
+####Ransack's `sort_link` helper creates table headers that are sortable links
 
 ```erb
 <%= sort_link(@q, :name) %>
@@ -681,4 +684,4 @@ fix bugs!
 
 ## Copyright
 
-Copyright &copy; 2011-2014 [Ernie Miller](http://twitter.com/erniemiller)
+Copyright &copy; 2011-2015 [Ernie Miller](http://twitter.com/erniemiller)

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

@@ -184,7 +184,7 @@ module Ransack
               :string_join
             when Hash, Symbol, Array
               :association_join
-            when ActiveRecord::Associations::JoinDependency
+            when Polyamorous::JoinDependency, Polyamorous::JoinAssociation
               :stashed_join
             when Arel::Nodes::Join
               :join_node

data/lib/ransack/helpers/form_builder.rb

@@ -1,36 +1,15 @@
 require 'action_view'
 
-# Monkey-patching, avert your eyes!
-# TODO: Find a better way to solve these two issues:
-#
 module ActionView::Helpers::Tags
-
+  # TODO: Find a better way to solve this issue!
   # This patch is needed since this Rails commit:
   # https://github.com/rails/rails/commit/c1a118a
-  #
   class Base
     private
     def value(object)
       object.send @method_name if object # use send instead of public_send
     end
   end
-
-  # This patch is needed for Rails 4.2.1 and 5.0.0 since these commits:
-  #
-  # Rails 4.2:
-  # https://github.com/rails/rails/commits/4-2-stable/actionview/lib/action_view/helpers/tags/translator.rb
-  # https://github.com/rails/rails/commits/4-2-stable/actionview/lib/action_view/helpers/tags/placeholderable.rb
-  #
-  # Rails master:
-  # https://github.com/rails/rails/commits/master/actionview/lib/action_view/helpers/tags/translator.rb
-  # https://github.com/rails/rails/commits/master/actionview/lib/action_view/helpers/tags/placeholderable.rb
-  #
-  class Translator
-    def i18n_default
-      return '' unless model
-      ["#{model}.#{method_and_value}".to_sym, ""]
-    end
-  end
 end
 
 RANSACK_FORM_BUILDER = 'RANSACK_FORM_BUILDER'.freeze

data/lib/ransack/naming.rb

@@ -20,6 +20,10 @@ module Ransack
     def to_model
       self
     end
+
+    def model_name
+      self.class.model_name
+    end
   end
 
   class Name < String

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.6.5"
+  VERSION = '1.6.6'
 end

data/ransack.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'activesupport', '>= 3.0'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', '~> 1.1'
+  s.add_dependency 'polyamorous', '~> 1.2'
   s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'

data/spec/spec_helper.rb

@@ -28,10 +28,12 @@ RSpec.configure do |config|
   config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior'
 
   config.before(:suite) do
-    connection_name = ActiveRecord::Base.connection.adapter_name
-    message = "Running specs against #{connection_name}, Active Record #{
-    ActiveRecord::VERSION::STRING} and Arel #{Arel::VERSION}..."
-     puts '=' * message.length, message, '=' * message.length
+    message = "Running Ransack specs with #{
+      ActiveRecord::Base.connection.adapter_name
+      }, Active Record #{::ActiveRecord::VERSION::STRING}, Arel #{Arel::VERSION
+      } and Ruby #{RUBY_VERSION}"
+    line = '=' * message.length
+    puts line, message, line
     Schema.create
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement