stretcher 1.16.3 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88325b35592832c59932c36dfccfa37fe03cb67
-  data.tar.gz: d4d1fa224462b023ab743386b555f5cfd682146a
+  metadata.gz: 5af13ebaa51c4010121aa5c822e4a03e48b04a3c
+  data.tar.gz: 67731bd18d6203bc3cdfff0ef99de2fb12826d27
 SHA512:
-  metadata.gz: 7278cc58d1d65a1ceac2f5b98e6c3fcd3b19d42c7ea904103bd0edbbf0ddc380fdf3dcdf6bf3a843d51291b030fcaa0f5ca22689fee3a4dde1a081b24b283c62
-  data.tar.gz: 8c1f8c7d2b630b30d44e77824d080af805ad8fa334b45bd6aadc15c48a2f1bda2b23cc55ed6e605652135d0bd070a059c873449bbc5106b5e8f55a8c5dec21a5
+  metadata.gz: ff9ec72cdec4eb9f78274470ff4e79c32c1d7f1e24c945b7f0289bb1c22072e8e6727a6844699503cba38bf695204dc539b3910fea12efa11ed637a5f82ba1f7
+  data.tar.gz: 036f21bf4fbc7dd4a698a8148dbd81ba3fd7cdb579b2901ae3237d48c283334855b81529fa0cfc44cad3210f4180193d1b87ecda3b2502fd54b2bc2bdb7c2bed

data/README.md

@@ -89,7 +89,7 @@ This README documents only part of stretcher's API. The full documentation for s
 
 ### Logging
 
