elastic_record 4.1.8 → 5.1.0

data/test/helper.rb

@@ -1,12 +1,16 @@
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../../test/dummy/config/environment.rb", __FILE__)
+require 'dummy/config/environment'
+require 'rails/test_help'
+Bundler.require(Rails.env)
 
-require 'minitest/autorun'
 require 'webmock/minitest'
-
 WebMock.disable_net_connect!(allow_localhost: true)
 
+def MiniTest.filter_backtrace(bt)
+  bt
+end
+
 module MiniTest
   class Test
     def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 5.1.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -54,11 +54,18 @@ files:
 - Rakefile
 - elastic_record.gemspec
 - lib/elastic_record.rb
+- lib/elastic_record/aggregation_response/aggregation.rb
+- lib/elastic_record/aggregation_response/bucket.rb
+- lib/elastic_record/aggregation_response/builder.rb
+- lib/elastic_record/aggregation_response/has_aggregations.rb
+- lib/elastic_record/aggregation_response/multi_bucket_aggregation.rb
+- lib/elastic_record/aggregation_response/multi_value_aggregation.rb
+- lib/elastic_record/aggregation_response/single_bucket_aggregation.rb
+- lib/elastic_record/aggregation_response/single_value_aggregation.rb
 - lib/elastic_record/as_document.rb
 - lib/elastic_record/callbacks.rb
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.rb
-- lib/elastic_record/doctype.rb
 - lib/elastic_record/errors.rb
 - lib/elastic_record/index.rb
 - lib/elastic_record/index/analyze.rb
@@ -66,12 +73,12 @@ files:
 - lib/elastic_record/index/documents.rb
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
+- lib/elastic_record/index/mapping_type.rb
+- lib/elastic_record/index/mapping_type_test.rb
 - lib/elastic_record/index/settings.rb
-- lib/elastic_record/json.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
-- lib/elastic_record/name_cache.rb
 - lib/elastic_record/percolator_model.rb
 - lib/elastic_record/railtie.rb
 - lib/elastic_record/railties/controller_runtime.rb
@@ -79,6 +86,7 @@ files:
 - lib/elastic_record/relation/batches.rb
 - lib/elastic_record/relation/delegation.rb
 - lib/elastic_record/relation/finder_methods.rb
+- lib/elastic_record/relation/hits.rb
 - lib/elastic_record/relation/merging.rb
 - lib/elastic_record/relation/none.rb
 - lib/elastic_record/relation/search_methods.rb
@@ -130,7 +138,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20151211225259_create_projects.rb
+- test/dummy/db/migrate/20151211225259_create_warehouses.rb
+- test/dummy/db/migrate/20180215140125_create_widgets.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -138,11 +147,13 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/elastic_record/aggregation_response/bucket_test.rb
+- test/elastic_record/aggregation_response/multi_bucket_aggregation_test.rb
+- test/elastic_record/aggregation_response/single_bucket_aggregation_test.rb
 - test/elastic_record/as_document_test.rb
 - test/elastic_record/callbacks_test.rb
 - test/elastic_record/config_test.rb
 - test/elastic_record/connection_test.rb
-- test/elastic_record/doctype_test.rb
 - test/elastic_record/index/analyze_test.rb
 - test/elastic_record/index/documents_test.rb
 - test/elastic_record/index/manage_test.rb
@@ -153,12 +164,12 @@ files:
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
-- test/elastic_record/name_cache_test.rb
 - test/elastic_record/percolator_model_test.rb
 - test/elastic_record/railties/controller_runtime_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb
 - test/elastic_record/relation/finder_methods_test.rb
+- test/elastic_record/relation/hits_test.rb
 - test/elastic_record/relation/merging_test.rb
 - test/elastic_record/relation/none_test.rb
 - test/elastic_record/relation/search_methods_test.rb
@@ -185,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Elasticsearch querying ORM

data/lib/elastic_record/doctype.rb

