ninjudd-model_set 0.10.4 → 0.10.5

data/VERSION.yml

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

data/lib/model_set.rb

@@ -56,7 +56,7 @@ class ModelSet
       query.send(action, as_ids(models))
       self
     end
-  end
+  end  
 
   clone_method :+, :add!
   clone_method :-, :subtract!
@@ -68,6 +68,13 @@ class ModelSet
   alias without! subtract!
   clone_method :without  
 
+  clone_method :shuffle
+  def shuffle!(seed = nil)
+    reanchor!(:set)
+    query.shuffle!(seed)
+    self
+  end
+
   def include?(model)
     model_id = as_id(model)
     model_ids.include?(model_id)
@@ -168,14 +175,17 @@ class ModelSet
     self
   end
 
-  def select(&block)
-    self.clone.select!(&block)
+  def select(limit = nil, &block)
+    self.clone.select!(limit, &block)
   end
 
-  def select!
+  def select!(limit = nil)
     filtered_ids = []
     self.each do |model|
-      filtered_ids << model.send(id_field) if yield model
+      if yield model
+        filtered_ids << model.send(id_field)
+        break if filtered_ids.size == limit
+      end
     end
     self.ids = filtered_ids
     self
@@ -237,7 +247,7 @@ class ModelSet
   def sort!(&block)
     block ||= lambda {|a,b| a <=> b}
     sorted_ids = to_a.sort(&block).collect {|m| m.id}
-    model_ids.reorder!(sorted_ids)
+    reorder!(sorted_ids)
     self
   end
 
@@ -247,7 +257,7 @@ class ModelSet
 
   def sort_by!(&block)
     sorted_ids = to_a.sort_by(&block).collect {|m| m.id}
-    model_ids.reorder!(sorted_ids)
+    reorder!(sorted_ids)
     self
   end
 
@@ -340,6 +350,13 @@ class ModelSet
     end
     self
   end
+
+  def reanchor!(type = default_query_type, *args)
+    # Force anchoring even if you are already anchored to this type.
+    return unless type
+    self.query = query_class(type).new(self, *args)
+    self
+  end
   
   def default_query_type
     :sql
@@ -364,6 +381,7 @@ class ModelSet
 
       # 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)
+      anchor!(:set) if [:limit!, :page!].include?(method_name) and not query.limit_enabled?
 
       query.send(method_name, *args)
       self
@@ -379,7 +397,6 @@ class ModelSet
 
   def add_fields!(fields)
     raise 'cannot use both add_fields and include_models' if @included_models
-
     ( @add_fields ||= {} ).merge!(fields)
 
     # We have to reload the models because we are adding additional fields.
@@ -464,7 +481,7 @@ class ModelSet
   end
 
   def self.find_by_sql(sql)
-    query = RawSQLQuery.new
+    query = RawSQLQuery.new(self)
     query.sql = sql
     new(query)
   end

data/lib/model_set/query.rb

@@ -27,6 +27,10 @@ class ModelSet
       clear_limited_cache!
     end
 
+    def limit_enabled?
+      true # Override if limit is not possible for subclass.
+    end
+
     def limit!(limit, offset = nil)
       @limit  = limit  ? limit.to_i  : nil
       @offset = offset ? offset.to_i : nil

data/lib/model_set/set_query.rb

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

data/lib/model_set/sql_base_query.rb

@@ -24,7 +24,7 @@ class ModelSet
     end
     
     def sanitize_condition(condition)
-      ActiveRecord::Base.send(:sanitize_sql, condition)
+      model_class.send(:sanitize_sql, condition)
     end
     
     def limit_clause

data/lib/model_set/sql_query.rb

@@ -8,9 +8,23 @@ class ModelSet
       else
         sql = ids_clause(query.ids)
       end
+      @reorder = query.ids
       add_conditions!(sql)
     end
     
+    def ids
+      if @ids.nil?
+        @ids = fetch_id_set(sql)
+        @ids.reorder!(@reorder) if @reorder
+      end
+      @ids
+    end
+
+    def limit_enabled?
+      return false if @reorder
+      super
+    end
+
     def aggregate(query, opts = {})
       sql = "SELECT #{query} #{from_clause}"
       sql << " LIMIT #{opts[:limit]}"       if opts[:limit]
@@ -39,11 +53,14 @@ class ModelSet
 
       @sort_join  = sanitize_condition(opts[:join])
       @sort_order = args
+      @reorder    = nil
       clear_cache!
     end
   
     def reverse!
-      if @sort_order
+      if @reorder
+        @reorder.reverse!
+      elsif @sort_order
         @sort_order.collect! do |sub_order|
           if sub_order =~ / DESC$/i
             sub_order.slice(0..-6)

data/test/model_set_test.rb

@@ -106,6 +106,20 @@ class ModelSetTest < Test::Unit::TestCase
       assert_equal [captain.id, spidey.id, ironman.id], set.ids
     end
 
+    should "maintain initial order when adding conditions" do
+      captain  = Hero.create(:name => 'Captain America', :universe => 'Marvel')
+      spidey   = Hero.create(:name => 'Spider Man',      :universe => 'Marvel')
+      batman   = Hero.create(:name => 'Batman',          :universe => 'D.C.'  )
+      superman = Hero.create(:name => 'Superman',        :universe => 'D.C.'  )
+      ironman  = Hero.create(:name => 'Iron Man',        :universe => 'Marvel')
+
+      set = HeroSet.new([ironman, captain, superman, spidey, batman])
+
+      set.add_conditions!("universe = 'Marvel'")
+
+      assert_equal [ironman.id, captain.id, spidey.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')
@@ -135,7 +149,7 @@ class ModelSetTest < Test::Unit::TestCase
       set.reverse!
       assert_equal ids.reverse, set.ids
     end
-  
+
     should "have missing ids" do
       missing_id = 5555
       spidey = Hero.create(:name => 'Spider Man', :universe => 'Marvel')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-model_set
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -125,6 +125,7 @@ files:
 - vendor/sphinx_client/tasks/sphinx.rake
 has_rdoc: true
 homepage: http://github.com/ninjudd/model_set
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Easy manipulation of sets of ActiveRecord models