ninjudd-model_set 0.10.0 → 0.10.1

data/VERSION.yml

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

data/lib/model_set/set_query.rb

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

data/lib/model_set/sphinx_query.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../vendor/sphinx_client/lib/sphinx'
 class ModelSet
   class SphinxQuery < Query
     MAX_SPHINX_RESULTS = 1000
+    MAX_QUERY_TIME = 5000 # milliseconds
 
     class SphinxError < StandardError; end
 
@@ -86,6 +87,7 @@ class ModelSet
         before_query(opts)
 
         search = Sphinx::Client.new
+        search.SetMaxQueryTime(MAX_QUERY_TIME)
         search.SetServer(self.class.server_host, self.class.server_port)
         search.SetMatchMode(Sphinx::Client::SPH_MATCH_EXTENDED2)
         if limit

data/lib/model_set/sql_query.rb

@@ -40,6 +40,21 @@ class ModelSet
       clear_cache!
     end
   
+    def reverse!
+      if @sort_order
+        @sort_order = @sort_order.split(/\s*,\s*/).collect do |sub_order|
+          if sub_order =~ / DESC$/i
+            sub_order.slice(0..-6)
+          else
+            "#{sub_order} DESC"
+          end
+        end.join(', ')
+      else
+        @sort_order = "#{id_field_with_prefix} DESC"
+      end
+      clear_cache!  
+    end
+
     def sql
       "#{select_clause} #{from_clause} #{order_clause} #{limit_clause}"
     end

data/lib/model_set.rb

@@ -24,6 +24,8 @@ class ModelSet
 
   MAX_CACHE_SIZE = 1000 if not defined?(MAX_CACHE_SIZE)
 
+  attr_reader :created_at
+
   def initialize(query_or_models)
     if query_or_models.kind_of?(Query)
       @query = query_or_models
@@ -33,6 +35,11 @@ class ModelSet
     elsif query_or_models
       self.ids = as_ids(query_or_models)
     end
+    @created_at = Time.now
+  end
+
+  def older_than?(duration)
+    created_at.nil? or created_at < Time.now - duration
   end
 
   def ids
@@ -352,12 +359,15 @@ class ModelSet
     end
   end
 
-  [:unsorted!, :limit!, :page!, :unlimited!].each do |method_name|
+  [:unsorted!, :limit!, :page!, :unlimited!, :reverse!].each do |method_name|
     clone_method method_name
     define_method(method_name) do |*args|
       # Don't change the query engine by default
       anchor!( extract_opt(:query_type, args) )
 
+      # Use the default query engine if the the current engine doesn't respond to the method.
+      anchor!(default_query_type) unless query.respond_to?(method_name)
+
       query.send(method_name, *args)
       self
     end
@@ -529,11 +539,11 @@ class ModelSet
   end
 
   def marshal_dump
-    [ @query, @add_fields, @included_models ]
+    [ @query, @add_fields, @included_models, @created_at ]
   end
 
   def marshal_load(fields)
-    @query, @add_fields, @included_models = fields
+    @query, @add_fields, @included_models, @created_at = fields
   end
 
 protected

data/test/model_set_test.rb

@@ -105,6 +105,29 @@ class ModelSetTest < Test::Unit::TestCase
       set = HeroSet.with_universe('Marvel')
       assert_equal [captain.id, spidey.id, ironman.id], set.ids
     end
+
+    should "order and reverse set" do
+      captain   = Hero.create(:name => 'Captain America', :universe => 'Marvel')
+      spidey    = Hero.create(:name => 'Spider Man',      :universe => 'Marvel')
+      wolverine = Hero.create(:name => 'Wolverine',       :universe => 'Marvel'  )
+      phoenix   = Hero.create(:name => 'Phoenix',         :universe => 'Marvel'  )
+      ironman   = Hero.create(:name => 'Iron Man',        :universe => 'Marvel')
+      
+      ids = [captain.id, ironman.id, phoenix.id, spidey.id, wolverine.id]
+      set = HeroSet.with_universe('Marvel')
+
+      set.order_by!('name')      
+      assert_equal ids, set.ids
+
+      set.reverse!
+      assert_equal ids.reverse, set.ids
+
+      set.order_by!('name DESC')
+      assert_equal ids.reverse, set.ids
+
+      set.reverse!
+      assert_equal ids, set.ids
+    end
   
     should "have missing ids" do
       missing_id = 5555
@@ -231,6 +254,9 @@ class ModelSetTest < Test::Unit::TestCase
       
       @bot_set.sort! {|a,b| b.name <=> a.name}
       assert_equal [@bender,@c3po,@johnny5,@r2d2,@rosie,@t1000,@small_wonder].reverse, @bot_set.to_a 
+
+      @bot_set.reverse!
+      assert_equal [@bender,@c3po,@johnny5,@r2d2,@rosie,@t1000,@small_wonder], @bot_set.to_a 
     end
     
     should "sort a set by name" do

metadata

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