chewy 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb12f365d07168ff5e5f52511029a07a5eccda1
-  data.tar.gz: aae1608aa3438ea0bc28ed43bf65ccde19e2bc8b
+  metadata.gz: a311bdd3957835909c81ba57886bba5fbebebbef
+  data.tar.gz: 0011b212e985166c040bb195ec3dc0214b797ab5
 SHA512:
-  metadata.gz: 2db0c6c51c6fc9061c5e751e2759213723b5a2524c4443e7688bd792b81615104d6f5ba698b5de33a0c91030045666d20957255a13e3d706c8f76b68bf7d4174
-  data.tar.gz: bab3cb005e8f0264022c39ecaa4d04b81b9dbccfc4de7fd28c637250746eb18ffea1d6cef89c2dcc7c09f4a4dccb0120a89e7bf15be1e1bf769dc85c10b5b4f1
+  metadata.gz: 2727a488bbaefa2b0d9bd47da643a83e72882bfe3da41e4eda9e7e59df37fb72ad0343273594ae7dfbfbb8d4f84534d63867038b6fd8de667aca4eb0126c34a3
+  data.tar.gz: 6e54cfb1362cc06ff500ee01eb24c809c54c590b6390e20bfd45db4bb61c0c403ea3afd93b6dd3ef23bb53336efb157bd9c4cbca2aad9065db019a6693e84530

data/.travis.yml

@@ -37,6 +37,6 @@ matrix:
     - rvm: 2.2.0
       gemfile: gemfiles/rails.3.2.activerecord.will_paginate.gemfile
 before_install:
-  - curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.5.0.tar.gz | tar xz -C /tmp
+  - curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.5.2.tar.gz | tar xz -C /tmp
 before_script:
-  - TEST_CLUSTER_COMMAND="/tmp/elasticsearch-1.5.0/bin/elasticsearch" rake elasticsearch:start
+  - TEST_CLUSTER_COMMAND="/tmp/elasticsearch-1.5.2/bin/elasticsearch" rake elasticsearch:start

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # master
 
+# Version 0.8.1
+
+## Bugfixes
+
+  * Added support of elasticsearch-ruby 1.0.10
+
 # Version 0.8.0
 
 ## Incompatible changes:

data/lib/chewy/index/actions.rb

@@ -78,7 +78,11 @@ module Chewy
         #   UsersIndex.delete '01-2014' # deletes `users_01-2014` index
         #
         def delete suffix = nil
-          delete! suffix
+          result = client.indices.delete index: build_index_name(suffix: suffix)
+          Chewy.wait_for_status if result
+          result
+          # es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
+          # by itself, rescue is for previous versions
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
           false
         end
@@ -93,9 +97,9 @@ module Chewy
         #   UsersIndex.delete '01-2014' # deletes `users_01-2014` index
         #
         def delete! suffix = nil
-          result = client.indices.delete index: build_index_name(suffix: suffix)
-          Chewy.wait_for_status if result
-          result
+          # es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
+          # by itself, so it is raised here
+          delete(suffix) or raise Elasticsearch::Transport::Transport::Errors::NotFound
         end
 
         # Deletes and recreates index. Supports suffixes.
@@ -118,11 +122,8 @@ module Chewy
         #   UsersIndex.purge! '01-2014' # deletes `users` and `users_01-2014` indexes, creates `users_01-2014`
         #
         def purge! suffix = nil
-          begin
-            delete! if suffix.present? && exists?
-            delete! suffix
-          rescue Elasticsearch::Transport::Transport::Errors::NotFound
-          end
+          delete if suffix.present? && exists?
+          delete suffix
           create! suffix
         end
 

data/lib/chewy/strategy.rb

@@ -61,7 +61,7 @@ module Chewy
     def debug string
       if Chewy.logger && Chewy.logger.debug?
         line = caller.detect { |line| line !~ %r{lib/chewy/strategy.rb:|lib/chewy.rb:} }
-        Chewy.logger.debug(["Chewy strategies stack: #{string}", line.sub(/:in\s.+$/, '')].join(' @ '))
+        Chewy.logger.debug(["DEBUG: Chewy strategies stack: #{string}", line.sub(/:in\s.+$/, '')].join(' @ '))
       end
     end
 

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - pyromaniac