ninjudd-model_set 0.10.3 → 0.10.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 10

data/lib/model_set.rb

@@ -50,7 +50,7 @@ class ModelSet
     ( @missing_ids || [] ).uniq
   end
 
-  [:add!, :unshift!, :subtract!, :intersect!, :reorder!].each do |action|  
+  [:add!, :unshift!, :subtract!, :intersect!, :reorder!, :reverse_reorder!].each do |action|  
     define_method(action) do |models|
       anchor!(:set)
       query.send(action, as_ids(models))
@@ -236,9 +236,8 @@ class ModelSet
 
   def sort!(&block)
     block ||= lambda {|a,b| a <=> b}
-    self.ids = model_ids.sort do |a,b|
-      block.call(by_id(a), by_id(b))
-    end
+    sorted_ids = to_a.sort(&block).collect {|m| m.id}
+    model_ids.reorder!(sorted_ids)
     self
   end
 
@@ -247,10 +246,8 @@ class ModelSet
   end
 
   def sort_by!(&block)
-    block ||= lambda {|a,b| a <=> b}
-    self.ids = model_ids.sort_by do |id|
-      yield by_id(id)
-    end
+    sorted_ids = to_a.sort_by(&block).collect {|m| m.id}
+    model_ids.reorder!(sorted_ids)
     self
   end
 

data/lib/model_set/set_query.rb

@@ -1,6 +1,6 @@
 class ModelSet
   class SetQuery < Query
-    delegate :add!, :unshift!, :subtract!, :intersect!, :reorder!, :reverse!, :to => :set
+    delegate :add!, :unshift!, :subtract!, :intersect!, :reorder!, :reverse!, :reverse_reorder!, :to => :set
 
     def anchor!(query)
       @set = query.ids.to_ordered_set

data/lib/model_set/sphinx_query.rb

@@ -5,8 +5,6 @@ class ModelSet
     MAX_SPHINX_RESULTS = 1000
     MAX_QUERY_TIME = 5000 # milliseconds
 
-    class SphinxError < StandardError; end
-
     attr_reader :conditions, :filters
 
     def anchor!(query)
@@ -14,8 +12,13 @@ class ModelSet
     end    
 
     def add_filters!(filters)
-      @filters ||= {}
-      @filters.merge!(filters)
+      @filters ||= []
+
+      filters.each do |key, value|
+        next if value.nil?
+        @empty = true if value.kind_of?(Array) and value.empty?
+        @filters << [key, value]
+      end
       clear_cache!
     end
 
@@ -24,6 +27,7 @@ class ModelSet
         conditions.each do |field, value|
           next if value.nil?
           field = field.join(',') if field.kind_of?(Array)
+          value = value.collect {|v| '"' + v + '"'}.join('|') if value.kind_of?(Array)
           add_conditions!("@(#{field}) #{value}")
         end
       else
@@ -52,8 +56,12 @@ class ModelSet
     }
 
     def order_by!(field, mode = :ascending)
-      raise "invalid mode: :#{mode}" unless SORT_MODES[mode]
-      @sort_order = [SORT_MODES[mode], field.to_s]
+      if field == :relevance
+        @sort_order = [SORT_MODES[:relevance]]
+      else
+        raise "invalid mode: :#{mode}" unless SORT_MODES[mode]
+        @sort_order = [SORT_MODES[mode], field.to_s]
+      end
       clear_cache!
     end
 
@@ -72,10 +80,17 @@ class ModelSet
       @ids
     end
 
+    class SphinxError < StandardError
+      attr_accessor :opts
+      def message
+        "#{super}: #{opts.inspect}"
+      end
+    end
+
   private
 
     def fetch_results
-      if @conditions.nil? or (@filters and @filters[id_field] and @filters[id_field].empty?)
+      if @conditions.nil? or @empty
         @count = 0
         @size  = 0
         @ids   = []
@@ -95,12 +110,11 @@ class ModelSet
         else
           search.SetLimits(0, MAX_SPHINX_RESULTS, MAX_SPHINX_RESULTS)
         end
+
         search.SetSortMode(*@sort_order) if @sort_order
         search.SetFilter('class_id', model_class.class_id) if model_class.respond_to?(:class_id)
 
         @filters and @filters.each do |field, value|
-          next if value.nil?
-
           exclude = defined?(AntiObject) && value.kind_of?(AntiObject)
           value = ~value if exclude
 
@@ -114,15 +128,21 @@ class ModelSet
 
         begin
           response = search.Query(opts[:query], index)
-          raise SphinxError, search.GetLastError unless response
+          unless response
+            e = SphinxError.new(search.GetLastError)
+            e.opts = opts
+            raise e
+          end
         rescue Exception => e
-          on_exception(e, opts)
+          e = SphinxError.new(e) unless e.kind_of?(SphinxError)
+          e.opts = opts
+          on_exception(e)
         end
         
         @count = response['total_found']
         @ids   = response['matches'].collect {|r| r['id']}.to_ordered_set
         @size  = @ids.size
-        
+
         after_query(opts)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-model_set
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: []