indextank 1.0.12 → 1.0.13

data/lib/indextank.rb

@@ -1,16 +1,16 @@
-require 'faraday_stack'
+require 'faraday_middleware'
 require 'uri'
 
 directory = File.expand_path(File.dirname(__FILE__))
 require File.join(directory, 'indextank', 'client')
 
 module IndexTank
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 
   def self.setup_connection(url)
     @conn = Faraday::Connection.new(:url => url) do |builder|
-      builder.use FaradayStack::ResponseJSON
-      yield builder if block_given? 
+      builder.use FaradayMiddleware::ParseJson
+      yield builder if block_given?
       builder.adapter Faraday.default_adapter
     end
     @uri = URI.parse(url)

data/lib/indextank/client.rb

@@ -46,7 +46,7 @@ module IndexTank
       when 401
         raise InvalidApiKey
       else
-        raise UnexpectedHTTPException, finished_env[:body]
+        raise UnexpectedHTTPException, env[:body]
       end
     end
 

data/lib/indextank/document.rb

@@ -26,7 +26,7 @@ module IndexTank
         req.body = options.to_json
       end
 
-      resp.status 
+      resp.status
     end
 
     def delete(options = {})

data/spec/lib/indextank/document_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../../spec_helper', __FILE__)
 describe IndexTank::Document do
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
   let(:document) { IndexTank::Client.new("http://:xxxx@dstqe.api.indextank.com").indexes('new-index').document('document1') }
-  let(:path_prefix) { '/v1/indexes/new-index/docs/' }
+  let(:path_prefix) { '/v1/indexes/new-index/docs' }
 
   before { stub_setup_connection do |builder| builder.use IndexTank::DocumentResponseMiddleware; end }
 
@@ -106,7 +106,7 @@ describe IndexTank::Document do
 
     context "variables indexed" do
       before do
-        stubs.put("#{path_prefix}variables") { [200, {}, ''] }
+        stubs.put("#{path_prefix}/variables") { [200, {}, ''] }
       end
 
       it { should be_true }
@@ -114,7 +114,7 @@ describe IndexTank::Document do
 
     context "index is initializing" do
       before do
-        stubs.put("#{path_prefix}variables") { [409, {}, ''] }
+        stubs.put("#{path_prefix}/variables") { [409, {}, ''] }
       end
 
       it "should raise an exception" do
@@ -124,7 +124,7 @@ describe IndexTank::Document do
 
     context "invalid or missing argument" do
       before do
-        stubs.put("#{path_prefix}variables") { [400, {}, ''] }
+        stubs.put("#{path_prefix}/variables") { [400, {}, ''] }
       end
 
       it "should raise an exception" do
@@ -134,7 +134,7 @@ describe IndexTank::Document do
 
     context "no index existed for the given name" do
       before do
-        stubs.put("#{path_prefix}variables") { [404, {}, ''] }
+        stubs.put("#{path_prefix}/variables") { [404, {}, ''] }
       end
 
       it "should raise an exception" do

data/spec/lib/indextank/function_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../../spec_helper', __FILE__)
 describe IndexTank::Function do
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
   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/' }
+  let(:path_prefix) { '/v1/indexes/new-index/functions/0' }
 
   before { stub_setup_connection do |builder| builder.use IndexTank::DocumentResponseMiddleware; end}
 

data/spec/lib/indextank/index_spec.rb

@@ -4,7 +4,7 @@ require 'yajl'
 describe IndexTank::Index do
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
   let(:index) { IndexTank::Client.new("http://:xxxx@dstqe.api.indextank.com").indexes('new-index') }
-  let(:path_prefix) { '/v1/indexes/new-index/' }
+  let(:path_prefix) { '/v1/indexes/new-index' }
 
   before { stub_setup_connection }
 
@@ -17,6 +17,7 @@ describe IndexTank::Index do
 
       context "the index does not exist" do
         before do
+          stubs.get(path_prefix) { [404, {}, ''] }
           stubs.put(path_prefix) { [201, {}, '{"started": false, "code": "dsyaj", "creation_time": "2010-08-14T13:01:48.454624", "size": 0}'] }
         end
 
@@ -26,7 +27,7 @@ describe IndexTank::Index do
       context "when an index already exists" do
         before do
           # @index.add
-          stubs.put(path_prefix) { [204, {}, ''] }
+          stubs.get(path_prefix) { [200, {}, '{"started": true, "code": "dsyaj", "creation_time": "2010-08-14T13:01:48.454624", "size": 0}'] }
         end
 
         it "should raise an exception" do
@@ -36,6 +37,7 @@ describe IndexTank::Index do
 
       context "when the user has too many indexes" do
         before do
+          stubs.get(path_prefix) { [404, {}, ''] }
           stubs.put(path_prefix) { [409, {}, ''] }
         end
 
@@ -144,7 +146,7 @@ describe IndexTank::Index do
 
     context "search is successful" do
       before do
-        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/"}]}'] }
+        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
@@ -165,7 +167,7 @@ describe IndexTank::Index do
 
     context "index is initializing" do
       before do
-        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [409, {}, ''] }
+        stubs.get("#{path_prefix}/search?len=10&q=foo&start=0") { [409, {}, ''] }
       end
 
       it "should return raise an exception" do
@@ -175,7 +177,7 @@ describe IndexTank::Index do
 
     context "index is invalid/missing argument" do
       before do
-        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [400, {}, ''] }
+        stubs.get("#{path_prefix}/search?len=10&q=foo&start=0") { [400, {}, ''] }
       end
 
       it "should return raise an exception" do
@@ -185,7 +187,7 @@ describe IndexTank::Index do
 
     context "no index existed for the given name" do
       before do
-        stubs.get("#{path_prefix}search?len=10&q=foo&start=0") { [404, {}, ''] }
+        stubs.get("#{path_prefix}/search?len=10&q=foo&start=0") { [404, {}, ''] }
       end
 
       it "should return raise an exception" do
@@ -199,7 +201,7 @@ describe IndexTank::Index do
 
     context "when the document is promoted" do
       before do
-        stubs.put("#{path_prefix}promote", Yajl::dump({"docid" => "4", "query" =>"foo"})) { [200, {}, ''] }
+        stubs.put("#{path_prefix}/promote", Yajl::dump({"docid" => "4", "query" =>"foo"})) { [200, {}, ''] }
       end
 
       it { should be_nil }
@@ -207,7 +209,7 @@ describe IndexTank::Index do
 
     context "when the index is initializing" do
       before do
-        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [409, {}, ''] }
+        stubs.put("#{path_prefix}/promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [409, {}, ''] }
       end
 
       it "should raise an exception" do
@@ -217,7 +219,7 @@ describe IndexTank::Index do
 
     context "when invalid or missing argument" do
       before do
-        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [400, {}, ''] }
+        stubs.put("#{path_prefix}/promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [400, {}, ''] }
       end
 
       it "should raise an exception" do
@@ -227,7 +229,7 @@ describe IndexTank::Index do
 
     context "when no index exists for the given name" do
       before do
-        stubs.put("#{path_prefix}promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [404, {}, ''] }
+        stubs.put("#{path_prefix}/promote", body=Yajl::dump({"docid" => "4", "query" =>"foo"})) { [404, {}, ''] }
       end
 
       it "should raise an exception" do
@@ -250,7 +252,7 @@ describe IndexTank::Index do
       subject { index.functions }
 
       before do
-        stubs.get("#{path_prefix}functions") { [200, {}, '{"0": "0-A", "1": "-age", "2": "relevance"}'] }
+        stubs.get("#{path_prefix}/functions") { [200, {}, '{"0": "0-A", "1": "-age", "2": "relevance"}'] }
       end
 
       it "should return an array of functions" do

data/spec/spec_helper.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: indextank
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - Santiago Perez
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -03:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -40,11 +37,9 @@ dependencies:
   name: rspec-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
@@ -58,11 +53,9 @@ dependencies:
   name: rspec-expectations
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
@@ -76,11 +69,9 @@ dependencies:
   name: rr
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 0
         - 10
@@ -92,11 +83,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -104,66 +93,48 @@ dependencies:
         version: 0.8.7
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: parka
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: faraday-stack
+  name: faraday_middleware
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 7
         - 7
         version: 0.7.7
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 description: Ruby Client for the IndexTank API
 email: 
 - santip@santip.com.ar
@@ -197,27 +168,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby Client for the IndexTank API