elastic_record 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1539f24ad6321a28834405dafdfcefa3828f199c
-  data.tar.gz: 1f3b102b792235592d0f4026d3d9e007f569fd59
+  metadata.gz: c59b1b2830ef2314166e53fed56b060628e31962
+  data.tar.gz: c88b89a8a5335502aa4cf0bb8b46fb477dcb8f4e
 SHA512:
-  metadata.gz: e634439f433e50cd8fae20c32cfcbc2edab24e18d78fb4542afd1a66f244f366d0a6d7798ebecf8b20be947d2113deda2087c6cd3bebf6150139de96ff3ea74a
-  data.tar.gz: 642794e9b9d678f51269327cc0ee671773a04aa1bdf716679f8f70b4c9cf4c5250a9d7f4c4417681228a4f6ed60e9af17aa37e79d0baa44e0bfb682df805f925
+  metadata.gz: '09c62833cc9bb4bc486b5b53d65ac1c0a2395129edd6fbe1f887a5e208e75a99e585d898b2c8e1661084268d48f1d6a836e92654dba5bb6de0cf812849f9d502'
+  data.tar.gz: 8948ebb21a69e0eaa17e51f2456a73f2d7cde27312cdb4d7c52c661742c4e8fbbfef7f8996d0d4e9e652e98f95ecfba0782e90bd2966ff2606a239b49426615c

data/.travis.yml

@@ -1,16 +1,21 @@
-rvm: 2.3.1
+rvm:
+- 2.4.1
 cache: bundler
+# Not using Trusty containers because of:
+# https://github.com/travis-ci/travis-ci/issues/6842
 sudo: required
 dist: trusty
-before_install:
-- wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.2.2/elasticsearch-2.2.2.deb
-- sudo dpkg -i elasticsearch-2.2.2.deb
-- sudo service elasticsearch start
-- sudo apt-get install --yes mysql-server
+addons:
+  apt:
+    sources:
+    - elasticsearch-2.x
+    packages:
+    - elasticsearch
 before_script:
 - cp test/dummy/.env.example test/dummy/.env
 - curl localhost:9200
 - bundle exec rake app:db:setup
 - bundle exec rake app:index:reset
 services:
+- elasticsearch
 - postgresql

data/Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'dotenv-rails'
-gem 'oj'
 gem 'mysql2'
+gem 'oj'
 gem 'pg'
 gem 'rails'
 gem 'rake', '~> 10.5.0'

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '3.1.3'
+  s.version = '3.1.4'
   s.summary = 'An Elasticsearch querying ORM'
   s.description = 'Find your records with Elasticsearch'
 

data/lib/elastic_record/callbacks.rb

@@ -45,7 +45,7 @@ module ElasticRecord
         end
       end
 
-      amend_partial_update_document(json) if respond_to?(:partial_update_document)
+      amend_partial_update_document(json) if respond_to?(:amend_partial_update_document)
 
       json
     end

data/lib/elastic_record/connection.rb

@@ -103,9 +103,11 @@ module ElasticRecord
           self.request_count = 0
         end
 
-        host, port = current_server.split ':'
+        server = current_server.start_with?('http') ? current_server : "http://#{current_server}"
+        uri = URI(server)
 
-        http = Net::HTTP.new(host, port)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == 'https'
         if options[:timeout]
           http.read_timeout = options[:timeout].to_i
         end

data/lib/elastic_record/index/manage.rb

@@ -8,8 +8,12 @@ module ElasticRecord
       end
 
       def create(index_name = new_index_name)
-        connection.json_put "/#{index_name}", "settings" => settings
-        update_mapping(index_name)
+        connection.json_put "/#{index_name}", {
+          "mappings" => {
+            type => mapping
+          },
+          "settings" => settings
+        }
         index_name
       end
 

data/lib/elastic_record/json.rb

@@ -19,7 +19,7 @@ module ElasticRecord
 
       def encode(data)
         if ElasticRecord::JSON.parser == :oj
-          Oj.dump(data, mode: :compat)
+          Oj.dump(data, mode: :compat, use_as_json: true)
         else
           ActiveSupport::JSON.encode(data)
         end

data/lib/elastic_record/relation/batches.rb

@@ -9,7 +9,7 @@ module ElasticRecord
 
       def find_in_batches(options = {})
         find_ids_in_batches(options) do |ids|
-          yield klass.find(ids)
+          yield klass.where(id: ids)
         end
       end
 

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

@@ -17,6 +17,10 @@ module TestModel
       ids.map { |id| new(id: id) }
     end
 
+    def where(query)
+      find query[:id]
+    end
+
     def primary_key
       'id'
     end

data/test/dummy/config/application.rb

@@ -18,9 +18,6 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An Elasticsearch querying ORM