elos 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 141f44ad81bf0ce324ac8918170dd06db0df709b
-  data.tar.gz: ce57df759708da43d8055905e3bd7c7d106b846c
+  metadata.gz: 80382b0017ffa0a395fe35b6de528b0339ec8d27
+  data.tar.gz: cdddbe3449d25388913a6b2561ae82ea351f835c
 SHA512:
-  metadata.gz: 03c23fba73664c3facd81d9808da21292e4a35baadcbffb242591372f2ecfd703d8f7280864d06d3a50281f141526611e2928f65a5818e825e10e4785a2e3f5b
-  data.tar.gz: 423bd408370fca519eb2e67bcf438491a03ced41a6df7c5b90171203ab987f1955b9315f0164e97478dd3dcdb9d600c413c5019bc5e66969348765db4df4be5f
+  metadata.gz: a3cfc4e04e08d71f0b38692e4a43ebab7e0546cf14a0eaf1be58348e3497d5d09b4e77a2d4d180dc03cbe4a93b0fc2cd711a183e42961aa9ff70746fc9ad39eb
+  data.tar.gz: a66163a35fc1b7127a23e49dc42c0571b249bf8ac1fd3cce6c42c5c116219a9e15c6a3c25c7cfa90f43c60c8ad5f3b0217443d2df8ad0bd4539678e6d28d4e8e

data/lib/elos/index/attributes/keys_guesser.rb

@@ -0,0 +1,5 @@
+class Elos::Index::Attributes::KeysGuesser
+  def self.guess(given_mappings, mappings_fields)
+    %i(id) + (given_mappings.try(:[], :properties) || {}).merge(mappings_fields || {}).keys
+  end
+end

data/lib/elos/index/attributes.rb

@@ -2,6 +2,12 @@ module Elos::Index::Attributes
   extend ActiveSupport::Concern
 
   included do
-    cattr_accessor :attribute_keys
+    cattr_accessor :set_attribute_keys
+  end
+
+  class_methods do
+    def attribute_keys
+      self.set_attribute_keys ||= KeysGuesser.guess(given_mappings, mappings_fields)
+    end
   end
 end

data/lib/elos/index/mappings/generator.rb

@@ -0,0 +1,14 @@
+class Elos::Index::Mappings::Generator
+  include Elos::Index::Properties
+
+  def self.generate(mappings, fields:, physically_destroyable:, type_name:)
+    fields ||= {}
+    mappings = (mappings || {}).deep_dup
+    mappings[:_all] = { enabled: false } unless mappings[:_all]
+    properties = mappings[:properties] || {}
+    properties[:_destroyed] = boolean_property unless physically_destroyable
+    properties[:json] = no_index_string_property
+    properties.reverse_merge!(fields)
+    { type_name => mappings }
+  end
+end

data/lib/elos/index/mappings.rb

@@ -2,25 +2,18 @@ module Elos::Index::Mappings
   extend ActiveSupport::Concern
 
   included do
-    cattr_writer :mappings
+    cattr_accessor :given_mappings, :set_mappings, :mappings_fields
   end
 
   class_methods do
-    def mappings(mappings = nil)
-      if mappings
-        set_mappings(mappings)
-      else
-        self.class_variable_get(:@@mappings)
-      end
+    def field(name, type)
+      self.mappings_fields ||= {}
+      mappings_fields[name] = send("#{type}_property")
     end
 
-    protected
-
-    def set_mappings(mappings)
-      mps = mappings.is_a?(Proc) ? mappings.() : mappings.deep_dup
-      self.attribute_keys = %i(id) + mps[:properties].keys
-      mps[:properties].merge!(_destroyed: boolean_property, json: no_index_string_property) if respond_to?(:physically_destroy?) && physically_destroy?
-      self.mappings = { type_name => mps }
+    def mappings(mappings = nil)
+      return self.given_mappings = mappings.is_a?(Proc) ? mappings.() : mappings.deep_dup if mappings
+      self.set_mappings ||= Generator.generate(given_mappings, fields: mappings_fields, type_name: type_name, physically_destroyable: respond_to?(:physically_destroy?) && physically_destroy?)
     end
   end
 end

data/lib/elos/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elos
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Tetsuri Moriya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -151,10 +151,12 @@ files:
 - lib/elos/helpers.rb
 - lib/elos/index.rb
 - lib/elos/index/attributes.rb
+- lib/elos/index/attributes/keys_guesser.rb
 - lib/elos/index/core.rb
 - lib/elos/index/indexable.rb
 - lib/elos/index/locatable.rb
 - lib/elos/index/mappings.rb
+- lib/elos/index/mappings/generator.rb
 - lib/elos/index/model.rb
 - lib/elos/index/model/assignable.rb
 - lib/elos/index/model/attributes.rb