index-tanked 0.7.0 → 0.7.1

data/lib/index-tanked/indextank/client.rb

@@ -37,8 +37,8 @@ module IndexTanked
       end
     end
 
-    class ClientResponseMiddleware < FaradayMiddleware::ResponseMiddleware
-      def process_response(env)
+    class ClientResponseMiddleware < Faraday::Response::Middleware
+      def on_complete(env)
         case env[:status]
         when 200
           nil # this is the expected return code
@@ -50,6 +50,11 @@ module IndexTanked
           raise UnexpectedHTTPException, env[:body]
         end
       end
+
+      def initialize(app)
+        super
+        @parser = nil
+      end
     end
   end
 end

data/lib/index-tanked/indextank/document.rb

@@ -65,8 +65,8 @@ module IndexTanked
       end
     end
 
-    class DocumentResponseMiddleware < FaradayMiddleware::ResponseMiddleware
-      def process_response(env)
+    class DocumentResponseMiddleware < Faraday::Response::Middleware
+      def on_complete(env)
         case env[:status]
         when 200
           nil # this is the expected code

data/lib/index-tanked/indextank/index.rb

@@ -27,8 +27,8 @@ module IndexTanked
           true
         when 409
           raise TooManyIndexes
-        when 401 
-          raise InvalidApiKey 
+        when 401
+          raise InvalidApiKey
         end
       end
 
@@ -37,7 +37,7 @@ module IndexTanked
         if not self.exists?
           raise NonExistentIndex
         end
-      
+
         response = @conn.put do |req|
           req.url ""
           req.body = options.to_json
@@ -45,8 +45,8 @@ module IndexTanked
         case response.status
         when 204
           true
-        when 401 
-          raise InvalidApiKey 
+        when 401
+          raise InvalidApiKey
         end
       end
 
@@ -132,7 +132,7 @@ module IndexTanked
         end
       end
 
-      # the options argument may contain an :index_code definition to override 
+      # the options argument may contain an :index_code definition to override
       # this instance's default index_code
       # it can also contain any of the following:
       #   :start => an int with the number of results to skip
@@ -155,15 +155,15 @@ module IndexTanked
       #   :docvar_filters =>  a hash with int keys and Array values to filter the query based on document variables.
       #                       see http://indextank.com/documentation/ruby-client#range_queries
       #
-      #                       Example: 
-      #                           docvar_filters = { 1 => [ [2, 3], [5, nil] ]} 
+      #                       Example:
+      #                           docvar_filters = { 1 => [ [2, 3], [5, nil] ]}
       #                           means that only documents with document variable number 1 between 2 and 3 or bigger than 5
       #                           will match the query.
       #   :function_filters => a hash with int keys and Array values to filter the query based on scoring functions.
       #                       see http://indextank.com/documentation/ruby-client#range_queries
       #
-      #                       Example: 
-      #                           function_filters = { 3 => [ [nil, 2], [5, 7], [8,14] ]} 
+      #                       Example:
+      #                           function_filters = { 3 => [ [nil, 2], [5, 7], [8,14] ]}
       #                           means that only documents whose score calculated by scoring function 3 is lower than 2,
       #                           between 5 and 7 or between 8 and 14 will match the query.
       def search(query, options = {})
@@ -175,24 +175,24 @@ module IndexTanked
 
         if options[:docvar_filters]
           # go from { 3 => [ [1, 3], [5, nil] ]} to filter_docvar3 => 1:3,5:*
-          options[:docvar_filters].each_pair { |k, v| 
+          options[:docvar_filters].each_pair { |k, v|
                                                 rng = v.map { |val|
                                                   raise ArgumentError, "using a range with bound count != 2"  unless val.length == 2
                                                   "#{val[0] || '*'}:#{val[1] || '*'}"
                                                 }.join ","
-                                                options.merge!( :"filter_docvar#{k}" => rng ) 
+                                                options.merge!( :"filter_docvar#{k}" => rng )
                                              }
           options.delete :docvar_filters
         end
 
         if options[:function_filters]
           # go from { 2 => [ [1 , 3],[5,8] ]} to filter_function2 => 1:3,5:8
-          options[:function_filters].each_pair { |k, v| 
+          options[:function_filters].each_pair { |k, v|
                                                 rng = v.map { |val|
                                                   raise ArgumentError, "using a range with bound count != 2"  unless val.length == 2
                                                   "#{val[0] || '*'}:#{val[1] || '*'}"
                                                 }.join ","
-                                                options.merge!( :"filter_function#{k}" => rng ) 
+                                                options.merge!( :"filter_function#{k}" => rng )
                                              }
           options.delete :function_filters
         end
@@ -203,7 +203,7 @@ module IndexTanked
 
         response = @conn.get do |req|
           req.url 'search', options
-        end  
+        end
         case response.status
         when 400
           raise InvalidQuery
@@ -216,7 +216,7 @@ module IndexTanked
         response.body
       end
 
-      # the options argument may contain an :index_code definition to override 
+      # the options argument may contain an :index_code definition to override
       # this instance's default index_code
       # it can also contain any of the following:
       #   :start => an int with the number of results to skip
@@ -234,15 +234,15 @@ module IndexTanked
       #   :docvar_filters =>  a hash with int keys and Array values to filter the query based on document variables.
       #                       see http://indextank.com/documentation/ruby-client#range_queries
       #
-      #                       Example: 
-      #                           docvar_filters = { 1 => [ [2, 3], [5, nil] ]} 
+      #                       Example:
+      #                           docvar_filters = { 1 => [ [2, 3], [5, nil] ]}
       #                           means that only documents with document variable number 1 between 2 and 3 or bigger than 5
       #                           will match the query.
       #   :function_filters => a hash with int keys and Array values to filter the query based on scoring functions.
       #                       see http://indextank.com/documentation/ruby-client#range_queries
       #
-      #                       Example: 
-      #                           function_filters = { 3 => [ [nil, 2], [5, 7], [8,14] ]} 
+      #                       Example:
+      #                           function_filters = { 3 => [ [nil, 2], [5, 7], [8,14] ]}
       #                           means that only documents whose score calculated by scoring function 3 is lower than 2,
       #                           between 5 and 7 or between 8 and 14 will match the query.
       def delete_by_search(query, options = {})
@@ -254,24 +254,24 @@ module IndexTanked
 
         if options[:docvar_filters]
           # go from { 3 => [ [1, 3], [5, nil] ]} to filter_docvar3 => 1:3,5:*
-          options[:docvar_filters].each_pair { |k, v| 
+          options[:docvar_filters].each_pair { |k, v|
                                                 rng = v.map { |val|
                                                   raise ArgumentError, "using a range with bound count != 2"  unless val.length == 2
                                                   "#{val[0] || '*'}:#{val[1] || '*'}"
                                                 }.join ","
-                                                options.merge!( :"filter_docvar#{k}" => rng ) 
+                                                options.merge!( :"filter_docvar#{k}" => rng )
                                              }
           options.delete :docvar_filters
         end
 
         if options[:function_filters]
           # go from { 2 => [ [1 , 3],[5,8] ]} to filter_function2 => 1:3,5:8
-          options[:function_filters].each_pair { |k, v| 
+          options[:function_filters].each_pair { |k, v|
                                                 rng = v.map { |val|
                                                   raise ArgumentError, "using a range with bound count != 2"  unless val.length == 2
                                                   "#{val[0] || '*'}:#{val[1] || '*'}"
                                                 }.join ","
-                                                options.merge!( :"filter_function#{k}" => rng ) 
+                                                options.merge!( :"filter_function#{k}" => rng )
                                              }
           options.delete :function_filters
         end
@@ -282,7 +282,7 @@ module IndexTanked
 
         response = @conn.delete do |req|
           req.url 'search', options
-        end  
+        end
         case response.status
         when 400
           raise InvalidQuery
@@ -302,15 +302,15 @@ module IndexTanked
         end.body
       end
 
-      # the options argument may contain an :index_code definition to override 
-      # this instance's default index_code  
+      # the options argument may contain an :index_code definition to override
+      # this instance's default index_code
       def promote(docid, query, options={})
         options.merge!( :docid => docid, :query => query )
         resp = @conn.put do |req|
           req.url 'promote'
           req.body = options.to_json
         end
-      
+
         case resp.status
         when 409
           raise IndexInitializing

data/lib/index-tanked/indextank/indextank.rb

@@ -1,23 +1,21 @@
 require 'faraday_middleware'
-require 'faraday_middleware/response_middleware'
 require 'uri'
 
-require 'index-tanked/indextank/client'
+require "index-tanked/indextank/client"
 
 module IndexTanked
   module IndexTank
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
 
     def self.setup_connection(url)
-      ## in Faraday 0.8 or above:
-      @conn = Faraday.new(url) do |conn|
-        conn.response :json
-        yield conn if block_given?
-        conn.adapter Faraday.default_adapter
+      @conn = Faraday::Connection.new(:url => url) do |builder|
+        builder.use FaradayMiddleware::ParseJson
+        yield builder if block_given?
+        builder.adapter Faraday.default_adapter
       end
       @uri = URI.parse(url)
       @conn.basic_auth @uri.user,@uri.password
-      @conn.headers['User-Agent'] = "IndexTanked::IndexTank-Ruby/#{VERSION}"
+      @conn.headers['User-Agent'] = "IndexTank-Ruby/#{VERSION}"
       @conn
     end
   end

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.7.0'
+  GEM_VERSION = '0.7.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-06 00:00:00 Z
+date: 2013-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: will_paginate
@@ -72,12 +72,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 33
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 10
+        - 3
+        version: 2.10.3
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -249,10 +251,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Index Tank <http://indextank.com> integration library.
 test_files: []
 
-has_rdoc: