liszt 0.1.0 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f95718b23f9690f8c3e7ffb3e6f749a3fd028ce
+  data.tar.gz: d4ec327052ee0cd233c66b5c84735d45742178ce
+SHA512:
+  metadata.gz: 1f535ac64af9552d73637902ccdca9a66cd4b216b3f208c3a3541455cfbeb2bf58e094bac2ddc7e302d20e4459e3ad73283a973b747a6d5192be9c3d7d73a96a
+  data.tar.gz: 0ef43c9600baf9996a59cb288f99e4d1da6a9d1fe9ad29f7da092df86a71dd44f28ce4c23ffe611d4b6a254450359e588a7c4085d7f1b01427b63187f02cdceb

data/lib/liszt/railtie.rb

@@ -0,0 +1,7 @@
+module Liszt
+  class Railtie < Rails::Railtie
+    config.after_initialize do
+      ActiveRecord::Base.extend Liszt
+    end
+  end
+end

data/lib/liszt/version.rb

@@ -1,3 +1,3 @@
 module Liszt
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/liszt.rb

@@ -1,6 +1,7 @@
 require "liszt/version"
 require "liszt/instantizeable"
 require "liszt/redis_list"
+require "liszt/railtie"  if defined?(Rails::Railtie)
 
 require "active_record"
 
@@ -106,8 +107,14 @@ module Liszt
         refresh_ordered_list(obj)
       else
         list_ids = ordered_list_ids(obj)
-        records  = where('id in (?)', list_ids).to_a
-        records.sort_by { |obj| list_ids.index(obj.id) }
+        records  = liszt_relation(obj).to_a
+        real_ids = records.map(&:id)
+
+        if real_ids.to_set == list_ids.to_set
+          records.sort_by { |obj| list_ids.index(obj.id) }
+        else
+          refresh_ordered_records obj, list_ids, records, real_ids
+        end
       end
     end
 
@@ -117,14 +124,8 @@ module Liszt
       list_ids   = ordered_list_ids(obj)
       records    = liszt_relation(obj).to_a
       real_ids   = records.map(&:id)
-      merged_ids = Liszt.merge_id_lists(
-                     real_ids, list_ids, @liszt_append_new_items)
 
-      if merged_ids != list_ids
-        ordered_list(obj).clear_and_populate!(merged_ids)
-      end
-
-      records.sort_by { |obj| merged_ids.index(obj.id) }
+      refresh_ordered_records obj, list_ids, records, real_ids
     end
 
     # Update the given object's list with the given ids. Returns the final list
@@ -145,6 +146,17 @@ module Liszt
 
     private
 
+    def refresh_ordered_records(obj, list_ids, records, real_ids)
+      merged_ids = Liszt.merge_id_lists(
+                     real_ids, list_ids, @liszt_append_new_items)
+
+      if merged_ids != list_ids
+        ordered_list(obj).clear_and_populate!(merged_ids)
+      end
+
+      records.sort_by { |obj| merged_ids.index(obj.id) }
+    end
+
     # Return the key for the Redis list that includes the given object.
     def liszt_key(obj={})
       key = "liszt:#{table_name}"
@@ -237,5 +249,4 @@ module Liszt
   end
 end
 
-# @@ TODO: use an actual railtie
-ActiveRecord::Base.extend Liszt
+ActiveRecord::Base.extend Liszt unless defined?(Rails::Railtie)

data/test/liszt_test.rb

@@ -86,11 +86,11 @@ describe Liszt do
         @person = Person.new(:name => "John Smith", :group_id => 1, :is_male => true)
       end
 
-      it "doesn't confirm the list when force_refresh is nil" do
+      it "confirms the list when force_refresh is nil but records and sort order don't match" do
         @person.save
         @person.remove_from_list
-        assert !@person.ordered_list_items.include?(@person)
-        assert !@person.ordered_list_ids.include?(@person.id)
+        assert @person.ordered_list_items.include?(@person)
+        assert @person.ordered_list_ids.include?(@person.id)
       end
 
       it "confirms the list when force_refresh is true" do
@@ -100,11 +100,17 @@ describe Liszt do
         assert @person.ordered_list_ids.include?(@person.id)
       end
 
-      it "removes incorrect items from the list when force_refresh is true" do
+      it "removes incorrect items from the list when force_refresh is not true" do
         @person.save
         @person.ordered_list.push(12314231)
         assert @person.ordered_list_ids.include?(12314231)
         @person.ordered_list_items
+        refute @person.ordered_list_ids.include?(12314231)
+      end
+
+      it "removes incorrect items from the list when force_refresh is true" do
+        @person.save
+        @person.ordered_list.push(12314231)
         assert @person.ordered_list_ids.include?(12314231)
         @person.ordered_list_items(:force_refresh => true)
         refute @person.ordered_list_ids.include?(12314231)
@@ -173,6 +179,13 @@ describe Liszt do
   end
 
   describe ".update_ordered_list" do
+    # check both the retval and the actual list
+    def assert_update(input, desired_result)
+      actual_result = @nelson.update_ordered_list input
+      actual_result.must_equal desired_result
+      @nelson.ordered_list_ids.must_equal desired_result
+    end
+
     before do
       @nelson = people(:nelson)
       @nelson.initialize_list!
@@ -180,9 +193,7 @@ describe Liszt do
     end
 
     it "reorders the elements based on the given list" do
-      retval = @nelson.update_ordered_list [@id4, @id3, @id2, @id1]
-      retval.must_equal [@id4, @id3, @id2, @id1]
-      @nelson.ordered_list_ids.must_equal [@id4, @id3, @id2, @id1]
+      assert_update [@id4, @id3, @id2, @id1], [@id4, @id3, @id2, @id1]
     end
 
     describe "when the existing list is missing elements from the db" do
@@ -193,16 +204,13 @@ describe Liszt do
 
       describe "and the user also didn't provide them" do
         it "prepends those elements to the list" do
-          retval = @nelson.update_ordered_list [@id4, @id2, @id1]
-          retval.must_equal [@id3, @id4, @id2, @id1]
-          @nelson.ordered_list_ids.must_equal [@id3, @id4, @id2, @id1]
+          assert_update [@id4, @id2, @id1], [@id3, @id4, @id2, @id1]
         end
       end
 
       describe "and the user provided them as part of their ordering" do
         it "adds those elements where the user provided them" do
-          @nelson.update_ordered_list [@id4, @id2, @id3, @id1]
-          @nelson.ordered_list_ids.must_equal [@id4, @id2, @id3, @id1]
+          assert_update [@id4, @id2, @id3, @id1], [@id4, @id2, @id3, @id1]
         end
       end
 
@@ -212,8 +220,7 @@ describe Liszt do
         end
 
         it "prepends only the one that wasn't provided" do
-          @nelson.update_ordered_list [@id4, @id2, @id1]
-          @nelson.ordered_list_ids.must_equal [@id3, @id4, @id2, @id1]
+          assert_update [@id4, @id2, @id1], [@id3, @id4, @id2, @id1]
         end
       end
     end
@@ -224,27 +231,29 @@ describe Liszt do
       end
 
       it "removes those elements from the list" do
-        @nelson.update_ordered_list [@id4, @id3, @id2, @id1]
-        @nelson.ordered_list_ids.must_equal [@id4, @id3, @id2, @id1]
+        assert_update [@id4, @id3, @id2, @id1], [@id4, @id3, @id2, @id1]
       end
 
       it "ignores those elements if given by the user" do
-        @nelson.update_ordered_list [@id4, @id3, 123, @id2, @id1]
-        @nelson.ordered_list_ids.must_equal [@id4, @id3, @id2, @id1]
+        assert_update [@id4, @id3, 123, @id2, @id1], [@id4, @id3, @id2, @id1]
       end
     end
 
     describe "when the list given by the user omits needed elements" do
-      it "prepends them to the list" do
-        @nelson.update_ordered_list [@id4, @id3, @id1]
-        @nelson.ordered_list_ids.must_equal [@id2, @id4, @id3, @id1]
+      it "prepends them to the list in their existing order" do
+        assert_update [@id3], [@id1, @id2, @id4, @id3]
+      end
+    end
+
+    describe "when the list given by the user is empty" do
+      it "preserves the existing order" do
+        assert_update [], [@id1, @id2, @id3, @id4]
       end
     end
 
     describe "when the list given by the user contains nonexistent elements" do
       it "ignores them and calls back" do
-        @nelson.update_ordered_list [@id4, @id3, 123, @id2, @id1]
-        @nelson.ordered_list_ids.must_equal [@id4, @id3, @id2, @id1]
+        assert_update [@id4, @id3, 123, @id2, @id1], [@id4, @id3, @id2, @id1]
       end
     end
   end

metadata

@@ -1,144 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: liszt
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
-  type: :runtime
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :runtime
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 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:
@@ -154,6 +137,7 @@ files:
 - Rakefile
 - lib/liszt.rb
 - lib/liszt/instantizeable.rb
+- lib/liszt/railtie.rb
 - lib/liszt/redis_list.rb
 - lib/liszt/version.rb
 - liszt.gemspec
@@ -165,27 +149,26 @@ files:
 - test/test_helper.rb
 homepage: http://academia.edu
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord sorting using Redis lists
 test_files:
 - test/fixtures/groups.yml