@@ -1,43 +0,0 @@
-module ElasticRecord
-  class Doctype
-    attr_accessor :name, :mapping, :analysis
-
-    DEFAULT_MAPPING = {
-      properties: {
-      },
-      _all: {
-        enabled: false
-      }
-    }
-
-    PERCOLATOR_MAPPING = {
-      properties: {
-        query: {
-          type: "percolator"
-        }
-      }
-    }
-
-    def self.percolator_doctype
-      new('queries', PERCOLATOR_MAPPING)
-    end
-
-    def initialize(name, mapping = DEFAULT_MAPPING.deep_dup)
-      @name = name
-      @mapping = mapping
-      @analysis = {}
-    end
-
-    def mapping=(custom_mapping)
-      mapping.deep_merge!(custom_mapping)
-    end
-
-    def analysis=(custom_analysis)
-      analysis.deep_merge!(custom_analysis)
-    end
-
-    def ==(other)
-      name == other.name && mapping == other.mapping && analysis == other.analysis
-    end
-  end
-end

data/lib/elastic_record/json.rb

@@ -1,29 +0,0 @@
-module ElasticRecord
-  module JSON
-    class << self
-      def parser
-        @@parser ||= :active_support
-      end
-
-      def parser=(value)
-        @@parser = value
-      end
-
-      def decode(json)
-        if ElasticRecord::JSON.parser == :oj
-          Oj.compat_load(json)
-        else
-          ActiveSupport::JSON.decode(json)
-        end
-      end
-
-      def encode(data)
-        if ElasticRecord::JSON.parser == :oj
-          Oj.dump(data, mode: :compat, use_as_json: true)
-        else
-          ActiveSupport::JSON.encode(data)
-        end
-      end
-    end
-  end
-end

data/lib/elastic_record/name_cache.rb

@@ -1,23 +0,0 @@
-module ElasticRecord
-  module NameCache
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :cached_index_name
-      class_attribute :index_name_cache_time
-      self.index_name_cache_time = 0
-    end
-
-    class_methods do
-      def current_index_name
-        if (Time.now - index_name_cache_time) < 60
-          cached_index_name
-        else
-          self.index_name_cache_time = Time.now
-          aliased_names = elastic_connection.json_get("/_alias/#{elastic_index.alias_name}").keys
-          self.cached_index_name = aliased_names.first
-        end
-      end
-    end
-  end
-end

data/test/dummy/db/migrate/20151211225259_create_projects.rb

@@ -1,7 +0,0 @@
-class CreateProjects < ActiveRecord::Migration
-  def change
-    create_table :projects do |t|
-      t.string :name, null: false
-    end
-  end
-end

data/test/elastic_record/doctype_test.rb

@@ -1,45 +0,0 @@
-require 'helper'
-
-class ElasticRecord::DoctypeTest < MiniTest::Test
-  def test_default_mapping
-    doctype = ElasticRecord::Doctype.new('widget')
-
-    refute_nil doctype.mapping[:properties]
-  end
-
-  def test_default_analysis
-    doctype = ElasticRecord::Doctype.new('widget')
-
-    assert_empty doctype.analysis
-  end
-
-  def test_merge_mapping
-    doctype = ElasticRecord::Doctype.new('widget')
-    doctype.mapping[:properties] = {
-      color: { type: 'string' },
-      name: { type: 'string' }
-    }
-
-    custom = { properties: { color: { type: 'integer' } }}
-    doctype.mapping = custom
-
-    expected = {
-      properties: {
-        color: { type: 'integer' },
-        name: { type: 'string' }
-      },
-      _all: {
-        enabled: false
-      }
-    }
-
-    assert_equal expected, doctype.mapping
-  end
-
-  def test_percolator_doctype
-    doctype = ElasticRecord::Doctype.percolator_doctype
-
-    assert_equal 'queries', doctype.name
-    assert_equal ElasticRecord::Doctype::PERCOLATOR_MAPPING, doctype.mapping
-  end
-end

data/test/elastic_record/name_cache_test.rb

@@ -1,16 +0,0 @@
-require 'helper'
-
-class ElasticRecord::NameCacheTest < MiniTest::Test
-  class Felon
-    include TestModel
-  end
-
-  def test_index_name
-    begin
-      Felon.elastic_index.create_and_deploy("felons_datestamp")
-      assert_equal "felons_datestamp", Felon.current_index_name
-    ensure
-      Felon.elastic_index.delete("felons_datestamp")
-    end
-  end
-end