es-elasticity 0.2.11 → 0.3.0

data/spec/units/{index_spec.rb → strategies/single_index_spec.rb}

@@ -1,6 +1,4 @@
-require "elasticity/index"
-
-RSpec.describe Elasticity::Index, elasticsearch: true do
+RSpec.describe Elasticity::Strategies::SingleIndex, elasticsearch: true do
   subject do
     described_class.new(Elasticity.config.client, "test_index_name")
   end
@@ -25,7 +23,7 @@ RSpec.describe Elasticity::Index, elasticsearch: true do
     subject.create(index_def)
     expect(subject.mappings).to eq({"document"=>{"properties"=>{"name"=>{"type"=>"string"}}}})
 
-    subject.recreate
+    subject.recreate(index_def)
     expect(subject.mappings).to eq({"document"=>{"properties"=>{"name"=>{"type"=>"string"}}}})
 
     subject.delete
@@ -62,6 +60,7 @@ RSpec.describe Elasticity::Index, elasticsearch: true do
         b.index  "document", 2, name: "bar"
         b.delete "document", 1
       end
+
       expect(results_b).to include("errors"=>false, "items"=>[{"index"=>{"_index"=>"test_index_name", "_type"=>"document", "_id"=>"2", "_version"=>1, "status"=>201}}, {"delete"=>{"_index"=>"test_index_name", "_type"=>"document", "_id"=>"1", "_version"=>2, "status"=>200, "found"=>true}}])
 
       subject.flush
@@ -73,13 +72,11 @@ RSpec.describe Elasticity::Index, elasticsearch: true do
     it "allows searching documents" do
       subject.index_document("document", 1, name: "test")
       subject.flush
-      results = subject.search("document", filter: { term: { name: "test" }})
-
-      expect(results["hits"]["total"]).to be 1
 
-      doc = results["hits"]["hits"][0]
-      expect(doc["_id"]).to eq "1"
-      expect(doc["_source"]).to eq({ "name" => "test" })
+      search = subject.search("document", filter: { term: { name: "test" }})
+      hashes = search.document_hashes
+      expect(hashes.size).to be 1
+      expect(hashes[0]).to eq("_id" => "1", "_index" => "test_index_name", "_type" => "document", "_score" => 1.0, "_source" => { "name" => "test" })
     end
 
     it "allows deleting by queryu" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -170,18 +184,24 @@ files:
 - bin/rspec
 - elasticity.gemspec
 - lib/elasticity.rb
+- lib/elasticity/bulk.rb
+- lib/elasticity/config.rb
 - lib/elasticity/document.rb
-- lib/elasticity/index.rb
+- lib/elasticity/instrumented_client.rb
+- lib/elasticity/log_subscriber.rb
 - lib/elasticity/multi_search.rb
 - lib/elasticity/railtie.rb
 - lib/elasticity/search.rb
+- lib/elasticity/strategies.rb
+- lib/elasticity/strategies/alias_index.rb
+- lib/elasticity/strategies/single_index.rb
 - lib/elasticity/version.rb
-- lib/elasticity_base.rb
+- spec/functional/persistence_spec.rb
 - spec/rspec_config.rb
 - spec/units/document_spec.rb
-- spec/units/index_spec.rb
 - spec/units/multi_search_spec.rb
 - spec/units/search_spec.rb
+- spec/units/strategies/single_index_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -207,9 +227,10 @@ signing_key:
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch
 test_files:
+- spec/functional/persistence_spec.rb
 - spec/rspec_config.rb
 - spec/units/document_spec.rb
-- spec/units/index_spec.rb
 - spec/units/multi_search_spec.rb
 - spec/units/search_spec.rb
+- spec/units/strategies/single_index_spec.rb
 has_rdoc: 

data/lib/elasticity/index.rb

