scalastic 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabee929f6467976bbb5a816048e1c22fba92020
-  data.tar.gz: b007176e8b386a2980ba01b7a0bd00f38b2e1706
+  metadata.gz: d9c85a4c8ce641aeb06c69d512a7a89bf5f7f17b
+  data.tar.gz: fa1fceadf8d9e1e149e5d20b64e94a31b43364de
 SHA512:
-  metadata.gz: a64d2f4512f8d281c28306e303d9e9039eb6597c5d60bc7039bd5360b3582392616432a75437e5e788869221a34fbfc7644c10c958e89b0c1ff56a1c53044cf5
-  data.tar.gz: a1ca18eb3fc0ff85003d8f087efa795254276218b84148a30b10ed815c074c0dc4ef32fa59300ccbee6814556eea166ca657b6b1fe4fd5cb00ba2f21cdd64c76
+  metadata.gz: 504345904505bdf7b63732a8ebc48caf1f535911fc9620510f67f066ac47c772f780d23d8288bcc4ae430610404e195fc01468fa46b54009887c40ccee53c34f
+  data.tar.gz: e3eea7ac3814e88f7889a64a65f1e3fb9570b81db57ebc85c67dc0bab72a1810bf3ee93a5bf086adcb59726e59f370dd3715f9eed7357973492c34da427fc50b

data/lib/scalastic/normalizer.rb

@@ -0,0 +1,22 @@
+module Scalastic
+  module Normalizer
+    extend self
+
+    def normalized(hash)
+      return hash if hash.keys.first.is_a?(String)
+      normalize_internal(hash)
+    end
+
+    private
+
+    def normalize_internal(object)
+      if (object.is_a?(Hash))
+        object.map{|k, v| [k.to_s, normalize_internal(v)]}.to_h
+      elsif object.respond_to?(:map)
+        object.map{|i| normalize_internal(i)}
+      else
+        object
+      end
+    end
+  end
+end

data/lib/scalastic/partition.rb

@@ -1,9 +1,12 @@
 require 'scalastic/es_actions_generator'
 require 'scalastic/partition_selector'
 require 'scalastic/scroller'
+require 'scalastic/normalizer'
 
 module Scalastic
   class Partition
+    include Normalizer
+
     Endpoint = Struct.new(:index, :routing)
     Endpoints = Struct.new(:index, :search)
 
@@ -26,7 +29,7 @@ module Scalastic
       raise(ArgumentError, 'Missing required argument :index') if index.nil? || index.to_s.empty?
 
       index_alias = config.index_endpoint(id)
-      indices = es_client.indices.get_aliases(name: index_alias).select{|i, d| d['aliases'].any?}.keys
+      indices = normalized(es_client.indices.get_aliases(name: index_alias)).select{|i, d| d['aliases'].any?}.keys
       actions = indices.map{|i| {remove: {index: i, alias: index_alias}}}
       actions << {add: EsActionsGenerator.new_index_alias(config, args.merge(id: id))}
       actions << {add: EsActionsGenerator.new_search_alias(config, args.merge(id: id))}
@@ -69,7 +72,7 @@ module Scalastic
 
     def exists?
       names = [config.search_endpoint(id), config.index_endpoint(id)]
-      all_aliases = es_client.indices.get_aliases name: names.join(',')
+      all_aliases = normalized(es_client.indices.get_aliases name: names.join(','))
       all_aliases.any?{|_index, data| data['aliases'].any?}
     end
 
@@ -101,7 +104,7 @@ module Scalastic
     def get_endpoints
       sa = config.search_endpoint(id)
       ia = config.index_endpoint(id)
-      aliases = es_client.indices.get_aliases name: [sa, ia].join(',')
+      aliases = normalized(es_client.indices.get_aliases name: [sa, ia].join(','))
       sas = aliases.map{|i, d| [i, d['aliases'][sa]]}.reject{|_i, sa| sa.nil?}
       ias = aliases.map{|i, d| [i, d['aliases'][ia]]}.reject{|_i, ia| ia.nil?}
       Endpoints.new(

data/lib/scalastic/partitions_client.rb

@@ -1,9 +1,11 @@
-require "scalastic/partition"
-require "scalastic/es_actions_generator"
+require 'scalastic/partition'
+require 'scalastic/es_actions_generator'
+require 'scalastic/normalizer'
 
 module Scalastic
   class PartitionsClient
     include Enumerable
+    include Normalizer
 
     attr_reader(:es_client)
     attr_reader(:config)
@@ -27,7 +29,7 @@ module Scalastic
     def delete(args = {})
       id = args[:id].to_s
       raise(ArgumentError, 'Missing required argument :id') if id.nil? || id.empty?
-      pairs = es_client.indices.get_aliases.map{|i, d| d['aliases'].keys.select{|a| config.get_partition_id(a) == id}.map{|a| [i, a]}}.flatten(1)
+      pairs = normalized(es_client.indices.get_aliases).map{|i, d| d['aliases'].keys.select{|a| config.get_partition_id(a) == id}.map{|a| [i, a]}}.flatten(1)
       unless pairs.any?
         #TODO: log a warning
         return
@@ -54,7 +56,7 @@ module Scalastic
     private
 
     def partition_ids
-      aliases = es_client.indices.get_aliases
+      aliases = normalized(es_client.indices.get_aliases)
       partition_ids = aliases.map{|_, data| data['aliases'].keys}.flatten.map{|a| config.get_partition_id(a)}.compact.uniq
     end
   end

data/lib/scalastic/scroller.rb

@@ -1,6 +1,9 @@
+require 'scalastic/normalizer'
+
 module Scalastic
   class Scroller
     include Enumerable
+    include Normalizer
 
     def initialize(es_client, args)
       @es_client = es_client
@@ -18,10 +21,10 @@ module Scalastic
     def each(&block)
       Enumerator.new do |enum|
         args = @args.merge(search_type: 'scan', scroll: scroll)
-        res = @es_client.search(args)
+        res = normalized(@es_client.search(args))
         loop do
           scroll_id = res['_scroll_id']
-          res = @es_client.scroll(body: scroll_id, scroll: scroll)
+          res = normalized(@es_client.scroll(body: scroll_id, scroll: scroll))
           hits = res['hits']['hits']
           break unless hits.any?
           hits.each{|h| enum << h}

data/lib/scalastic/version.rb

@@ -1,3 +1,3 @@
 module Scalastic
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/regression/regression_tests/scroll.rb

@@ -21,9 +21,11 @@ module RegressionTests
         p.index id: i + 1, type: 'test', body: {subject: "Test ##{i + 1}"}
       end
 
+      sleep 1.5
+
       # Get the hits. Size is set to 7 to test multiple calls to scroll
       actual_hits = p.scroll(type: 'test', size: 7).to_a.sort{|h1, h2| h1['_id'].to_i <=> h2['_id'].to_i}
-      expected_hits = 10.times.map{|i| {'_id' => "#{i + }", '_type' => 'test', '_source' => {'_subject' => "Test ##{i + 1}"} }}
+      expected_hits = 10.times.map{|i| {'_index' => 'scrolling', '_type' => 'test', '_id' => "#{i + 1}", '_score' => 0.0, '_source' => {'subject' => "Test ##{i + 1}", 'scalastic_partition_id' => 1} }}
 
       raise "Expected: #{expected_hits}, got: #{actual_hits}" unless expected_hits == actual_hits
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalastic
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Aliaksei Baturytski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,7 @@ files:
 - lib/scalastic.rb
 - lib/scalastic/config.rb
 - lib/scalastic/es_actions_generator.rb
+- lib/scalastic/normalizer.rb
 - lib/scalastic/partition.rb
 - lib/scalastic/partition_selector.rb
 - lib/scalastic/partitions_client.rb
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch document partitions