stretcher 1.21.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85bcaf96526c898dbcdf9787e6ae41fbf8d88be5
-  data.tar.gz: 668a0bbe9a04ec5e69c2b3d62b771449d59f4588
+  metadata.gz: 68796baf58beb2f78fd3383919e0cd94d824aff8
+  data.tar.gz: 2d3bdb627625a7f5c427d30c9b6a31bae18d9bd9
 SHA512:
-  metadata.gz: 113de685c58e2350fbf8cd1eaa00c46393fa20d33f681ddbfb0540a568ffe564911bf59fc0b05d909c3c6c9ebc3019a10e2de4c5f2c117b5a5ead116c058c211
-  data.tar.gz: 419d71e6f5c7549d8740a39601d03577b5cdc14173474ecc231d9e861b435a088f93ba9f9ad6f5964b331e1af9d95f3e67c0faee72195959cd9391cf76cc86f3
+  metadata.gz: 95b20ad5885ee1790e052587cdd77e2f2acf45d42f7c14236ce1ed8928177718f589ae683989df07891a350e265b2ed51e02e5b6129beac244ba0d88ba64c60d
+  data.tar.gz: 2b4927fdb72f53db78b638973a7f93a56d8f16ad6e50891c66c9fd79cdc33e43dabab5b48371768abdadec26ce52af448d4e772ebd8a72ae13b04b554e7fdb10

data/lib/stretcher/es_component.rb

@@ -15,7 +15,7 @@ module Stretcher
         body = generic_opts
       end
 
-      response = request(:get, "_search", query_opts) do |req|
+      response = request(:get, "_search", query_opts, nil, {}, :mashify => false) do |req|
         req.body = body
       end
       SearchResults.new(response)
@@ -25,10 +25,10 @@ module Stretcher
       request(:post, "_refresh")
     end
 
-    def request(method, path=nil, params={}, body=nil, headers={}, &block)
+    def request(method, path=nil, params={}, body=nil, headers={}, options={}, &block)
       prefixed_path = path_uri(path)
       raise "Cannot issue request, no server specified!" unless @server
-      @server.request(method, prefixed_path, params, body, headers, &block)
+      @server.request(method, prefixed_path, params, body, headers, options, &block)
     end
 
     def do_delete_query(query)

data/lib/stretcher/index_type.rb

@@ -85,7 +85,7 @@ module Stretcher
     # See http://www.elasticsearch.org/guide/reference/api/more-like-this/ for more
     # Takens an options hash as a second argument, for things like fields=
     def mlt(id, options={})
-      SearchResults.new(request(:get, "#{id}/_mlt", options))
+      SearchResults.new(request(:get, "#{id}/_mlt", options, nil, {}, :mashify => false))
     end
 
     # Retrieve the mapping for this type

data/lib/stretcher/server.rb

@@ -6,7 +6,6 @@ module Stretcher
     # Returns a properly configured HTTP client when initializing an instance
     def self.build_client(uri_components, options={})
       http = Faraday.new(:url => uri_components) do |builder|
-        builder.response :mashify
         builder.response :multi_json, :content_type => /\bjson$/
 
         builder.request :multi_json
@@ -139,9 +138,9 @@ module Stretcher
       raise ArgumentError, "msearch takes an array!" unless body.is_a?(Array)
       fmt_body = body.map {|l| MultiJson.dump(l) }.join("\n") << "\n"
 
-      res = request(:get, path_uri("/_msearch"), {}, fmt_body)
+      res = request(:get, path_uri("/_msearch"), {}, fmt_body, {}, :mashify => false)
 
-      errors = res.responses.map(&:error).compact
+      errors = res['responses'].map { |response| response['error'] }.compact
       if !errors.empty?
         raise RequestError.new(res), "Could not msearch #{errors.inspect}"
       end
@@ -213,7 +212,8 @@ module Stretcher
 
     # Handy way to query the server, returning *only* the body
     # Will raise an exception when the status is not in the 2xx range
-    def request(method, path, params={}, body=nil, headers={}, &block)
+    def request(method, path, params={}, body=nil, headers={}, options={}, &block)
+      options = { :mashify => true }.merge(options)
       req = http.build_request(method)
       req.path = path
       req.params.update(Util.clean_params(params)) if params
@@ -224,7 +224,7 @@ module Stretcher
 
       @request_mtx.synchronize {
         env = req.to_env(http)
-        check_response(http.app.call(env))
+        check_response(http.app.call(env), options)
       }
     end
 
@@ -233,9 +233,13 @@ module Stretcher
 
     # Internal use only
     # Check response codes from request
-    def check_response(res)
+    def check_response(res, options)
       if res.status >= 200 && res.status <= 299
-        res.body
+        if(options[:mashify] && res.body.instance_of?(Hash))
+          Hashie::Mash.new(res.body)
+        else
+          res.body
+        end
       elsif [404, 410].include? res.status
         err_str = "Error processing request: (#{res.status})! #{res.env[:method]} URL: #{res.env[:url]}"
         err_str << "\n Resp Body: #{res.body}"

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.21.0"
+  VERSION = "1.21.1"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -235,7 +235,7 @@ describe Stretcher::Index do
 
     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, {})
+        expect(index.server).to receive(:request).with(:post, request_url, nil, nil, {}, {})
         index.optimize
       end
 
@@ -246,7 +246,7 @@ describe Stretcher::Index do
 
     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, {})
+        expect(index.server).to receive(:request).with(:post, request_url, {"max_num_segments" => 1}, nil, {}, {})
         index.optimize("max_num_segments" => 1)
       end
 

data/spec/lib/stretcher_search_results_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe Stretcher::SearchResults do
+  let(:server) {
+    Stretcher::Server.new(ES_URL, :logger => DEBUG_LOGGER)
+  }
+  let(:index) { ensure_test_index(server, :foo) }
+
   let(:result) do
     Hashie::Mash.new({
                        'facets' => [],
@@ -53,4 +58,18 @@ describe Stretcher::SearchResults do
     its(:_id) { should == 2 }
     its(:_highlight) { should == {'message.*' => ["meeting at <hit>protonet</hit>!"]} }
   end
+
+  context 'result object types' do
+    let(:search_result) {
+      index.search(:query => {:match_all => {}})
+    }
+
+    it 'returns a plain hash for raw_plain' do
+      search_result.raw_plain.should be_instance_of(::Hash)
+    end
+
+    it 'returns a hashie mash for raw' do
+      search_result.raw.should be_instance_of(Hashie::Mash)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday