mongoid-elasticsearch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817468060649097bdc9d2087961b3c1e48a3f3bf
-  data.tar.gz: 11a922cfb895f5d0876148f98f69582ed267209a
+  metadata.gz: d6ddc81ca8a60464402cee8f9b312a60386c203c
+  data.tar.gz: 772a4c6a18512ccaddcb0f334e20fe1596c6ec24
 SHA512:
-  metadata.gz: 8108f386fc0005c154d79cc7cf0b9e91d40545295880240781e62b9ec6a58f81e08d73fdfa7eabeaf19e6ed7418e7406f3971deee9d3b08c3bf9b655b4c4b972
-  data.tar.gz: 6c2cd84050776f09459cddb15c11526c13a55ed6f1719dba9183e869eed87f9e283de44c490ce9fcab9a3380e24585c5a572dd4272c4d7d19e08067dbea6cecc
+  metadata.gz: c438080f5c384aa026249dcd58c3ba94b75e0713539e54a91f79db8d43db52db6c394bfc942fd27c2b5e79cdf45bf274a666df990efdc4b56359091a5cb882ca
+  data.tar.gz: f1687552273b2f52af268a5c4c12705f31bde5162f65f1881f138b4edc304e983cb4036eec4cb71eccb242ac7bfaa50cdd281534ce7591638d92bd0d2bad48c4

data/.travis.yml

@@ -10,16 +10,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - ruby-head
 
 gemfile:
   - Gemfile
-  - gemfiles/mongoid-4.0.gemfile
   - gemfiles/es-git.gemfile
-  - gemfiles/es-0.4.0.gemfile
   - gemfiles/es-0.4.1.gemfile
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid_rating.gemspec
 gem "mongoid", github: "mongoid/mongoid"
+gem 'mongoid_slug', github: 'glebtv/mongoid-slug'
+
 gemspec

data/README.md

@@ -129,6 +129,7 @@ index definition options and custom model serialization:
         name: name,
         excerpt: excerpt
       }
+      # mongoid_slug note: add _slugs to as_indexed_json, NOT slug
     end
     
 [Mapping definition docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html)    

data/gemfiles/es-0.4.1.gemfile

@@ -2,5 +2,6 @@ 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: "../"

data/gemfiles/es-git.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "mongoid", github: "mongoid/mongoid", branch: "master"
 gem 'elasticsearch', github: 'elasticsearch/elasticsearch-ruby', branch: "master"
+gem 'mongoid_slug', github: 'glebtv/mongoid-slug'
 
 gemspec path: "../"

data/lib/mongoid/elasticsearch/response.rb

@@ -66,13 +66,7 @@ module Mongoid
               m
             end
           when :model
-            if @multi
-              multi_without_load
-            else
-              hits.map do |h|
-                model_from_hash(h)
-              end
-            end
+            multi_without_load
           else
             hits
           end
@@ -118,12 +112,6 @@ module Mongoid
       alias_method :length, :size
 
       private
-      def model_from_hash(h)
-        source = h.delete('_source')
-        m = @model.new(h.merge(source))
-        m.new_record = false
-        m
-      end
 
       def find_klass(type)
         raise NoMethodError, "You have tried to eager load the model instances, " +

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mongoid", [">= 4.0", "< 5.0"]
-  spec.add_dependency "elasticsearch", "~> 0.4.0"
+  spec.add_dependency "elasticsearch", "~> 0.4.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "hashie"
+  spec.add_development_dependency "mongoid_slug"
 end

data/spec/models/article.rb

@@ -4,12 +4,17 @@ class Article
   include ActiveModel::ForbiddenAttributesProtection
 
   field :name
+
+  include Mongoid::Slug
+  slug :name
+
   field :tags
 
   include Mongoid::Elasticsearch
   i_fields = {
     name:     {type: 'string', analyzer: 'snowball'},
-    raw:      {type: 'string', index: :not_analyzed}
+    raw:      {type: 'string', index: :not_analyzed},
+    _slugs:   {type: 'string', index: :not_analyzed}
   }
 
   if Gem::Version.new(::Elasticsearch::Client.new.info['version']['number']) > Gem::Version.new('0.90.2')

data/spec/mongoid_elasticsearch_spec.rb

@@ -54,6 +54,24 @@ describe Article do
       results.first.name.should eq @article_2.name
     end
 
+    it 'mongoid_slug with wrapper: :load' do
+      results = Article.es.search q: 'likely'
+      expect(Article).to receive(:find).once.with([@article_2.id.to_s]).and_call_original
+      results.first.slug.should eq @article_2.name.to_url
+      results.first.to_param.should eq @article_2.name.to_url
+    end
+
+    it 'mongoid_slug with wrapper: :model' do
+      sleep 3
+      results = Article.es.search 'likely', wrapper: :model
+      sleep 3
+      allow(Article).to receive(:find)
+      results.first.slug.should eq @article_2.name.to_url
+      results.first.to_param.should eq @article_2.name.to_url
+      expect(Article).to_not have_received(:find)
+    end
+
+
     if Article.es.completion_supported?
       it 'completion' do
         Article.es.completion('te', 'name.suggest').should eq [
@@ -204,6 +222,7 @@ describe "Multisearch" do
     @ns_1 = Namespaced::Model.create!(name: 'test article name likes')
     Namespaced::Model.es.index.refresh
   end
+
   it 'works' do
     response = Mongoid::Elasticsearch.search 'test'
     response.length.should eq 4

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ require "rubygems"
 require "rspec"
 require "mongoid"
 require "hashie"
+require "mongoid_slug"
 require "database_cleaner"
 
 require "mongoid-elasticsearch"
@@ -26,9 +27,9 @@ Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 Mongoid.configure do |config|
   config.connect_to "mongoid_elasticsearch_test"
+  #config.logger = Logger.new($stdout, :info)
 end
-Mongoid.logger = Logger.new($stdout)
-
+#Moped.logger = Logger.new($stdout, Logger::DEBUG)
 
 DatabaseCleaner.orm = "mongoid"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,20 @@ dependencies:
     - - '>='
       - !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
 email:
 - glebtv@gmail.com
@@ -159,10 +173,8 @@ files:
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/es-0.4.0.gemfile
 - gemfiles/es-0.4.1.gemfile
 - gemfiles/es-git.gemfile
-- gemfiles/mongoid-4.0.gemfile
 - lib/mongoid-elasticsearch.rb
 - lib/mongoid/elasticsearch.rb
 - lib/mongoid/elasticsearch/callbacks.rb

data/gemfiles/es-0.4.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
-gem 'elasticsearch', '0.4.0'
-
-gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
-
-gemspec path: "../"