elos 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eddb8b06fad525400b72ad67c1b7c48be90e134
-  data.tar.gz: c69cc8b44ede66f71ae48f3a30ae98cf80ee1da6
+  metadata.gz: fe5bbc693cfe2e038f139deb09c102dd0af99f1e
+  data.tar.gz: b63e3d600c0d54a8709728180393d773ffd10f61
 SHA512:
-  metadata.gz: 4adb9cd894b1a449b6966732ec0659ab0436987b833ba58014b8651fec0c0055257e82748b1188183861162aeabed98b266d684073f45b4dbfbfc28b00b5d5e0
-  data.tar.gz: 116426a8018d2bf9084595774da941b3708c37df8d6cdb79e15bbd58f9b57768e4396df06360a576e672753bd746589acef689b4b22d006120df75f1a05af5ee
+  metadata.gz: cf1587da23fac13d0edb1663faac1af03da1811f56529808dd3bef1f023b72b4f2379da2eebb951a30ef82e10088be8e266fe4d4e3259e91e782aa4c31243626
+  data.tar.gz: 30b4ef0a98c1e42c902d89804a172056fac60ffa36c7ee56b91c8e42668fc835617daa541b0c7b76eedb3796aced9acf69eae8f23682d45fe5d8b5c00e3762d1

data/lib/elos/index/mappings.rb

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

data/lib/elos/lock.rb

@@ -1,6 +1,15 @@
 class Elos::Lock
   include Elos::Index::Core
   include Elos::Index::Properties
+  include Elos::Index::Mappings
+
+  mappings -> do
+    {
+      _all: { enabled: false },
+      _ttl: { enabled: true, default: '5d' },
+      properties: { lock: boolean_property }
+    }
+  end
 
   def self.lock(key, &block)
     create_index(index_name)
@@ -24,22 +33,4 @@ class Elos::Lock
     client.delete(index: index_name, type: type_name, id: key)
   rescue Elasticsearch::Transport::Transport::Errors::NotFound
   end
-
-  private
-
-  def self.mappings
-    {
-      type_name => {
-        _all: { enabled: false },
-        _ttl: { enabled: true, default: '5d' },
-        properties: properties
-      }
-    }
-  end
-
-  def self.properties
-    {
-      boolean_property => %i(lock)
-    }.inject({}) { |m, x| m.merge(Hash[x[1].map { |y| [y, x[0]] }]) }
-  end
 end

data/lib/elos/version.rb

@@ -1,3 +1,3 @@
 class Elos
-  VERSION = '1.0.11'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elos
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Tetsuri Moriya