nazrin 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f65c87ab62673a083a1ff25f8bb1ef6895bc711
-  data.tar.gz: 2720dc6ef684787ddda67c54a2cb9629513bf8fd
+  metadata.gz: 8e9cf38a42182748cb66ae4cbe9b0fdee0ee0e28
+  data.tar.gz: 1697512262d0dc064e714f916475ca2a98bdfa28
 SHA512:
-  metadata.gz: 131440d1483c5239c9097eab18c1ab50d1842fad9463f248748f9fd682f9fdb3ba393be94665e1cdc5dfeb42531e41ed3ddeeccc858cd143518bed2e02995d36
-  data.tar.gz: 87daa6ba9f73f46c3287fd4853e5e6e280155991a0b68e19e12b9b59216dc7cfa3cbcd9842ce5497239388eb7b75472cdd6ea84049c7be0f1edc116ca203060f
+  metadata.gz: aadbe716cbbb97d6a22147a1b0341df7a7ce06b8eef371d3e1e00f2570c1fe1a1d8a2bcb4b809a5a199c98a1d8596ac11241b1c1beb1613901a948d2a4d8c840
+  data.tar.gz: 469c6dec4d4fa66a1972a9c4cb5b1d860ad9fd939024ad7e9cb6842652f084e77084cfce4bd4599ece4e4f56f9a526058fb819e9e45ca1b8beab7f8d598f47f5

data/lib/nazrin/data_accessor/active_record.rb

@@ -4,15 +4,16 @@ module Nazrin
       # load from activerecord
       def load_all(ids)
         records_table = {}
-        options.each do |k, v|
-          @model = model.send(k, v)
+
+        relation = options.reduce(model) do |rel, (k, v)|
+          rel.send(k, v)
         end
-        model.where(id: ids).each do |record|
-          records_table[record.id] = record
+
+        relation.where(id: ids).each do |record|
+          records_table[record.id.to_s] = record
         end
-        ids.map do |id|
-          records_table.select { |k, _| k == id.to_i }[id.to_i]
-        end.reject(&:nil?)
+
+        records_table.values_at(*ids.map(&:to_s)).compact
       end
 
       def data_from_response(res)

data/lib/nazrin/data_accessor/mongoid.rb

@@ -3,19 +3,16 @@ module Nazrin
     class Mongoid < Nazrin::DataAccessor
       def load_all(ids)
         documents_table = {}
-        options.each do |k, v|
-          @model = if v.nil?
-                     model.send(k)
-                   else
-                     model.send(k, v)
-                   end
+
+        relation = options.reduce(model) do |rel, send_args|
+          rel.send(*send_args.compact)
         end
-        model.where('_id' => { '$in' => ids }).each do |document|
+
+        relation.where('_id' => { '$in' => ids }).each do |document|
           documents_table[document._id.to_s] = document
         end
-        ids.map do |id|
-          documents_table[id]
-        end.reject(&:nil?)
+
+        documents_table.values_at(*ids.map(&:to_s)).compact
       end
 
       def data_from_response(res)

data/lib/nazrin/data_accessor/struct.rb

@@ -45,6 +45,7 @@ module Nazrin
 
         def cloudsearch_client
           @cloudsearch_client ||= Aws::CloudSearch::Client.new(
+            region: config.region,
             access_key_id: config.access_key_id,
             secret_access_key: config.secret_access_key,
             logger: config.logger

data/lib/nazrin/version.rb

@@ -1,3 +1,3 @@
 module Nazrin
-  VERSION = '2.6.2'
+  VERSION = '2.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazrin
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core