Fix finding multiple non-hashids

jcypret · Jan 8, 2017 · 23caa22 · 23caa22
1 parent f1887a7
commit 23caa22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/hashid/rails.rb b/lib/hashid/rails.rb
@@ -55,7 +55,8 @@ def encode_id(ids)
 
       def decode_id(ids)
         if ids.is_a?(Array)
-          ids.map { |id| hashid_decode(id) }
+          decoded_ids = ids.map { |id| hashid_decode(id) }
+          decoded_ids.any? ? decoded_ids : nil
         else
           hashid_decode(ids)
         end

diff --git a/spec/hashid/rails_spec.rb b/spec/hashid/rails_spec.rb
@@ -31,6 +31,15 @@
     expect(decoded_ids).to eql [1, 3, 5]
   end
 
+  it "finds muliple un-encoded ids" do
+    model_one = FakeModel.create!
+    model_two = FakeModel.create!
+
+    FakeModel.find([model_one.id, model_two.id])
+
+    FakeModel.delete_all
+  end
+
   it "encodes multiple ids" do
     encoded_ids = FakeModel.encode_id([2, 4, 6])
     expect(encoded_ids).to eq %w(YznovR OeVre9 YNAOva)