elasticsearch-persistence 5.0.2 → 6.1.1

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+require 'pry-nav'
+require 'elasticsearch/persistence'
+
+unless defined?(ELASTICSEARCH_URL)
+  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
+end
+
+RSpec.configure do |config|
+  config.formatter = 'documentation'
+  config.color = true
+
+  config.after(:suite) do
+    DEFAULT_CLIENT.indices.delete(index: '_all')
+  end
+end
+
+# The default client to be used by the repositories.
+#
+# @since 6.0.0
+DEFAULT_CLIENT = Elasticsearch::Client.new(host: ELASTICSEARCH_URL,
+                                           tracer: (ENV['QUIET'] ? nil : ::Logger.new(STDERR)))
+
+class MyTestRepository
+  include Elasticsearch::Persistence::Repository
+  include Elasticsearch::Persistence::Repository::DSL
+  client DEFAULT_CLIENT
+end
+
+# The default repository to be used by tests.
+#
+# @since 6.0.0
+DEFAULT_REPOSITORY = MyTestRepository.new(index_name: 'my_test_repository', document_type: 'test')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-persistence
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 6.1.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
@@ -81,33 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -314,34 +300,13 @@ extra_rdoc_files:
 - LICENSE.txt
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - elasticsearch-persistence.gemspec
-- examples/music/album.rb
-- examples/music/artist.rb
-- examples/music/artists/_form.html.erb
-- examples/music/artists/artists_controller.rb
-- examples/music/artists/artists_controller_test.rb
-- examples/music/artists/index.html.erb
-- examples/music/artists/show.html.erb
-- examples/music/assets/application.css
-- examples/music/assets/autocomplete.css
-- examples/music/assets/blank_artist.png
-- examples/music/assets/blank_cover.png
-- examples/music/assets/form.css
-- examples/music/index_manager.rb
-- examples/music/search/index.html.erb
-- examples/music/search/search_controller.rb
-- examples/music/search/search_controller_test.rb
-- examples/music/search/search_helper.rb
-- examples/music/suggester.rb
-- examples/music/template.rb
-- examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.css
-- examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.js
-- examples/music/vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 - examples/notes/.gitignore
 - examples/notes/Gemfile
 - examples/notes/README.markdown
@@ -349,48 +314,21 @@ files:
 - examples/notes/config.ru
 - examples/notes/test.rb
 - lib/elasticsearch/persistence.rb
-- lib/elasticsearch/persistence/client.rb
-- lib/elasticsearch/persistence/model.rb
-- lib/elasticsearch/persistence/model/base.rb
-- lib/elasticsearch/persistence/model/errors.rb
-- lib/elasticsearch/persistence/model/find.rb
-- lib/elasticsearch/persistence/model/rails.rb
-- lib/elasticsearch/persistence/model/store.rb
-- lib/elasticsearch/persistence/model/utils.rb
 - lib/elasticsearch/persistence/repository.rb
-- lib/elasticsearch/persistence/repository/class.rb
+- lib/elasticsearch/persistence/repository/dsl.rb
 - lib/elasticsearch/persistence/repository/find.rb
-- lib/elasticsearch/persistence/repository/naming.rb
 - lib/elasticsearch/persistence/repository/response/results.rb
 - lib/elasticsearch/persistence/repository/search.rb
 - lib/elasticsearch/persistence/repository/serialize.rb
 - lib/elasticsearch/persistence/repository/store.rb
 - lib/elasticsearch/persistence/version.rb
