liszt 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liszt (0.0.3)
+    liszt (0.0.5)
       rails (>= 2.3.2)
       redis
 
@@ -82,7 +82,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.3)

data/Gemfile.rails2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liszt (0.0.3)
+    liszt (0.0.5)
       rails (>= 2.3.2)
       redis
 

data/lib/liszt/version.rb

@@ -1,3 +1,3 @@
 module Liszt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/liszt.rb

@@ -78,13 +78,14 @@ module Liszt
       end
     end
 
-    def ordered_list_items(obj={}, double_check=false)
+    def ordered_list_items(obj={}, opts={})
+      force_refresh = opts.delete(:force_refresh) || false
       was_initialized = ordered_list_initialized?(obj)
       ids = ordered_list_ids(obj)
 
       # If ordered_list_ids just did the initialization, we can trust that
-      # the list of ids is accurate and ignore the double_check flag.
-      if double_check and was_initialized
+      # the list of ids is accurate and ignore the force_refresh flag.
+      if force_refresh and was_initialized
         objs = find(:all, :conditions => liszt_query(obj))
         real_ids = objs.map(&:id)
         unlisted_ids = real_ids - ids
@@ -92,7 +93,7 @@ module Liszt
           ids = ordered_list(obj).clear_and_populate!(unlisted_ids + ids)
         end
       else
-        objs = find_all_by_id(ids)
+        objs = find(:all, {:conditions => ['id in (?)', ids]}.merge(opts))
       end
 
       objs.sort_by { |obj| ids.index(obj.id) }

data/test/liszt_test.rb

@@ -83,25 +83,30 @@ class LisztTest < ActiveSupport::TestCase
       end
     end
 
-    context "double_check" do
+    context "options" do
       setup do
         Person.initialize_list!(:group_id => 1, :is_male => true)
         @person = Person.new(:name => "John Smith", :group_id => 1, :is_male => true)
       end
 
-      should "not confirm the list when double_check=false" do
+      should "not confirm the list when force_refresh is nil" do
         @person.save
         @person.remove_from_list
         assert !@person.ordered_list_items.include?(@person)
         assert !@person.ordered_list_ids.include?(@person.id)
       end
 
-      should "confirm the list when double_check=true" do
+      should "confirm the list when force_refresh is true" do
         @person.save
         @person.remove_from_list
-        assert @person.ordered_list_items(true).include?(@person)
+        assert @person.ordered_list_items(:force_refresh => true).include?(@person)
         assert @person.ordered_list_ids.include?(@person.id)
       end
+
+      should "pass any other options through to the ActiveRecord query" do
+        @person.save
+        assert @person.ordered_list_items(:limit => 2).count == 2
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liszt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70165237093020 !ruby/object:Gem::Requirement
+  requirement: &70233352439880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70165237093020
+  version_requirements: *70233352439880
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70165237092600 !ruby/object:Gem::Requirement
+  requirement: &70233352439380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165237092600
+  version_requirements: *70233352439380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70165237092140 !ruby/object:Gem::Requirement
+  requirement: &70233352438860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165237092140
+  version_requirements: *70233352438860
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70165237091720 !ruby/object:Gem::Requirement
+  requirement: &70233352438280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165237091720
+  version_requirements: *70233352438280
 description: Liszt is an alternative to acts_as_list and sortable that uses atomic
   Redis operations to maintain scoped ordering information for ActiveRecord objects.
 email:
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: ActiveRecord sorting using Redis lists