elastictastic 0.5.0 → 0.10.2

data/lib/elastictastic/test_helpers.rb

@@ -1,172 +1,227 @@
-require 'fakeweb'
+begin
+  require 'fakeweb'
+rescue LoadError => e
+  raise LoadError, "Elastictastic::TestHelpers requires the 'fakeweb' gem."
+end
 
 module Elastictastic
   module TestHelpers
     ALPHANUM = ('0'..'9').to_a + ('A'..'Z').to_a + ('a'..'z').to_a
 
-    def stub_elasticsearch_create(index, type, *args)
-      options = args.extract_options!
-      id = args.pop
+    def stub_es_create(index, type, id = nil)
       if id.nil?
-        id = ''
-        22.times { id << ALPHANUM[rand(ALPHANUM.length)] }
-        path = "/#{index}/#{type}"
+        id = generate_es_id
+        components = [index, type]
         method = :post
       else
-        path = "/#{index}/#{type}/#{id}/_create"
+        components = [index, type, id, '_create']
         method = :put
       end
 
-      FakeWeb.register_uri(
+      stub_request_json(
         method,
-        /^#{Regexp.escape(TestHelpers.uri_for_path(path))}(\?.*)?$/,
-        options.reverse_merge(:body => {
-          'ok' => 'true',
-          '_index' => index,
-          '_type' => type,
-          '_id' => id
-        }.to_json)
+        match_es_resource(components),
+        generate_es_hit(type, :id => id, :index => index).merge('ok' => 'true')
       )
       id
     end
 
-    def stub_elasticsearch_update(index, type, id)
-      FakeWeb.register_uri(
+    def stub_es_update(index, type, id, version = 2)
+      stub_request_json(
         :put,
-        /^#{TestHelpers.uri_for_path("/#{index}/#{type}/#{id}")}(\?.*)?$/,
-        :body => {
-          'ok' => 'true',
-          '_index' => index,
-          '_type' => type,
-          '_id' => id
-        }.to_json
+        match_es_resource(index, type, id),
+        generate_es_hit(type, :index => index, :id => id, :version => version)
+      )
+    end
+
+    def stub_es_head(index, type, id, exists)
+      stub_request(
+        :head,
+        match_es_resource(index, type, id),
+        :status => (exists ? 200 : 404),
+        :body => nil
       )
     end
 
-    def stub_elasticsearch_get(index, type, id, doc = {})
-      FakeWeb.register_uri(
+    def stub_es_get(index, type, id, doc = {}, version = 1)
+      stub_request_json(
         :get,
-        /^#{Regexp.escape(TestHelpers.uri_for_path("/#{index}/#{type}/#{id}").to_s)}(\?.*)?$/,
-        :body => {
-          'ok' => true,
-          '_index' => index,
-          '_type' => type,
-          '_id' => id,
-          '_source' => doc,
-          'exists' => !doc.nil?
-        }.to_json
+        match_es_resource(index, type, id),
+        generate_es_hit(
+          type,
+          :index => index,
+          :id => id,
+          :version => version,
+          :source => doc
+        ).merge('exists' => !doc.nil?)
       )
     end
 
-    def stub_elasticsearch_mget(index, type, *ids)
+    def stub_es_mget(index, type, *ids)
       given_ids_with_docs = ids.extract_options!
       ids_with_docs = {}
       ids.each { |id| ids_with_docs[id] = {} }
       ids_with_docs.merge!(given_ids_with_docs)
       path = index ? "/#{index}/#{type}/_mget" : "/_mget"
       docs = ids_with_docs.each_pair.map do |id, doc|
-        id, index = *id if Array === id
-        {
-          '_index' => index,
-          '_type' => type,
-          '_id' => id,
-          'exists' => !!doc,
-          '_source' => doc
-        }
+        id, type, index = *id if Array === id
+        generate_es_hit(
+          type, :index => index, :id => id, :source => doc
+        ).merge('exists' => !!doc)
       end
 
-      FakeWeb.register_uri(
+      stub_request_json(
         :post,
-        TestHelpers.uri_for_path(path).to_s,
-        :body => {
-          'docs' => docs
-        }.to_json
+        match_es_path(path),
+        'docs' => docs
       )
     end
 
-    def stub_elasticsearch_destroy(index, type, id, options = {})
-      FakeWeb.register_uri(
+    def stub_es_destroy(index, type, id, options = {})
+      stub_request_json(
         :delete,
-        /^#{TestHelpers.uri_for_path("/#{index}/#{type}/#{id}")}(\?.*)?$/,
-        options.reverse_merge(:body => {
-          'ok' => true,
-          'found' => true,
-          '_index' => 'test',
-          '_type' => 'test',
-          '_id' => id,
-          '_version' => 1
-        }.to_json)
+        match_es_resource(index, type, id),
+        generate_es_hit(
+          type, :index => index, :id => id
+        ).merge('ok' => true, 'found' => true).merge(options)
       )
     end
 
-    def stub_elasticsearch_destroy_all(index, type)
-      FakeWeb.register_uri(
+    def stub_es_destroy_all(index, type)
+      stub_request_json(
         :delete,
-        TestHelpers.uri_for_path("/#{index}/#{type}"),
-        :body => { 'ok' => true }.to_json
+        match_es_resource(index, type),
+        'ok' => true
       )
     end
 
-    def stub_elasticsearch_bulk(*responses)
-      FakeWeb.register_uri(
+    def stub_es_bulk(*responses)
+      stub_request_json(
         :post,
-        TestHelpers.uri_for_path("/_bulk"),
-        :body => { 'took' => 1, 'items' => responses }.to_json
+        match_es_path('/_bulk'),
+        'took' => 1, 'items' => responses
       )
     end
 
-    def stub_elasticsearch_put_mapping(index, type)
-      FakeWeb.register_uri(
+    def stub_es_put_mapping(index, type)
+      stub_request_json(
         :put,
-        TestHelpers.uri_for_path("/#{index}/#{type}/_mapping"),
-        :body => { 'ok' => true, 'acknowledged' =>  true }.to_json
+        match_es_resource(index, type, '_mapping'),
+        'ok' => true, 'acknowledged' => true
       )
     end
 
-    def stub_elasticsearch_search(index, type, data)
+    def stub_es_search(index, type, data)
       if Array === data
         response = data.map do |datum|
-          { :body => datum.to_json }
+          { :body => Elastictastic.json_encode(datum) }
         end
       else
-        response = { :body =>  data.to_json }
+        response = { :body =>  Elastictastic.json_encode(data) }
       end
 
-      uri = TestHelpers.uri_for_path("/#{index}/#{type}/_search").to_s
-      FakeWeb.register_uri(
+      stub_request(
         :post,
-        /^#{Regexp.escape(uri)}/,
+        match_es_resource(index, type, '_search'),
         response
       )
     end
 
-    def stub_elasticsearch_scan(index, type, batch_size, *hits)
-      scan_uri = Regexp.escape(TestHelpers.uri_for_path("/#{index}/#{type}/_search").to_s)
-      scroll_ids = Array.new(batch_size + 1) { rand(10**100).to_s(36) }
-      FakeWeb.register_uri(
+    def stub_es_msearch(*hits_collections)
+      responses = hits_collections.map do |collection|
+        { 'hits' => { 'hits' => collection, 'total' => collection.length }}
+      end
+      stub_request_json(
         :post,
-        /^#{scan_uri}\?.*search_type=scan/,
-        :body => {
-          '_scroll_id' => scroll_ids.first,
-          'hits' => { 'total' => hits.length, 'hits' => [] }
-        }.to_json
+        match_es_path('/_msearch'),
+        'responses' => responses
       )
+    end
 
-      batches = hits.each_slice(batch_size).each_with_index.map do |hit_batch, i|
-        { :body => { '_scroll_id' => scroll_ids[i+1], 'hits' => { 'hits' => hit_batch }}.to_json }
+    def stub_es_msearch_count(*counts)
+      responses = counts.map do |count|
+        { 'hits' => { 'hits' => [], 'total' => count }}
       end
-      batches << { :body => { 'hits' => { 'hits' => [] }}.to_json }
-      scroll_uri = Regexp.escape(TestHelpers.uri_for_path("/_search/scroll").to_s)
-      FakeWeb.register_uri(
+      stub_request_json(
         :post,
-        /^#{scroll_uri}/,
-        batches
+        match_es_path('/_msearch'),
+        'responses' => responses
       )
+    end
+
+    def stub_es_scan(index, type, batch_size, *hits)
+      scroll_ids = Array.new(batch_size + 1) { rand(10**100).to_s(36) }
+      stub_request_json(
+        :post,
+        match_es_resource(index, type, '_search'),
+        '_scroll_id' => scroll_ids.first,
+        'hits' => { 'total' => hits.length, 'hits' => [] }
+      )
+
+      batches = hits.each_slice(batch_size).each_with_index.map do |hit_batch, i|
+        {
+          :body => Elastictastic.json_encode(
+            '_scroll_id' => scroll_ids[i+1], 'hits' => { 'hits' => hit_batch }
+          )
+        }
+      end
+      batches << { :body => Elastictastic.json_encode('hits' => { 'hits' => [] }) }
+      stub_request(:post, match_es_path('/_search/scroll'), batches)
       scroll_ids
     end
 
-    def self.uri_for_path(path)
-      "#{Elastictastic.config.hosts.first}#{path}"
+    def self.match_es_path(path)
+      /^#{Regexp.escape(Elastictastic.config.hosts.first)}#{Regexp.escape(path)}(\?.*)?$/
+    end
+
+    def self.match_es_resource(*components)
+      match_es_path("/#{components.flatten.join('/')}")
+    end
+
+    def match_es_path(path)
+      TestHelpers.match_es_path(path)
+    end
+
+    def match_es_resource(*components)
+      TestHelpers.match_es_resource(*components)
+    end
+
+    def stub_request_json(method, uri, *responses)
+      json_responses = responses.map { |response| { :body => Elastictastic.json_encode(response) }}
+      json_responses = json_responses.first if json_responses.length == 1
+      stub_request(method, uri, json_responses)
+    end
+
+    def stub_request(method, url, options = {})
+      FakeWeb.register_uri(method, url, options)
+    end
+
+    def last_request
+      FakeWeb.last_request
+    end
+
+    def last_request_json
+      Elastictastic.json_decode(last_request.body)
+    end
+
+    def last_request_uri
+      URI.parse(last_request.path)
+    end
+
+    def generate_es_id
+      ''.tap do |id|
+        22.times { id << ALPHANUM[rand(ALPHANUM.length)] }
+      end
+    end
+
+    def generate_es_hit(type, options = {})
+      {
+        '_id' => options[:id] || generate_es_id,
+        '_type' => type,
+        '_index' => options[:index] || Elastictastic.config.default_index,
+        '_version' => options[:version] || 1,
+        '_source' => options.key?(:source) ? options[:source] : {}
+      }
     end
   end
 end

data/lib/elastictastic/thrift/constants.rb

@@ -0,0 +1,12 @@
+#
+# Autogenerated by Thrift Compiler (0.8.0-dev)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'elastictastic/thrift/types'
+
+module Elastictastic
+  module Thrift
+  end
+end

data/lib/elastictastic/thrift/rest.rb

@@ -0,0 +1,83 @@
+#
+# Autogenerated by Thrift Compiler (0.8.0-dev)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'elastictastic/thrift/types'
+
+module Elastictastic
+  module Thrift
+    module Rest
+      class Client
+        include ::Thrift::Client
+
+        def execute(request)
+          send_execute(request)
+          return recv_execute()
+        end
+
+        def send_execute(request)
+          send_message('execute', Execute_args, :request => request)
+        end
+
+        def recv_execute()
+          result = receive_message(Execute_result)
+          return result.success unless result.success.nil?
+          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'execute failed: unknown result')
+        end
+
+      end
+
+      class Processor
+        include ::Thrift::Processor
+
+        def process_execute(seqid, iprot, oprot)
+          args = read_args(iprot, Execute_args)
+          result = Execute_result.new()
+          result.success = @handler.execute(args.request)
+          write_result(result, oprot, 'execute', seqid)
+        end
+
+      end
+
+      # HELPER FUNCTIONS AND STRUCTURES
+
+      class Execute_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        REQUEST = 1
+
+        FIELDS = {
+          REQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'request', :class => Elastictastic::Thrift::RestRequest}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field request is unset!') unless @request
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Execute_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        SUCCESS = 0
+
+        FIELDS = {
+          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Elastictastic::Thrift::RestResponse}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+    end
+
+  end
+end

data/lib/elastictastic/thrift/types.rb

@@ -0,0 +1,124 @@
+#
+# Autogenerated by Thrift Compiler (0.8.0-dev)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+
+module Elastictastic
+  module Thrift
+    module Method
+      GET = 0
+      PUT = 1
+      POST = 2
+      DELETE = 3
+      HEAD = 4
+      OPTIONS = 5
+      VALUE_MAP = {0 => "GET", 1 => "PUT", 2 => "POST", 3 => "DELETE", 4 => "HEAD", 5 => "OPTIONS"}
+      VALID_VALUES = Set.new([GET, PUT, POST, DELETE, HEAD, OPTIONS]).freeze
+    end
+
+    module Status
+      CONT = 100
+      SWITCHING_PROTOCOLS = 101
+      OK = 200
+      CREATED = 201
+      ACCEPTED = 202
+      NON_AUTHORITATIVE_INFORMATION = 203
+      NO_CONTENT = 204
+      RESET_CONTENT = 205
+      PARTIAL_CONTENT = 206
+      MULTI_STATUS = 207
+      MULTIPLE_CHOICES = 300
+      MOVED_PERMANENTLY = 301
+      FOUND = 302
+      SEE_OTHER = 303
+      NOT_MODIFIED = 304
+      USE_PROXY = 305
+      TEMPORARY_REDIRECT = 307
+      BAD_REQUEST = 400
+      UNAUTHORIZED = 401
+      PAYMENT_REQUIRED = 402
+      FORBIDDEN = 403
+      NOT_FOUND = 404
+      METHOD_NOT_ALLOWED = 405
+      NOT_ACCEPTABLE = 406
+      PROXY_AUTHENTICATION = 407
+      REQUEST_TIMEOUT = 408
+      CONFLICT = 409
+      GONE = 410
+      LENGTH_REQUIRED = 411
+      PRECONDITION_FAILED = 412
+      REQUEST_ENTITY_TOO_LARGE = 413
+      REQUEST_URI_TOO_LONG = 414
+      UNSUPPORTED_MEDIA_TYPE = 415
+      REQUESTED_RANGE_NOT_SATISFIED = 416
+      EXPECTATION_FAILED = 417
+      UNPROCESSABLE_ENTITY = 422
+      LOCKED = 423
+      FAILED_DEPENDENCY = 424
+      INTERNAL_SERVER_ERROR = 500
+      NOT_IMPLEMENTED = 501
+      BAD_GATEWAY = 502
+      SERVICE_UNAVAILABLE = 503
+      GATEWAY_TIMEOUT = 504
+      INSUFFICIENT_STORAGE = 506
+      VALUE_MAP = {100 => "CONT", 101 => "SWITCHING_PROTOCOLS", 200 => "OK", 201 => "CREATED", 202 => "ACCEPTED", 203 => "NON_AUTHORITATIVE_INFORMATION", 204 => "NO_CONTENT", 205 => "RESET_CONTENT", 206 => "PARTIAL_CONTENT", 207 => "MULTI_STATUS", 300 => "MULTIPLE_CHOICES", 301 => "MOVED_PERMANENTLY", 302 => "FOUND", 303 => "SEE_OTHER", 304 => "NOT_MODIFIED", 305 => "USE_PROXY", 307 => "TEMPORARY_REDIRECT", 400 => "BAD_REQUEST", 401 => "UNAUTHORIZED", 402 => "PAYMENT_REQUIRED", 403 => "FORBIDDEN", 404 => "NOT_FOUND", 405 => "METHOD_NOT_ALLOWED", 406 => "NOT_ACCEPTABLE", 407 => "PROXY_AUTHENTICATION", 408 => "REQUEST_TIMEOUT", 409 => "CONFLICT", 410 => "GONE", 411 => "LENGTH_REQUIRED", 412 => "PRECONDITION_FAILED", 413 => "REQUEST_ENTITY_TOO_LARGE", 414 => "REQUEST_URI_TOO_LONG", 415 => "UNSUPPORTED_MEDIA_TYPE", 416 => "REQUESTED_RANGE_NOT_SATISFIED", 417 => "EXPECTATION_FAILED", 422 => "UNPROCESSABLE_ENTITY", 423 => "LOCKED", 424 => "FAILED_DEPENDENCY", 500 => "INTERNAL_SERVER_ERROR", 501 => "NOT_IMPLEMENTED", 502 => "BAD_GATEWAY", 503 => "SERVICE_UNAVAILABLE", 504 => "GATEWAY_TIMEOUT", 506 => "INSUFFICIENT_STORAGE"}
+      VALID_VALUES = Set.new([CONT, SWITCHING_PROTOCOLS, OK, CREATED, ACCEPTED, NON_AUTHORITATIVE_INFORMATION, NO_CONTENT, RESET_CONTENT, PARTIAL_CONTENT, MULTI_STATUS, MULTIPLE_CHOICES, MOVED_PERMANENTLY, FOUND, SEE_OTHER, NOT_MODIFIED, USE_PROXY, TEMPORARY_REDIRECT, BAD_REQUEST, UNAUTHORIZED, PAYMENT_REQUIRED, FORBIDDEN, NOT_FOUND, METHOD_NOT_ALLOWED, NOT_ACCEPTABLE, PROXY_AUTHENTICATION, REQUEST_TIMEOUT, CONFLICT, GONE, LENGTH_REQUIRED, PRECONDITION_FAILED, REQUEST_ENTITY_TOO_LARGE, REQUEST_URI_TOO_LONG, UNSUPPORTED_MEDIA_TYPE, REQUESTED_RANGE_NOT_SATISFIED, EXPECTATION_FAILED, UNPROCESSABLE_ENTITY, LOCKED, FAILED_DEPENDENCY, INTERNAL_SERVER_ERROR, NOT_IMPLEMENTED, BAD_GATEWAY, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT, INSUFFICIENT_STORAGE]).freeze
+    end
+
+    class RestRequest
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      METHOD = 1
+      URI = 2
+      PARAMETERS = 3
+      HEADERS = 4
+      BODY = 5
+
+      FIELDS = {
+        METHOD => {:type => ::Thrift::Types::I32, :name => 'method', :enum_class => Elastictastic::Thrift::Method},
+        URI => {:type => ::Thrift::Types::STRING, :name => 'uri'},
+        PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+        HEADERS => {:type => ::Thrift::Types::MAP, :name => 'headers', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+        BODY => {:type => ::Thrift::Types::STRING, :name => 'body', :binary => true, :optional => true}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field method is unset!') unless @method
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field uri is unset!') unless @uri
+        unless @method.nil? || Elastictastic::Thrift::Method::VALID_VALUES.include?(@method)
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field method!')
+        end
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+    class RestResponse
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      STATUS = 1
+      HEADERS = 2
+      BODY = 3
+
+      FIELDS = {
+        STATUS => {:type => ::Thrift::Types::I32, :name => 'status', :enum_class => Elastictastic::Thrift::Status},
+        HEADERS => {:type => ::Thrift::Types::MAP, :name => 'headers', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+        BODY => {:type => ::Thrift::Types::STRING, :name => 'body', :binary => true, :optional => true}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field status is unset!') unless @status
+        unless @status.nil? || Elastictastic::Thrift::Status::VALID_VALUES.include?(@status)
+          raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!')
+        end
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+  end
+end

data/lib/elastictastic/thrift_adapter.rb

@@ -0,0 +1,61 @@
+begin
+  require 'thrift'
+rescue LoadError
+  raise LoadError, 'Using the ThriftAdapter requires the "thrift" gem. Please install it.'
+end
+require 'cgi'
+require 'faraday'
+require 'elastictastic/thrift/rest'
+
+module Elastictastic
+  class ThriftAdapter < Faraday::Adapter
+    def initialize(app, options = {})
+      super(app)
+      @options = options
+    end
+
+    def call(env)
+      super
+      url = env[:url]
+      req = env[:request]
+
+      request = Elastictastic::Thrift::RestRequest.new
+      request.method =
+        Elastictastic::Thrift::Method.const_get(env[:method].to_s.upcase)
+      request.body = env[:body] if env[:body]
+      request.uri = url.path
+      parameters = {}
+      request.parameters = url.query_values
+
+      response = thrift_request(url.host, url.inferred_port, request)
+
+      save_response(env, response.status, response.body) do |response_headers|
+        if response.headers
+          headers.each_pair do |key, value|
+            response_headers[key] = value
+          end
+        end
+      end
+
+      @app.call(env)
+    end
+
+    private
+
+    def thrift_request(host, port, request)
+      @thrift_clients ||= {}
+      client = @thrift_clients[[host, port]] ||=
+        begin
+          transport = ::Thrift::BufferedTransport.new(::Thrift::Socket.new(host, port, @options[:timeout]))
+          protocol = ::Thrift::BinaryProtocol.new(transport)
+          Elastictastic::Thrift::Rest::Client.new(protocol).tap do
+            transport.open
+          end
+        end
+      client.execute(request)
+    rescue ::Thrift::TransportException, IOError => e
+      @thrift_clients.delete([host, port])
+      raise Faraday::Error::ConnectionFailed, e.message
+    end
+  end
+end

data/lib/elastictastic/transport_methods.rb

@@ -0,0 +1,27 @@
+module Elastictastic
+
+  module TransportMethods
+
+    def head(path)
+      request(:head, path)
+    end
+
+    def get(path)
+      request(:get, path)
+    end
+
+    def post(path, body)
+      request(:post, path, body)
+    end
+
+    def put(path, body)
+      request(:put, path, body)
+    end
+
+    def delete(path)
+      request(:delete, path)
+    end
+
+  end
+
+end

data/lib/elastictastic/validations.rb

@@ -15,22 +15,20 @@ module Elastictastic
       end
     end
 
-    module InstanceMethods
-      def save
-        if valid?
-          super
-          true
-        else
-          false
-        end
+    def save(options = {})
+      if options[:validate] == false || valid?
+        super
+        true
+      else
+        false
       end
+    end
 
-      def save!
-        if !save
-          raise Elastictastic::RecordInvalid, errors.full_messages.to_sentence
-        end
-        self
+    def save!
+      if !save
+        raise Elastictastic::RecordInvalid, errors.full_messages.to_sentence
       end
+      self
     end
 
     class NestedValidator < ActiveModel::EachValidator

data/lib/elastictastic/version.rb

@@ -1,3 +1,3 @@
 module Elastictastic
-  VERSION = '0.5.0'
+  VERSION = '0.10.2'
 end