-- lib/rails/generators/elasticsearch/model/model_generator.rb
-- lib/rails/generators/elasticsearch/model/templates/model.rb.tt
-- lib/rails/generators/elasticsearch_generator.rb
-- test/integration/model/model_basic_test.rb
-- test/integration/repository/custom_class_test.rb
-- test/integration/repository/customized_class_test.rb
-- test/integration/repository/default_class_test.rb
-- test/integration/repository/virtus_model_test.rb
-- test/test_helper.rb
-- test/unit/model_base_test.rb
-- test/unit/model_find_test.rb
-- test/unit/model_gateway_test.rb
-- test/unit/model_rails_test.rb
-- test/unit/model_store_test.rb
-- test/unit/persistence_test.rb
-- test/unit/repository_class_test.rb
-- test/unit/repository_client_test.rb
-- test/unit/repository_find_test.rb
-- test/unit/repository_indexing_test.rb
-- test/unit/repository_module_test.rb
-- test/unit/repository_naming_test.rb
-- test/unit/repository_response_results_test.rb
-- test/unit/repository_search_test.rb
-- test/unit/repository_serialize_test.rb
-- test/unit/repository_store_test.rb
+- spec/repository/find_spec.rb
+- spec/repository/response/results_spec.rb
+- spec/repository/search_spec.rb
+- spec/repository/serialize_spec.rb
+- spec/repository/store_spec.rb
+- spec/repository_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/elasticsearch/elasticsearch-rails/
 licenses:
 - Apache 2
@@ -404,38 +342,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Persistence layer for Ruby models and Elasticsearch.
 test_files:
-- test/integration/model/model_basic_test.rb
-- test/integration/repository/custom_class_test.rb
-- test/integration/repository/customized_class_test.rb
-- test/integration/repository/default_class_test.rb
-- test/integration/repository/virtus_model_test.rb
-- test/test_helper.rb
-- test/unit/model_base_test.rb
-- test/unit/model_find_test.rb
-- test/unit/model_gateway_test.rb
-- test/unit/model_rails_test.rb
-- test/unit/model_store_test.rb
-- test/unit/persistence_test.rb
-- test/unit/repository_class_test.rb
-- test/unit/repository_client_test.rb
-- test/unit/repository_find_test.rb
-- test/unit/repository_indexing_test.rb
-- test/unit/repository_module_test.rb
-- test/unit/repository_naming_test.rb
-- test/unit/repository_response_results_test.rb
-- test/unit/repository_search_test.rb
-- test/unit/repository_serialize_test.rb
-- test/unit/repository_store_test.rb
+- spec/repository/find_spec.rb
+- spec/repository/response/results_spec.rb
+- spec/repository/search_spec.rb
+- spec/repository/serialize_spec.rb
+- spec/repository/store_spec.rb
+- spec/repository_spec.rb
+- spec/spec_helper.rb

data/examples/music/album.rb

@@ -1,54 +0,0 @@
-class Meta
-  include Virtus.model
-
-  attribute :rating
-  attribute :have
-  attribute :want
-  attribute :formats
-end
-
-class Album
-  include Elasticsearch::Persistence::Model
-
-  index_name [Rails.application.engine_name, Rails.env].join('-')
-
-
-  mapping _parent: { type: 'artist' } do
-  end
-
-  attribute :artist
-  attribute :artist_id, String, mapping: { index: 'not_analyzed' }
-  attribute :label, Hash, mapping: { type: 'object' }
-
-  attribute :title
-  attribute :released, Date
-  attribute :notes
-  attribute :uri
-
-  attribute :tracklist, Array, mapping: { type: 'object' }
-
-  attribute :styles
-  attribute :meta, Meta, mapping: { type: 'object' }
-
-  attribute :suggest, Hashie::Mash, mapping: {
-    type: 'object',
-    properties: {
-      title: {
-        type: 'object',
-        properties: {
-          input:   { type: 'completion' },
-          output:  { type: 'keyword', index: false },
-          payload: { type: 'object', enabled: false }
-        }
-      },
-      track: {
-        type: 'object',
-        properties: {
-          input:   { type: 'completion' },
-          output:  { type: 'keyword', index: false },
-          payload: { type: 'object', enabled: false }
-        }
-      }
-    }
-  }
-end

data/examples/music/artist.rb

