sortifiable 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.1.2 (February 7th, 2011)
+
+* Configure association scopes correctly
+
+
 *0.1.1 (February 7th, 2011)
 
 * Use the class in which act_as_list is called

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/sortifiable.rb

@@ -58,7 +58,7 @@ module Sortifiable
               reflection.options[:foreign_type].to_sym
             ]
           else
-            reflection.association_foreign_key.to_sym
+            options[:scope] = reflection.association_foreign_key.to_sym
           end
         else
           raise ArgumentError, "Only belongs_to associations can be used as a scope"

data/test/sortifiable_test.rb

@@ -55,6 +55,20 @@ class ArrayScopeListMixin < ActiveRecord::Base
   default_scope order(:pos)
 end
 
+class AssociationScopeListMixin < ActiveRecord::Base
+  belongs_to :parent
+  acts_as_list :column => "pos", :scope => :parent
+  set_table_name "mixins"
+  default_scope order(:pos)
+end
+
+class PolymorphicAssociationScopeListMixin < ActiveRecord::Base
+  belongs_to :parent, :polymorphic => true
+  acts_as_list :column => "pos", :scope => :parent
+  set_table_name "mixins"
+  default_scope order(:pos)
+end
+
 teardown_db
 
 class NonListTest < Test::Unit::TestCase
@@ -603,3 +617,39 @@ class ArrayScopeListTest < Test::Unit::TestCase
   end
 
 end
+
+class AssociationScopeListTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each do |counter|
+      AssociationScopeListMixin.create!(
+        :pos => counter,
+        :parent_id => 5
+      )
+    end
+
+    (1..4).each do |counter|
+      PolymorphicAssociationScopeListMixin.create!(
+        :pos => counter,
+        :parent_id => 5,
+        :parent_type => 'ParentClass'
+      )
+    end
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_association_scope_is_configured
+    assert_equal :parent_id,
+      AssociationScopeListMixin.acts_as_list_options[:scope]
+  end
+
+  def test_polymorphic_association_scope_is_configured
+    assert_equal [:parent_id, :parent_type],
+      PolymorphicAssociationScopeListMixin.acts_as_list_options[:scope]
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sortifiable
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andrew White