active-fedora 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,11 @@
+1.1.6
+
+Bug #959: Base.delete fails to delete objects from Solr even when ENABLE_SOLR_UPDATES == true
+
+1.1.5
+
+Feature: Base.save triggers Solrizer if you've required the gem in your app 
+
 1.1.2 
 
 Bug: Model.find_by_solr fails when you pass it an argument of :all

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-05-16}
+  s.date = %q{2010-06-14}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [

data/lib/active_fedora/base.rb

@@ -105,8 +105,7 @@ module ActiveFedora
     #the underlying inner_object.
     def delete
       Fedora::Repository.instance.delete(@inner_object)
-      escaped_pid = self.pid.gsub(/(:)/, '\\:')
-      SolrService.instance.conn.delete(escaped_pid) if ENABLE_SOLR_UPDATES 
+      SolrService.instance.conn.delete(self.pid) if ENABLE_SOLR_UPDATES 
     end
 
 

data/spec/integration/base_spec.rb

@@ -12,7 +12,10 @@ describe ActiveFedora::Base do
   end
   
   after(:each) do
-    @test_object.delete
+    begin
+      @test_object.delete
+    rescue
+    end
   end
   
   
@@ -196,5 +199,15 @@ describe ActiveFedora::Base do
       @test_object.modified_date.should_not be_nil
     end  
   end
+  
+  describe "delete" do
+    
+    it "should delete the object from Fedora and Solr" do
+      ActiveFedora::Base.find_by_solr(@test_object.pid).hits.first["id"].should == @test_object.pid
+      @test_object.delete
+      ActiveFedora::Base.find_by_solr(@test_object.pid).hits.should be_empty
+    end
+    
+  end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency