active-fedora 1.1.7 → 1.1.8

data/History.txt

@@ -1,3 +1,7 @@
+1.1.8
+
+solrizer fix to ensure that Nokogiri Datastreams are included in Base.to_solr
+
 1.1.7 
 
 Nokogiri Datastream support using Nokogiri and OM::XML.  Includes indexing of xml contents into solr based on accessors declared using OM::XML:Accessor module.

data/Rakefile

@@ -21,7 +21,7 @@ begin
     gem.add_dependency('mime-types', '>= 1.16')
     gem.add_dependency('multipart-post')
     gem.add_dependency('nokogiri')
-    gem.add_dependency('om', '>= 0.1.4')
+    gem.add_dependency('om', '>= 0.1.5')
     # gem.add_dependency('yaml')
 
     gem.add_development_dependency "rspec", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/active-fedora.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
@@ -343,7 +343,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<om>, [">= 0.1.4"])
+      s.add_runtime_dependency(%q<om>, [">= 0.1.5"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -353,7 +353,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<om>, [">= 0.1.4"])
+      s.add_dependency(%q<om>, [">= 0.1.5"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -364,7 +364,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<om>, [">= 0.1.4"])
+    s.add_dependency(%q<om>, [">= 0.1.5"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 1.2.9"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/lib/active_fedora/base.rb

@@ -410,7 +410,8 @@ module ActiveFedora
         solr_doc << {SOLR_DOCUMENT_ID.to_sym => pid, solr_name(:system_create, :date) => self.create_date, solr_name(:system_modified, :date) => self.modified_date, solr_name(:active_fedora_model, :symbol) => self.class.inspect}
       end
       datastreams.each_value do |ds|
-        solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream) && !opts[:model_only] )
+        # solr_doc = ds.to_solr(solr_doc) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) ||( ds.kind_of?(ActiveFedora::RelsExtDatastream) || ( ds.kind_of?(ActiveFedora::QualifiedDublinCoreDatastream) && !opts[:model_only] )
+        solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream) && !opts[:model_only] )
       end
       return solr_doc
     end

data/spec/unit/base_extra_spec.rb

@@ -66,12 +66,15 @@ describe ActiveFedora::Base do
       mock1 = mock("ds1", :to_solr)
       mock2 = mock("ds2", :to_solr)
       mock3 = mock("RELS-EXT", :to_solr)
+      
+      mock_datastreams = {:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3}
+      mock_datastreams.values.each {|ds| ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)}
       mock1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock3.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
       mock3.expects(:kind_of?).with(ActiveFedora::RelsExtDatastream).returns(true)
 
-      @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3})
+      @test_object.expects(:datastreams).returns(mock_datastreams)
       @test_object.update_index
     end
 

data/spec/unit/base_spec.rb

@@ -355,13 +355,16 @@ describe ActiveFedora::Base do
       solr_doc[:active_fedora_model_field].should eql(@test_object.class.inspect)
     end
     
-    it "should call .to_solr on all MetadataDatastreams and pass the resulting document to solr" do
+    it "should call .to_solr on all MetadataDatastreams and NokogiriDatastreams, passing the resulting document to solr" do
       mock1 = mock("ds1", :to_solr)
       mock2 = mock("ds2", :to_solr)
+      ngds = mock("ngds", :to_solr)
       mock1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
-
-      @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2})
+      ngds.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
+      ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
+      
+      @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2, :ngds => ngds})
       @test_object.to_solr
     end
     it "should call .to_solr on the RELS-EXT datastream if it is dirty" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -102,12 +102,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency