inquisitio 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5beb1d995aa120b59b2a6f45c0f2c3827e40f5eb
-  data.tar.gz: 4b0f184f436c0042c3096b74dc4a6dfa82b0c109
+  metadata.gz: 2441b583d2147a1ae532629e234864e41e647559
+  data.tar.gz: 27392ff3783c2a60312f24d4a20e9da16d87bede
 SHA512:
-  metadata.gz: 92252a7a9af735589d88d89181ad5377383c1350350d85182f6cb02d7011175a84965e5ff32550a4f293e1f44150eeb50b50295b4bf668d087a2b65e3cfa5c1b
-  data.tar.gz: 5f975e567a4c08fb553090446eee45e44cf2d086334ed05fab01afee966c3136fe8fb11eb4d9e1144bf21291b1d2d716a9f3e3e9a6316a880b354e6dd376b2d4
+  metadata.gz: aa1af91095a8da0800a5f66c5deef6c328d17c31bdd2c3005b47081dc1a612e9fc3088da6d8d2b8250f6815b2c14484779aa8f5793cfe81e3c060c90c312b2ce
+  data.tar.gz: 369761c5a03509d7ee631207243d29dbdb79eb743b15e90c1101f9b69238db2c1dc895fe437515070f25662e4a4035b98110317a341f4c25bfdd8158d2bfcd60

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.1.1 / 2014-01-25
+
+[BUGFIX] Sort records into result order before returning
+
 1.1.0 / 2014-01-24
 
 [BUGFIX] Use 'type' and 'id' fields instead of deprecated med_ fields

data/bin/facet_query

@@ -14,18 +14,18 @@ require "inquisitio"
 endpoint = ARGV[0]
 query = ARGV[1]
 filter_name = ARGV[2]
-filter_value =  ARGV[3]
-return_fields = [ ARGV[4] ]
+filter_value = ARGV[3]
+return_fields = [ARGV[4]]
 
 Inquisitio.config do |config|
   config.search_endpoint = endpoint
 end
 
 puts Inquisitio.search(query,
-                       { filter_name.to_sym => filter_value.to_sym, 
-                         :arguments => { :facet => 'genre',
-                                         'facet-genre-constraints' => 'Animation',
-                                         'facet-genre-top-n' => '5'
-                                       },
-                         :return_fields => return_fields
-                       } )
+                       {filter_name.to_sym => filter_value.to_sym,
+                        :arguments => {:facet => 'genre',
+                                       'facet-genre-constraints' => 'Animation',
+                                       'facet-genre-top-n' => '5'
+                        },
+                        :return_fields => return_fields
+                       })

data/lib/inquisitio/searcher.rb

@@ -9,6 +9,7 @@ module Inquisitio
     end
 
     attr_reader :params
+
     def initialize(params = nil)
       @params = params || {
         criteria: [],
@@ -28,23 +29,38 @@ module Inquisitio
     end
 
     def ids
-      @ids ||= map{|r|r['data']['id'].first}.flatten.map(&:to_i)
+      @ids ||= map { |r| r['data']['id'].first }.flatten.map(&:to_i)
     end
 
     def records
-      @records ||= begin
-        klasses = {}
-        results.map do |result|
-          klass = result['data']['type'].first
-          klasses[klass] ||= []
-          klasses[klass] << result['data']['id'].first
-        end
+      return @records unless @records.nil?
+
+      @records = []
+      klasses = {}
+      results.each do |result|
+        klass = result['data']['type'].first
+        id = result['data']['id'].first
+        klasses[klass] ||= []
+        klasses[klass] << id
+      end
 
-        klasses.map {|klass, ids|
-          klass = klass.gsub("_", "::")
-          klass.constantize.where(id: ids)
-        }.flatten
+      objs = klasses.map { |klass_name, ids|
+        klass_name = klass_name.gsub("_", "::")
+        klass = klass_name.constantize
+        klass.where(id: ids)
+      }.flatten
+
+      results.each do |result|
+        klass_name = result['data']['type'].first
+        klass_name = klass_name.gsub("_", "::")
+        id = result['data']['id'].first
+        record = objs.select { |r|
+          r.class.name == klass_name && r.id == id.to_i
+        }.first
+        @records << record
       end
+
+      return @records
     end
 
     def where(value)
@@ -52,7 +68,7 @@ module Inquisitio
         if value.is_a?(Array)
           s.params[:criteria] += value
         elsif value.is_a?(Hash)
-          value.each do |k,v|
+          value.each do |k, v|
             s.params[:filters][k] ||= []
             if v.is_a?(Array)
               s.params[:filters][k] = v
@@ -110,9 +126,9 @@ module Inquisitio
       raise InquisitioError.new("Search failed with status code: #{response.status} Message #{response.body}") unless response.status == 200
       body = JSON.parse(response.body)
       @results = Results.new(body["hits"]["hit"],
-                             params[:page],
-                             params[:per],
-                             body["hits"]["found"])
+        params[:page],
+        params[:per],
+        body["hits"]["found"])
     rescue => e
       @failed_attempts += 1
       Inquisitio.config.logger.error("Exception Performing search: #{search_url} #{e}")
@@ -127,7 +143,7 @@ module Inquisitio
 
     def search_url
       @search_url ||= begin
-        return_fields = params[:returns].empty?? [:type, :id] : params[:returns]
+        return_fields = params[:returns].empty? ? [:type, :id] : params[:returns]
 
         SearchUrlBuilder.build(
           query: params[:criteria],

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/searcher_test.rb

@@ -1,6 +1,21 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module Inquisitio
+
+  class Elephant
+    attr_accessor :id, :name
+    def initialize(_id, _name)
+      @id, @name = _id, _name
+    end
+  end
+
+  class Giraffe
+    attr_accessor :id, :name
+    def initialize(_id, _name)
+      @id, @name = _id, _name
+    end
+  end
+
   class SearcherTest < Minitest::Test
     def setup
       super
@@ -288,20 +303,24 @@ module Inquisitio
       assert_equal [1,2,20], searcher.ids
     end
 
-    def test_should_return_records
-      Object.const_set :Cat, Object.new
-      Module.const_set :Dog, Object.new
-
-      res1 = "Foobar"
-      res2 = 123
-      res3 = true
+    def test_should_return_records_in_results_order
+      expected_1 = Elephant.new(2, 'Sootica')
+      expected_2 = Giraffe.new(20, 'Wolf')
+      expected_3 = Elephant.new(1, 'Gobbolino')
 
-      Cat.expects(:where).with(id: ['1','2']).returns([res1, res2])
-      Module::Dog.expects(:where).with(id: ['20']).returns([res3])
+      Elephant.expects(:where).with(id: ['2','1']).returns([expected_3, expected_1])
+      Giraffe.expects(:where).with(id: ['20']).returns([expected_2])
 
       searcher = Searcher.new
-      searcher.instance_variable_set("@results", [])
-      assert_equal [res1, res2, res3], Searcher.records
+      result = [
+          {'data' => {'id' => ['2'],  'type' => ['Inquisitio_Elephant']}},
+          {'data' => {'id' => ['20'], 'type' => ['Inquisitio_Giraffe']}},
+          {'data' => {'id' => ['1'],  'type' => ['Inquisitio_Elephant']}}
+      ]
+      searcher.instance_variable_set("@results", result)
+      expected_records = [expected_1, expected_2, expected_3]
+      actual_records = searcher.records
+      assert_equal expected_records, actual_records
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeremy Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: This wraps AWS CloudSearch in a Ruby Gem