@@ -1,118 +0,0 @@
-module Elasticity
-  class Index
-    attr_reader :name
-
-    def initialize(client, index_name)
-      @client    = client
-      @name      = index_name
-    end
-
-    def exists?
-      @client.indices.exists(index: @name)
-    end
-
-    def create(index_def)
-      args = { index: @name, body: index_def }
-      instrument("index_create", args) { @client.indices.create(args) }
-    end
-
-    def create_if_undefined(index_def)
-      create(index_def) unless exists?
-    end
-
-    def delete
-      args = { index: @name }
-      instrument("index_delete", args) { @client.indices.delete(args) }
-    end
-
-    def delete_if_defined
-      delete if exists?
-    end
-
-    def recreate(index_def = nil)
-      index_def ||= { settings: settings, mappings: mappings }
-      delete_if_defined
-      create(index_def)
-    end
-
-    def index_document(type, id, attributes)
-      args = { index: @name, type: type, id: id, body: attributes }
-      instrument("index_document", args) { @client.index(args) }
-    end
-
-    def delete_document(type, id)
-      args = { index: @name, type: type, id: id }
-      instrument("delete_document", args) { @client.delete(args) }
-    end
-
-    def get_document(type, id)
-      args = { index: @name, type: type, id: id }
-      instrument("get_document", args) { @client.get(args) }
-    end
-
-    def search(type, body)
-      args = { index: @name, type: type, body: body }
-      instrument("search", args) { @client.search(args) }
-    end
-
-    def delete_by_query(type, body)
-      args = { index: @name, type: type, body: body }
-      instrument("delete_by_query", args) { @client.delete_by_query(args) }
-    end
-
-    def bulk
-      b = Bulk.new(@client, @name)
-      yield b
-      b.execute
-    end
-
-    def settings
-      args = { index: @name }
-      settings = instrument("settings", args) { @client.indices.get_settings(args) }
-      settings[@name]["settings"] if settings[@name]
-    rescue Elasticsearch::Transport::Transport::Errors::NotFound
-      nil
-    end
-
-    def mappings
-      args = { index: @name }
-      mappings = instrument("mappings", args) { @client.indices.get_mapping(args) }
-      mappings[@name]["mappings"] if mappings[@name]
-    rescue Elasticsearch::Transport::Transport::Errors::NotFound
-      nil
-    end
-
-    def flush
-      args = { index: @name }
-      instrument("flush", args) { @client.indices.flush(args) }
-    end
-
-    private
-
-    def instrument(name, extra = {})
-      ActiveSupport::Notifications.instrument("#{name}.elasticity", args: extra, backtrace: caller(1)) do
-        yield
-      end
-    end
-
-    class Bulk
-      def initialize(client, name)
-        @client     = client
-        @name       = name
-        @operations = []
-      end
-
-      def index(type, id, attributes)
-        @operations << { index: { _index: @name, _type: type, _id: id, data: attributes }}
-      end
-
-      def delete(type, id)
-        @operations << { delete: { _index: @name, _type: type, _id: id }}
-      end
-
-      def execute
-        @client.bulk(body: @operations)
-      end
-    end
-  end
-end

data/lib/elasticity_base.rb

@@ -1,56 +0,0 @@
-require "rubygems"
-require "bundler/setup"
-Bundler.setup
-
-require "active_support"
-require "active_support/core_ext"
-require "active_model"
-require "elasticsearch"
-
-if defined?(Rails)
-  require "elasticity/railtie"
-end
-
-module Elasticity
-  class Config
-    attr_writer :logger, :client, :settings, :namespace, :pretty_json
-
-    def logger
-      return @logger if defined?(@logger)
-
-      if defined?(Rails)
-        @logger = Rails.logger
-      else
-        @logger = Logger.new(STDOUT)
-      end
-    end
-
-    def client
-      return @client if defined?(@client)
-      @client = Elasticsearch::Client.new
-    end
-
-    def settings
-      return @settings if defined?(@settings)
-      @settings = {}
-    end
-
-    def namespace
-      @namespace
-    end
-
-    def pretty_json
-      @pretty_json || false
-    end
-  end
-
-  def self.configure
-    @config = Config.new
-    yield(@config)
-  end
-
-  def self.config
-    return @config if defined?(@config)
-    @config = Config.new
-  end
-end