active-fedora 4.0.0.rc19 → 4.0.0.rc20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc19)
+    active-fedora (4.0.0.rc20)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,8 +1,8 @@
-4.0.0.rc19
+4.0.0.rc20
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
-Added sharding TODO add documentation
+Added sharding
 Added find_document which determines the correct model and then casts the object to that.
 Improved loading from solr
 RDF datastreams
@@ -26,6 +26,7 @@ HYDRA-767 Remove Model::DEFAULT_NS
 Upgrade Om to 1.6.0
 QualifiedDublinCore now extends immediately from NokogiriDatastream
 Deprecated MetadataDatastream
+HYDRA-755 Succeed with loading from solr even if the object was missing a declared datastream
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/lib/active_fedora/base.rb

@@ -387,8 +387,8 @@ module ActiveFedora
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext
       obj.datastreams.each_value do |ds|
-        if ds.respond_to?(:profile_from_hash)
-          ds.profile_from_hash(profile_hash['datastreams'][ds.dsid])
+        if ds.respond_to?(:profile_from_hash) and (ds_prof = profile_hash['datastreams'][ds.dsid])
+          ds.profile_from_hash(ds_prof)
         end
         if ds.respond_to?(:from_solr)
           ds.from_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream))

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc19"
+    VERSION = "4.0.0.rc20"
 end

data/spec/unit/solr_digital_object_spec.rb

@@ -33,6 +33,21 @@ describe ActiveFedora::SolrDigitalObject do
         subject.datastreams['properties'].should be_kind_of ActiveFedora::NokogiriDatastream
       end
     end
+    
+    describe "with a ds spec that's not part of the solrized object" do
+      before do
+        class MissingMetadataDs < ActiveFedora::Base
+          has_metadata :name => "foo", :type => ActiveFedora::NokogiriDatastream, :label => 'Foo Data'
+        end
+        after do
+          Object.send(:remove_const, MissingMetadataDs)
+        end
+        subject { ActiveFedora::SolrDigitalObject.new({}, {'datastreams'=>{'properties'=>{'dsMIME'=>'text/xml'}}},MissingMetadataDs) }
+        it "should have a foo datastream" do
+          subject.datastreams['foo'].label.should == 'Foo Data'
+        end
+      end
+    end
   end
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424179
+  hash: 15424189
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 19
-  version: 4.0.0.rc19
+  - 20
+  version: 4.0.0.rc20
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false