es 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/es.gemspec

@@ -17,5 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency 'oj'
+  gem.add_dependency 'curb'
+
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
 end

data/lib/es.rb

@@ -1,4 +1,6 @@
 require 'es/version'
+require 'es/connection'
+require 'es/raw_client'
 require 'es/client'
 
 module ES

data/lib/es/client.rb

@@ -1,73 +1,49 @@
+# TODO find a better way to wrap serialization to client
 module ES
   class Client
     def initialize(opts = {})
-      @host = opts[:host] || 'http://localhost:9200'
-      @backend = opts[:backend] || Curl
-      @serializer = opts[:serializer] || Oj
-    end
-
-    def create_index(name, definition)
-      http_put(url(name), serialize(definition))
-    end
-
-    def delete_index(name)
-      http_delete(url(name))
+      @dumper = opts[:dumper] || Oj
+      @client = opts[:client] || begin
+        RawClient.new(opts)
+      end
     end
 
     def bulk(requests, path = nil)
-      serialized_requests = requests.collect do |request|
-        serialize(request) + "\n"
-      end.join('')
+      serialized = requests.map do |r|
+        @dumper.dump(r)
+      end.join("\n")
 
-      http_post(url(path, :bulk), serialized_requests)
-    end
+      response = @client.bulk(serialized, path)
 
-    def index(path, data)
-      http_put(url(path), serialize(data))
+      @dumper.load(response)
     end
 
-    def search(path, query)
-      http_post(url(path, :search), serialize(query))
+    def get(path)
+      response = @client.get(path)
+      @dumper.load(response)
     end
 
-    private
-    def url(path, action = nil)
-      root = path ? "#{@host}/#{path}" : @host
-      action ? "#{root}/_#{action}" : root
-    end
-
-    def http_put(url, data)
-      # TODO refactor
-      response = @backend.put(url, data)
-      if [200, 201].include?(response.response_code)
-        @serializer.load(response.body_str)
-      else
-        raise StandardError.new(response.body_str)
-      end
+    def index(path, data)
+      serialized = @dumper.dump(data)
+      response = @client.index(path, serialized)
+      @dumper.load(response)
     end
 
-    def http_post(url, data)
-      # TODO refactor
-      response = @backend.post(url, data)
-      if response.response_code == 200
-        @serializer.load(response.body_str)
-      else
-        raise StandardError.new(response.body_str)
-      end
+    def search(path, data)
+      serialized = @dumper.dump(data)
+      response = @client.search(path, serialized)
+      @dumper.load(response)
     end
 
-    def http_delete(url)
-      # TODO refactor
-      response = @backend.delete(url)
-      if response.response_code == 200
-        @serializer.load(response.body_str)
-      else
-        raise StandardError.new(response.body_str)
-      end
+    def create_index(path, data)
+      serialized = @dumper.dump(data)
+      response = @client.create_index(path, serialized)
+      @dumper.load(response)
     end
 
-    def serialize(data)
-      @serializer.dump(data.as_json)
+    def delete_index(path)
+      response = @client.delete_index(path)
+      @dumper.load(response)
     end
   end
-end
+end

data/lib/es/connection.rb

@@ -0,0 +1,36 @@
+module ES
+  class Connection
+    OK_HTTP_CODES = [200, 201]
+
+    def initialize(host, driver)
+      @host = host
+      @driver = driver
+    end
+
+    def request(method, path, data = nil)
+      response = translate_request(method, "#{@host}/#{path}", data)
+      raise Error.new(response) unless OK_HTTP_CODES.include?(response.response_code)
+      response.body_str
+    end
+
+    class Error < StandardError
+      def initialize(response)
+        super(response)
+      end
+    end
+
+    private
+    def translate_request(method, url, data)
+      case method
+        when :get
+          @driver.http_get(url)
+        when :put
+          @driver.http_put(url, data)
+        when :post
+          @driver.http_post(url, data)
+        when :delete
+          @driver.http_post(url)
+      end
+    end
+  end
+end

data/lib/es/raw_client.rb

@@ -0,0 +1,40 @@
+module ES
+  class RawClient
+    def initialize(opts = {})
+      @connection = opts[:connection] || begin
+        host = opts[:host] || 'http://localhost:9200'
+        driver = opts[:driver] || Curl
+        Connection.new(host, driver)
+      end
+    end
+
+    def create_index(name, definition)
+      @connection.request(:put, name, definition)
+    end
+
+    def delete_index(name)
+      @connection.request(:delete, name)
+    end
+
+    def get(path)
+      @connection.request(:get, path)
+    end
+
+    def index(path, data)
+      @connection.request(:put, path, data)
+    end
+
+    def search(path, query)
+      @connection.request(:post, action_path(path, :search), query)
+    end
+
+    def bulk(path, requests)
+      @connection.request(:post, action_path(path, :bulk), requests)
+    end
+
+    private
+    def action_path(path, action)
+      "#{path}/_#{action}"
+    end
+  end
+end

data/lib/es/version.rb

@@ -1,3 +1,3 @@
 module ES
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/es/client_spec.rb

