rummageable 1.0.1 → 1.1.0

data/lib/rummageable.rb

@@ -36,9 +36,9 @@ module Rummageable
       end
     end
 
-    def delete(link)
+    def delete(id, type = 'edition')
       repeatedly do
-        make_request(:delete, documents_url(link: link))
+        make_request(:delete, documents_url(id: id, type: type))
       end
     end
 
@@ -89,8 +89,11 @@ module Rummageable
     end
 
     def documents_url(options = {})
+      options[:id] ||= options[:link]
+
       parts = [@index_url, 'documents']
-      parts << CGI.escape(options[:link]) if options[:link]
+      parts << CGI.escape(options[:type]) if options[:type]
+      parts << CGI.escape(options[:id]) if options[:id]
       parts.join('/')
     end
   end

data/lib/rummageable/version.rb

@@ -1,3 +1,3 @@
 module Rummageable
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/delete_test.rb

@@ -6,11 +6,11 @@ class DeleteTest < MiniTest::Unit::TestCase
   end
 
   def stub_successful_delete_request
-    stub_request(:delete, link_url).to_return(status(200))
+    stub_request(:delete, documents_url(id: link, type: 'edition')).to_return(status(200))
   end
 
   def stub_one_failed_delete_request
-    stub_request(:delete, link_url).
+    stub_request(:delete, documents_url(id: link, type: 'edition')).
       to_return(status(502)).times(1).then.to_return(status(200))
   end
 
@@ -18,7 +18,19 @@ class DeleteTest < MiniTest::Unit::TestCase
     stub_successful_delete_request
     index = Rummageable::Index.new(rummager_url, index_name)
     index.delete(link)
-    assert_requested :delete, link_url do |request|
+    assert_requested :delete, documents_url(id: link, type: 'edition') do |request|
+      request.headers['Content-Type'] == 'application/json' &&
+        request.headers['Accept'] == 'application/json'
+    end
+  end
+
+  def test_should_delete_a_document_by_its_type_and_id
+    stub_request(:delete, documents_url(id: 'jobs-exact', type: 'best_bet')).to_return(status(200))
+
+    index = Rummageable::Index.new(rummager_url, index_name)
+    index.delete('jobs-exact', 'best_bet')
+
+    assert_requested :delete, documents_url(id: 'jobs-exact', type: 'best_bet') do |request|
       request.headers['Content-Type'] == 'application/json' &&
         request.headers['Accept'] == 'application/json'
     end
@@ -39,7 +51,7 @@ class DeleteTest < MiniTest::Unit::TestCase
     Rummageable::Index.any_instance.expects(:sleep).once
     index = Rummageable::Index.new(rummager_url, index_name)
     index.delete(link)
-    assert_requested :delete, link_url, times: 2
+    assert_requested :delete, documents_url(id: link, type: 'edition'), times: 2
   end
 
   def test_delete_should_log_attempts_to_delete_documents_from_rummager

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rummageable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -139,6 +139,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mediator for apps that want their content to be in the search index
 email: 
 executables: []
@@ -166,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064356095318215702
+      hash: 4581626904595307404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064356095318215702
+      hash: 4581626904595307404
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23