active-fedora 4.0.0.rc14 → 4.0.0.rc15

data/Gemfile.lock

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

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc14
+4.0.0.rc15
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed

data/lib/active_fedora/base.rb

@@ -372,7 +372,7 @@ module ActiveFedora
         ActiveFedora::Base
       end
      
-      obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, self))
+      obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, klass))
       #set by default to load any dependent relationship objects from solr as well
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext

data/lib/active_fedora/file_configurator.rb

@@ -48,7 +48,6 @@ module ActiveFedora
     attr_reader :config_options, :fedora_config_path, :solr_config_path
 
     # The configuration hash that gets used by RSolr.connect
-    # @solr_config ||= {}
     def initialize
       reset!
     end

data/lib/active_fedora/solr_digital_object.rb

@@ -17,8 +17,9 @@ module ActiveFedora
       @datastreams = {}
       
       dsids = @solr_doc.keys.collect { |k| k.scan(/^(.+)_dsProfile_/).flatten.first }.compact.uniq
-      missing = dsids-klass.ds_specs.keys
+      missing = dsids - klass.ds_specs.keys
       missing.each do |dsid|
+        #Initialize the datastreams that are in the solr document, but not found in the classes spec.
         mime_key = ActiveFedora::SolrService.solr_name("#{dsid}_dsProfile_dsMIME",:symbol)
         mime_type = Array(@solr_doc[mime_key]).first
         ds_class = mime_type =~ /[\/\+]xml$/ ? NokogiriDatastream : Datastream

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc14"
+    VERSION = "4.0.0.rc15"
 end

data/spec/integration/model_spec.rb

@@ -63,5 +63,11 @@ describe ActiveFedora::Model do
       subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
       it { should be_instance_of HydrangeaArticle}
     end
+    describe "with metadata datastrem spec" do
+      subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
+      it "should create an xml datastream" do
+        subject.datastreams['properties'].should be_kind_of ActiveFedora::MetadataDatastream
+      end
+    end
   end
 end

data/spec/samples/models/hydrangea_article.rb

@@ -9,5 +9,6 @@ class HydrangeaArticle < ActiveFedora::Base
   
   has_metadata :name => "descMetadata", :type=> Hydra::ModsArticleDatastream  
   has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadataDatastream
+  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream
 
 end

data/spec/unit/solr_digital_object_spec.rb

@@ -1,18 +1,37 @@
 require 'spec_helper'
 
 describe ActiveFedora::SolrDigitalObject do
-  subject { ActiveFedora::SolrDigitalObject.new({}) }
-  describe "when not finished" do
-    it "should not respond_to? :repository" do
-      subject.should_not respond_to :repository
+  describe "repository" do
+    subject { ActiveFedora::SolrDigitalObject.new({}) }
+    describe "when not finished" do
+      it "should not respond_to? :repository" do
+        subject.should_not respond_to :repository
+      end
     end
-  end
-  describe "when finished" do
-    before do
-      subject.freeze
+    describe "when finished" do
+      before do
+        subject.freeze
+      end
+      it "should respond_to? :repository" do
+        subject.should respond_to :repository
+      end
     end
-    it "should respond_to? :repository" do
-      subject.should respond_to :repository
+  end
+
+  describe "initializing" do
+    describe "without a datastream in the ds spec and an xml mime type in the solr doc" do
+      before do
+        class WithoutMetadataDs < ActiveFedora::Base
+          ## No datastreams are defined in this class
+        end
+      end
+      after do
+        Object.send(:remove_const, :WithoutMetadataDs)
+      end
+      subject { ActiveFedora::SolrDigitalObject.new({'properties_dsProfile_dsMIME_s' =>'text/xml'}, WithoutMetadataDs) }
+      it "should create an xml datastream" do
+        subject.datastreams['properties'].should be_kind_of ActiveFedora::NokogiriDatastream
+      end
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424137
+  hash: 15424139
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 14
-  version: 4.0.0.rc14
+  - 15
+  version: 4.0.0.rc15
 platform: ruby
 authors: 
 - Matt Zumwalt