elasticsearch-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNhMWI2MzQ0ZjU0YmVjY2Y0MTBlMDNlM2JmOWUyODUwMTQ4OGM5MQ==
+    NGQ1YzEyMTY2NDgyYjg1YjU3ZDFkYTZkMjIyZmVkNzdmMjBmMTgxZA==
   data.tar.gz: !binary |-
-    ZjFmYjE4NDMyYzBhNzgxOGQzZTA2YTg5YzllNjcxODQ3YjU2YTVkYw==
+    ZDU0MTUzZDc1NzlhOGYyYzE3ODRlNTlkZGVlMjdkNjAyOTlhZjYzMw==
 SHA512:
   metadata.gz: !binary |-
-    OTM0MDA0MzNkMWZlZWNlYTczZWZiMzc5OTE4NDRiZmIzNDMzMDY3YWQ4NDAx
-    M2U4MjEwOGJlMzUxNDFmOTQ3MzRmNmFiMzg4M2JmNTUwMWQyMTIxNDMzOWE5
-    ZGU0Zjg4YTM3OTJiNjIwMmI3Mzc2MzVhYTIwZDEyZDg0NmZkNTM=
+    MWMwMjg4MGU4NWU4OWZlMTJlNjI4M2UwMTM0ZDY3NjQyNWJiNmEwMDZmOWQy
+    OWNmYzU2NTFhNzkyMmZhZDU1YzA3ZThlMmZmMzYzZWJlMjU1NWM5MTJkNTUx
+    MzU1OGExYmZjMWZjYjRhZmNjODRhOTllNjg3NzM1NWRmMjRjNjU=
   data.tar.gz: !binary |-
-    OGQ4OGRkOTdiM2E4YzZhZmE5MTBlNTUwMTE5ZTVhNTYxMDJjMTI3NjE5MGFi
-    MGE4NTFiYTQ4YmQ3OGQ1NGQ2Yjg5YWFlYzUwYjM2MTYyODVkNzcyNjJhYjA2
-    N2ZmNTEzYWNhNjhkYjM0ZjllNDBlNWE4YWM0NDM2ZmY0NDdjMmI=
+    NzlkMjM5ZjlhMTI4YTM2OTRkOTVjN2IwZmE1MzRhNzk3OWNiZDE1NjI2NTRh
+    YzcyMjVkOTU5ZmI2OThlYWE4NTYzYTVmZjk2OTQxMzZiNjhiNzBiODkyM2Yy
+    YzMyYWU5ZjIxOWI2YjNkNTRkN2IxNTI0NDQyMGI2NmY4ZGQ5MTk=

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## 0.1.3
+## 0.1.5
+
+* Fixed an exception when no suggestions were returned in the `03-expert` example application template
 
 ## 0.1.2
 

data/elasticsearch-rails.gemspec

@@ -34,14 +34,15 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "lograge"
 
-  s.add_development_dependency "minitest", "~> 4.0"
+  s.add_development_dependency "minitest", "~> 4"
+  s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
   s.add_development_dependency "ruby-prof"
   s.add_development_dependency "pry"
-  s.add_development_dependency "ci_reporter"
+  s.add_development_dependency "ci_reporter", "~> 1.9"
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "simplecov"

data/lib/elasticsearch/rails/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Rails
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/rails/templates/02-pretty.rb

@@ -91,6 +91,7 @@ gsub_file "#{Rails::VERSION::STRING > '4' ? 'test/models' : 'test/unit' }/articl
   test "has a search method delegating to __elasticsearch__" do
     Article.__elasticsearch__.expects(:search).with do |definition|
       assert_equal 'foo', definition[:query][:multi_match][:query]
+      true
     end
 
     Article.search 'foo'

data/lib/rails/templates/index.html.erb

@@ -50,10 +50,13 @@
 <% if @articles.size < 1 && (suggestions = @articles.response.response['suggest']) && suggestions.present?  %>
 <div class="col-md-12">
   <p class="alert alert-warning">
-    No documents have been found. Maybe you mean
-    <%= suggestions.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq.map do |term|
-      link_to term, search_path(params.merge q: term)
-    end.to_sentence(last_word_connector: ' or ').html_safe %>?
+    No documents have been found.
+    <% if suggestions['suggest_title'].present? || suggestions['suggest_body'].present? %>
+      Maybe you mean
+      <%= suggestions.map { |k,v| v.first['options'] }.flatten.map {|v| v['text']}.uniq.map do |term|
+        link_to term, search_path(params.merge q: term)
+      end.to_sentence(last_word_connector: ' or ').html_safe %>?
+    <% end %>
   </p>
 </div>
 <% end %>

data/test/test_helper.rb

@@ -10,10 +10,17 @@ at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
 
 puts '-'*80
 
-require 'test/unit'
+if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
+  require 'test-unit'
+  require 'mocha/test_unit'
+else
+  require 'minitest/autorun'
+  require 'mocha/mini_test'
+end
+
 require 'shoulda-context'
-require 'mocha/setup'
-require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
 require 'oj'

data/test/unit/instrumentation/instrumentation_test.rb

@@ -19,10 +19,9 @@ class Elasticsearch::Rails::InstrumentationTest < Test::Unit::TestCase
     RESPONSE = { 'took' => '5ms', 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [] } }
 
     setup do
-      @search   = Elasticsearch::Model::Searching::SearchRequest.new ::DummyInstrumentationModel, '*'
-      @response = Elasticsearch::Model::Response::Response.new ::DummyInstrumentationModel, @search
+      @search = Elasticsearch::Model::Searching::SearchRequest.new ::DummyInstrumentationModel, '*'
 
-      @client = stub('client', search: @response)
+      @client = stub('client', search: RESPONSE)
       DummyInstrumentationModel.stubs(:client).returns(@client)
 
       Elasticsearch::Rails::Instrumentation::Railtie.run_initializers
@@ -41,6 +40,7 @@ class Elasticsearch::Rails::InstrumentationTest < Test::Unit::TestCase
         assert_equal "search.elasticsearch", name
         assert_equal 'DummyInstrumentationModel', payload[:klass]
         assert_equal @query, payload[:search][:body]
+        true
       end
 
       s = ::DummyInstrumentationModel.search @query
@@ -56,6 +56,6 @@ class Elasticsearch::Rails::InstrumentationTest < Test::Unit::TestCase
       assert_not_nil logged
       assert_match /DummyInstrumentationModel Search \(\d+\.\d+ms\)/,  logged
       assert_match /body\: \{query\: \{match\: \{moo\: "bam"\}\}\}\}/, logged
-    end
+    end unless defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,16 @@ dependencies:
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement