indextank 1.0.8.1 → 1.0.9

data/lib/indextank.rb

@@ -1,19 +1,17 @@
-require 'faraday'
+require 'faraday_stack'
 require 'uri'
 
 directory = File.expand_path(File.dirname(__FILE__))
 require File.join(directory, 'indextank', 'client')
 
 module IndexTank
-  VERSION = "1.0.8.1"
+  VERSION = "1.0.9"
 
-  def self.setup_connection(url, &block)
+  def self.setup_connection(url)
     @conn = Faraday::Connection.new(:url => url) do |builder|
+      builder.use FaradayStack::ResponseJSON
+      yield builder if block_given? 
       builder.adapter Faraday.default_adapter
-      builder.use Faraday::Response::Yajl
-      if block_given? 
-        block.call builder
-      end 
     end
     @uri = URI.parse(url)
     @conn.basic_auth @uri.user,@uri.password

data/lib/indextank/client.rb

@@ -7,8 +7,9 @@ module IndexTank
 
     def initialize(api_url)
       @uri = api_url
-      builder = Proc.new { |builder| builder.use ClientResponseMiddleware }
-      @conn = IndexTank.setup_connection(api_url, &builder)
+      @conn = IndexTank.setup_connection(api_url) do |faraday|
+        faraday.use ClientResponseMiddleware
+      end
     end
 
     def indexes(name = nil)
@@ -36,18 +37,16 @@ module IndexTank
   end
 
   class ClientResponseMiddleware < Faraday::Response::Middleware
-    def self.register_on_complete(env)
-      env[:response].on_complete do |finished_env|
-        case finished_env[:status]
-        when 200
-          nil # this is the expected return code
-        when 204
-          nil # this is the expected return code for empty responses
-        when 401
-          raise InvalidApiKey
-        else
-          raise UnexpectedHTTPException, finished_env[:body]
-        end
+    def on_complete(env)
+      case env[:status]
+      when 200
+        nil # this is the expected return code
+      when 204
+        nil # this is the expected return code for empty responses
+      when 401
+        raise InvalidApiKey
+      else
+        raise UnexpectedHTTPException, finished_env[:body]
       end
     end
 

data/lib/indextank/document.rb

@@ -9,8 +9,9 @@ module IndexTank
     def initialize(document_url, docid)
       raise InvalidArgument , "docid too long. max is 1024 bytes and got #{String(docid).bytesize}" unless String(docid).bytesize <= 1024
       @docid = docid
-      builder = Proc.new { |builder| builder.use DocumentResponseMiddleware }
-      @conn  = IndexTank.setup_connection(document_url, &builder)
+      @conn = IndexTank.setup_connection(document_url) do |faraday|
+        faraday.use DocumentResponseMiddleware
+      end
     end
 
     # the options argument may contain a :variables key
@@ -64,30 +65,23 @@ module IndexTank
   end
 
   class DocumentResponseMiddleware < Faraday::Response::Middleware
-    def self.register_on_complete(env)
-      env[:response].on_complete do |finished_env|
-        case finished_env[:status]
-        when 200
-          nil # this is the expected code
-        when 204
-          nil # this is another expected code, for empty responses
-        when 401
-          raise InvalidApiKey
-        when 409
-          raise IndexInitializing
-        when 404
-          raise NonExistentIndex
-        when 400
-          raise InvalidArgument, finished_env[:body]
-        else
-          raise UnexpectedHTTPException, finished_env[:body]
-        end
+    def on_complete(env)
+      case env[:status]
+      when 200
+        nil # this is the expected code
+      when 204
+        nil # this is another expected code, for empty responses
+      when 401
+        raise InvalidApiKey
+      when 409
+        raise IndexInitializing
+      when 404
+        raise NonExistentIndex
+      when 400
+        raise InvalidArgument, env[:body]
+      else
+        raise UnexpectedHTTPException, env[:body]
       end
     end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
   end
 end

data/lib/indextank/function.rb

@@ -8,9 +8,10 @@ module IndexTank
       @uri        = "#{function_url}/#{index}"
       @index      = index
       @definition = definition
-      # Function and Document have the same Response statuses .. so borrow DocumentResponseMiddleware
-      builder = Proc.new { |builder| builder.use IndexTank::DocumentResponseMiddleware }
-      @conn  = IndexTank.setup_connection(@uri, &builder)
+      @conn = IndexTank.setup_connection(@uri) do |faraday|
+        # Function and Document have the same Response statuses
+        faraday.use IndexTank::DocumentResponseMiddleware
+      end
     end
 
     def add(options = {})
@@ -21,6 +22,8 @@ module IndexTank
         req.url ''
         req.body = options.to_json
       end
+
+      true
     end
 
     def delete(options = {})
@@ -28,6 +31,8 @@ module IndexTank
         req.url ''
         req.body = options.to_json
       end
+
+      true
     end
 
     def ==(other)

data/lib/indextank/index.rb

@@ -152,6 +152,8 @@ module IndexTank
       case response.status
       when 400
         raise InvalidQuery
+      when 404
+        raise NonExistentIndex
       when 409
         raise IndexInitializing
       end
@@ -174,6 +176,15 @@ module IndexTank
         req.url 'promote'
         req.body = options.to_json
       end
+      
+      case resp.status
+      when 409
+        raise IndexInitializing
+      when 404
+        raise NonExistentIndex
+      when 400
+        raise InvalidArgument, resp.body
+      end
     end
 
     # creates a new document, identified by :docid

data/spec/lib/indextank/document_spec.rb

@@ -5,7 +5,7 @@ describe IndexTank::Document do
   let(:document) { IndexTank::Client.new("http://:xxxx@dstqe.api.indextank.com").indexes('new-index').document('document1') }
   let(:path_prefix) { '/v1/indexes/new-index/docs/' }
 
-  before { stub_setup_connection }
+  before { stub_setup_connection do |builder| builder.use IndexTank::DocumentResponseMiddleware; end }
 
   describe "document management" do
     describe "#add" do
@@ -24,7 +24,9 @@ describe IndexTank::Document do
           stubs.put(path_prefix) { [409, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::IndexInitializing)
+        end
       end
 
       context "invalid or missing argument" do
@@ -32,7 +34,9 @@ describe IndexTank::Document do
           stubs.put(path_prefix) { [400, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::InvalidArgument)
+        end
       end
 
       context "no index existed for the given name" do
@@ -40,7 +44,9 @@ describe IndexTank::Document do
           stubs.put(path_prefix) { [404, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::NonExistentIndex)
+        end
       end
     end
 
@@ -60,7 +66,9 @@ describe IndexTank::Document do
           stubs.delete(path_prefix) { [409, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::IndexInitializing)
+        end
       end
 
       context "invalid or missing argument" do
@@ -68,7 +76,9 @@ describe IndexTank::Document do
           stubs.delete(path_prefix) { [400, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::InvalidArgument)
+        end
       end
 
       context "no index existed for the given name" do
@@ -76,7 +86,9 @@ describe IndexTank::Document do
           stubs.delete(path_prefix) { [404, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::NonExistentIndex)
+        end
       end
     end
   end
@@ -105,7 +117,9 @@ describe IndexTank::Document do
         stubs.put("#{path_prefix}variables") { [409, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect { subject }.to raise_error(IndexTank::IndexInitializing)
+      end
     end
 
     context "invalid or missing argument" do
@@ -113,7 +127,9 @@ describe IndexTank::Document do
         stubs.put("#{path_prefix}variables") { [400, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect { subject }.to raise_error(IndexTank::InvalidArgument)
+      end
     end
 
     context "no index existed for the given name" do
@@ -121,7 +137,9 @@ describe IndexTank::Document do
         stubs.put("#{path_prefix}variables") { [404, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect { subject }.to raise_error(IndexTank::NonExistentIndex)
+      end
     end
   end
 end

data/spec/lib/indextank/function_spec.rb

@@ -5,7 +5,7 @@ describe IndexTank::Function do
   let(:function) { IndexTank::Client.new("http://:xxxx@dstqe.api.indextank.com").indexes('new-index').functions(0, '-age') }
   let(:path_prefix) { '/v1/indexes/new-index/functions/0/' }
 
-  before { stub_setup_connection }
+  before { stub_setup_connection do |builder| builder.use IndexTank::DocumentResponseMiddleware; end}
 
   describe "function management" do
     describe "#add" do
@@ -31,7 +31,9 @@ describe IndexTank::Function do
           stubs.put(path_prefix) { [409, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::IndexInitializing)
+        end
       end
 
       context "invalid or missing argument" do
@@ -39,7 +41,9 @@ describe IndexTank::Function do
           stubs.put(path_prefix) { [400, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::InvalidArgument)
+        end
       end
 
       context "no index existed for the given name" do
@@ -47,7 +51,9 @@ describe IndexTank::Function do
           stubs.put(path_prefix) { [404, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::NonExistentIndex)
+        end
       end
     end
 
@@ -67,7 +73,9 @@ describe IndexTank::Function do
           stubs.delete(path_prefix) { [409, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::IndexInitializing)
+        end
       end
 
       context "invalid or missing argument" do
@@ -75,7 +83,9 @@ describe IndexTank::Function do
           stubs.delete(path_prefix) { [400, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::InvalidArgument)
+        end
       end
 
       context "no index existed for the given name" do
@@ -83,7 +93,9 @@ describe IndexTank::Function do
           stubs.delete(path_prefix) { [404, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect {subject}.to raise_error(IndexTank::NonExistentIndex)
+        end
       end
     end
   end

data/spec/lib/indextank/index_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require 'yajl'
 
 describe IndexTank::Index do
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
@@ -53,7 +54,7 @@ describe IndexTank::Index do
           stubs.delete(path_prefix) { [200, {}, ''] }
         end
 
-        it { should be_true }
+        it { should be_nil }
       end
 
       context "the index does not exist" do
@@ -61,7 +62,9 @@ describe IndexTank::Index do
           stubs.delete(path_prefix) { [204, {}, ''] }
         end
 
-        it { subject.should be_false }
+        it "should raise an exception" do
+          expect { subject }.to raise_error(IndexTank::NonExistentIndex)
+        end
       end
     end
   end
@@ -141,7 +144,7 @@ describe IndexTank::Index do
 
     context "search is successful" do
       before do
-        stubs.get("#{path_prefix}search?q=foo&start=0&len=10") { [200, {}, '{"matches": 4, "search_time": "0.022", "results": [{"docid": "http://cnn.com/HEALTH"}, {"docid": "http://www.cnn.com/HEALTH/"}, {"docid": "http://cnn.com/HEALTH/?hpt=Sbin"}, {"docid": "http://cnn.com/HEALTH/"}]}'] }
+        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [200, {}, '{"matches": 4, "search_time": "0.022", "results": [{"docid": "http://cnn.com/HEALTH"}, {"docid": "http://www.cnn.com/HEALTH/"}, {"docid": "http://cnn.com/HEALTH/?hpt=Sbin"}, {"docid": "http://cnn.com/HEALTH/"}]}'] }
       end
 
       it "should have the number of matches" do
@@ -160,65 +163,78 @@ describe IndexTank::Index do
       end
     end
 
-    context "index is initializing", :pending => true do
+    context "index is initializing" do
       before do
-        stubs.get("#{path_prefix}search") { [409, {}, ''] }
+        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [409, {}, ''] }
       end
 
-      it "should return an empty body"
+      it "should return raise an exception" do
+        expect { subject }.to raise_error(IndexTank::IndexInitializing)
+      end
     end
 
-    context "index is invalid/missing argument", :pending => true do
+    context "index is invalid/missing argument" do
       before do
-        stubs.get("#{path_prefix}search") { [400, {}, ''] }
+        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [400, {}, ''] }
       end
 
-      it "should return a descriptive error message"
+      it "should return raise an exception" do
+        expect { subject }.to raise_error(IndexTank::InvalidQuery)
+      end
     end
 
-    context "no index existed for the given name", :pending => true do
+    context "no index existed for the given name" do
       before do
-        stubs.get("#{path_prefix}search") { [404, {}, ''] }
+        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [404, {}, ''] }
       end
 
-      it "should return a descriptive error message"
+      it "should return raise an exception" do
+        expect { subject }.to raise_error(IndexTank::NonExistentIndex)
+      end
     end
   end
 
   describe "#promote" do
-    subject { index.promote(4, 'foo') }
+    subject { index.promote("4", "foo") }
 
     context "when the document is promoted" do
       before do
-        stubs.get("#{path_prefix}promote?docid=4&query=foo") { [200, {}, ''] }
+        stubs.put("#{path_prefix}promote", Yajl::dump({"docid" => "4", "query" =>"foo"})) { [200, {}, ''] }
       end
 
-      it { should be_true }
+      it { should be_nil }
     end
 
     context "when the index is initializing" do
       before do
-        stubs.get("#{path_prefix}promote?docid=4&query=foo") { [409, {}, ''] }
+        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [409, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect{ subject }.to raise_error(IndexTank::IndexInitializing)
+      end
     end
 
     context "when invalid or missing argument" do
       before do
-        stubs.get("#{path_prefix}promote?docid=4&query=foo") { [400, {}, ''] }
+        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [400, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect{ subject }.to raise_error(IndexTank::InvalidArgument)
+      end
     end
 
     context "when no index exists for the given name" do
       before do
-        stubs.get("#{path_prefix}promote?docid=4&query=foo") { [404, {}, ''] }
+        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [404, {}, ''] }
       end
 
-      it { subject.should be_false }
+      it "should raise an exception" do
+        expect{ subject }.to raise_error(IndexTank::NonExistentIndex)
+      end
     end
+
   end
 
   describe "#document" do

data/spec/spec_helper.rb

@@ -21,8 +21,9 @@ end
 def stub_setup_connection
   stub(IndexTank).setup_connection(anything) do |url|
     Faraday::Connection.new(:url => url) do |builder|
+      builder.use FaradayStack::ResponseJSON
+      yield builder if block_given?
       builder.adapter :test, stubs
-      builder.use Faraday::Response::Yajl
     end
   end
 end

metadata

@@ -1,142 +1,138 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: indextank
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.9
   prerelease: 
-  version: 1.0.8.1
 platform: ruby
-authors: 
+authors:
 - Santiago Perez
 - Terence Lee
 - Diego Buthay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-07 00:00:00 -03:00
+date: 2011-01-07 00:00:00.000000000 -03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &72509310 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *72509310
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &72509010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.19
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *72509010
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &72508710 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.19
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *72508710
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &72508440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.10.11
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *72508440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &72508160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *72508160
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  requirement: &72507910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: parka
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *72507910
+- !ruby/object:Gem::Dependency
+  name: parka
+  requirement: &72507640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *72507640
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &72507400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *72507400
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &72507160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.7
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *72507160
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &72506920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *72506920
 description: Ruby Client for the IndexTank API
-email: 
+email:
 - santip@santip.com.ar
 - hone02@gmail.com
 - dbuthay@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/indextank.rb
 - lib/indextank/client.rb
 - lib/indextank/document.rb
@@ -151,30 +147,26 @@ files:
 has_rdoc: true
 homepage: http://www.indextank.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.6.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby Client for the IndexTank API
 test_files: []
-