@@ -1,70 +0,0 @@
-class Artist
-  include Elasticsearch::Persistence::Model
-
-  index_name [Rails.application.engine_name, Rails.env].join('-')
-
-  analyzed_and_raw = { fields: {
-    name: { type: 'text', analyzer: 'snowball' },
-    raw:  { type: 'keyword' }
-  } }
-
-  attribute :name, String, mapping: analyzed_and_raw
-
-  attribute :profile
-  attribute :date, Date
-
-  attribute :members, String, default: [], mapping: analyzed_and_raw
-  attribute :members_combined, String, default: [], mapping: { analyzer: 'snowball' }
-
-  attribute :urls, String, default: []
-  attribute :album_count, Integer, default: 0
-
-  attribute :suggest, Hashie::Mash, mapping: {
-    type: 'object',
-    properties: {
-      name: {
-        type: 'object',
-        properties: {
-          input:   { type: 'completion' },
-          output:  { type: 'keyword', index: false },
-          payload: { type: 'object', enabled: false }
-        }
-      },
-      member: {
-        type: 'object',
-        properties: {
-          input:   { type: 'completion' },
-          output:  { type: 'keyword', index: false },
-          payload: { type: 'object', enabled: false }
-        }
-      }
-    }
-  }
-
-  validates :name, presence: true
-
-  def albums
-    Album.search(
-      { query: {
-          has_parent: {
-            type: 'artist',
-            query: {
-              bool: {
-                filter: {
-                  ids: { values: [ self.id ] }
-                }
-              }
-            }
-          }
-        },
-        sort: 'released',
-        size: 100
-      },
-      { type: 'album' }
-  )
-  end
-
-  def to_param
-    [id, name.parameterize].join('-')
-  end
-end

data/examples/music/artists/_form.html.erb

@@ -1,8 +0,0 @@
-<%= simple_form_for @artist do |f| %>
-  <%= f.input :name %>
-  <%= f.input :profile, as: :text %>
-  <%= f.input :date, as: :date %>
-  <%= f.input :members, hint: 'Separate names by comma', input_html: { value: f.object.members.join(', ') } %>
-
-  <%= f.button :submit %>
-<% end %>

data/examples/music/artists/artists_controller.rb

@@ -1,67 +0,0 @@
-class ArtistsController < ApplicationController
-  before_action :set_artist, only: [:show, :edit, :update, :destroy]
-
-  rescue_from Elasticsearch::Persistence::Repository::DocumentNotFound do
-    render file: "public/404.html", status: 404, layout: false
-  end
-
-  def index
-    @artists = Artist.all sort: 'name.raw', _source: ['name', 'album_count']
-  end
-
-  def show
-    @albums = @artist.albums
-  end
-
-  def new
-    @artist = Artist.new
-  end
-
-  def edit
-  end
-
-  def create
-    @artist = Artist.new(artist_params)
-
-    respond_to do |format|
-      if @artist.save refresh: true
-        format.html { redirect_to @artist, notice: 'Artist was successfully created.' }
-        format.json { render :show, status: :created, location: @artist }
-      else
-        format.html { render :new }
-        format.json { render json: @artist.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def update
-    respond_to do |format|
-      if @artist.update(artist_params, refresh: true)
-        format.html { redirect_to @artist, notice: 'Artist was successfully updated.' }
-        format.json { render :show, status: :ok, location: @artist }
-      else
-        format.html { render :edit }
-        format.json { render json: @artist.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    @artist.destroy refresh: true
-    respond_to do |format|
-      format.html { redirect_to artists_url, notice: 'Artist was successfully destroyed.' }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    def set_artist
-      @artist = Artist.find(params[:id].split('-').first)
-    end
-
-    def artist_params
-      a = params.require(:artist)
-      a[:members] = a[:members].split(/,\s?/) unless a[:members].is_a?(Array) || a[:members].blank?
-      return a
-    end
-end