Code cleanup

This commit is contained in:
jonatack 2013-12-10 13:04:17 +01:00
parent 935af8a446
commit 025e229bfe
4 changed files with 11 additions and 6 deletions

View File

@ -8,8 +8,8 @@ module Ransack
options[:url] ||= polymorphic_path(search.klass)
elsif record.is_a?(Array) &&
(search = record.detect { |o| o.is_a?(Ransack::Search) })
options[:url] ||= polymorphic_path(record.
map { |o| o.is_a?(Ransack::Search) ? o.klass : o }
options[:url] ||= polymorphic_path(
record.map { |o| o.is_a?(Ransack::Search) ? o.klass : o }
)
else
raise ArgumentError,

View File

@ -107,7 +107,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=
@ -116,7 +117,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

View File

@ -28,6 +28,8 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.executables = `git ls-files -- bin/*`
.split("\n")
.map { |f| File.basename(f) }
s.require_paths = ["lib"]
end

View File

@ -90,7 +90,7 @@ module Ransack
)
conditions = search.base.conditions
conditions.should have(2).items
conditions.map {|c| c.class}.should eq [Nodes::Condition, Nodes::Condition]
conditions.map { |c| c.class }.should eq [Nodes::Condition, Nodes::Condition]
end
it 'creates Conditions for custom predicates that take arrays' do