stretcher 1.2.0 → 1.3.0

data/README.md

@@ -29,17 +29,18 @@ server = Stretcher::Server.new('http://localhost:9200')
 # Delete an index (in case you already have this one)
 server.index(:foo).delete rescue nil
 # Create an index
-server.index(:foo).create(mappings: {tweet: {properties: {text: 'string'}}})
-# Add a document
-server.index(:foo).type(:tweet).put(123, {text: 'Hello'})
+server.index(:foo).create(mappings: {tweet: {properties: {text: {type: 'string'}}}})
+# Add some documents
+30.times {|t| server.index(:foo).type(:tweet).put(t, {text: "Hello #{t}"}) }
 # Retrieve a document
-server.index(:foo).type(:tweet).get(123)
+server.index(:foo).type(:tweet).get(3)
+# => #<Hashie::Mash text="Hello 3">
 # Perform a search (Returns a Stretcher::SearchResults instance)
-res = server.index(:foo).search({size: 12}, {query: {match_all: {}}})
+res = server.index(:foo).search(size: 12, query: {match_all: {}})
 res.class   # Stretcher::SearchResults
-res.total   # => 1
+res.total   # => 30
+res.results # => [#<Hashie::Mash _id="4" text="Hello 4">, ...]
 res.facets  # => nil
-res.results # => [#<Hashie::Mash _id="123" text="Hello">]
 res.raw     # => #<Hashie::Mash ...> Raw JSON from the search
 ```
 
@@ -50,10 +51,10 @@ res.raw     # => #<Hashie::Mash ...> Raw JSON from the search
 # with_server takes the same args as #new, but is amenable to blocks
 Stretcher::Server.with_server('http://localhost:9200') {|srv|
   srv.index(:foo) {|idx|
-    idx.type(:bar) {|t| [t.exists?, t.get_mapping] }
+    idx.type(:tweet) {|t| {exists: t.exists?, mapping: t.get_mapping} }
   } 
 }
-# => [true, #<Hashie::Mash bar=...>]
+# => {:exists=>true, :mapping=>#<Hashie::Mash tweet=...>}
 ```
 
 ### Multi Search
@@ -74,6 +75,11 @@ docs = [{"_type" => "tweet", "_id" => 91011, "text" => "Bulked"}]
 server.index(:foo).bulk_index(docs)
 ```
 
+### Rails Integration
+
+Stretcher is a low level-client, but it was built as a part of a full suite of Rails integration tools.
+While not yet open-sourced, you can read our detailed blog post: [integrating Stretcher with Rails](http://blog.andrewvc.com/elasticsearch-rails-stretcher-at-pose).
+
 ### Full Documentation
 
 This README documents only part of stretcher's API. The full documentation for stretcher is available in its [full rdocs](http://rdoc.info/github/PoseBiz/stretcher/master/frames).

data/lib/stretcher/index.rb

@@ -81,10 +81,18 @@ module Stretcher
     #    res.facets  # => nil
     #    res.results # => [#<Hashie::Mash _id="123" text="Hello">]
     #    res.raw     # => #<Hashie::Mash ...> Raw JSON from the search
-    def search(query_opts={}, body=nil)
-      uri = path_uri('/_search?' + Util.querify(query_opts))
-      logger.info { "Stretcher Search: curl -XGET #{uri} -d '#{body.to_json}'" }
-      response = @server.request(:get, uri) do |req|
+    def search(generic_opts={}, explicit_body=nil)
+      uri_str = '/_search'
+      body = nil
+      if explicit_body
+        uri_str << '?' + Util.querify(generic_opts)
+        body = explicit_body
+      else
+        body = generic_opts
+      end
+      
+      logger.info { "Stretcher Search: curl -XGET '#{uri}' -d '#{body.to_json}'" }
+      response = @server.request(:get, path_uri(uri_str)) do |req|
         req.body = body
       end
       SearchResults.new(raw: response)

data/lib/stretcher/index_type.rb

@@ -71,8 +71,8 @@ module Stretcher
     end
 
     # Issues an Index#search scoped to this type
-    def search(query_opts={}, body=nil)
-      @index.search(query_opts.merge(type: name), body)
+    def search(generic_opts={}, body=nil)
+      @index.search(generic_opts.merge(type: name), body)
     end
 
     # Full path to this index type

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday