elos 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff9706189ea5a190be433cce62e342e05552d05
-  data.tar.gz: 2ab9903f440a63db5e69ef32a087895b6dba2b00
+  metadata.gz: 141f44ad81bf0ce324ac8918170dd06db0df709b
+  data.tar.gz: ce57df759708da43d8055905e3bd7c7d106b846c
 SHA512:
-  metadata.gz: e07f881970b0912a7f1d15f3ec6dcc5d70beb284f0392e0b06281dbb10ef8f4e28f512a2689026de050fd0a2cd5f913cf2d599df0b8c9df5faa15a56a233d859
-  data.tar.gz: 6769fd11b933634fda7f3ef626386cec2f0c1a972ea52cc402db7f5e6326137c8c7551b9f598d70e34901ee3a211ab28cae85a0682a0b8199cd2a72921f9d736
+  metadata.gz: 03c23fba73664c3facd81d9808da21292e4a35baadcbffb242591372f2ecfd703d8f7280864d06d3a50281f141526611e2928f65a5818e825e10e4785a2e3f5b
+  data.tar.gz: 423bd408370fca519eb2e67bcf438491a03ced41a6df7c5b90171203ab987f1955b9315f0164e97478dd3dcdb9d600c413c5019bc5e66969348765db4df4be5f

data/lib/elos/index/indexable.rb

@@ -15,9 +15,7 @@ module Elos::Index::Indexable
     end
 
     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]
+      if !unindex && data = wrap_index_data(obj, destroy)
         params = { index: write_alias_name, type: type_name, body: data }
         params.merge!(id: obj.id) if obj.id
         client.index(params)['_id']
@@ -29,5 +27,15 @@ module Elos::Index::Indexable
         end
       end
     end
+
+    private
+
+    def wrap_index_data(obj, destroy)
+      data = index_data.(obj)
+      return unless data
+      data.merge!(_destroyed: destroy)
+      data[:json] = Elos::Index::Model::Object.encode(data[:json]) if data[:json]
+      data
+    end
   end
 end

data/lib/elos/index/model/initializable.rb

@@ -6,7 +6,7 @@ module Elos::Index::Model::Initializable
   end
 
   def initialize(attrs = {})
-    @_data = Elos::DataObject.new
+    @_data = Elos::Index::Model::Object.new
     @_attrs = attrs
     run_callbacks :new
   end

data/lib/elos/index/model/object.rb

@@ -0,0 +1,54 @@
+class Elos::Index::Model::Object
+  attr_reader :object
+
+  def self.encode(object)
+    inner_encode(object).to_json
+  end
+
+  def initialize(params = {})
+    @params = params
+    @object = objectify(params)
+  end
+
+  def method_missing(method, *args, **hargs, &block)
+    if method.to_s.end_with?('=')
+      object.send(method, objectify(args[0]))
+    elsif object.respond_to?(method)
+      object.send(method, *args)
+    else
+      super
+    end
+  end
+
+  protected
+
+  def self.inner_encode(object)
+    if object.is_a?(Hash)
+      object.each do |k, v|
+        object[k] = inner_encode(v)
+      end
+    elsif object.is_a?(Array)
+      object.each_with_index do |o, i|
+        object[i] = inner_encode(o)
+      end
+    elsif object.is_a?(Elos::Index)
+      object.attributes.merge!(type: object.class.name)
+    else
+      object
+    end
+  end
+
+  def objectify(value)
+    if value.is_a?(Hash)
+      if value.key?(:type)
+        value.delete(:type).constantize.new(value)
+      else
+        OpenStruct.new(Hash[value.map { |k, v| [k, objectify(v)] }])
+      end
+    elsif value.is_a?(Array)
+      value.map { |v| objectify(v) }
+    else
+      value
+    end
+  end
+end

data/lib/elos/version.rb

@@ -1,3 +1,3 @@
 class Elos
-  VERSION = '1.0.22'
+  VERSION = '1.0.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elos
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Tetsuri Moriya
@@ -146,7 +146,6 @@ files:
 - lib/elos.rb
 - lib/elos/configuration.rb
 - lib/elos/criteria.rb
-- lib/elos/data_object.rb
 - lib/elos/errors/not_found.rb
 - lib/elos/errors/validation_failed.rb
 - lib/elos/helpers.rb
@@ -161,6 +160,7 @@ files:
 - lib/elos/index/model/attributes.rb
 - lib/elos/index/model/identifiable.rb
 - lib/elos/index/model/initializable.rb
+- lib/elos/index/model/object.rb
 - lib/elos/index/properties.rb
 - lib/elos/index/raw_helpers.rb
 - lib/elos/index/refreshable.rb

data/lib/elos/data_object.rb

@@ -1,30 +0,0 @@
-class Elos::DataObject
-  attr_reader :object
-
-  def initialize(params = {})
-    @params = params
-    @object = objectify(params)
-  end
-
-  def method_missing(method, *args, **hargs, &block)
-    if method.to_s.end_with?('=')
-      object.send(method, objectify(args[0]))
-    elsif object.respond_to?(method)
-      object.send(method, *args)
-    else
-      super
-    end
-  end
-
-  protected
-
-  def objectify(value)
-    if value.is_a?(Hash)
-      OpenStruct.new(Hash[value.map { |k, v| [k, objectify(v)] }])
-    elsif value.is_a?(Array)
-      value.map { |v| objectify(v) }
-    else
-      value
-    end
-  end
-end