es-elasticity 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c68c0531188ec748580e9dca08ef476d93d2b5f
-  data.tar.gz: 05c85b83b78bc01ada5940dfd1bf222de6fdacc0
+  metadata.gz: 3b76200d65a0e6774e76eef4ea2251d9cc509173
+  data.tar.gz: 1da42184260cbe560b050fd0177f01d7245ed524
 SHA512:
-  metadata.gz: acd0da8c79ee7376bb7d1236ba444e238c1e046af0724d9a6357d51a3d16d4ead3ee357dc19ef646eaaa2d74a70572229732fc211b93eb1de412f8d6989e84b6
-  data.tar.gz: d07b79d85935534f65ae761432dab36129094bbe0e9074b3fd9e406a34f74520886f4f1f7239daf7f96e770638b43c373e6780bc090e319046859bdd2db86143
+  metadata.gz: 3a649dc7bb0631b411f24eb9000ba477c224deb9d2e8876d8391e2176d95cb2e88aaa15820c80d8eb5f92f0118682f96840b0bac71924c5af629613b8ce9cbf5
+  data.tar.gz: 67f7d70d8559fcd8167de2c9c32412a3eb5e43b588fdfe87ba01d98ff10eb01a76af57fcfd387b524892c128bec86f50f0d1246471d12138fcbc037ae0561cc7

data/lib/elasticity/search.rb

@@ -179,8 +179,9 @@ module Elasticity
         ids = hits.map { |hit| hit["_id"] }
 
         if ids.any?
-          id_col = "#{relation.connection.quote_column_name(relation.table_name)}.#{relation.connection.quote_column_name(relation.klass.primary_key)}"
-          relation.where("#{id_col} IN (?)", ids).order("FIELD(#{id_col},#{ids.join(',')})")
+          id_col  = "#{relation.connection.quote_column_name(relation.table_name)}.#{relation.connection.quote_column_name(relation.klass.primary_key)}"
+          id_vals = ids.map { |id| relation.connection.quote(id) }
+          relation.where("#{id_col} IN (?)", ids).order("FIELD(#{id_col}, #{id_vals.join(',')})")
         else
           relation.none
         end
@@ -224,8 +225,8 @@ module Elasticity
         metadata[:suggestions]
       end
 
-      def method_missing(name, *args, **options, &block)
-        filtered_relation.public_send(name, *args, **options, &block)
+      def method_missing(name, *args, &block)
+        filtered_relation.public_send(name, *args, &block)
       end
 
       private

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler