elastic_record 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbc183b9807acb14f1ba0b3d2f860c7be2eddbcf7360d542cbf9f1a9ea9df166
-  data.tar.gz: cbcb08f9fff903a87f0fa35b4f5ceb1542870ec1b176605e559eb99111f53b72
+  metadata.gz: 3667cdd2ffc2ca7e744f74c570aca1de6217ab14f4ca196cacce22828ac09f55
+  data.tar.gz: 4099515af51acadaa10531d11c82078db1e239be9bb52f27d6211babd1b3774f
 SHA512:
-  metadata.gz: da4b87dc02cb1bd4f0db4fdd02923584b96137ad1c8b115f94c906244f66f77aa8f021721724333a14f33b15f950d1df57a863c566ee96265b00f5586509a784
-  data.tar.gz: ed8050784a85135ac6e3a9c650608e20d168221349bb84bc4b35588a474ac475b45f2e0605d358577f0b9147644c4254b303885db3153b8a169ef087b8ae4593
+  metadata.gz: e41404a6079677a0e0235c59217c0eebc42829bd07f0b57bff25b9da47cdd1585c29dfa83b614229f4be33da8e2335d58522a4e27a2c00cc3baad5c58bdd3838
+  data.tar.gz: 5ffbe7ee7525c9319d3b7db41e7ca4e0279f188aefe547b75bdccb1af1798c43564e83611366dcb5900b28c0bc0baf7d768a12da85a004e6060982e8dc086909

data/README.md

@@ -224,14 +224,14 @@ end
 
 ```
 
-Use `elastic_index.load_from_source = true` to configure an index without ActiveRecord.
+Call `load_from_source!` to configure an index without ActiveRecord. Finder methods will be
+delegated to the ElasticRecord module.
 
 ```ruby
 class Product
   include ActiveModel::Model
   include ElasticRecord::Record
-
-  self.elastic_index.load_from_source = true
+  elastic_index.load_from_source!
 end
 ```
 

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '5.2.0'
+  s.version = '5.3.0'
   s.summary = 'An Elasticsearch querying ORM'
   s.description = 'Find your records with Elasticsearch'
 
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
 
-  s.add_dependency 'arelastic', '>= 2.0.0'
+  s.add_dependency 'arelastic', '>= 2.5.0'
   s.add_dependency 'activemodel'
 end

data/lib/elastic_record/index/manage.rb

@@ -12,7 +12,7 @@ module ElasticRecord
           "mappings" => {
             mapping_type => mapping
           },
-          "settings" => setting_overrides.merge(settings)
+          "settings" => settings.merge(setting_overrides)
         }
         index_name
       end

data/lib/elastic_record/index.rb

@@ -42,7 +42,7 @@ module ElasticRecord
     def initialize(model)
       @model = model
       @disabled = false
-      @load_from_source = false
+      self.load_from_source = false
     end
 
     def initialize_copy(other)
@@ -65,11 +65,16 @@ module ElasticRecord
       @disabled = false
     end
 
+    def load_from_source!
+      self.load_from_source = true
+      model.singleton_class.delegate :find, :find_by, :find_each, :find_in_batches, :first, to: :elastic_search
+    end
+
     def loading_from_source(&block)
-      @load_from_source = true
+      self.load_from_source = true
       yield
     ensure
-      @load_from_source = false
+      self.load_from_source = false
     end
 
     def real_connection

data/lib/elastic_record/model.rb

@@ -9,6 +9,8 @@ module ElasticRecord
 
         class_attribute :elastic_connection
         self.elastic_connection = ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)
+
+        singleton_class.delegate :query, :filter, :aggregate, to: :elastic_search
       end
     end
 

data/lib/elastic_record/relation/finder_methods.rb

@@ -2,15 +2,18 @@ module ElasticRecord
   class Relation
     module FinderMethods
       def find(*ids)
-        return [] if ids.first.is_a?(Array) && ids.first.empty?
-        ids       = ids.flatten
-        id_filter = filter(arelastic.filter.ids(ids))
-        id_filter = id_filter.limit(ids.size) unless limit_value
-
-        case ids.size
-        when 0; raise ActiveRecord::RecordNotFound.new('empty argument')
-        when 1; id_filter.first!
-        else id_filter
+        flattened_ids = ids.flatten
+        id_filter     = filter(arelastic.filter.ids(flattened_ids))
+        id_filter     = id_filter.limit(flattened_ids.size) unless limit_value
+
+        if ids.first.is_a?(Array)
+          id_filter
+        else
+          case ids.size
+          when 0; raise ActiveRecord::RecordNotFound.new('empty argument')
+          when 1; id_filter.first!
+          else id_filter
+          end
         end
       end
 

data/lib/elastic_record/relation/hits.rb

@@ -7,7 +7,7 @@ module ElasticRecord
 
       def load_hits(search_hits)
         if klass.elastic_index.load_from_source
-           search_hits.map { |hit| klass.new(hit['_source'].update('id' => hit['_id'])) }
+           search_hits.map { |hit| load_from_hit(hit) }
         else
           klass.find map_hits_to_ids(search_hits)
         end
@@ -21,6 +21,15 @@ module ElasticRecord
         search_results['hits']['hits']
       end
 
+      def load_from_hit(hit)
+        record = klass.new
+        record.id = hit['_id']
+        hit['_source'].each do |k, v|
+          record.send("#{k}=", v) if record.respond_to?("#{k}=")
+        end
+        record
+      end
+
       def search_results
         @search_results ||= begin
           options = {typed_keys: true}

data/lib/elastic_record/relation/search_methods.rb

@@ -196,13 +196,15 @@ module ElasticRecord
           query = build_query(query)
           filter = build_filter(filters)
 
-          if filter
+          query_and_filter = if filter
             arelastic.query.bool(filter: filter, must: query)
           elsif query
-            Arelastic::Searches::Query.new(query)
+            query
           else
             arelastic.query.match_all
           end
+
+          Arelastic::Searches::Query.new query_and_filter
         end
 
         def build_query(query)

data/lib/elastic_record/searching.rb

@@ -11,6 +11,7 @@ module ElasticRecord
         elastic_relation
       end
     end
+    alias es elastic_search
 
     def elastic_scope(name, body, &block)
       extension = Module.new(&block) if block

data/test/dummy/app/models/project.rb

@@ -7,12 +7,11 @@ class Project
 
   include ActiveModel::Model
   include ElasticRecord::Model
+  elastic_index.load_from_source!
 
   attr_accessor :id, :name
   alias_method :as_json, :as_search_document
 
-  elastic_index.load_from_source = true
-
   def as_search_document
     { name: name }
   end

data/test/elastic_record/index/manage_test.rb

@@ -18,6 +18,21 @@ class ElasticRecord::Index::ManageTest < MiniTest::Test
     assert index.exists?('felons_foo')
   end
 
+  def test_create_with_overrides
+    old_settings = ElasticRecord::Config.default_index_settings
+    ElasticRecord::Config.default_index_settings = {
+      number_of_replicas: '2'
+    }
+    index.remove_instance_variable('@settings') if index.instance_variable_defined?('@settings')
+    index.create 'felons_default'
+    assert_equal '2', index_settings('felons_default')['index']['number_of_replicas']
+    index.create 'felons_override', setting_overrides: { number_of_replicas: 4 }
+    assert_equal '4', index_settings('felons_override')['index']['number_of_replicas']
+  ensure
+    ElasticRecord::Config.default_index_settings = old_settings
+    index.remove_instance_variable('@settings') if index.instance_variable_defined?('@settings')
+  end
+
   def test_exists
     index.create 'felons_foo'
 
@@ -48,4 +63,8 @@ class ElasticRecord::Index::ManageTest < MiniTest::Test
     def index
       @index ||= Felon.elastic_index
     end
+
+    def index_settings(index_name)
+      Felon.elastic_connection.json_get("/#{index_name}/_settings")[index_name]['settings']
+    end
 end

data/test/elastic_record/index_test.rb

@@ -31,6 +31,15 @@ class ElasticRecord::IndexTest < MiniTest::Test
     refute index.load_from_source
   end
 
+  def test_delegations_when_loading_from_source
+    project = Project.new(name: 'Something')
+    Project.elastic_index.index_record(project)
+
+    found_project = Project.first
+    assert_equal 'Something', found_project.name
+    assert_equal 'Something', Project.find(found_project.id).name
+  end
+
   private
 
     def index

data/test/elastic_record/relation/finder_methods_test.rb

@@ -24,6 +24,7 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Test
 
   def test_find_passed_an_array
     assert_equal 2, Widget.elastic_relation.find([@red_widget.id, @blue_widget.id]).size
+    assert_equal 1, Widget.elastic_relation.find([@red_widget.id]).size
     assert_equal 2, Widget.elastic_relation.filter('color' => ['red', 'blue']).find([@red_widget.id, @blue_widget.id]).size
     assert_equal 0, Widget.elastic_relation.filter('color' => ['purple', 'gold']).find([@red_widget.id, @blue_widget.id]).size
   end

data/test/elastic_record/searching_test.rb

@@ -9,7 +9,9 @@ class ElasticRecord::SearchingTest < MiniTest::Test
   end
 
   def test_elastic_search
-
+    widget = Widget.create(color: 'red')
+    assert_equal widget, Widget.elastic_search.filter(color: 'red').first
+    assert_equal widget, Widget.es.filter(color: 'red').first
   end
 
   def test_elastic_scope

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Elasticsearch querying ORM