@@ -0,0 +1,47 @@
+require 'es/raw_client'
+require 'es/client'
+require 'oj'
+
+describe ES::Client do
+  let(:client) { double(:Client) }
+  subject { described_class.new(client: client) }
+  let(:raw_response) { '{}' }
+  let(:response) { {} }
+
+  it 'serializes data for .create_index' do
+    client.should_receive(:create_index).with('index/1', '[1,2,3]').and_return(raw_response)
+
+    subject.create_index('index/1', [1,2,3]).should == response
+  end
+
+  it 'serializes data for .delete_index' do
+    client.should_receive(:delete_index).with('index/1').and_return(raw_response)
+
+    subject.delete_index('index/1').should == response
+  end
+
+  it 'serializes data for .bulk' do
+    requests = [1, 2, 3]
+    client.should_receive(:bulk).with("1\n2\n3", 'an_index').and_return(raw_response)
+
+    subject.bulk(requests, 'an_index').should == response
+  end
+
+  it 'serializes data for .index' do
+    client.should_receive(:index).with('index/1', '[1,2,3]').and_return(raw_response)
+
+    subject.index('index/1', [1,2,3]).should == response
+  end
+
+  it 'serializes data for .get' do
+    client.should_receive(:get).with('index/1').and_return(raw_response)
+
+    subject.get('index/1').should == response
+  end
+
+  it 'serializes data for .search' do
+    client.should_receive(:search).with('index/1', '[1,2,3]').and_return(raw_response)
+
+    subject.search('index/1', [1,2,3]).should == response
+  end
+end

data/spec/es/connection_spec.rb

@@ -0,0 +1,41 @@
+require 'es/connection'
+
+describe ES::Connection do
+  let(:data) { :data }
+  let(:response_body) { :response }
+  let(:response) { stub(response_code: 200, body_str: response_body) }
+  let(:driver) { double(:Driver) }
+
+  subject { described_class.new('http://localhost:9200', driver) }
+
+  it 'sends get request with url to driver' do
+    driver.should_receive(:http_get).with('http://localhost:9200/index/1').and_return(response)
+
+    subject.request(:get, 'index/1').should == response_body
+  end
+
+  it 'sends post request with url to driver' do
+    driver.should_receive(:http_post).with('http://localhost:9200/index', data).and_return(response)
+
+    subject.request(:post, 'index', data).should == response_body
+  end
+
+  it 'sends put request with url to driver' do
+    driver.should_receive(:http_put).with('http://localhost:9200/index', data).and_return(response)
+
+    subject.request(:put, 'index', data).should == response_body
+  end
+
+  it 'sends delete request with url to driver' do
+    driver.should_receive(:http_post).with('http://localhost:9200/index').and_return(response)
+
+    subject.request(:delete, 'index').should == response_body
+  end
+
+  it 'throws error if response code is not 2XX' do
+    error_response = stub(response_code: 400)
+    driver.should_receive(:http_post).and_return(error_response)
+
+    expect { subject.request(:post, 'index/_search', data) }.to raise_error(ES::Connection::Error)
+  end
+end

data/spec/es/raw_client_spec.rb

@@ -0,0 +1,56 @@
+require 'es/raw_client'
+
+describe ES::RawClient do
+  let(:data) { {} }
+  let(:response) { :response }
+  let(:connection) { double(:Connection) }
+  let(:subject) { described_class.new({connection: connection}) }
+
+  context '.create_index' do
+    it 'sends PUT to connection' do
+      connection.should_receive(:request).with(:put, :an_index, data).and_return(response)
+
+      subject.create_index(:an_index, data).should == response
+    end
+  end
+
+  context '.delete_index' do
+    it 'sends DELETE to connection' do
+      connection.should_receive(:request).with(:delete, :an_index).and_return(response)
+
+      subject.delete_index(:an_index).should == response
+    end
+  end
+
+  context '.get' do
+    it 'sends GET to connection' do
+      connection.should_receive(:request).with(:get, 'index/1').and_return(response)
+
+      subject.get('index/1').should == response
+    end
+  end
+
+  context '.index' do
+    it 'sends PUT to connection' do
+      connection.should_receive(:request).with(:put, 'index/1', data).and_return(response)
+
+      subject.index('index/1', data).should == response
+    end
+  end
+
+  context '.search' do
+    it 'sends POST to connection' do
+      connection.should_receive(:request).with(:post, 'index/_search', data).and_return(response)
+
+      subject.search('index', data).should == response
+    end
+  end
+
+  context '.bulk' do
+    it 'sends POST to connection' do
+      connection.should_receive(:request).with(:post, 'index/_bulk', data).and_return(response)
+
+      subject.bulk('index', data).should == response
+    end
+  end
+end

metadata

@@ -1,18 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: es
 version: !ruby/object:Gem::Version
-  version: 0.0.1
   prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Jan Suchal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: curb
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -21,12 +59,22 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
 description: Simple wrapper for elasticsearch
 email:
 - johno@jsmf.net
@@ -42,7 +90,12 @@ files:
 - es.gemspec
 - lib/es.rb
 - lib/es/client.rb
+- lib/es/connection.rb
+- lib/es/raw_client.rb
 - lib/es/version.rb
+- spec/es/client_spec.rb
+- spec/es/connection_spec.rb
+- spec/es/raw_client_spec.rb
 homepage: http://github.com/minio-sk/es
 licenses: []
 post_install_message: 
@@ -63,8 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple wrapper for elasticsearch.
-test_files: []
+test_files:
+- spec/es/client_spec.rb
+- spec/es/connection_spec.rb
+- spec/es/raw_client_spec.rb