Merge branch 'fix/infinitive'

learnjin · Aug 18, 2014 · c363ead · c363ead
2 parents 978acf4 + 52947e7
commit c363ead
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/rewritten.rb b/lib/rewritten.rb
@@ -229,6 +229,8 @@ def get_current_translation(path, tail=nil)
   # infinitive for translations only!
   def infinitive(some_from)
 
+    some_from ||= ''
+
     conjugated = some_from.chomp('/')
 
     to = translate(conjugated)
@@ -240,7 +242,8 @@ def infinitive(some_from)
       infinitive(shorter_path)
     else
       conjugated = get_current_translation(to) if to
-      conjugated.split('?')[0].chomp('/')
+      conjugated = conjugated.split('?')[0] || ''
+      conjugated.chomp('/')
     end
   end
 

diff --git a/lib/rewritten/version.rb b/lib/rewritten/version.rb
@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.14.1"
+  VERSION = "0.14.2"
 end
 
diff --git a/test/rewritten_test.rb b/test/rewritten_test.rb
@@ -38,6 +38,10 @@
 
   describe 'get_infinitive (always from conjugated for -> for)' do
 
+    it 'must work with nil' do
+      Rewritten.infinitive(nil).must_equal ''
+    end
+
     it 'must remove query parameters from non translatable foreign path' do
       Rewritten.infinitive('/no/translation').must_equal '/no/translation'
       Rewritten.infinitive('/no/translation/').must_equal '/no/translation'