mongoid-elasticsearch 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fccb1027e5e75109d622f5d3e739f86cc98e974
-  data.tar.gz: 26828679705d5ef28df814ac561c07bc770ac0e2
+  metadata.gz: f4677ca4d511880593ad4caaa3db6a94d7b94eb8
+  data.tar.gz: ce66a3fd85bf6b7ac28049076071fed86fbd935e
 SHA512:
-  metadata.gz: b7624a2bef1ee0ba77aedb27854e87c4ac245b90d041ed0390be4b8e5c16add984ab1517e953a52cad78d143ad6db9cdaf81988be64123afe6f3bb0114e4c66d
-  data.tar.gz: 65571126df2b71fb3dff69358f609e343ea83157dfe6f69daa8e0ca07ab4e8bdb49c191b57cd33d8698c61682fd1e781fd144ee8eadb9f7af5f5f66f96222b82
+  metadata.gz: 2d49b4a4f21afde4f6b0f9bc567c90867a543b43738f067fe48dbdf90fbb6fd84bc948606dc6b08c700352b56be795e596f93d89c7810524da45c252a20c8e1e
+  data.tar.gz: c1adf29ebb70a6afc79a0180c7f690902520b91a660b91dcb4b5664cbfd9c4e601365199d3a7888798756a214be267639e541e8162d48b20b9cb71fd72b79a60

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.1

data/.travis.yml

@@ -9,7 +9,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - jruby-19mode
   - jruby-20mode
 
@@ -17,4 +17,3 @@ gemfile:
   - Gemfile
   - gemfiles/mongoid3.gemfile
   - gemfiles/es-git.gemfile
-  - gemfiles/es-0.4.1.gemfile

data/README.md

@@ -150,6 +150,37 @@ index definition options and custom model serialization:
       # mongoid_slug note: add _slugs to as_indexed_json, NOT slug
     end
     
+Example mapping with boost field:
+
+    elasticsearch!({
+      index_name: Rails.env.test? ? 'vv_test_articles' : 'vv_articles',
+      index_options: {
+        settings: {
+          index: {
+            analysis: {
+              analyzer: {
+                my_analyzer: {
+                  type: "snowball",
+                  language: "Russian"
+                }
+              }
+            }
+          }
+        },
+        mappings: {
+          "articles/article" => {
+            _boost: {name: '_boost', null_value: 1},
+            properties: {
+              name: {type: 'string', boost: 10, analyzer: 'my_analyzer'},
+              tags: {type: 'string', analyzer: 'my_analyzer'}
+            }
+          }
+        }
+      },
+      wrapper: :load
+    })
+    
+    
 [Mapping definition docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html)    
 
 ### Pagination

data/lib/mongoid/elasticsearch.rb

@@ -10,6 +10,8 @@ require 'mongoid/elasticsearch/index'
 require 'mongoid/elasticsearch/indexing'
 require 'mongoid/elasticsearch/response'
 
+require 'mongoid/elasticsearch/monkeypatches'
+
 module Mongoid
   module Elasticsearch
     mattr_accessor :prefix
@@ -87,7 +89,7 @@ module Mongoid
       # use `_all` or empty string to perform the operation on all indices
       # regardless whether they are managed by Mongoid::Elasticsearch or not
       unless query.key?(:index)
-        query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_indices: 'missing')
+        query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_indices: 'missing', ignore_unavailable: true)
       end
 
       page = options[:page]

data/lib/mongoid/elasticsearch/monkeypatches.rb

@@ -0,0 +1,56 @@
+# Quick fix for https://github.com/elasticsearch/elasticsearch-ruby/issues/43
+
+require 'elasticsearch/api/actions/search'
+module Elasticsearch
+  module API
+    module Actions
+      def search(arguments={})
+        arguments[:index] = '_all' if ! arguments[:index] && arguments[:type]
+
+        valid_params = [
+          :analyzer,
+          :analyze_wildcard,
+          :default_operator,
+          :df,
+          :explain,
+          :fields,
+          :from,
+          :ignore_indices,
+          :ignore_unavailable,
+          :allow_no_indices,
+          :expand_wildcards,
+          :indices_boost,
+          :lenient,
+          :lowercase_expanded_terms,
+          :preference,
+          :q,
+          :routing,
+          :scroll,
+          :search_type,
+          :size,
+          :sort,
+          :source,
+          :_source,
+          :_source_include,
+          :_source_exclude,
+          :stats,
+          :suggest_field,
+          :suggest_mode,
+          :suggest_size,
+          :suggest_text,
+          :timeout,
+          :version ]
+
+        method = 'GET'
+        path   = Utils.__pathify( Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_search' )
+
+        params = Utils.__validate_and_extract_params arguments, valid_params
+        body   = arguments[:body]
+
+        params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
+
+        perform_request(method, path, params, body).body
+      end
+    end
+  end
+end

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
-  spec.add_dependency "elasticsearch", "~> 0.4.2"
+  spec.add_dependency "elasticsearch", "~> 1.0.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/spec_helper.rb

@@ -21,6 +21,8 @@ require "database_cleaner"
 
 require "mongoid-elasticsearch"
 
+# Mongoid::Elasticsearch.client_options = {log: true}
+
 Mongoid::Elasticsearch.prefix = "mongoid_es_test_"
 I18n.enforce_available_locales = true
 

metadata

@@ -1,159 +1,159 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.1
 - !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: rake
   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: rspec
   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: kaminari
   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: database_cleaner
   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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   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: mongoid_slug
   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: Simple and easy integration of mongoid with the new elasticsearch gem
@@ -163,17 +163,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/es-0.4.1.gemfile
 - gemfiles/es-git.gemfile
 - gemfiles/mongoid3.gemfile
 - lib/mongoid-elasticsearch.rb
@@ -182,6 +181,7 @@ files:
 - lib/mongoid/elasticsearch/es.rb
 - lib/mongoid/elasticsearch/index.rb
 - lib/mongoid/elasticsearch/indexing.rb
+- lib/mongoid/elasticsearch/monkeypatches.rb
 - lib/mongoid/elasticsearch/pagination.rb
 - lib/mongoid/elasticsearch/response.rb
 - lib/mongoid/elasticsearch/utils.rb
@@ -203,17 +203,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple and easy integration of mongoid with the new elasticsearch gem

data/gemfiles/es-0.4.1.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
-gem 'elasticsearch', '0.4.1'
-gem 'mongoid_slug', github: 'glebtv/mongoid-slug'
-
-gemspec path: "../"