-Pass in the the `:log_level` parameter to set logging verbosity. cURL statements are surfaced at the `:debug` log level. For instance:
+Pass in the `:log_level` parameter to set logging verbosity. cURL statements are surfaced at the `:debug` log level. For instance:
 
 ```ruby
 Stretcher::Server.new('http://localhost:9200', :log_level => :debug)
@@ -116,10 +116,11 @@ Specs may be run with `rake spec`
 ## Contributors
 
 * [@andrewvc](https://github.com/andrewvc)
+* [@cmaitchison](https://github.com/cmaitchison)
+* [@danharvey](https://github.com/danharvey)
 * [@aq1018](https://github.com/aq1018)
 * [@akahn](https://github.com/akahn)
 * [@psynix](https://github.com/psynix)
-* [@cmaitchison](https://github.com/cmaitchison)
 * [@fmardini](https://github.com/fmardini)
 * [@chatgris](https://github.com/chatgris)
 * [@alpinegizmo](https://github.com/alpinegizmo)

data/lib/stretcher/es_component.rb

@@ -38,5 +38,12 @@ module Stretcher
         req.body = query
       end
     end
+
+    def do_alias(alias_name_or_prefix)
+      request(:get, "_alias/#{alias_name_or_prefix}")
+    rescue Stretcher::RequestError::NotFound => e
+      return {} if e.http_response.status == 404
+      raise e
+    end
   end
 end

data/lib/stretcher/index.rb

@@ -94,6 +94,11 @@ module Stretcher
       request :get, "_settings"
     end
 
+    # Update settings for this index
+    def update_settings(settings)
+      request :put, "_settings", nil, settings
+    end
+
     # Check if the index has been created on the remote server
     def exists?
       # Unless the exception is hit we know its a 2xx response
@@ -154,6 +159,11 @@ module Stretcher
       do_refresh
     end
 
+    # Perform an optimize on the index to merge and reduce the number of segments
+    def optimize(options=nil)
+      request(:post, "_optimize", options)
+    end
+
     # Full path to this index
     def path_uri(path="/")
       p = @server.path_uri("/#{name}")

data/lib/stretcher/server.rb

@@ -185,6 +185,10 @@ module Stretcher
       end
     end
 
+    def get_alias(alias_name_or_prefix)
+      do_alias(alias_name_or_prefix)
+    end
+
     # Perform a refresh, making all indexed documents available
     def refresh
       do_refresh
@@ -192,7 +196,7 @@ module Stretcher
 
     # Full path to the server root dir
     def path_uri(path=nil)
-      @uri.to_s + path.to_s
+      URI.join(@uri.to_s, path.to_s).to_s
     end
 
     # Handy way to query the server, returning *only* the body

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.16.3"
+  VERSION = "1.17.0"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -220,4 +220,40 @@ describe Stretcher::Index do
       res = server.index(:does_not_exist).msearch([{:query => {:match_all => {}}}])
     }.should raise_exception(Stretcher::RequestError)
   end
+
+  describe "#update_settings" do
+    it "updates settings on the index" do
+      index.get_settings['foo']['settings']['index.number_of_replicas'].should eq("0")
+      index.update_settings("index.number_of_replicas" => "1")
+      index.get_settings['foo']['settings']['index.number_of_replicas'].should eq("1")
+    end
+  end
+
+  describe "#optimize" do
+    let(:request_url) { "http://localhost:9200/foo/_optimize" }
+
+    context "with no options" do
+      it "calls request for the correct endpoint with empty options" do
+        expect(index.server).to receive(:request).with(:post, request_url, nil, nil, {})
+        index.optimize
+      end
+
+      it "successfully runs the optimize command for the index" do
+        expect(index.optimize.ok).to be_true
+      end
+    end
+
+    context "with options" do
+      it "calls request for the correct endpoint with options passed" do
+        expect(index.server).to receive(:request).with(:post, request_url, {"max_num_segments" => 1}, nil, {})
+        index.optimize("max_num_segments" => 1)
+      end
+
+      it "successfully runs the optimize command for the index with the options passed" do
+        expect(index.optimize("max_num_segments" => 1).ok).to be_true
+      end
+    end
+
+  end
+
 end

data/spec/lib/stretcher_server_spec.rb

@@ -1,7 +1,13 @@
 require 'spec_helper'
 
 describe Stretcher::Server do
-  let(:server) { Stretcher::Server.new(ES_URL, :logger => DEBUG_LOGGER) }
+  let(:server) do
+    server = Stretcher::Server.new(ES_URL, :logger => DEBUG_LOGGER)
+    i = server.index('foo')
+    i.delete rescue Stretcher::RequestError::NotFound
+    i.create
+    server
+  end
 
   it "should initialize cleanly" do
     server.class.should == Stretcher::Server
@@ -86,4 +92,50 @@ describe Stretcher::Server do
     server.analyze("Candles", :analyzer => :snowball)
   end
 
+  describe ".path_uri" do
+    context "uri contains trailing /" do
+      subject { Stretcher::Server.new("http://example.com/").path_uri("/foo") }
+      it { should eq ("http://example.com/foo") }
+    end
+
+    context "uri contains no trailing /" do
+      subject { Stretcher::Server.new("http://example.com").path_uri("/foo") }
+      it { should eq ("http://example.com/foo") }
+    end
+  end
+
+  describe "#get_alias" do
+    let(:request_url) { "_alias/bar" }
+    let(:http_response) { double("http_response") }
+    let(:exception) { Stretcher::RequestError::NotFound.new(http_response) }
+
+    it "sends a request to the correct endpoint with an alias that exists" do
+      expect(server).to receive(:request).with(:get, request_url) { :foo }
+      expect(server.get_alias("bar")).to eq(:foo)
+    end
+
+    it "sends a request to the correct endpoint with an alias that does not exist" do
+      expect(server).to receive(:request).with(:get, request_url).and_raise(exception)
+      expect(http_response).to receive(:status) { 404 }
+
+      expect(server.get_alias("bar")).to eq({})
+    end
+
+    it "sends a request to the correct endpoint and gets and error response" do
+      expect(server).to receive(:request).with(:get, request_url).and_raise(exception)
+      expect(http_response).to receive(:status) { 410 }
+
+      expect { server.get_alias("bar") }.to raise_error(exception)
+    end
+
+    it "should return an empty array if no aliases exist" do
+      expect(server.get_alias("bar")).to eq({})
+    end
+
+    it "should return a hash of the aliases if at least one exists" do
+      server.aliases(:actions => [{ :add => { :index => "foo", :alias => "bar" }}])
+      expect(server.get_alias("bar")).to eq({"foo" => {"aliases" => {"bar" => {}}}})
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.17.0
 platform: ruby
 authors:
 - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday