common_indexer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b26c3cf3c10115c85b72ef1f551393f41ab80df040b74a31e4073e34b1add7
-  data.tar.gz: 75c0681b5b3eaf60845d102360ce51347cb56a54d8076bbdc1e1c4ee74b3b2a0
+  metadata.gz: db62cbc76077d2796deb4adbae93aa3c7b34a4e08108a4803e7dc7f026332b22
+  data.tar.gz: b19d7cc054255b15766f995efa45846b6a4b8848b0bb88853a4e6fba66a89ccc
 SHA512:
-  metadata.gz: bbdf9bda38b86151d951da22b9b83754e19009af9eca9d4461d60d242357006ec0b3c76423eb205ca874a5dc278fc358eeb45c9ea0ee20884ca0084cc8e38e65
-  data.tar.gz: 58889be56ac62972e7efbabcafe3081d8fa911cd572681a9361714208049fde514da6ef7aa9df93eaebc206cc7ec22745caffcf0e10df061161eecd941ed7099
+  metadata.gz: d5f77ead6629442cf436b346d32c8dbaa355af894f092aa75edac5c9fb550ed1b03c56b144cc677fb71a504dac829c88b622a71fc9fd8d8a371f8ac78b54ac19
+  data.tar.gz: '0164482b997687f9438b0749cd2911178f5c3e1adb1d5d36d58049deb78d2db4962d7c30adafaebb542e82264fde312aa82f3195b43a21c52c044c9ae047f2fe'

data/config/schema.json

@@ -1,13 +1,22 @@
 {
   "properties": {
     "full_text": { 
-      "type": "text" 
-    }, 
+      "type": "text",
+      "analyzer": "phrase_analyzer",
+      "search_analyzer": "keyword_analyzer",
+      "search_quote_analyzer": "phrase_analyzer"
+  }, 
     "all_titles": {
-        "type": "text"
+        "type": "text",
+      "analyzer": "phrase_analyzer",
+      "search_analyzer": "keyword_analyzer",
+      "search_quote_analyzer": "phrase_analyzer"
     },
     "all_subjects": {
-      "type": "text"
+      "type": "text",
+      "analyzer": "phrase_analyzer",
+      "search_analyzer": "keyword_analyzer",
+      "search_quote_analyzer": "phrase_analyzer"
     }
   },
   "dynamic_templates": [
@@ -29,6 +38,9 @@
         "match": "^date",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "fields": {
             "keyword": { "type": "keyword" }
           }
@@ -52,6 +64,9 @@
         "path_match": "subject.label",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "copy_to": [
             "full_text",
             "all_subjects"
@@ -67,6 +82,9 @@
         "path_match": "title.*",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "fields": {
             "keyword": { "type": "keyword" }
           },
@@ -79,6 +97,9 @@
         "path_match": "*.title",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "fields": {
             "keyword": { "type": "keyword" }
           },
@@ -91,6 +112,9 @@
         "path_match": "*.label",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "fields": {
             "keyword": { "type": "keyword" }
           },
@@ -103,6 +127,9 @@
         "match_mapping_type": "string",
         "mapping": {
           "type": "text",
+          "analyzer": "phrase_analyzer",
+          "search_analyzer": "keyword_analyzer",
+          "search_quote_analyzer": "phrase_analyzer",
           "fields": {
             "keyword": {
               "type": "keyword",

data/config/settings.json

@@ -25,15 +25,5 @@
         }
       }
     }
-  },
-  "mappings": {
-    "properties": {
-      "title": {
-        "type": "text",
-        "analyzer": "phrase_analyzer",
-        "search_analyzer": "keyword_analyzer",
-        "search_quote_analyzer": "phrase_analyzer"
-      }
-    }
   }
 }

data/lib/common_indexer.rb

@@ -33,7 +33,6 @@ module CommonIndexer # :nodoc:
     def configure_index!
       new_index = [index_name, Time.now.utc.strftime('%Y%m%d%H%M%S%3N')].join('_')
       create_index(new_index)
-      apply_settings(new_index)
       reindex_into(new_index) if client.indices.exists(index: index_name)
       client.indices.put_alias(index: new_index, name: index_name)
     end
@@ -41,16 +40,10 @@ module CommonIndexer # :nodoc:
     private
 
       def create_index(new_index)
-        client.indices.create(index: new_index)
+        client.indices.create(index: new_index, body: config.settings)
         client.indices.put_mapping(index: new_index, type: '_doc', body: { _doc: config.schema })
       end
 
-      def apply_settings(new_index)
-        client.indices.close(index: new_index)
-        client.indices.put_settings(index: new_index, body: config.settings)
-        client.indices.open(index: new_index)
-      end
-
       def reindex_into(new_index)
         existing_index = client.indices.get(index: index_name).keys.first
         raise ArgumentError, "Cannot reindex #{index_name} into itself" if existing_index == new_index

data/lib/common_indexer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CommonIndexer
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_indexer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Klein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Common Indexing mixin for NUL Digital Collections