elasticsearch-persistence 2.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d649049655dad24c44a755b5b05cd51a83c7e86e
-  data.tar.gz: 905fd9269d924b26a6d9c095d629e1aab1aa2fad
+  metadata.gz: 0de349098f6228ded1b437402e5a39476f0e0ef5
+  data.tar.gz: 1d4b0d9a0842cae6fe45e279eac6d63957604082
 SHA512:
-  metadata.gz: 6df21313b738fbb559e1770ad9414391fac1c01649e60289646c4fa109b6c7dc00379e7c022210779ff6656b5bafe606ca22779a00424e78b6516f2cf3dcfb55
-  data.tar.gz: 8dce665b1ce90b9f38647812ed6e72bb8672c82a8442a4c72bfecc94983430b41aa5b2ac4adc9a04929222946058dba783d8c060c37a3f5cd8a765bdac37ba0b
+  metadata.gz: 0e75f259f5152a34730ceecd9d05ac182d67cb036c06c97c6ed6938c2cf5ea02bf7e5fec7d37a3064cabaf15ae4a5c9fab1c5be235ff138f3a0c714f9e5d93b7
+  data.tar.gz: 8e1ae7bb7659b42c21136fc0bac8624f92e98aa6f102c04fddfac7d9299ad6c376d96af4ff371dd293aff0648d84287446b9251b6f96fe590ab5918b349702bf

data/README.md

@@ -593,7 +593,7 @@ retrieve big collections of model instances, using the Elasticsearch's _Scan API
 
 ```ruby
 Article.find_each(_source_include: 'title') { |a| puts "===> #{a.title.upcase}" }
-# GET http://localhost:9200/articles/article/_search?scroll=5m&search_type=scan&size=20
+# GET http://localhost:9200/articles/article/_search?scroll=5m&size=20
 # GET http://localhost:9200/_search/scroll?scroll=5m&scroll_id=c2Nhb...
 # ===> TEST
 # GET http://localhost:9200/_search/scroll?scroll=5m&scroll_id=c2Nhb...

data/elasticsearch-persistence.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency "elasticsearch",       '~> 2'
+  s.add_dependency "elasticsearch",       '> 1'
   s.add_dependency "elasticsearch-model", '>= 0.1'
   s.add_dependency "activesupport",       '> 4'
   s.add_dependency "activemodel",         '> 4'

data/examples/music/album.rb

@@ -12,9 +12,8 @@ class Album
 
   index_name [Rails.application.engine_name, Rails.env].join('-')
 
+
   mapping _parent: { type: 'artist' } do
-    indexes :suggest_title, type: 'completion', payloads: true
-    indexes :suggest_track, type: 'completion', payloads: true
   end
 
   attribute :artist
@@ -30,4 +29,26 @@ class Album
 
   attribute :styles
   attribute :meta, Meta, mapping: { type: 'object' }
+
+  attribute :suggest, Hashie::Mash, mapping: {
+    type: 'object',
+    properties: {
+      title: {
+        type: 'object',
+        properties: {
+          input:   { type: 'completion' },
+          output:  { type: 'keyword', index: false },
+          payload: { type: 'object', enabled: false }
+        }
+      },
+      track: {
+        type: 'object',
+        properties: {
+          input:   { type: 'completion' },
+          output:  { type: 'keyword', index: false },
+          payload: { type: 'object', enabled: false }
+        }
+      }
+    }
+  }
 end

data/examples/music/artist.rb

@@ -4,23 +4,43 @@ class Artist
   index_name [Rails.application.engine_name, Rails.env].join('-')
 
   analyzed_and_raw = { fields: {
-    name: { type: 'string', analyzer: 'snowball' },
-    raw:  { type: 'string', analyzer: 'keyword' }
+    name: { type: 'text', analyzer: 'snowball' },
+    raw:  { type: 'keyword' }
   } }
 
   attribute :name, String, mapping: analyzed_and_raw
-  attribute :suggest_name, String, default: {}, mapping: { type: 'completion', payloads: true }
 
   attribute :profile
   attribute :date, Date
 
   attribute :members, String, default: [], mapping: analyzed_and_raw
   attribute :members_combined, String, default: [], mapping: { analyzer: 'snowball' }
-  attribute :suggest_member, String, default: {}, mapping: { type: 'completion', payloads: true }
 
   attribute :urls, String, default: []
   attribute :album_count, Integer, default: 0
 
+  attribute :suggest, Hashie::Mash, mapping: {
+    type: 'object',
+    properties: {
+      name: {
+        type: 'object',
+        properties: {
+          input:   { type: 'completion' },
+          output:  { type: 'keyword', index: false },
+          payload: { type: 'object', enabled: false }
+        }
+      },
+      member: {
+        type: 'object',
+        properties: {
+          input:   { type: 'completion' },
+          output:  { type: 'keyword', index: false },
+          payload: { type: 'object', enabled: false }
+        }
+      }
+    }
+  }
+
   validates :name, presence: true
 
   def albums
@@ -29,7 +49,7 @@ class Artist
           has_parent: {
             type: 'artist',
             query: {
-              filtered: {
+              bool: {
                 filter: {
                   ids: { values: [ self.id ] }
                 }

data/examples/music/artists/index.html.erb

@@ -15,6 +15,7 @@
   <% @artists.each do |artist| %>
     <%= div_for artist, class: 'result clearfix' do %>
       <h2>
+        <%= image_tag "http://ruby.elastic.co.s3-website-us-east-1.amazonaws.com/demo/music/bands/#{artist.id}.jpeg", height: '50px', class: 'band' %>
         <%= link_to artist do %>
           <span class="name"><%= artist.name %></span>
           <small><%= pluralize artist.album_count, 'album' %></small>
@@ -41,7 +42,7 @@ $.widget( "custom.suggest", $.ui.autocomplete, {
         var category = ul.append( "<li class='ui-autocomplete-category'>" + item.label + "</li>" );
 
         $.each( item.value, function( index, item ) {
-          var li = $('<li class="ui-autocomplete-item"><a href="<%= Rails.application.config.relative_url_root %>'+ item.payload.url +'">'+ item.text +'</a></li>').data('ui-autocomplete-item', item )
+          var li = $('<li class="ui-autocomplete-item"><a href="<%= Rails.application.config.relative_url_root %>'+ item.url +'">'+ item.text +'</a></li>').data('ui-autocomplete-item', item )
           category.append(li)
         } )
       });
@@ -51,7 +52,9 @@ $.widget( "custom.suggest", $.ui.autocomplete, {
 $( "#q" ).suggest({
   source: '<%= suggest_path %>',
   select: function(event, ui) {
-    document.location.href = '<%= Rails.application.config.relative_url_root %>'+ui.item.payload.url
+    document.location.href = '<%= Rails.application.config.relative_url_root %>'+ui.item.url
   }
 });
 </script>
+
+<script>$('img.band').error(function(){ $(this).attr('src', '/images/blank_artist.png'); });</script>

data/examples/music/artists/show.html.erb

@@ -1,51 +1,54 @@
-<header>
-  <h1>
-    <span class="back"><%= link_to "〈".html_safe, artists_path, title: "Back" %></span>
-    <%= @artist.name %>
-    <%= button_to 'Edit', edit_artist_path(@artist), method: 'get' %>
-  </h1>
-</header>
+<div class="artist">
+  <header>
+    <h1>
+      <span class="back"><%= link_to "〈".html_safe, artists_path, title: "Back" %></span>
+      <%= image_tag "http://ruby.elastic.co.s3-website-us-east-1.amazonaws.com/demo/music/bands/#{@artist.id}.jpeg", height: '50px', class: 'band' %>
+      <%= @artist.name %>
+      <%= button_to 'Edit', edit_artist_path(@artist), method: 'get' %>
+    </h1>
+  </header>
 
-<p id="notice"><%= notice %></p>
+  <p id="notice"><%= notice %></p>
 
-<section class="artist-info">
-  <span><%= @artist.members.to_sentence last_word_connector: ' and ' %></span> |
-  <span><%= pluralize @albums.size, 'album' %></span>
-  <p class="artist-profile"><%= @artist.profile %></p>
-</section>
+  <section class="artist-info">
+    <span><%= @artist.members.to_sentence last_word_connector: ' and ' %></span> |
+    <span><%= pluralize @albums.size, 'album' %></span>
+    <p class="artist-profile"><%= @artist.profile %></p>
+  </section>
 
-<section class="albums">
-  <% @albums.each do |album| %>
-  <%= div_for album, class: 'clearfix' do %>
-      <h3>
-        <span class="title"><%= album.title %></span>
-        <div class="info">
-          <small><%= album.meta.formats.join(', ') %></small>
-          <small><%= album.released %></small>
+  <section class="albums">
+    <% @albums.each do |album| %>
+    <%= div_for album, class: 'clearfix' do %>
+        <h3>
+          <span class="title"><%= album.title %></span>
+          <div class="info">
+            <small><%= album.meta.formats.join(', ') %></small>
+            <small><%= album.released %></small>
+          </div>
+        </h3>
+
+        <div class="cover">
+          <%= image_tag "http://ruby.elastic.co.s3-website-us-east-1.amazonaws.com/demo/music/covers/#{album.id}.jpeg", width: '100px', class: 'cover' %>
         </div>
-      </h3>
 
-      <div class="cover">
-        <%= image_tag "http://ruby-demo-assets.s3.amazonaws.com/discogs/covers/#{album.id}.jpeg", width: '100px', class: 'cover' %>
-      </div>
+        <div class="content">
+          <% album.tracklist.in_groups_of(album.tracklist.size/2+1).each_with_index do |half, g| %>
+            <ul class=<%= cycle 'first', 'second' %> start="<%= g < 1 ? 1 : album.tracklist.size/2+2 %>">
+              <% half.compact.each_with_index do |track, i| %>
+                <li>
+                  <i class="counter"><%= g < 1 ? i+1 : i+(g*album.tracklist.size/2+2)  %></i>
+                  <%= track['title'] %>
+                  <small><%= track['duration'] %></small>
+                </li>
+              <% end %>
+            </ul>
+          <% end %>
+        </div>
+      <% end %>
 
-      <div class="content">
-        <% album.tracklist.in_groups_of(album.tracklist.size/2+1).each_with_index do |half, g| %>
-          <ul class=<%= cycle 'first', 'second' %> start="<%= g < 1 ? 1 : album.tracklist.size/2+2 %>">
-            <% half.compact.each_with_index do |track, i| %>
-              <li>
-                <i class="counter"><%= g < 1 ? i+1 : i+(g*album.tracklist.size/2+2)  %></i>
-                <%= track['title'] %>
-                <small><%= track['duration'] %></small>
-              </li>
-            <% end %>
-          </ul>
-        <% end %>
-      </div>
     <% end %>
 
-  <% end %>
-
-  <script>$('img').error(function(){ $(this).attr('src', '/images/blank_cover.png'); });</script>
-  <script>$(document.location.hash).effect('highlight', 1500)</script>
-</section>
+    <script>$('img').error(function(){ $(this).attr('src', '/images/blank_cover.png'); });</script>
+    <script>$(document.location.hash).effect('highlight', 1500)</script>
+  </section>
+</div>

data/examples/music/assets/application.css

@@ -100,6 +100,20 @@ h1 form {
 
 .artist h2 {
   float: left;
+  margin-left: 50px;
+}
+
+.artist.search.result h2 {
+  float: none;
+}
+
+.artist h1 .back {
+  margin-right: 65px;
+}
+
+.artist h1 img.band {
+  left: 120px;
+  top: 50px;
 }
 
 .result h2 a,
@@ -124,17 +138,17 @@ h1 form {
   text-decoration: underline;
 }
 
-.result .small {
+.result .highlight.small {
   font-size: 90%;
   font-weight: 200;
   padding: 0;
-  margin: 0.25em 0 0.25em 0;
+  margin: 0.25em 0 0.25em 50px;
 }
 
 .result .small .label {
   color: #999;
   font-size: 80%;
-  min-width: 5em;
+  /*min-width: 5em;*/
   display: inline-block;
 }
 
@@ -156,15 +170,32 @@ h1 form {
   margin: 0.25em 0 0 0;
 }
 
+.artist img.band {
+  position: absolute;
+  left: 85px;
+  margin-top: 14px;
+  transform: translate(-50%,-50%);
+  clip-path: circle(20px at center);
+}
+
 .album {
   margin: 0 0 4em 0;
 }
 
+.album.search.result {
+  margin: 0;
+}
+
 .album .cover {
   float: left;
   width: 150px;
 }
 
+.album.search.result .cover {
+  width: 40px;
+  margin-right: 10px;
+}
+
 .album .cover img {
   border: 1px solid rgba(0,0,0,0.15);
   box-shadow: 0px 0px 1px 0px rgba(0,0,0,0.05);

data/examples/music/index_manager.rb

@@ -26,33 +26,46 @@ class IndexManager
       Artist.create artist.update(
         'album_count' => artist['releases'].size,
         'members_combined' => artist['members'].join(', '),
-        'suggest_name' => {
-          'input'  => artist['namevariations'].unshift(artist['name']),
-          'output' => artist['name'],
-          'payload' => { 'url' => "/artists/#{artist['id']}" }
-        },
-        'suggest_member' => {
-          'input'  => artist['members'],
-          'output' => artist['name'],
-          'payload' => { 'url' => "/artists/#{artist['id']}" }
+        'suggest' => {
+          'name' => {
+            'input' => { 'input' => artist['namevariations'].unshift(artist['name']).reject { |d| d.to_s.empty? } },
+            'output' => artist['name'],
+            'payload' => {
+              'url' => "/artists/#{artist['id']}"
+            }
+          },
+          'member' => {
+            'input' => { 'input' => artist['members'] },
+            'output' => artist['name'],
+            'payload' => {
+              'url' => "/artists/#{artist['id']}"
+            }
+          }
         }
       )
 
       artist['releases'].each do |album|
         album.update(
-          'suggest_title' => {
-            'input'  => album['title'],
-            'output' => album['title'],
-            'payload' => { 'url' => "/artists/#{artist['id']}#album_#{album['id']}" }
-          },
-          'suggest_track' => {
-            'input'  => album['tracklist'].map { |d| d['title'] },
-            'output' => album['title'],
-            'payload' => { 'url' => "/artists/#{artist['id']}#album_#{album['id']}" }
+          'suggest' => {
+            'title' => {
+              'input' => { 'input' => album['title'] },
+              'output' => album['title'],
+              'payload' => {
+                'url' => "/artists/#{artist['id']}#album_#{album['id']}"
+              }
+            },
+            'track' => {
+              'input' => { 'input' => album['tracklist'].map { |d| d['title'] }.reject { |d| d.to_s.empty? } },
+              'output' => album['title'],
+              'payload' => {
+                'url' => "/artists/#{artist['id']}#album_#{album['id']}"
+              }
+            }
           }
         )
         album['notes'] = album['notes'].to_s.gsub(/<.+?>/, '').gsub(/ {2,}/, '')
         album['released'] = nil if album['released'] < 1
+
         Album.create album, id: album['id'], parent: artist['id']
       end
     end

data/examples/music/search/index.html.erb

@@ -13,21 +13,22 @@
 
 <section class="artists">
   <% @artists.each do |artist| %>
-    <%= content_tag :div, class: 'result clearfix' do %>
+    <%= content_tag :div, class: 'artist search result clearfix' do %>
       <h2>
+        <%= image_tag "http://ruby.elastic.co.s3-website-us-east-1.amazonaws.com/demo/music/bands/#{artist.id}.jpeg", height: '45px', class: 'band' %>
         <%= link_to artist do %>
           <span class="name"><%= highlighted(artist, :name) %></span>
           <small><%= pluralize artist.album_count, 'album' %></small>
         <% end %>
       </h2>
       <% if highlight = highlight(artist, :members_combined) %>
-      <p class="small">
+      <p class="highlight small">
         <span class="label">Members</span>
         <%= highlight.first.html_safe %>
       </p>
       <% end %>
       <% if highlight = highlight(artist, :profile) %>
-      <p class="small">
+      <p class="highlight small">
         <span class="label">Profile</span>
         <%= highlight.join('&hellip;').html_safe %>
       </p>
@@ -38,8 +39,9 @@
 
 <section class="albums">
   <% @albums.each do |album| %>
-    <%= content_tag :div, class: 'result clearfix' do %>
+    <%= content_tag :div, class: 'album search result clearfix' do %>
       <h2>
+        <%= image_tag "http://ruby.elastic.co.s3-website-us-east-1.amazonaws.com/demo/music/covers/#{album.id}.jpeg", width: '45px', class: 'cover' %>
         <%= link_to artist_path(album.artist_id, anchor: "album_#{album.id}") do %>
           <span class="name"><%= highlighted(album, :title) %></span>
           <small><%= album.artist %></small>
@@ -48,14 +50,14 @@
       </h2>
 
       <% if highlight = highlight(album, 'tracklist.title') %>
-        <p class="small">
+        <p class="highlight small">
           <span class="label">Tracks</span>
           <%= highlight.join('&hellip;').html_safe %>
         </p>
       <% end %>
 
       <% if highlight = highlight(album, :notes) %>
-        <p class="small">
+        <p class="highlight small">
           <span class="label">Notes</span>
           <%= highlight.map { |d| d.gsub(/^\.\s?/, '') }.join('&hellip;').html_safe %>
         </p>
@@ -77,7 +79,7 @@ $.widget( "custom.suggest", $.ui.autocomplete, {
         var category = ul.append( "<li class='ui-autocomplete-category'>" + item.label + "</li>" );
 
         $.each( item.value, function( index, item ) {
-          var li = $('<li class="ui-autocomplete-item"><a href="<%= Rails.application.config.relative_url_root %>'+ item.payload.url +'">'+ item.text +'</a></li>').data('ui-autocomplete-item', item )
+          var li = $('<li class="ui-autocomplete-item"><a href="<%= Rails.application.config.relative_url_root %>'+ item.url +'">'+ item.text +'</a></li>').data('ui-autocomplete-item', item )
           category.append(li)
         } )
       });
@@ -87,7 +89,7 @@ $.widget( "custom.suggest", $.ui.autocomplete, {
 $( "#q" ).suggest({
   source: '<%= suggest_path %>',
   select: function(event, ui) {
-    document.location.href = '<%= Rails.application.config.relative_url_root %>'+ui.item.payload.url
+    document.location.href = '<%= Rails.application.config.relative_url_root %>'+ui.item.url
   }
 });
 </script>

data/examples/music/search/search_controller_test.rb

@@ -1,9 +1,12 @@
 require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
+  setup do
+    IndexManager.create_index force: true
+  end
+
   test "should get suggest" do
-    get :suggest
+    get :suggest, term: 'foo'
     assert_response :success
   end
-
 end

data/examples/music/suggester.rb

@@ -7,39 +7,63 @@ class Suggester
 
   def response
     @response ||= begin
-      Elasticsearch::Persistence.client.suggest \
+      Elasticsearch::Persistence.client.search \
       index: Artist.index_name,
       body: {
-        artists: {
-          text: @term,
-          completion: { field: 'suggest_name', size: 25 }
+        suggest: {
+          artists: {
+            text: @term,
+            completion: { field: 'suggest.name.input', size: 25 }
+          },
+          members: {
+            text: @term,
+            completion: { field: 'suggest.member.input', size: 25 }
+          },
+          albums: {
+            text: @term,
+            completion: { field: 'suggest.title.input', size: 25 }
+          },
+          tracks: {
+            text: @term,
+            completion: { field: 'suggest.track.input', size: 25 }
+          }
         },
-        members: {
-          text: @term,
-          completion: { field: 'suggest_member', size: 25 }
-        },
-        albums: {
-          text: @term,
-          completion: { field: 'suggest_title', size: 25 }
-        },
-        tracks: {
-          text: @term,
-          completion: { field: 'suggest_track', size: 25 }
-        }
+        _source: ['suggest.*']
       }
     end
   end
 
   def as_json(options={})
-    response
-      .except('_shards')
-      .reduce([]) do |sum,d|
-        # category = { d.first => d.second.first['options'] }
-        item = { :label => d.first.titleize, :value => d.second.first['options'] }
-        sum << item
-      end
-      .reject do |d|
-        d[:value].empty?
-      end
+    return [] unless response['suggest']
+
+    output = [
+      { label: 'Bands',
+        value: response['suggest']['artists'][0]['options'].map do |d|
+          { text: d['_source']['suggest']['name']['output'],
+            url:  d['_source']['suggest']['name']['payload']['url'] }
+        end
+      },
+
+      { label: 'Albums',
+        value: response['suggest']['albums'][0]['options'].map do |d|
+          { text: d['_source']['suggest']['title']['output'],
+            url:  d['_source']['suggest']['title']['payload']['url'] }
+        end
+      },
+
+      { label: 'Band Members',
+        value: response['suggest']['members'][0]['options'].map do |d|
+          { text: "#{d['text']} (#{d['_source']['suggest']['member']['output']})",
+            url:  d['_source']['suggest']['member']['payload']['url'] }
+        end
+      },
+
+      { label: 'Album Tracks',
+        value: response['suggest']['tracks'][0]['options'].map do |d|
+          { text: "#{d['text']} (#{d['_source']['suggest']['track']['output']})",
+            url:  d['_source']['suggest']['track']['payload']['url'] }
+        end
+      }
+    ]
   end
 end

data/examples/music/template.rb

@@ -11,8 +11,8 @@
 #
 # * Git
 # * Ruby  >= 1.9.3
-# * Rails >= 4
-# * Java  >= 7 (for Elasticsearch)
+# * Rails >= 5
+# * Java  >= 8 (for Elasticsearch)
 #
 # Usage:
 # ------
@@ -25,6 +25,7 @@ STDOUT.sync = true
 STDERR.sync = true
 
 require 'uri'
+require 'json'
 require 'net/http'
 
 at_exit do
@@ -35,29 +36,32 @@ at_exit do
   end
 end
 
-run "touch tmp/.gitignore"
+$elasticsearch_url = ENV.fetch('ELASTICSEARCH_URL', 'http://localhost:9200')
 
-append_to_file ".gitignore", "vendor/elasticsearch-1.2.1/\n"
+# ----- Check & download Elasticsearch ------------------------------------------------------------
 
-git :init
-git add:    "."
-git commit: "-m 'Initial commit: Clean application'"
+cluster_info = Net::HTTP.get(URI.parse($elasticsearch_url)) rescue nil
+cluster_info = JSON.parse(cluster_info) if cluster_info
 
-# ----- Download Elasticsearch --------------------------------------------------------------------
+if cluster_info.nil? || cluster_info['version']['number'] < '5'
+  # Change the port when incompatible Elasticsearch version is running on localhost:9200
+  if $elasticsearch_url == 'http://localhost:9200' && cluster_info && cluster_info['version']['number'] < '5'
+    $change_port = '9280'
+    $elasticsearch_url = "http://localhost:#{$change_port}"
+  end
 
-unless (Net::HTTP.get(URI.parse('http://localhost:9200')) rescue false)
   COMMAND = <<-COMMAND.gsub(/^    /, '')
-    curl -# -O "http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.2.1.tar.gz"
-    tar -zxf elasticsearch-1.2.1.tar.gz
-    rm  -f   elasticsearch-1.2.1.tar.gz
-    ./elasticsearch-1.2.1/bin/elasticsearch -d -p #{destination_root}/tmp/pids/elasticsearch.pid
+    curl -# -O "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.1.tar.gz"
+    tar -zxf elasticsearch-5.2.1.tar.gz
+    rm  -f   elasticsearch-5.2.1.tar.gz
+    ./elasticsearch-5.2.1/bin/elasticsearch -d -p #{destination_root}/tmp/pids/elasticsearch.pid #{$change_port.nil? ? '' : "-E http.port=#{$change_port}" }
   COMMAND
 
   puts        "\n"
   say_status  "ERROR", "Elasticsearch not running!\n", :red
   puts        '-'*80
-  say_status  '',      "It appears that Elasticsearch is not running on this machine."
-  say_status  '',      "Is it installed? Do you want me to install it for you with this command?\n\n"
+  say_status  '',      "It appears that Elasticsearch 5 is not running on this machine."
+  say_status  '',      "Is it installed? Do you want me to install and run it for you with this command?\n\n"
   COMMAND.each_line { |l| say_status '', "$ #{l}" }
   puts
   say_status  '',      "(To uninstall, just remove the generated application directory.)"
@@ -69,9 +73,9 @@ unless (Net::HTTP.get(URI.parse('http://localhost:9200')) rescue false)
 
     java_info = `java -version 2>&1`
 
-    unless java_info.match /1\.[7-9]/
+    unless java_info.match /1\.[8-9]/
       puts
-      say_status "ERROR", "Required Java version (1.7) not found, exiting...", :red
+      say_status "ERROR", "Required Java version (1.8) not found, exiting...", :red
       exit(1)
     end
 
@@ -81,18 +85,36 @@ unless (Net::HTTP.get(URI.parse('http://localhost:9200')) rescue false)
       commands.each { |command| run command }
       run "(#{exec})"  # Launch Elasticsearch in subshell
     end
+
+    # Wait for Elasticsearch to be up...
+    #
+    system <<-COMMAND
+      until $(curl --silent --head --fail #{$elasticsearch_url} > /dev/null 2>&1); do
+          printf '.'; sleep 1
+      done
+    COMMAND
   end
 end unless ENV['RAILS_NO_ES_INSTALL']
 
+# ----- Application skeleton ----------------------------------------------------------------------
+
+run "touch tmp/.gitignore"
+
+append_to_file ".gitignore", "vendor/elasticsearch-5.2.1/\n"
+
+git :init
+git add:    "."
+git commit: "-m 'Initial commit: Clean application'"
+
 # ----- Add README --------------------------------------------------------------------------------
 
 puts
 say_status  "README", "Adding Readme...\n", :yellow
 puts        '-'*80, ''; sleep 0.25
 
-remove_file 'README.rdoc'
+remove_file 'README.md'
 
-create_file 'README.rdoc', <<-README
+create_file 'README.md', <<-README
 = Ruby on Rails and Elasticsearch persistence: Example application
 
 README
@@ -101,20 +123,31 @@ README
 git add:    "."
 git commit: "-m 'Added README for the application'"
 
-# ----- Use Thin ----------------------------------------------------------------------------------
+# ----- Use Pry as the Rails console --------------------------------------------------------------
 
-begin
-  require 'thin'
-  puts
-  say_status  "Rubygems", "Adding Thin into Gemfile...\n", :yellow
-  puts        '-'*80, '';
+puts
+say_status  "Rubygems", "Adding Pry into Gemfile...\n", :yellow
+puts        '-'*80, '';
 
-  gem 'thin'
-rescue LoadError
+gem_group :development do
+  gem 'pry'
+  gem 'pry-rails'
 end
 
+git add:    "Gemfile*"
+git commit: "-m 'Added Pry into the Gemfile'"
+
 # ----- Auxiliary gems ----------------------------------------------------------------------------
 
+puts
+say_status  "Rubygems", "Adding libraries into the Gemfile...\n", :yellow
+puts        '-'*80, ''; sleep 0.75
+
+gem "simple_form"
+
+git add:    "Gemfile*"
+git commit: "-m 'Added auxiliary libraries into the Gemfile'"
+
 # ----- Remove CoffeeScript, Sass and "all that jazz" ---------------------------------------------
 
 comment_lines   'Gemfile', /gem 'coffee/
@@ -128,16 +161,13 @@ puts
 say_status  "Rubygems", "Adding Elasticsearch libraries into Gemfile...\n", :yellow
 puts        '-'*80, ''; sleep 0.75
 
-gem "quiet_assets"
-gem "simple_form"
-
-gem 'elasticsearch', git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
-gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git', require: 'elasticsearch/model'
-gem 'elasticsearch-persistence', git: 'git://github.com/elasticsearch/elasticsearch-rails.git', require: 'elasticsearch/persistence/model'
-gem 'elasticsearch-rails', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
+gem 'elasticsearch', git: 'https://github.com/elastic/elasticsearch-ruby.git'
+gem 'elasticsearch-model', git: 'https://github.com/elastic/elasticsearch-rails.git', require: 'elasticsearch/model'
+gem 'elasticsearch-persistence', git: 'https://github.com/elastic/elasticsearch-rails.git', require: 'elasticsearch/persistence/model'
+gem 'elasticsearch-rails', git: 'https://github.com/elastic/elasticsearch-rails.git'
 
 git add:    "Gemfile*"
-git commit: "-m 'Added libraries into Gemfile'"
+git commit: "-m 'Added the Elasticsearch libraries into the Gemfile'"
 
 # ----- Install gems ------------------------------------------------------------------------------
 
@@ -173,11 +203,15 @@ if ENV['LOCAL']
             'vendor/assets/javascripts/jquery-ui-1.10.4.custom.min.js'
   copy_file File.expand_path('../vendor/assets/jquery-ui-1.10.4.custom.min.css', __FILE__),
             'vendor/assets/stylesheets/ui-lightness/jquery-ui-1.10.4.custom.min.css'
+  copy_file File.expand_path('../vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png', __FILE__),
+            'vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png'
 else
   get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.js',
       'vendor/assets/javascripts/jquery-ui-1.10.4.custom.min.js'
   get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.css',
       'vendor/assets/stylesheets/ui-lightness/jquery-ui-1.10.4.custom.min.css'
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png',
+      'vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png'
 end
 
 append_to_file 'app/assets/javascripts/application.js', "//= require jquery-ui-1.10.4.custom.min.js"
@@ -301,6 +335,7 @@ if ENV['LOCAL']
   copy_file File.expand_path('../assets/autocomplete.css', __FILE__), 'app/assets/stylesheets/autocomplete.css'
   copy_file File.expand_path('../assets/form.css', __FILE__),         'app/assets/stylesheets/form.css'
   copy_file File.expand_path('../assets/blank_cover.png', __FILE__),  'public/images/blank_cover.png'
+  copy_file File.expand_path('../assets/blank_artist.png', __FILE__),  'public/images/blank_artist.png'
 else
   get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/application.css',
       'app/assets/stylesheets/application.css'
@@ -310,6 +345,8 @@ else
       'app/assets/stylesheets/form.css'
   get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/blank_cover.png',
       'public/images/blank_cover.png'
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/blank_artist.png',
+      'public/images/blank_artist.png'
 end
 
 git add:    "."
@@ -359,9 +396,9 @@ puts
 say_status  "Data", "Import the data...", :yellow
 puts        '-'*80, ''; sleep 0.25
 
-source = ENV.fetch('DATA_SOURCE', 'http://ruby-demo-assets.s3.amazonaws.com/dischord.yml')
+source = ENV.fetch('DATA_SOURCE', 'https://github.com/elastic/elasticsearch-rails/releases/download/dischord.yml/dischord.yml')
 
-run  "rails runner 'IndexManager.import_from_yaml(\"#{source}\", force: true)'"
+run  "ELASTICSEARCH_URL=#{$elasticsearch_url} rails runner 'IndexManager.import_from_yaml(\"#{source}\", force: true)'"
 
 # ----- Print Git log -----------------------------------------------------------------------------
 
@@ -389,5 +426,5 @@ unless ENV['RAILS_NO_SERVER_START']
   say_status  "DONE", "\e[1mStarting the application.\e[0m", :yellow
   puts  "="*80, ""
 
-  run  "rails server --port=#{port}"
+  run  "ELASTICSEARCH_URL=#{$elasticsearch_url} rails server --port=#{port}"
 end

data/examples/notes/Gemfile

@@ -9,8 +9,8 @@ gem 'hashie'
 
 gem 'patron'
 gem 'elasticsearch'
-gem 'elasticsearch-model',       path: File.expand_path('../../../../elasticsearch-model', __FILE__)
-gem 'elasticsearch-persistence', path: File.expand_path('../../../', __FILE__)
+gem 'elasticsearch-model',       git: 'https://github.com/elastic/elasticsearch-rails.git'
+gem 'elasticsearch-persistence', git: 'https://github.com/elastic/elasticsearch-rails.git'
 
 gem 'sinatra', require: false
 gem 'thin'

data/examples/notes/application.rb

@@ -62,8 +62,8 @@ class NoteRepository
 
   mapping do
     indexes :text,       analyzer: 'snowball'
-    indexes :tags,       analyzer:   'keyword'
-    indexes :created_at, type: 'date'
+    indexes :tags,       type:     'keyword'
+    indexes :created_at, type:     'date'
   end
 
   create_index!
@@ -105,7 +105,7 @@ class Application < Sinatra::Base
                 end
 
                 if filter
-                  { filtered: { query: query, filter: filter } }
+                  { bool: { must: [ query ], filter: filter } }
                 else
                   query
                 end

data/lib/elasticsearch/persistence.rb

@@ -1,7 +1,10 @@
+require 'hashie/mash'
+
 require 'elasticsearch'
+
+require 'elasticsearch/model/hash_wrapper'
 require 'elasticsearch/model/indexing'
 require 'elasticsearch/model/searching'
-require 'hashie'
 
 require 'active_support/inflector'
 

data/lib/elasticsearch/persistence/model.rb

@@ -113,7 +113,7 @@ module Elasticsearch
               # Store the "hit" information (highlighting, score, ...)
               #
               object.instance_variable_set :@hit,
-                 Hashie::Mash.new(document.except('_index', '_type', '_id', '_version', '_source'))
+                 Elasticsearch::Model::HashWrapper.new(document.except('_index', '_type', '_id', '_version', '_source'))
 
               object.instance_variable_set(:@persisted, true)
               object

data/lib/elasticsearch/persistence/model/base.rb

@@ -70,7 +70,7 @@ module Elasticsearch
         def lookup_type(type)
           case
             when type == String
-              'string'
+              'text'
             when type == Integer
               'integer'
             when type == Float

data/lib/elasticsearch/persistence/model/find.rb

@@ -55,7 +55,7 @@ module Elasticsearch
             gateway.count( query_or_definition, options )
           end
 
-          # Returns all models efficiently via the Elasticsearch's scan/scroll API
+          # Returns all models efficiently via the Elasticsearch's scroll API
           #
           # You can restrict the models being returned with a query.
           #
@@ -117,20 +117,17 @@ module Elasticsearch
 
             body = options
 
-            # Get the initial scroll_id
+            # Get the initial batch of documents and the scroll_id
             #
             response = gateway.client.search( { index: gateway.index_name,
                                          type:  gateway.document_type,
-                                         search_type: 'scan',
-                                         scroll:      scroll,
-                                         size:        20,
-                                         body:        body }.merge(search_params) )
+                                         scroll: scroll,
+                                         sort:   ['_doc'],
+                                         size:   20,
+                                         body:   body }.merge(search_params) )
 
-            # Get the initial batch of documents
-            #
-            response = gateway.client.scroll( { scroll_id: response['_scroll_id'], scroll: scroll } )
 
-            # Break when receiving an empty array of hits
+            # Scroll the search object and break when receiving an empty array of hits
             #
             while response['hits']['hits'].any? do
               yield Repository::Response::Results.new(gateway, response)
@@ -149,7 +146,7 @@ module Elasticsearch
           #
           #     Person.find_each { |person| puts person.name }
           #
-          #     # # GET http://localhost:9200/people/person/_search?scroll=5m&search_type=scan&size=20
+          #     # # GET http://localhost:9200/people/person/_search?scroll=5m&size=20
           #     # # GET http://localhost:9200/_search/scroll?scroll=5m&scroll_id=c2Nhbj...
           #     # Test 0
           #     # Test 1

data/lib/elasticsearch/persistence/repository/response/results.rb

@@ -18,7 +18,7 @@ module Elasticsearch
           #
           def initialize(repository, response, options={})
             @repository = repository
-            @response   = Hashie::Mash.new(response)
+            @response   = Elasticsearch::Model::HashWrapper.new(response)
             @options    = options
           end
 
@@ -78,7 +78,7 @@ module Elasticsearch
           #     results.response.aggregations.titles.buckets.map { |term| "#{term['key']}: #{term['doc_count']}" }
           #     # => ["brown: 1", "dog: 1", ...]
           #
-          # @return [Hashie::Mash]
+          # @return [Elasticsearch::Model::HashWrapper]
           #
           def response
             @response

data/lib/elasticsearch/persistence/repository/search.rb

@@ -75,8 +75,18 @@ module Elasticsearch
         #
         def count(query_or_definition=nil, options={})
           query_or_definition ||= { query: { match_all: {} } }
-          response = search query_or_definition, options.update(search_type: 'count')
-          response.response.hits.total
+          type = document_type || (klass ? __get_type_from_class(klass) : nil  )
+
+          case
+          when query_or_definition.respond_to?(:to_hash)
+            response = client.count( { index: index_name, type: type, body: query_or_definition.to_hash }.merge(options) )
+          when query_or_definition.is_a?(String)
+            response = client.count( { index: index_name, type: type, q: query_or_definition }.merge(options) )
+          else
+            raise ArgumentError, "[!] Pass the search definition as a Hash-like object or pass the query as a String, not as [#{query_or_definition.class}]"
+          end
+
+          response['count']
         end
       end
 

data/lib/elasticsearch/persistence/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Persistence
-    VERSION = "2.0.1"
+    VERSION = "5.0.0"
   end
 end

data/test/integration/repository/virtus_model_test.rb

@@ -102,7 +102,11 @@ module Elasticsearch
         should "update the object with a script and params" do
           response = @repository.save Page.new(title: 'Test Page')
 
-          @repository.update id: response['_id'], script: 'ctx._source.views += count', params: { count: 3 }
+          @repository.update id: response['_id'],
+                             script: {
+                              inline: 'ctx._source.views += params.count',
+                              params: { count: 3 }
+                             }
 
           page = @repository.find(response['_id'])
           assert_equal 3, page.views

data/test/unit/model_find_test.rb

@@ -83,27 +83,29 @@ class Elasticsearch::Persistence::ModelFindTest < Test::Unit::TestCase
       DummyFindModel.all( { query: { match: { title: 'test' } } }, { routing: 'abc123' } )
     end
 
-    context "finding via scan/scroll" do
+    context "finding via scroll" do
       setup do
         @gateway
         .expects(:deserialize)
-        .with('_source' => {'foo' => 'bar'})
         .returns('_source' => {'foo' => 'bar'})
+        .at_least_once
 
+        # 1. Initial batch of documents and the scroll_id
         @gateway.client
           .expects(:search)
           .with do |arguments|
-            assert_equal 'scan', arguments[:search_type]
             assert_equal 'foo',  arguments[:index]
             assert_equal 'bar',  arguments[:type]
             true
           end
-          .returns(MultiJson.load('{"_scroll_id":"abc123==", "hits":{"hits":[]}}'))
+          .returns(MultiJson.load('{"_scroll_id":"abc123==", "hits":{"hits":[{"_source":{"foo":"bar_1"}}]}}'))
 
+        # 2. Second batch of documents and the scroll_id
+        # 3. Last, empty batch of documents
         @gateway.client
           .expects(:scroll)
           .twice
-          .returns(MultiJson.load('{"_scroll_id":"abc456==", "hits":{"hits":[{"_source":{"foo":"bar"}}]}}'))
+          .returns(MultiJson.load('{"_scroll_id":"abc456==", "hits":{"hits":[{"_source":{"foo":"bar_2"}}]}}'))
           .then
           .returns(MultiJson.load('{"_scroll_id":"abc789==", "hits":{"hits":[]}}'))
       end

data/test/unit/model_gateway_test.rb

@@ -70,7 +70,7 @@ class Elasticsearch::Persistence::ModelGatewayTest < Test::Unit::TestCase
     end
 
     should "properly look up types for classes" do
-      assert_equal 'string',  Elasticsearch::Persistence::Model::Utils::lookup_type(String)
+      assert_equal 'text',    Elasticsearch::Persistence::Model::Utils::lookup_type(String)
       assert_equal 'integer', Elasticsearch::Persistence::Model::Utils::lookup_type(Integer)
       assert_equal 'float',   Elasticsearch::Persistence::Model::Utils::lookup_type(Float)
       assert_equal 'date',    Elasticsearch::Persistence::Model::Utils::lookup_type(Date)

data/test/unit/repository_indexing_test.rb

@@ -22,7 +22,7 @@ class Elasticsearch::Persistence::RepositoryIndexingTest < Test::Unit::TestCase
           indexes :title
         end
 
-        assert_equal( {:"my_document"=>{:properties=>{:title=>{:type=>"string"}}}}, subject.mappings.to_hash )
+        assert_equal( {:"my_document"=>{:properties=>{:title=>{:type=>"text"}}}}, subject.mappings.to_hash )
       end
     end
 

data/test/unit/repository_response_results_test.rb

@@ -41,7 +41,7 @@ class Elasticsearch::Persistence::RepositoryResponseResultsTest < Test::Unit::Te
       assert_equal 5, subject.response['_shards']['total']
     end
 
-    should "wrap the response in Hashie::Mash" do
+    should "wrap the response in HashWrapper" do
       assert_equal 5, subject.response._shards.total
     end
 

data/test/unit/repository_search_test.rb

@@ -96,21 +96,21 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
     end
 
     should "return the number of domain objects" do
-      subject.expects(:search)
-        .returns(Elasticsearch::Persistence::Repository::Response::Results.new( subject, {'hits' => { 'total' => 1 }}))
+      subject.client.expects(:count).returns({'count' => 1})
       assert_equal 1, subject.count
     end
 
-    should "pass arguments from count to search" do
-      subject.expects(:search)
-        .with do |query_or_definition, options|
-          assert_equal 'bar', query_or_definition[:query][:match][:foo]
-          assert_equal true, options[:ignore_unavailable]
+    should "pass arguments to count" do
+      subject.client.expects(:count)
+        .with do |arguments|
+          assert_equal 'test', arguments[:index]
+          assert_equal 'bar',  arguments[:body][:query][:match][:foo]
+          assert_equal true,   arguments[:ignore_unavailable]
           true
         end
-        .returns(Elasticsearch::Persistence::Repository::Response::Results.new( subject, {'hits' => { 'total' => 1 }}))
+        .returns({'count' => 1})
 
-      subject.count( { query: { match: { foo: 'bar' } } }, { ignore_unavailable: true } )
+      assert_equal 1, subject.count( { query: { match: { foo: 'bar' } } }, { ignore_unavailable: true } )
     end
   end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-persistence
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +329,7 @@ files:
 - examples/music/artists/show.html.erb
 - examples/music/assets/application.css
 - examples/music/assets/autocomplete.css
+- examples/music/assets/blank_artist.png
 - examples/music/assets/blank_cover.png
 - examples/music/assets/form.css
 - examples/music/index_manager.rb
@@ -340,6 +341,7 @@ files:
 - examples/music/template.rb
 - examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.css
 - examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.js
+- examples/music/vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 - examples/notes/.gitignore
 - examples/notes/Gemfile
 - examples/notes/README.markdown