elos 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5bbc693cfe2e038f139deb09c102dd0af99f1e
-  data.tar.gz: b63e3d600c0d54a8709728180393d773ffd10f61
+  metadata.gz: 306f795d5ea0e638105459865f4d4f222ca9bd31
+  data.tar.gz: 678c7a91bb3d15043b8999b86411c73744f1baa7
 SHA512:
-  metadata.gz: cf1587da23fac13d0edb1663faac1af03da1811f56529808dd3bef1f023b72b4f2379da2eebb951a30ef82e10088be8e266fe4d4e3259e91e782aa4c31243626
-  data.tar.gz: 30b4ef0a98c1e42c902d89804a172056fac60ffa36c7ee56b91c8e42668fc835617daa541b0c7b76eedb3796aced9acf69eae8f23682d45fe5d8b5c00e3762d1
+  metadata.gz: 874ff50acf8ed9c30aedb9423d96c4fa4048f7e16e267436f02d91f8d0b9ce7718e9fc68ce1e051a04c02a152af2818aeaf617680bbc11441aca757359d8f0a7
+  data.tar.gz: 2f58762b8ad62a697ee1433d051f25220744b54eb5b63bc654701c3ed3ab447be51ad87be6db76285dc935bd5ee49f95303b50f2b65f5ab412d9caae747d703c

data/db/migrate/001_create_a_entry_repos.rb

@@ -2,6 +2,7 @@ class CreateAEntryRepos < ActiveRecord::Migration
   def change
     create_table :a_entry_repos do |t|
       t.string :title
+      t.string :description
     end
   end
 end

data/lib/elos/criteria.rb

@@ -72,7 +72,12 @@ class Elos::Criteria < Elos::Result
     # puts JSON.pretty_generate(results)
     @total_count = search_result['hits']['total']
     @results = search_result['hits']['hits'].map do |h|
-      @klass.new(h['_source'].reverse_merge(score: h['_score'], highlight: h['highlight']).merge(id: h['_id'], _persisted: true))
+      source = h['_source']
+      if json = source.delete('json')
+        source.reverse_merge!(JSON.parse(json))
+      end
+      source.deep_symbolize_keys!
+      @klass.new(source.reverse_merge(score: h['_score'], highlight: h['highlight']).merge(id: h['_id'], _persisted: true))
     end
   end
 end

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)
+      mps[:properties].merge!(_destroyed: boolean_property, json: no_index_string_property)
       self.mappings = { type_name => mps }
     end
   end

data/lib/elos/index/properties.rb

@@ -14,6 +14,10 @@ module Elos::Index::Properties
       { type: 'string', index: 'not_analyzed' }
     end
 
+    def no_index_string_property
+      { type: 'string', index: 'no' }
+    end
+
     def integer_property
       { type: 'integer' }
     end

data/lib/elos/version.rb

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

metadata

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