stretcher 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ad9ca446b66da2b1558340d83accb106dd80bc
-  data.tar.gz: bc711b243bd448dbe5cb7079ad32353ef1244378
+  metadata.gz: 45e7f0125d5ba9baba24e71c12522d6150501edf
+  data.tar.gz: 6f5f9ec4b5e7fc75209c919e2d8e6abb2564a8ab
 SHA512:
-  metadata.gz: 41acaea45c9f4ec37fcd736c4ba7dab2929ffcb39b06a4134c7db3a84b843e923c529113b08f29d5b98142a1d9e013a8c23238498cd3d6d7e5074702a8c071ae
-  data.tar.gz: f00e4c5f5beaa2645680fdeff3182c4fd3b708981c15647ef2096ddad2a3ae84ea5ef959d0ccf3de8317e514806a756e5fc0dc5cc085098a09d3767f2d4e41a2
+  metadata.gz: f9287ac799f24dbe74738968c57e693f10ddceb3589226f6e235485af7bd3cd24482877b83f877eb65210235f7480133ba5b9a29209dcc2d10f62f837c44ef05
+  data.tar.gz: 4ed876dad2d9820b0f3a3959745bf66d5a6e7d75c28c247af9b5fb5d7213d2de8eae9490c9a7b1af818e5df8441c4413be660cc8853894e587b27525b759f81b

data/lib/stretcher.rb

@@ -4,6 +4,7 @@ require 'hashie'
 require 'excon'
 require 'faraday'
 require 'faraday_middleware'
+require 'faraday_middleware/multi_json'
 Faraday.load_autoloaded_constants
 require "stretcher/version"
 require 'stretcher/request_error'

data/lib/stretcher/index.rb

@@ -50,8 +50,8 @@ module Stretcher
           index_meta[key] = d.delete(key) if system_fields.include?(key.to_s)
         end
 
-        post_data << ({action => index_meta}.to_json + "\n")
-        post_data << (d.to_json + "\n") unless action == :delete
+        post_data << (MultiJson.dump({action => index_meta}) + "\n")
+        post_data << (MultiJson.dump(d) + "\n") unless action == :delete
         post_data
       }
       @server.bulk body, options

data/lib/stretcher/server.rb

@@ -7,9 +7,9 @@ module Stretcher
     def self.build_client(uri, options={})
       http = Faraday.new(:url => uri) do |builder|
         builder.response :mashify
-        builder.response :json, :content_type => /\bjson$/
+        builder.response :multi_json, :content_type => /\bjson$/
 
-        builder.request :json
+        builder.request :multi_json
 
         builder.options[:read_timeout] = options[:read_timeout] || 4
         builder.options[:open_timeout] = options[:open_timeout] || 2
@@ -125,7 +125,7 @@ module Stretcher
     #    server.msearch(data)
     def msearch(body=[])
       raise ArgumentError, "msearch takes an array!" unless body.is_a?(Array)
-      fmt_body = body.map(&:to_json).join("\n") + "\n"
+      fmt_body = body.map {|l| MultiJson.dump(l) }.join("\n") + "\n"
 
       res = request(:get, path_uri("/_msearch"), {}, fmt_body)
 

data/lib/stretcher/util.rb

@@ -3,7 +3,7 @@ module Stretcher
     
     # cURL formats a Faraday req. Useful for logging
     def self.curl_format(req)
-      body = "-d '#{req.body.is_a?(Hash) ? req.body.to_json : req.body}'" if req.body
+      body = "-d '#{req.body.is_a?(Hash) ? MultiJson.dump(req.body) : req.body}'" if req.body
       headers = req.headers.map {|name, value| "'-H #{name}: #{value}'" }.sort.join(' ')
       method = req.method.to_s.upcase
       url = Util.qurl(req.path,req.params)

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.16.0"
+  VERSION = "1.16.1"
 end

data/spec/lib/stretcher_index_spec.rb

@@ -58,7 +58,7 @@ describe Stretcher::Index do
     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 #{Stretcher::VERSION}'}
+      block.call.should == %{curl -XPUT http://localhost:9200/foo -d '#{MultiJson.dump(options)}' '-H Accept: application/json' '-H Content-Type: application/json' '-H User-Agent: Stretcher Ruby Gem #{Stretcher::VERSION}'}
     end
 
     index.create(options)

data/stretcher.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency('faraday_middleware', '~> 0.9.0')
   gem.add_dependency('excon', '>= 0.16')
   gem.add_dependency('hashie', '>= 1.2.0')
+  gem.add_dependency('multi_json', '>= 1.0')
+  gem.add_dependency('faraday_middleware-multi_json', "~> 0.0.5")
 
   gem.add_development_dependency 'rspec', '>= 2.5.0'
   gem.add_development_dependency 'coveralls'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Andrew Cholakian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware-multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement