common_indexer 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931029ffbaed76ee103cb5bc8dd88dcd88fa1556494d2d3f562c2893fae77c38
-  data.tar.gz: 662a785dced385458c692e967d96a71c90aab3fdf9c21a09d6551dc014521f93
+  metadata.gz: 20b26c3cf3c10115c85b72ef1f551393f41ab80df040b74a31e4073e34b1add7
+  data.tar.gz: 75c0681b5b3eaf60845d102360ce51347cb56a54d8076bbdc1e1c4ee74b3b2a0
 SHA512:
-  metadata.gz: e042d390d0c68c4d3abc7d38569434be1740a9ceed64330d30e6a019cea5aeb718ad6cef3ec2e1bcdf6278a2e612dade48684c48329ca124a81d22c5c63913d9
-  data.tar.gz: e75f6390d3b751dd0f60e655d1218845454d3b87935c9bfc126f3db25f15b46ff9e32eb3b98417000f455aef3e9ced42fce81cfe292ee6c9063834bb338128cc
+  metadata.gz: bbdf9bda38b86151d951da22b9b83754e19009af9eca9d4461d60d242357006ec0b3c76423eb205ca874a5dc278fc358eeb45c9ea0ee20884ca0084cc8e38e65
+  data.tar.gz: 58889be56ac62972e7efbabcafe3081d8fa911cd572681a9361714208049fde514da6ef7aa9df93eaebc206cc7ec22745caffcf0e10df061161eecd941ed7099

data/.circleci/config.yml

@@ -0,0 +1,31 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.5
+        environment:
+          BUNDLER_VERSION: 2.1.4
+    steps:
+      - checkout
+      - run:
+          name: Install Bundler 2.1.4
+          command: gem install --no-doc bundler:2.1.4
+      - restore_cache:
+          keys:
+            - bundle-{{ checksum "Gemfile" }}-{{ checksum "common_indexer.gemspec" }}
+            - bundle- # used if checksum fails
+      - run:
+          name: Install dependencies
+          command: |
+            bundle config set path vendor/bundle
+            bundle check || bundle install --jobs 4 --retry 3
+      - save_cache:
+          key: bundle-{{ checksum "Gemfile" }}-{{ checksum "common_indexer.gemspec" }}
+          paths:
+            - "vendor/bundle"
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop
+      - run:
+          name: Run Specs
+          command: bundle exec rspec spec

data/common_indexer.gemspec

@@ -27,8 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'typhoeus'
   spec.add_dependency 'elasticsearch'
   spec.add_development_dependency 'bixby'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls', '~> 0.8.3'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
 end

data/config/settings.json

@@ -0,0 +1,39 @@
+{
+  "settings": {
+    "analysis": {
+      "analyzer": {
+        "phrase_analyzer": {
+          "type": "custom",
+          "tokenizer": "standard",
+          "filter": [
+            "lowercase"
+          ]
+        },
+        "keyword_analyzer": {
+          "type": "custom",
+          "tokenizer": "standard",
+          "filter": [
+            "lowercase",
+            "english_stop"
+          ]
+        }
+      },
+      "filter": {
+        "english_stop": {
+          "type": "stop",
+          "stopwords": "_english_"
+        }
+      }
+    }
+  },
+  "mappings": {
+    "properties": {
+      "title": {
+        "type": "text",
+        "analyzer": "phrase_analyzer",
+        "search_analyzer": "keyword_analyzer",
+        "search_quote_analyzer": "phrase_analyzer"
+      }
+    }
+  }
+}

data/lib/common_indexer.rb

@@ -17,6 +17,7 @@ module CommonIndexer # :nodoc:
   setting :endpoint, 'http://localhost:9200/'
   setting :index_name, 'common'
   setting :schema, JSON.parse(File.read(File.expand_path('../../config/schema.json', __FILE__)))
+  setting :settings, JSON.parse(File.read(File.expand_path('../../config/settings.json', __FILE__)))
 
   class << self
     delegate :index_name, to: :config
@@ -31,19 +32,30 @@ module CommonIndexer # :nodoc:
 
     def configure_index!
       new_index = [index_name, Time.now.utc.strftime('%Y%m%d%H%M%S%3N')].join('_')
-      client.indices.create(index: new_index)
-      client.indices.put_mapping(index: new_index, type: '_doc', body: { _doc: config.schema })
+      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
 
     private
 
-    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
-      client.reindex(body: { source: { index: existing_index }, dest: { index: new_index } })
-      client.indices.delete(index: existing_index)
-    end
+      def create_index(new_index)
+        client.indices.create(index: new_index)
+        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
+        client.reindex(body: { source: { index: existing_index }, dest: { index: new_index } })
+        client.indices.delete(index: existing_index)
+      end
   end
 end

data/lib/common_indexer/base.rb

@@ -4,7 +4,7 @@ require 'active_support/concern'
 module CommonIndexer # :nodoc:
   module Base
     extend ActiveSupport::Concern
-    
+
     included do
       extend ActiveModel::Callbacks
       define_model_callbacks :delete_common_index, :update_common_index
@@ -21,8 +21,8 @@ module CommonIndexer # :nodoc:
     def delete_document
       _run_delete_common_index_callbacks do
         CommonIndexer.client.delete index: CommonIndexer.index_name,
-                                  id: id,
-                                  type: '_doc'
+                                    id: id,
+                                    type: '_doc'
       end
     rescue Elasticsearch::Transport::Transport::Error => err
       Rails.logger.warn("Common Index delete failure: #{err.message}")
@@ -31,10 +31,10 @@ module CommonIndexer # :nodoc:
     def update_common_index
       _run_update_common_index_callbacks do
         CommonIndexer.client.index index: CommonIndexer.index_name,
-                                  id: id,
-                                  type: '_doc',
-                                  body: to_common_index
-      end  
+                                   id: id,
+                                   type: '_doc',
+                                   body: to_common_index
+      end
     rescue Elasticsearch::Transport::Transport::Error => err
       Rails.logger.warn("Common Indexing failure: #{err.message}")
     end

data/lib/common_indexer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_indexer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Klein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -111,18 +111,32 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common Indexing mixin for NUL Digital Collections
 email:
 - mbklein@gmail.com
@@ -173,6 +201,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -185,6 +214,7 @@ files:
 - bin/setup
 - common_indexer.gemspec
 - config/schema.json
+- config/settings.json
 - lib/common_indexer.rb
 - lib/common_indexer/base.rb
 - lib/common_indexer/version.rb
@@ -207,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Common Indexing mixin for NUL Digital Collections