elos 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d31b68839dfd6de47dc55dfd864836782cdc92
-  data.tar.gz: 2b1b66f0e8a64c6db1c00e6db59598cf690bfd38
+  metadata.gz: 6ff3008e40d503964c422631fad5d77de60a7885
+  data.tar.gz: 466ffd95f2b4c692dbc3e72af3c38b05917c40d7
 SHA512:
-  metadata.gz: c1c7c854e2e603f9a6e8b940f32ae5a10ca418929964428b6805fbc1c174d09da486c662ff04476b0596996c99ca06515b90d04ad3661412f40c15c797505ebb
-  data.tar.gz: 0db04d2376b97469be902158dac7e79d776ecfe6de0e33bba2cfeed0c916e606d6a249c1cc9755982a234310787c4671a59bb75e2cf8f923056b1f686394adbc
+  metadata.gz: c413e33ee7e80fe240836c337bfa1803fde01c621578d235d36d13a1cb079d9ab55e5185e3119aaf53a619185b3e1f40b29a9c0b8d2b8940f3ac5e80c876ecd6
+  data.tar.gz: 507bb34e5aad52e3308bdd4aac681f373bb40639ad08a2409c6ae4d9b79ff274dc4d27a8f63ed1cde4b8138aed887b93a21cd7b49041163724159b96585c7750

data/lib/elos/criteria.rb

@@ -61,7 +61,7 @@ class Elos::Criteria < Elos::Result
   end
 
   def query
-    @query_builder_class.new(@params)._build
+    @query_builder_class.new(@params.merge(class: @klass)).wrap_build
   end
 
   protected

data/lib/elos/index/indexable.rb

@@ -17,6 +17,7 @@ module Elos::Index::Indexable
     def index(obj, destroy: false, unindex: false)
       if !unindex && data = index_data.(obj)
         data.merge!(_destroyed: destroy)
+        data[:json] = data[:json].to_json if data[:json]
         params = { index: write_alias_name, type: type_name, body: data }
         params.merge!(id: obj.id) if obj.id
         client.index(params)['_id']

data/lib/elos/index/mappings.rb

@@ -18,7 +18,7 @@ module Elos::Index::Mappings
 
     def set_mappings(mappings)
       mps = mappings.is_a?(Proc) ? mappings.() : mappings.deep_dup
-      mps[:properties].merge!(_destroyed: boolean_property, json: no_index_string_property)
+      mps[:properties].merge!(_destroyed: boolean_property, json: no_index_string_property) if respond_to?(:physically_destroy?) && physically_destroy?
       self.mappings = { type_name => mps }
     end
   end

data/lib/elos/query_builder/base.rb

@@ -3,11 +3,13 @@ class Elos::QueryBuilder::Base
   include Elos::QueryBuilder::Queries
 
   def initialize(params)
+    @klass = params.delete(:class)
     @params = params
   end
 
-  def _build
+  def wrap_build
     query = build
+    return query if !@klass.respond_to?(:physically_destroy?) || @klass.physically_destroy?
     original_query = query[:query]
     filter = term_filter(:_destroyed, value: false)
     query[:query] = { filtered: { query: original_query, filter: filter } }

data/lib/elos/version.rb

@@ -1,3 +1,3 @@
 class Elos
-  VERSION = '1.0.16'
+  VERSION = '1.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elos
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Tetsuri Moriya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport