ransack 0.5.7 → 0.5.8

data/lib/ransack/context.rb

@@ -59,15 +59,17 @@ module Ransack
       str ||= ''
 
       if (segments = str.split(/_/)).size > 0
-        association_parts = []
+        remainder = []
         found_assoc = nil
-        while !found_assoc && segments.size > 0 && association_parts << segments.shift do
+        while !found_assoc && segments.size > 0 do
           # Strip the _of_Model_type text from the association name, but hold
           # onto it in klass, for use as the next base
-          assoc, klass = unpolymorphize_association(association_parts.join('_'))
+          assoc, klass = unpolymorphize_association(segments.join('_'))
           if found_assoc = get_association(assoc, base)
-            base = traverse(segments.join('_'), klass || found_assoc.klass)
+            base = traverse(remainder.join('_'), klass || found_assoc.klass)
           end
+
+          remainder.unshift segments.pop
         end
         raise UntraversableAssociationError, "No association matches #{str}" unless found_assoc
       end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70314605054500 !ruby/object:Gem::Requirement
+  requirement: &70316894493020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314605054500
+  version_requirements: *70316894493020
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70314605053560 !ruby/object:Gem::Requirement
+  requirement: &70316894492520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314605053560
+  version_requirements: *70316894492520
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70314605053020 !ruby/object:Gem::Requirement
+  requirement: &70316894492020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70314605053020
+  version_requirements: *70316894492020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314605052340 !ruby/object:Gem::Requirement
+  requirement: &70316894491540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70314605052340
+  version_requirements: *70316894491540
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70314605051080 !ruby/object:Gem::Requirement
+  requirement: &70316894491000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70314605051080
+  version_requirements: *70316894491000
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70314605050120 !ruby/object:Gem::Requirement
+  requirement: &70316894490480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70314605050120
+  version_requirements: *70316894490480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70314605049340 !ruby/object:Gem::Requirement
+  requirement: &70316894489760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70314605049340
+  version_requirements: *70316894489760
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email: