@@ -37,4 +37,4 @@ end if defined?(ActionController) require "searchlogic/rails_helpers" ActionController::Base.helper(Searchlogic::RailsHelpers) -end \ No newline at end of file +end lib/searchlogic.rb @@ -13,10 +13,15 @@ module Searchlogic # ActiveRecord hides this internally in a Proc, so we have to try and pull it out with this # method. def named_scope_options(name) + key = scopes.key?(name.to_sym) ? name.to_sym : primary_condition_name(name) if key eval("options", scopes[key].binding) + elsif name.to_s.downcase.match("_or_") + condition = find_applied_condition(name) + newname = name.to_s.gsub(/_or_/, "_#{condition}_or_").to_sym + named_scope_options(newname) unless name == newname else nil end lib/searchlogic/active_record/named_scopes.rb @@ -64,4 +64,4 @@ module Searchlogic end end end -end \ No newline at end of file +end lib/searchlogic/named_scopes/alias_scope.rb @@ -8,7 +8,7 @@ module Searchlogic private def association_condition?(name) - !association_condition_details(name).nil? + !association_condition_details(name).nil? unless name.to_s.downcase.match("_or_") end def method_missing(name, *args, &block) @@ -24,20 +24,18 @@ module Searchlogic assocs = reflect_on_all_associations.reject { |assoc| assoc.options[:polymorphic] }.sort { |a, b| b.name.to_s.size <=> a.name.to_s.size } return nil if assocs.empty? - [nil, last_condition].uniq.map do |condition| - name_with_condition = [name, condition].compact.join('_') - if name_with_condition.to_s =~ /^(#{assocs.collect(&:name).join("|")})_(\w+)$/ - association_name = $1 - condition = $2 - association = reflect_on_association(association_name.to_sym) - klass = association.klass - if klass.condition?(condition) - {:association => $1, :condition => $2} - else - nil - end + name_with_condition = [name, last_condition].compact.join('_') + if name_with_condition.to_s =~ /^(#{assocs.collect(&:name).join("|")})_(\w+)$/ + association_name = $1 + condition = $2 + association = reflect_on_association(association_name.to_sym) + klass = association.klass + if klass.condition?(condition) + {:association => $1, :condition => $2} + else + nil end - end.detect{ |details| !details.nil? } + end end def create_association_condition(association, condition, args) @@ -101,4 +99,4 @@ module Searchlogic end end end -end \ No newline at end of file +end lib/searchlogic/named_scopes/association_conditions.rb @@ -40,4 +40,4 @@ module Searchlogic end end end -end \ No newline at end of file +end lib/searchlogic/named_scopes/association_ordering.rb @@ -76,6 +76,12 @@ module Searchlogic super end end + + def find_applied_condition(name) + if name.to_s =~ /(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/ + $1 + end + end def condition_details(name, *args) if args.size > 0 and !args.first.nil? lib/searchlogic/named_scopes/conditions.rb @@ -45,4 +45,4 @@ module Searchlogic end end end -end \ No newline at end of file +end lib/searchlogic/named_scopes/ordering.rb @@ -104,7 +104,7 @@ describe "Search" do search.username_gt.should == "bjohnson" end - it "should allow chainging conditions" do + it "should allow chaining conditions" do user = User.create(:username => "bjohnson", :age => 20) User.create(:username => "bjohnson", :age => 5) search = User.search @@ -112,6 +112,12 @@ describe "Search" do search.all.should == [user] end + it "should allow chaining conditions with n-depth associations" do + search = User.search + search.company_conglomerate_name_or_company_conglomerate_description_like("ben") + search.proxy_options.should == User.company_conglomerate_name_or_company_conglomerate_description_like("ben").proxy_options + end + it "should allow setting association conditions" do search = User.search search.orders_total_gt = 10 spec/search_spec.rb 6915df9fa199a28d0753b354d6fa4f619454a137 n00bish skolod@lueshi.dontexist.net http://github.com/binarylogic/searchlogic/commit/b2ebf53c8310bc41cb5b3fbef17946423bad8c71 b2ebf53c8310bc41cb5b3fbef17946423bad8c71 2009-10-24T20:18:55-07:00 2009-10-24T18:00:30-07:00 Fixed association condition interpreter from erroneously catching "OR" conditions & added failing case "chaining conditions with n-depth associations", with resolution for issue. d62fcfd03a052f7175745b4a96e75d07c6a576d0 Ben Johnson bjohnson@binarylogic.com