esearch 0.2.1 → 0.2.2

data/lib/esearch/presenter/hits.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Presenter
 
@@ -15,13 +17,13 @@ module Esearch
       #
       # @api private
       #
-      def each(&block)
+      def each
         return to_enum unless block_given?
 
         hits.each do |hit|
           yield Hit.new(hit)
         end
-        
+
         self
       end
 
@@ -34,7 +36,7 @@ module Esearch
       def size
         hits.size
       end
-      
+
       # Return total amount of hits in the query
       #
       # @return [Fixnum]
@@ -54,7 +56,6 @@ module Esearch
       expose_primitive(:hits)
       private :hits
 
-    end
-  end
-end
-
+    end # Hits
+  end # Presenter
+end # Esearch

data/lib/esearch/presenter/index.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Presenter
 
@@ -7,17 +9,17 @@ module Esearch
       # Create operation presenter
       class Create < self
         expose_primitive :ok, :ok?
-      end
+      end # Create
 
       # Delete operation presenter
       class Delete < self
         expose_primitive :ok, :ok?
-      end
-      
+      end # Delete
+
       # Refresh operation presenter
       class Refresh < self
-      end
+      end # Referesh
 
-    end
-  end
-end
+    end # Index
+  end # Presenter
+end # Esearch

data/lib/esearch/presenter/search.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Presenter
     # Presenter for search result
@@ -10,8 +12,8 @@ module Esearch
       # @api private
       #
       def facets
-        raw.fetch('facets', {}).each_with_object({}) do |(name, body), hash|
-          hash[name] = Facet.build(body)
+        raw.fetch('facets', {}).each_with_object({}) do |(name, body), aggregate|
+          aggregate[name] = Facet.build(body)
         end
       end
       memoize :facets
@@ -27,6 +29,6 @@ module Esearch
       end
       memoize :hits
 
-    end
-  end
-end
+    end # Search
+  end # Presenter
+end # Esearch

data/lib/esearch/presenter/status.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Presenter
 
@@ -9,10 +11,10 @@ module Esearch
 
         expose_primitive('name')
 
-      end
+      end # Index
 
       expose_tagged_collection('indices', Status::Index)
 
-    end
-  end
-end
+    end # Status
+  end # Presenter
+end # Esearch

data/lib/esearch/request.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
 
   # Request used to interface elasticsearch
@@ -75,7 +77,7 @@ module Esearch
     def run(connection)
       connection.public_send(verb, path) do |request|
         request.params = params
-        request.headers[:content_type]=Command::JSON_CONTENT_TYPE
+        request.headers[:content_type] = Command::JSON_CONTENT_TYPE
         request.body = MultiJson.dump(body)
       end
     end
@@ -86,5 +88,5 @@ module Esearch
       end
     end
 
-  end
-end
+  end # Request
+end # Esearch

data/lib/esearch/type.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   # Interface to a specific elasticsearch type
   class Type
@@ -36,5 +38,6 @@ module Esearch
       es_index.path.join(name)
     end
     memoize :path
-  end
-end
+
+  end # Type
+end # Esearch

data/spec/integration/esearch/spike_spec.rb

@@ -1,13 +1,18 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 require 'logger'
 
 describe Esearch do
+  before do
+    pending
+  end
   let(:uri) { ENV.fetch('ESEARCH_TEST_URI', 'http://localhost:9200') }
 
   SINGLE_NODE_SETTINGS = IceNine.deep_freeze(
-    :settings => {
-      :number_of_shards => 1,
-      :number_of_replicas => 0
+    settings: {
+      number_of_shards: 1,
+      number_of_replicas: 0
     }
   )
 
@@ -28,19 +33,19 @@ describe Esearch do
 
     indices = cluster.indices(%w(test-a test-b))
 
-    result_a = index_a.type('type-a').index({'foo' => 'bar'})
-    result_b = index_b.type('type-b').index({'foo' => 'baz'})
+    result_a = index_a.type('type-a').index('foo' => 'bar')
+    result_b = index_b.type('type-b').index('foo' => 'baz')
 
-    cluster.health(:wait_for_status => :green, :timeout => '10s')
+    cluster.health(wait_for_status: :green, timeout: '10s')
 
     indices.refresh
 
-    result = index_a.search({:query => { :match_all => {}}})
-    result.hits.map(&:source).should eql([{'foo' => 'bar'}])
+    result = index_a.search(query: { match_all: {} })
+    result.hits.map(&:source).should eql([{ 'foo' => 'bar' }])
 
-    result = indices.search({:query => { :match_all => {}}})
+    result = indices.search(query: { match_all: {} })
 
-    result.hits.map(&:source).to_set.should eql([{'foo' => 'bar'}, {'foo' => 'baz'}].to_set)
+    result.hits.map(&:source).to_set.should eql([{ 'foo' => 'bar' }, { 'foo' => 'baz' }].to_set)
 
     index_a.type('type-a').document(result_a.id).delete
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# # encoding: UTF-8
+
 # encoding: utf-8
 require 'esearch'
 require 'devtools'
@@ -18,11 +20,11 @@ module CommandHelper
     end
 
     def setup_connection
-      let(:context)    { double('Context', :connection => connection, :path => Pathname.new('/foo')) }
-      let(:connection) { double('Connection')                                                        }
+      let(:context)    { double('Context', connection: connection, path: Pathname.new('/foo')) }
+      let(:connection) { double('Connection')                                                  }
 
-      let(:headers)    { {'content-type' => 'application/json; charset=UTF-8'} }
-      let(:response)   { double('Response', :frozen? => true, :status => status, :headers => headers, :body => '{}') }
+      let(:headers)    { { 'content-type' => 'application/json; charset=UTF-8' } }
+      let(:response)   { double('Response', :frozen? => true, status: status, headers: headers, body: '{}') }
 
       let(:status)     { 200 }
 
@@ -59,7 +61,6 @@ module CommandHelper
   end
 end
 
-
 RSpec.configure do |config|
   config.include(CommandHelper)
 end

data/spec/support/example_group_methods.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Spec
   module ExampleGroupMethods
     def testing_block_passing_broken?

data/spec/support/ice_nine_config.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module IceNine
   class Freezer
     class RSpec < NoFreeze

data/spec/unit/esearch/cluster_spec.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Esearch::Cluster do
+  let(:object)     { described_class.new(connection) }
+
+  let(:connection) { double('Connection')            }
+
+  describe '.connect' do
+    subject { object.connect(*arguments) }
+
+    let(:object)     { described_class      }
+
+    let(:arguments) { [:foo, :bar] }
+
+    before do
+      Esearch::Connection.should_receive(:build).with(:foo, :bar).and_return(connection)
+    end
+
+    it { should eql(described_class.new(connection)) }
+  end
+
+  describe '#health' do
+    subject { object.health }
+
+    let(:expected_arguments) { [{}] }
+
+    expect_to_run_command(Esearch::Command::Cluster::Health)
+  end
+
+  describe '#index' do
+    subject { object.index(name) }
+
+    let(:name) { 'foo' }
+
+    it { should eql(Esearch::Index.new(connection, name)) }
+  end
+
+  describe '#all_indices' do
+    subject { object.all_indices }
+
+    it { should eql(Esearch::Indices::All.new(connection)) }
+  end
+
+  describe '#indices' do
+    subject { object.indices(names) }
+
+    let(:names) { %w(foo bar) }
+
+    it { should eql(Esearch::Indices.new(connection, names)) }
+  end
+
+  describe '#path' do
+    subject { object.path }
+
+    it { should eql(Pathname.new('/')) }
+  end
+end

data/spec/unit/esearch/command/class_methods/run_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command, '.run' do
@@ -5,7 +7,7 @@ describe Esearch::Command, '.run' do
 
   let(:object) { described_class }
 
-  let(:instance)  { double('Instance', :result => result) }
+  let(:instance)  { double('Instance', result: result) }
   let(:result)    { double('Result')                      }
   let(:arguments) { [:foo, :bar]                          }
 

data/spec/unit/esearch/command/cluster/health/run_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Cluster::Health, '.run' do

data/spec/unit/esearch/command/document/delete/run_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Delete, '.run' do
@@ -8,6 +10,6 @@ describe Esearch::Command::Document::Delete, '.run' do
   let(:expected_request) do
     Esearch::Request.new(:delete, '/foo', {}, {})
   end
- 
+
   expect_presenter(Esearch::Presenter::Document::Operation::Delete)
 end

data/spec/unit/esearch/command/document/get/result_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Get, '.run' do
@@ -8,17 +10,17 @@ describe Esearch::Command::Document::Get, '.run' do
   let(:expected_request) do
     Esearch::Request.new(:get, '/foo', {}, {})
   end
- 
+
   context 'with status 200' do
     expect_presenter(Esearch::Presenter::Document::Get)
   end
- 
+
   context 'with status 404' do
     expect_result(nil) do
       let(:status) { 404 }
     end
   end
- 
+
   context 'with status 500' do
     expect_exception(Esearch::ProtocolError) do
       let(:status) { 500 }

data/spec/unit/esearch/command/document/index/create/run_spec.rb

@@ -1,3 +1,7 @@
+# # encoding: UTF-8
+
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Index::Create, '.run' do
@@ -5,10 +9,10 @@ describe Esearch::Command::Document::Index::Create, '.run' do
 
   let(:object)   { described_class    }
   let(:document) { double('Document') }
-  let(:options)  { { :foo => :bar }   }
+  let(:options)  { { foo: :bar }      }
 
   let(:expected_request) do
-    Esearch::Request.new(:post, '/foo', document, { :foo => :bar, :op_type => :create })
+    Esearch::Request.new(:post, '/foo', document, foo: :bar, op_type: :create)
   end
 
   expect_presenter(Esearch::Presenter::Document::Operation::Index) do

data/spec/unit/esearch/command/document/index/run_create_spec.rb

@@ -1,3 +1,7 @@
+# # encoding: UTF-8
+
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Index::Create, '.run' do
@@ -5,10 +9,10 @@ describe Esearch::Command::Document::Index::Create, '.run' do
 
   let(:object)   { described_class    }
   let(:document) { double('Document') }
-  let(:options)  { { :foo => :bar }   }
+  let(:options)  { { foo: :bar }      }
 
   let(:expected_request) do
-    Esearch::Request.new(:post, '/foo', document, { :foo => :bar, :op_type => :create })
+    Esearch::Request.new(:post, '/foo', document, foo: :bar, op_type: :create)
   end
 
   expect_presenter(Esearch::Presenter::Document::Operation::Index) do

data/spec/unit/esearch/command/document/index/run_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Index, '.run' do
@@ -5,7 +7,7 @@ describe Esearch::Command::Document::Index, '.run' do
 
   let(:object)   { described_class    }
   let(:document) { double('Document') }
-  let(:options)  { { :foo => :bar }   }
+  let(:options)  { { foo: :bar }      }
 
   let(:expected_request) do
     Esearch::Request.new(:post, '/foo', document, options)

data/spec/unit/esearch/command/document/index/run_update_spec.rb

@@ -1,3 +1,7 @@
+# # encoding: UTF-8
+
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Esearch::Command::Document::Index::Update, '.run' do
@@ -5,10 +9,10 @@ describe Esearch::Command::Document::Index::Update, '.run' do
 
   let(:object)   { described_class    }
   let(:document) { double('Document') }
-  let(:options)  { { :foo => :bar }   }
+  let(:options)  { { foo: :bar }   }
 
   let(:expected_request) do
-    Esearch::Request.new(:post, '/foo', document, { :foo => :bar, :op_type => :index })
+    Esearch::Request.new(:post, '/foo', document, foo: :bar, op_type: :index)
   end
 
   expect_presenter(Esearch::Presenter::Document::Operation::Index)