stretcher 1.14.0 → 1.15.0

data/.travis.yml

@@ -4,7 +4,6 @@ services:
   - elasticsearch
 
 rvm:
-  - ruby-head
   - 2.0.0
   - 1.9.3
   - 1.8.7

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stretcher.gemspec
 gemspec
+ 

data/README.md

@@ -109,6 +109,7 @@ Specs may be run with `rake spec`
 * [@chatgris](https://github.com/chatgris)
 * [@alpinegizmo](https://github.com/alpinegizmo)
 * [@mcolyer](https://github.com/mcolyer)
+* [@mulderp](https://github.com/mulderp)
 
 ## Contributing
 

data/lib/stretcher/index.rb

@@ -44,9 +44,10 @@ module Stretcher
       body = documents.reduce("") {|post_data, d_raw|
         d = Hashie::Mash.new(d_raw)
         index_meta = { :_index => name, :_id => (d.delete(:id) || d.delete(:_id)) }
-        
+
+        system_fields = %w{_type _parent _routing}
         d.keys.reduce(index_meta) do |memo, key|
-          index_meta[key] = d.delete(key) if key.to_s.start_with?('_')
+          index_meta[key] = d.delete(key) if system_fields.include?(key.to_s)
         end
 
         post_data << ({action => index_meta}.to_json + "\n")
@@ -56,9 +57,9 @@ module Stretcher
       @server.bulk body, options
     end
 
-    # Creates the index, with the supplied hash as the optinos body (usually mappings: and settings:))
-    def create(options={})
-      request(:put, "/", {}, options)
+    # Creates the index, with the supplied hash as the options body (usually mappings: and settings:))
+    def create(options=nil)
+      request(:put, nil, nil, options)
     end
 
     # Deletes the index
@@ -94,7 +95,7 @@ module Stretcher
     rescue Stretcher::RequestError::NotFound
       false
     end
-    
+
     # Delete documents by a given query.
     # Per: http://www.elasticsearch.org/guide/reference/api/delete-by-query.html
     def delete_query(query)

data/lib/stretcher/server.rb

@@ -30,26 +30,20 @@ module Stretcher
       if uri_components.user || uri_components.password
         http.basic_auth(uri_components.user, uri_components.password)
       end
-      
+
       http
     end
-    
+
     # Internal use only.
     # Builds a logger when initializing an instance
     def self.build_logger(options)
-      logger = nil
-      
-      if options[:logger]
-        logger = options[:logger]
-      else
-        logger = Logger.new(STDOUT)
-        logger.level = Logger::WARN
-      end
+      logger = options[:logger] || Logger.new(STDOUT)
+      log_level = options[:log_level] || :debug
+      logger.level = Logger.const_get(log_level.to_s.upcase)
 
       logger.formatter = proc do |severity, datetime, progname, msg|
         "[Stretcher][#{severity}]: #{msg}\n"
       end
-      
       logger
     end
 
@@ -66,7 +60,7 @@ module Stretcher
     # The options hash takes an optional instance of Logger under :logger.
     #
     #    server = Stretcher::Server.new('http://localhost:9200')
-    # 
+    #
     # The default implementation here uses the net_http_persistent adapter
     # for faraday. If you would like to use a different HTTP library, or alter
     # other faraday config settings you may specify an optional :faraday_configurator
@@ -92,7 +86,7 @@ module Stretcher
       idx = Index.new(self, name, :logger => logger)
       block ? block.call(idx) : idx
     end
-    
+
     # Perform a raw bulk operation. You probably want to use Stretcher::Index#bulk_index
     # which properly formats a bulk index request.
     def bulk(data, options={})
@@ -128,7 +122,7 @@ module Stretcher
     def msearch(body=[])
       raise ArgumentError, "msearch takes an array!" unless body.is_a?(Array)
       fmt_body = body.map(&:to_json).join("\n") + "\n"
-      
+
       res = request(:get, path_uri("/_msearch"), {}, fmt_body)
 
       errors = res.responses.map(&:error).compact
@@ -181,12 +175,12 @@ module Stretcher
     end
 
     # Handy way to query the server, returning *only* the body
-    # Will raise an exception when the status is not in the 2xx range    
+    # Will raise an exception when the status is not in the 2xx range
     def request(method, path, params={}, body=nil, headers={}, &block)
       req = http.build_request(method)
       req.path = path
       req.params.update(Util.clean_params(params)) if params
-      req.body = body if body
+      req.body = body
       req.headers.update(headers) if headers
       block.call(req) if block
       logger.debug { Util.curl_format(req) }

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -23,10 +23,11 @@ describe Stretcher::Index do
     i
   }
   let(:corpus) {
+    # underscore field that are not system fields should make it through to _source
     [
-     {:text => "Foo", "_type" => 'tweet', "_id" => 'fooid'},
-     {:text => "Bar", "_type" => 'tweet', "_id" => 'barid'},
-     {:text => "Baz", "_type" => 'tweet', "id" => 'bazid'} # Note we support both _id and id
+     {:text => "Foo", :_text => '_Foo', "_type" => 'tweet', "_id" => 'fooid'},
+     {:text => "Bar", :_text => '_Bar', "_type" => 'tweet', "_id" => 'barid'},
+     {:text => "Baz", :_text => '_Baz', "_type" => 'tweet', "id" => 'bazid'} # Note we support both _id and id
     ]
   }
 
@@ -41,6 +42,18 @@ describe Stretcher::Index do
     index.refresh
   end
 
+  it 'creates an index with the correct HTTP command' do
+    index.delete rescue nil
+
+    options = { :mappings => { :movie => { :properties => { :category => { :type => 'string' } } } } }
+
+    server.logger.should_receive(:debug) do |&block|
+      block.call.should == %{curl -XPUT http://localhost:9200/foo -d '#{options.to_json}' '-H Accept: application/json' '-H Content-Type: application/json' '-H User-Agent: Stretcher Ruby Gem 1.14.0'}
+    end
+
+    index.create(options)
+  end
+
   it "should work on an existential level" do
     index.delete rescue nil
     index.exists?.should be_false
@@ -81,6 +94,7 @@ describe Stretcher::Index do
       corpus.each {|doc|
         fetched_doc = index.type(doc["_type"]).get(doc["_id"] || doc["id"], {}, true)
         fetched_doc._source.text.should == doc[:text]
+        fetched_doc._source._text.should == doc[:_text]
         fetched_doc._source._id.should be_nil
         fetched_doc._source._type.should be_nil
       }

data/spec/lib/stretcher_server_spec.rb

@@ -7,6 +7,11 @@ describe Stretcher::Server do
     server.class.should == Stretcher::Server
   end
 
+  it 'sets log level from options' do
+    server = Stretcher::Server.new(ES_URL, :log_level => :info)
+    server.logger.level.should == Logger::INFO
+  end
+
   it "should support the block friendly 'with_server'" do
     exposed = nil
     res = Stretcher::Server.with_server() {|s|
@@ -80,4 +85,5 @@ describe Stretcher::Server do
     end
     server.analyze("Candles", :analyzer => :snowball)
   end
+
 end

data/spec/spec_helper.rb

@@ -6,6 +6,5 @@ require 'stretcher'
 
 File.open("test_logs", 'wb') {|f| f.write("")}
 DEBUG_LOGGER = Logger.new('test_logs')
-DEBUG_LOGGER.level = Logger::DEBUG
 ES_URL = 'http://localhost:9200'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib stretcher]))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday