sortifiable 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.3 (May 3rd, 2011)
+
+* Rails 3.1 has added Model.foreign_{key,type} to association reflections
+
+
 *0.2.2 (May 3rd, 2011)
 
 * Ensure that callbacks return true when no updates take place

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/sortifiable.rb

@@ -53,14 +53,7 @@ module Sortifiable
           reflection = reflections[options.delete(:scope)]
 
           if reflection.belongs_to?
-            if reflection.options[:polymorphic]
-              options[:scope] = [
-                reflection.association_foreign_key.to_sym,
-                reflection.options[:foreign_type].to_sym
-              ]
-            else
-              options[:scope] = reflection.association_foreign_key.to_sym
-            end
+            options[:scope] = scope_from_association_reflection(reflection)
           else
             raise ArgumentError, "Only belongs_to associations can be used as a scope"
           end
@@ -80,6 +73,24 @@ module Sortifiable
 
       self.acts_as_list_options = options
     end
+
+    private
+      def scope_from_association_reflection(reflection) #:nodoc:
+        if reflection.options[:polymorphic]
+          if reflection.respond_to?(:foreign_type)
+            [reflection.foreign_key, reflection.foreign_type].map(&:to_sym)
+          else
+            [reflection.association_foreign_key, reflection.options[:foreign_type]].map(&:to_sym)
+          end
+        else
+          if reflection.respond_to?(:foreign_type)
+            reflection.foreign_key.to_sym
+          else
+            reflection.association_foreign_key.to_sym
+          end
+        end
+      end
+
   end
 
   # All the methods available to a record that has had <tt>acts_as_list</tt>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sortifiable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Andrew White