shuber-sortable 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+2009-05-27 - Sean Huber (shuber@huberry.com)
+  * Use self.class.base_class when scoping records
+  * Fix conflicts
+
 2009-05-14 - Sean Huber (shuber@huberry.com)
   * Remove MIT-LICENSE from gemspec - github complaining for some reason
   * Type cast position and offset arguments as integers

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Sean Huber (shuber@huberry.com)
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,6 +1,6 @@
 = sortable
 
-Allows you to sort ActiveRecord items similar to http://github.com/rails/acts_as_list but with support for multiple scopes and lists
+Allows you to sort ActiveRecord items similar to http://github.com/rails/acts_as_list but with added support for multiple scopes and lists
 
 
 == Installation

data/lib/sortable.rb

@@ -163,7 +163,7 @@ module Huberry
       # Returns the first item in a list associated with the current item
       def first_item(list_name = nil)
         options = evaluate_sortable_options(list_name)
-        self.class.send("find_by_#{options[:column]}".to_sym, 1, :conditions => options[:conditions])
+        self.class.base_class.send("find_by_#{options[:column]}".to_sym, 1, :conditions => options[:conditions])
       end
       
       # Returns a boolean after determining if the current item is the first item in the specified list
@@ -207,14 +207,14 @@ module Huberry
       # Returns nil if an item at the specified offset could not be found
       def item_at_offset(offset, list_name = nil)
         options = evaluate_sortable_options(list_name)
-        in_list?(list_name) ? self.class.send("find_by_#{options[:column]}".to_sym, send(options[:column]) + offset.to_s.to_i, :conditions => options[:conditions]) : nil
+        in_list?(list_name) ? self.class.base_class.send("find_by_#{options[:column]}".to_sym, send(options[:column]) + offset.to_s.to_i, :conditions => options[:conditions]) : nil
       end
       
       # Returns the last item in a list associated with the current item
       def last_item(list_name = nil)
         options = evaluate_sortable_options(list_name)
         (options[:conditions].is_a?(Array) ? options[:conditions].first : options[:conditions]) << " AND #{self.class.table_name}.#{options[:column]} IS NOT NULL "
-        self.class.find(:last, :conditions => options[:conditions], :order => options[:column].to_s)
+        self.class.base_class.find(:last, :conditions => options[:conditions], :order => options[:column].to_s)
       end
       
       # Returns a boolean after determining if the current item is the last item in the specified list
@@ -305,7 +305,7 @@ module Huberry
         # Returns the evaluated options
         def evaluate_sortable_options(list_name = nil)
           self.class.assert_sortable_list_exists!(list_name)
-          options = self.class.sortable_lists[list_name.to_s].inject({}) { |hash, pair| hash[pair.first] = pair.last.nil? || pair.last.is_a?(Symbol) ? pair.last : pair.last.dup; hash }
+          options = self.class.sortable_lists[list_name.to_s].inject({}) { |hash, pair| hash.merge! pair.first => (pair.last.dup rescue pair.last) }
           options[:scope].each do |scope|
             value = send(scope)
             if value.nil?
@@ -315,7 +315,7 @@ module Huberry
               options[:conditions] << value
             end
           end
-          options
+          options     
         end
         
         # Moves items with a position lower than a certain <tt>position</tt> by an offset of 1 in the specified 
@@ -323,7 +323,7 @@ module Huberry
         def move_lower_items(direction, position, list_name = nil)
           options = evaluate_sortable_options(list_name)
           (options[:conditions].is_a?(Array) ? options[:conditions].first : options[:conditions]) << " AND #{self.class.table_name}.#{options[:column]} > '#{position}' AND #{self.class.table_name}.#{options[:column]} IS NOT NULL "
-          self.class.update_all "#{options[:column]} = #{options[:column]} #{direction == :up ? '-' : '+'} 1", options[:conditions]
+          self.class.base_class.update_all "#{options[:column]} = #{options[:column]} #{direction == :up ? '-' : '+'} 1", options[:conditions]
         end
         
         # Removes the current item from the specified list

data/test/sortable_test.rb

@@ -6,22 +6,28 @@ require File.dirname(__FILE__) + '/../lib/sortable'
 
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
 
-def create_todos_table
+def create_tables
   silence_stream(STDOUT) do
     ActiveRecord::Schema.define(:version => 1) do
       create_table :todos do |t|
         t.integer  :project_id
+        t.string   :type
         t.string   :action
         t.integer  :client_priority
         t.integer  :developer_priority
         t.integer  :position
       end
+      
+      create_table :users do |t|
+        t.string   :type
+        t.integer  :position
+      end
     end
   end
 end
 
 # The table needs to exist before defining the class
-create_todos_table
+create_tables
 
 class Todo < ActiveRecord::Base
   sortable :scope => :project_id, :conditions => 'todos.action IS NOT NULL'
@@ -29,11 +35,21 @@ class Todo < ActiveRecord::Base
   sortable :scope => :project_id, :column => :developer_priority, :list_name => :developer
 end
 
+class TodoChild < Todo
+end
+
+class User < ActiveRecord::Base
+  sortable :scope => :type
+end
+
+class Admin < User
+end
+
 class SortableTest < Test::Unit::TestCase
   
   def setup
     ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
-    create_todos_table
+    create_tables
   end
   
   def test_should_add_to_lists
@@ -257,4 +273,24 @@ class SortableTest < Test::Unit::TestCase
     assert_equal 3, @todo_6.position
   end
   
+  def test_should_scope_with_base_class
+    @todo = Todo.create :action => 'test'
+    @todo_2 = TodoChild.create :action => 'test'
+    @todo_3 = Todo.create :action => 'test'
+    assert_equal 1, @todo.position
+    assert_equal 2, @todo_2.position
+    assert_equal 3, @todo_3.position
+  end
+  
+  def test_should_not_scope_with_base_class
+    @user = User.create
+    @admin = Admin.create
+    @user_2 = User.create
+    @admin_2 = Admin.create
+    assert_equal 1, @user.position
+    assert_equal 2, @user_2.position
+    assert_equal 1, @admin.position
+    assert_equal 2, @admin_2.position
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shuber-sortable
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Sean Huber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -07:00
+date: 2009-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - CHANGELOG
 - init.rb
 - lib/sortable.rb
+- MIT-LICENSE
 - Rakefile
 - README.rdoc
 has_rdoc: false