stretcher 1.21.0.beta2 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce236606130c06da32f892b0dc2b65bae05118f
-  data.tar.gz: d609025a35624c98fa675dfe4fa878a8900f7e61
+  metadata.gz: 85bcaf96526c898dbcdf9787e6ae41fbf8d88be5
+  data.tar.gz: 668a0bbe9a04ec5e69c2b3d62b771449d59f4588
 SHA512:
-  metadata.gz: fbc088865620e42c268673837cd6c66ac8398f7643ff00be75e12a8310b15050010355f86d3e3d4c1fd64d0c1b325b2c6fdad51f2393d0b0c6712bf25ca25eee
-  data.tar.gz: 6e54d0d191f3a7adfc507ad7c1f3743b3bb11132198b4d84e4c01b303544b109b673d02de6a03eb108910ce49653b1e878773ec6e939d59ce9e6307ffb162231
+  metadata.gz: 113de685c58e2350fbf8cd1eaa00c46393fa20d33f681ddbfb0540a568ffe564911bf59fc0b05d909c3c6c9ebc3019a10e2de4c5f2c117b5a5ead116c058c211
+  data.tar.gz: 419d71e6f5c7549d8740a39601d03577b5cdc14173474ecc231d9e861b435a088f93ba9f9ad6f5964b331e1af9d95f3e67c0faee72195959cd9391cf76cc86f3

data/.travis.yml

@@ -6,6 +6,5 @@ services:
 rvm:
   - 2.0.0
   - 1.9.3
-  - jruby-head
   - jruby-19mode
   - rbx-19mode

data/README.md

@@ -17,7 +17,7 @@ A concise, fast ElasticSearch Ruby client designed to reflect the actual elastic
 * Logs curl commandline statements in debug mode
 * Pure, threadsafe, ruby
 * Easily swap HTTP clients via Faraday
-* Tested against Ruby 2.0,1.9,1.8.7, Jruby, and Rubinius
+* Tested against Ruby 2.0,1.9, Jruby, and Rubinius
 * [Semantically versioned](http://semver.org/)
 
 ## Installation

data/lib/stretcher/search_results.rb

@@ -11,7 +11,7 @@ module Stretcher
     def initialize(raw)
       @raw_plain = raw
     end
-    
+
     # Returns a plain (string keyed) hash of the raw response
     # Normally stretcher deals in Hashie::Mash-ified versions of data
     # If you have truly gigantic result sets this may matter.
@@ -23,7 +23,7 @@ module Stretcher
     def raw
       @raw ||= Hashie::Mash.new(@raw_plain)
     end
-    
+
     # Returns the total number of results
     def total
       @total ||= raw_plain['hits']['total']
@@ -33,12 +33,12 @@ module Stretcher
     # Equivalent to raw[:facets]
     def facets
       @facets ||= raw[:facets]
-    end    
-  
+    end
+
     # Returns a 'prettier' version of elasticsearch results
     # Also aliased as +docs+
     # This will:
-    # 
+    #
     # 1. Return either '_source' or 'fields' as the base of the result
     # 2. Merge any keys beginning with a '_' into it as well (such as '_score')
     # 3. Copy the 'highlight' field into '_highlight'
@@ -59,9 +59,9 @@ module Stretcher
     def results
       documents
     end
-    
+
     private
-    
+
     def extract_source(hit)
       # Memoize the key, since it will be uniform across results
       @doc_key ||= if hit.key?(:_source)
@@ -71,8 +71,8 @@ module Stretcher
                    else
                      nil
                    end
-      
-      Hashie::Mash.new(@doc_key ? hit[@doc_key] : Hashie::Mash.new)      
+
+      Hashie::Mash.new(@doc_key ? hit[@doc_key] : Hashie::Mash.new)
     end
 
     def copy_underscores(hit, doc)
@@ -80,13 +80,13 @@ module Stretcher
       hit.each do |k,v|
         doc[k] = v if k && k[0] == "_"
       end
-      
+
       doc
     end
 
     def copy_highlight(hit, doc)
-      if highlight = hit.key?("highlight")
-        doc[:_highlight] = highlight 
+      if highlight = hit["highlight"]
+        doc[:_highlight] = highlight
       end
       doc
     end

data/lib/stretcher/version.rb

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

data/spec/lib/stretcher_search_results_spec.rb

@@ -10,20 +10,47 @@ describe Stretcher::SearchResults do
                                        '_score' => 255,
                                        '_id' => 2,
                                        '_index' => 'index_name',
-                                       '_type' => 'type_name'
+                                       '_type' => 'type_name',
                                      }]
                        }
                      })
   end
 
-  context 'merges in select keys' do
+  let(:result_with_hightlight) do
+    Hashie::Mash.new({
+                       'facets' => [],
+                       'hits' => {
+                         'total' => 1,
+                         'hits'  => [{
+                                       '_score' => 255,
+                                       '_id' => 2,
+                                       '_index' => 'index_name',
+                                       '_type' => 'type_name',
+                                       'highlight' => {'message.*' => ["meeting at <hit>protonet</hit>!"]}
+                                     }]
+                       }
+                     })
+  end
+
+
+  context 'merges in underscore keys' do
     subject(:search_result) {
       Stretcher::SearchResults.new(result).documents.first
     }
-    
+
     its(:_score) { should == 255 }
     its(:_id) { should == 2 }
     its(:_index) { should == 'index_name' }
     its(:_type) { should == 'type_name' }
+    its(:_highlight) { should be(nil) }
+  end
+
+  context 'merges in optional keys' do
+    subject(:search_result) {
+      Stretcher::SearchResults.new(result_with_hightlight).documents.first
+    }
+
+    its(:_id) { should == 2 }
+    its(:_highlight) { should == {'message.*' => ["meeting at <hit>protonet</hit>!"]} }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.21.0.beta2
+  version: 1.21.0
 platform: ruby
 authors:
 - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -213,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2