ransack 1.1.0 → 1.2.0

data/lib/ransack/nodes/grouping.rb

@@ -9,7 +9,7 @@ module Ransack
       i18n_word :condition, :and, :or
       i18n_alias :c => :condition, :n => :and, :o => :or
 
-      delegate :each, :to => :values
+      delegate :each, to: :values
 
       def initialize(context, combinator = nil)
         super(context)
@@ -21,7 +21,7 @@ module Ransack
       end
 
       def translate(key, options = {})
-        super or Translate.attribute(key.to_s, options.merge(:context => context))
+        super or Translate.attribute(key.to_s, options.merge(context: context))
       end
 
       def conditions
@@ -48,7 +48,7 @@ module Ransack
       alias :c= :conditions=
 
       def [](key)
-        if condition = conditions.detect {|c| c.key == key.to_s}
+        if condition = conditions.detect { |c| c.key == key.to_s }
           condition
         else
           nil
@@ -56,7 +56,7 @@ module Ransack
       end
 
       def []=(key, value)
-        conditions.reject! {|c| c.key == key.to_s}
+        conditions.reject! { |c| c.key == key.to_s }
         self.conditions << value
       end
 
@@ -82,7 +82,6 @@ module Ransack
         attrs = opts[:attributes] || 1
         vals = opts[:values] || 1
         condition = Condition.new(@context)
-        condition.predicate = Predicate.named('eq')
         attrs.times { condition.build_attribute }
         vals.times { condition.build_value }
         condition
@@ -106,7 +105,8 @@ module Ransack
             self.groupings << grouping_object if grouping_object.values.any?
           end
         else
-          raise ArgumentError, "Invalid argument (#{groupings.class}) supplied to groupings="
+          raise ArgumentError,
+            "Invalid argument (#{groupings.class}) supplied to groupings="
         end
       end
       alias :g= :groupings=
@@ -115,7 +115,9 @@ module Ransack
         method_name = method_id.to_s
         writer = method_name.sub!(/\=$/, '')
         if attribute_method?(method_name)
-          writer ? write_attribute(method_name, *args) : read_attribute(method_name)
+          writer ?
+            write_attribute(method_name, *args) :
+            read_attribute(method_name)
         else
           super
         end
@@ -127,7 +129,9 @@ module Ransack
         when /^(g|c|m|groupings|conditions|combinator)=?$/
           true
         else
-          name.split(/_and_|_or_/).select {|n| !@context.attribute_method?(n)}.empty?
+          name.split(/_and_|_or_/)
+          .select { |n| !@context.attribute_method?(n) }
+          .empty?
         end
       end
 
@@ -155,9 +159,12 @@ module Ransack
       end
 
       def inspect
-        data =[['conditions', conditions], ['combinator', combinator]].reject { |e|
-          e[1].blank?
-        }.map { |v| "#{v[0]}: #{v[1]}" }.join(', ')
+        data = [
+                ['conditions', conditions], ['combinator', combinator]
+               ].
+               reject { |e| e[1].blank? }
+               .map { |v| "#{v[0]}: #{v[1]}" }
+               .join(', ')
         "Grouping <#{data}>"
       end
 
@@ -183,7 +190,6 @@ module Ransack
         Predicate.detect_and_strip_from_string!(string)
         string
       end
-
     end
   end
-end
+end

data/lib/ransack/nodes/node.rb

@@ -2,7 +2,7 @@ module Ransack
   module Nodes
     class Node
       attr_reader :context
-      delegate :contextualize, :to => :context
+      delegate :contextualize, to: :context
       class_attribute :i18n_words
       class_attribute :i18n_aliases
       self.i18n_words = []
@@ -14,7 +14,7 @@ module Ransack
         end
 
         def i18n_alias(opts = {})
-          self.i18n_aliases.merge! Hash[opts.map {|k, v| [k.to_s, v.to_s]}]
+          self.i18n_aliases.merge! Hash[opts.map { |k, v| [k.to_s, v.to_s] }]
         end
       end
 
@@ -31,4 +31,4 @@ module Ransack
 
     end
   end
-end
+end

data/lib/ransack/nodes/sort.rb

@@ -9,7 +9,7 @@ module Ransack
       class << self
         def extract(context, str)
           attr, direction = str.split(/\s+/,2)
-          self.new(context).build(:name => attr, :dir => direction)
+          self.new(context).build(name: attr, dir: direction)
         end
       end
 
@@ -24,7 +24,9 @@ module Ransack
       end
 
       def valid?
-        bound? && attr
+        bound? && attr &&
+          context.klassify(parent).ransortable_attributes(context.auth_object)
+          .include?(attr_name)
       end
 
       def name=(name)
@@ -39,4 +41,4 @@ module Ransack
 
     end
   end
-end
+end

data/lib/ransack/nodes/value.rb

@@ -2,7 +2,7 @@ module Ransack
   module Nodes
     class Value < Node
       attr_accessor :value
-      delegate :present?, :blank?, :to => :value
+      delegate :present?, :blank?, to: :value
 
       def initialize(context, value = nil)
         super(context)
@@ -107,4 +107,4 @@ module Ransack
        end
     end
   end
-end
+end

data/lib/ransack/predicate.rb

@@ -1,6 +1,7 @@
 module Ransack
   class Predicate
-    attr_reader :name, :arel_predicate, :type, :formatter, :validator, :compound, :wants_array
+    attr_reader :name, :arel_predicate, :type, :formatter, :validator,
+                :compound, :wants_array
 
     class << self
 
@@ -9,7 +10,7 @@ module Ransack
       end
 
       def names_by_decreasing_length
-        names.sort {|a,b| b.length <=> a.length}
+        names.sort { |a,b| b.length <=> a.length }
       end
 
       def named(name)
@@ -17,15 +18,20 @@ module Ransack
       end
 
       def detect_and_strip_from_string!(str)
-        names_by_decreasing_length.detect {|p| str.sub!(/_#{p}$/, '')}
+        if p = detect_from_string(str)
+          str.sub! /_#{p}$/, ''
+          p
+        end
       end
 
       def detect_from_string(str)
-        names_by_decreasing_length.detect {|p| str.match(/_#{p}$/)}
+        names_by_decreasing_length.detect { |p| str.end_with?("_#{p}") }
       end
 
       def name_from_attribute_name(attribute_name)
-        names_by_decreasing_length.detect {|p| attribute_name.to_s.match(/_#{p}$/)}
+        names_by_decreasing_length.detect {
+          |p| attribute_name.to_s.match(/_#{p}$/)
+        }
       end
 
       def for_attribute_name(attribute_name)
@@ -39,9 +45,12 @@ module Ransack
       @arel_predicate = opts[:arel_predicate]
       @type = opts[:type]
       @formatter = opts[:formatter]
-      @validator = opts[:validator] || lambda { |v| v.respond_to?(:empty?) ? !v.empty? : !v.nil? }
+      @validator = opts[:validator] || lambda {
+        |v| v.respond_to?(:empty?) ? !v.empty? : !v.nil?
+        }
       @compound = opts[:compound]
-      @wants_array = opts[:wants_array] == true || @compound || ['in', 'not_in'].include?(@arel_predicate)
+      @wants_array = opts[:wants_array] == true || @compound || ['in', 'not_in'].
+        include?(@arel_predicate)
     end
 
     def eql?(other)
@@ -63,8 +72,8 @@ module Ransack
     end
 
     def validate(vals, type = @type)
-      vals.select {|v| validator.call(type ? v.cast(type) : v.value)}.any?
+      vals.select { |v| validator.call(type ? v.cast(type) : v.value) }.any?
     end
 
   end
-end
+end

data/lib/ransack/ransacker.rb

@@ -3,7 +3,7 @@ module Ransack
 
     attr_reader :name, :type, :formatter, :args
 
-    delegate :call, :to => :@callable
+    delegate :call, to: :@callable
 
     def initialize(klass, name, opts = {}, &block)
       @klass, @name = klass, name
@@ -13,12 +13,12 @@ module Ransack
       @formatter = opts[:formatter]
       @callable = opts[:callable] || block ||
                   (@klass.method(name) if @klass.respond_to?(name)) ||
-                  proc {|parent| parent.table[name]}
+                  proc { |parent| parent.table[name] }
     end
 
     def attr_from(bindable)
-      call(*args.map {|arg| bindable.send(arg)})
+      call(*args.map { |arg| bindable.send(arg) })
     end
 
   end
-end
+end

data/lib/ransack/search.rb

@@ -8,13 +8,14 @@ module Ransack
 
     attr_reader :base, :context
 
-    delegate :object, :klass, :to => :context
+    delegate :object, :klass, to: :context
     delegate :new_grouping, :new_condition,
              :build_grouping, :build_condition,
-             :translate, :to => :base
+             :translate, to: :base
 
     def initialize(object, params = {}, options = {})
-      (params ||= {}).delete_if { |k, v| v.blank? && v != false }
+      params = {} unless params.is_a?(Hash)
+      params.delete_if { |k, v| v.blank? && v != false }
       @context = Context.for(object, options)
       @context.auth_object = options[:auth_object]
       @base = Nodes::Grouping.new(@context, 'and')
@@ -41,7 +42,11 @@ module Ransack
       case args
       when Array
         args.each do |sort|
-          sort = Nodes::Sort.extract(@context, sort)
+          if sort.kind_of? Hash
+            sort = Nodes::Sort.new(@context).build(sort)
+          else
+            sort = Nodes::Sort.extract(@context, sort)
+          end
           self.sorts << sort
         end
       when Hash
@@ -72,14 +77,6 @@ module Ransack
       Nodes::Sort.new(@context).build(opts)
     end
 
-    def respond_to?(method_id, include_private = false)
-      super or begin
-        method_name = method_id.to_s
-        writer = method_name.sub!(/\=$/, '')
-        base.attribute_method?(method_name) ? true : false
-      end
-    end
-
     def method_missing(method_id, *args)
       method_name = method_id.to_s
       writer = method_name.sub!(/\=$/, '')

data/lib/ransack/translate.rb

@@ -1,13 +1,15 @@
+require 'i18n'
+
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locale', '*.yml')]
 
 module Ransack
   module Translate
     def self.word(key, options = {})
-      I18n.translate(:"ransack.#{key}", :default => key.to_s)
+      I18n.translate(:"ransack.#{key}", default: key.to_s)
     end
 
     def self.predicate(key, options = {})
-      I18n.translate(:"ransack.predicates.#{key}", :default => key.to_s)
+      I18n.translate(:"ransack.predicates.#{key}", default: key.to_s)
     end
 
     def self.attribute(key, options = {})
@@ -17,13 +19,15 @@ module Ransack
 
       original_name = key.to_s
       base_class = context.klass
-      base_ancestors = base_class.ancestors.select { |x| x.respond_to?(:model_name) }
+      base_ancestors = base_class.ancestors.select {
+        |x| x.respond_to?(:model_name)
+      }
       predicate = Predicate.detect_from_string(original_name)
       attributes_str = original_name.sub(/_#{predicate}$/, '')
       attribute_names = attributes_str.split(/_and_|_or_/)
       combinator = attributes_str.match(/_and_/) ? :and : :or
       defaults = base_ancestors.map do |klass|
-        :"ransack.attributes.#{klass.model_name.singular}.#{original_name}"
+        :"ransack.attributes.#{i18n_key(klass)}.#{original_name}"
       end
 
       translated_names = attribute_names.map do |attr|
@@ -31,7 +35,9 @@ module Ransack
       end
 
       interpolations = {}
-      interpolations[:attributes] = translated_names.join(" #{Translate.word(combinator)} ")
+      interpolations[:attributes] = translated_names.join(
+        " #{Translate.word(combinator)} "
+        )
 
       if predicate
         defaults << "%{attributes} %{predicate}"
@@ -41,7 +47,7 @@ module Ransack
       end
 
       defaults << options.delete(:default) if options[:default]
-      options.reverse_merge! :count => 1, :default => defaults
+      options.reverse_merge! count: 1, default: defaults
       I18n.translate(defaults.shift, options.merge(interpolations))
     end
 
@@ -50,9 +56,11 @@ module Ransack
         raise ArgumentError, "A context is required to translate associations"
       end
 
-      defaults = key.blank? ? [:"#{context.klass.i18n_scope}.models.#{context.klass.model_name.singular}"] : [:"ransack.associations.#{context.klass.model_name.singular}.#{key}"]
+      defaults = key.blank? ?
+        [:"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"] :
+        [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
       defaults << context.traverse(key).model_name.human
-      options = {:count => 1, :default => defaults}
+      options = { count: 1, default: defaults }
       I18n.translate(defaults.shift, options)
     end
 
@@ -64,30 +72,43 @@ module Ransack
       attr_name = name.sub(/^#{assoc_path}_/, '')
       interpolations = {}
       interpolations[:attr_fallback_name] = I18n.translate(
-        (associated_class ?
-          :"ransack.attributes.#{associated_class.model_name.singular}.#{attr_name}" :
-          :"ransack.attributes.#{context.klass.model_name.singular}.#{attr_name}"
-        ),
-        :default => [
-          (associated_class ?
-            :"#{associated_class.i18n_scope}.attributes.#{associated_class.model_name.singular}.#{attr_name}" :
-            :"#{context.klass.i18n_scope}.attributes.#{context.klass.model_name.singular}.#{attr_name}"
+        :"ransack.attributes.#{
+          i18n_key(associated_class || context.klass)
+          }.#{attr_name}",
+        default: [
+          (
+            if associated_class
+              :"#{associated_class.i18n_scope}.attributes.#{
+                i18n_key(associated_class)}.#{attr_name}"
+            else
+              :"#{context.klass.i18n_scope}.attributes.#{
+                i18n_key(context.klass)}.#{attr_name}"
+            end
           ),
           :".attributes.#{attr_name}",
           attr_name.humanize
         ]
       )
-      defaults = [
-        :"ransack.attributes.#{context.klass.model_name.singular}.#{name}"
-      ]
+      defaults = [:"ransack.attributes.#{i18n_key(context.klass)}.#{name}"]
       if include_associations && associated_class
         defaults << '%{association_name} %{attr_fallback_name}'
-        interpolations[:association_name] = association(assoc_path, :context => context)
+        interpolations[:association_name] = association(
+          assoc_path,
+          context: context
+          )
       else
         defaults << '%{attr_fallback_name}'
       end
-      options = {:count => 1, :default => defaults}
+      options = { count: 1, default: defaults }
       I18n.translate(defaults.shift, options.merge(interpolations))
     end
+
+    def self.i18n_key(klass)
+      if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+        klass.model_name.i18n_key.to_s.tr('.', '/')
+      else
+        klass.model_name.i18n_key.to_s
+      end
+    end
   end
 end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/ransack/visitor.rb

@@ -10,7 +10,7 @@ module Ransack
     end
 
     def visit_Array(object)
-      object.map {|o| accept(o)}.compact
+      object.map { |o| accept(o) }.compact
     end
 
     def visit_Ransack_Nodes_Condition(object)
@@ -22,7 +22,7 @@ module Ransack
     end
 
     def visit_and(object)
-      nodes = object.values.map {|o| accept(o)}.compact
+      nodes = object.values.map { |o| accept(o) }.compact
       return nil unless nodes.size > 0
 
       if nodes.size > 1
@@ -33,7 +33,7 @@ module Ransack
     end
 
     def visit_or(object)
-      nodes = object.values.map {|o| accept(o)}.compact
+      nodes = object.values.map { |o| accept(o) }.compact
       return nil unless nodes.size > 0
 
       if nodes.size > 1
@@ -65,4 +65,4 @@ module Ransack
     end
 
   end
-end
+end