active-fedora 6.0.0.rc5 → 6.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e2f066e9427bc89c4e04d96ee04b95b5dd1589
-  data.tar.gz: cfa6839afae6e7a17734bcc80599afa75da00e8d
+  metadata.gz: 9409f2deb359a4478e64508db0a9e1efeddd3ede
+  data.tar.gz: 24abcbc60267a4dc7d119ea21e02bdf792f12b39
 SHA512:
-  metadata.gz: c88d464c1acd22f8f8e4c6c5a905c78b7dae98f86b14a3a735ddb84139e54c2e497d22d3e627a7bf1c2144f40f17cb04fe3275030564430cf6df0c3e18039b5f
-  data.tar.gz: 39c20226680cd0c79c4e39bcbf69cddd5c6d426b8c32c89b7efc913c0f92e3a2a56df57e2b2804812effeb4207040a96c42e13c947e8d232919e9361c5c712ca
+  metadata.gz: c3447788f7c5fbe82a19d97bee6f6c4b8fbef4811738e3555f9c853d18e0e77f8b3acc1114d342f27177d9b65ecfde8e45818568337d82cd4856bb145b42f029
+  data.tar.gz: 0e0471d596cd79f882e9face2f5f70c6a93ff72ce19e6759e081c79d7db2575354f1b74aa044ea7f807857c8af6455b1a05fa2c4f204ea8af9b76a30236fac5e

data/active-fedora.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")
-  s.add_development_dependency("jettywrapper", ">=1.2.0")
+  s.add_development_dependency("jettywrapper", ">=1.4.0")
   s.add_development_dependency("rspec", ">= 2.9.0")
   s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("rest-client")

data/lib/active_fedora/datastream_hash.rb

@@ -8,7 +8,7 @@ module ActiveFedora
 
     def [] (key)
       if key == 'DC' && !has_key?(key)
-        ds = Datastream.new(@obj.inner_object, key)
+        ds = Datastream.new(@obj.inner_object, key, :controlGroup=>'X')
         self[key] = ds
       end
       super

data/lib/active_fedora/datastreams.rb

@@ -4,7 +4,7 @@ module ActiveFedora
 
     included do
       class_attribute :ds_specs
-      self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
+      self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"Fedora Object-to-Object Relationship Metadata", :block=>nil}}
       class << self
         def inherited_with_datastreams(kls) #:nodoc:
           ## Do some inheritance logic that doesn't override Base.inherited

data/lib/active_fedora/nom_datastream.rb

@@ -16,7 +16,7 @@ module ActiveFedora
       end
 
     def self.default_attributes
-      super.merge(:controlGroup => 'X', :mimeType => 'text/xml')
+      super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
     end
 
     # Create an instance of this class based on xml content

data/lib/active_fedora/om_datastream.rb

@@ -10,7 +10,7 @@ module ActiveFedora
         false
       end
     end
-    
+
     include OM::XML::Document
     include OM::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
     
@@ -20,7 +20,7 @@ module ActiveFedora
     attr_accessor :internal_solr_doc
     
     def self.default_attributes
-      super.merge(:controlGroup => 'X', :mimeType => 'text/xml')
+      super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
     end
 
     # Create an instance of this class based on xml content
@@ -95,10 +95,9 @@ module ActiveFedora
       true
     end
 
-    def content
-      return to_xml if ng_xml_changed? || autocreate?
-      val = local_or_remote_content(false)
-      val unless val == "<?xml version=\"1.0\"?>\n"
+    def local_or_remote_content(ensure_fetch = true)
+      @content = to_xml if ng_xml_changed? || autocreate?
+      super
     end
 
     def autocreate?

data/lib/active_fedora/rels_ext_datastream.rb

@@ -7,8 +7,8 @@ module ActiveFedora
     
     attr_accessor :model
 
-   def self.default_attributes
-      super.merge(:mimeType => 'application/rdf+xml')
+    def self.default_attributes
+      super.merge(:controlGroup => 'X', :mimeType => 'application/rdf+xml')
     end
     
     def changed?

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.rc5"
+  VERSION = "6.0.0.rc6"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -2,38 +2,6 @@ APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
 
-namespace :jetty do
-  JETTY_URL = 'https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip'
-  JETTY_ZIP = File.join 'tmp', JETTY_URL.split('/').last
-  JETTY_DIR = 'jetty'
-
-  desc "download the jetty zip file"
-  task :download do
-    system 'mkdir tmp' unless File.directory? 'tmp'
-    puts "Downloading jetty..."
-    system "curl -L #{JETTY_URL} -o #{JETTY_ZIP}"
-    abort "Unable to download jetty from #{JETTY_URL}" unless $?.success?
-  end
-
-  task :unzip do
-    Rake::Task["jetty:download"].invoke unless File.exists? JETTY_ZIP
-    puts "Unpacking jetty..."
-    tmp_save_dir = File.join 'tmp', 'jetty_generator'
-    system "unzip -d #{tmp_save_dir} -qo #{JETTY_ZIP}"
-    abort "Unable to unzip #{JETTY_ZIP} into tmp_save_dir/" unless $?.success?
-
-    expanded_dir = Dir[File.join(tmp_save_dir, "hydra-jetty-*")].first        
-
-    system "mv #{expanded_dir} #{JETTY_DIR}"
-    abort "Unable to move #{expanded_dir} into #{JETTY_DIR}/" unless $?.success?
-  end
-
-  task :clean do
-    system "rm -rf #{JETTY_DIR}"
-    Rake::Task["jetty:unzip"].invoke
-  end
-end
-
 namespace :active_fedora do
   require 'active-fedora'
 

data/spec/integration/bug_spec.rb

@@ -6,46 +6,31 @@ require "rexml/document"
 include ActiveFedora::Model
 
 describe 'bugs' do
-  before :all do
+  before do
     class FooHistory < ActiveFedora::Base
       has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
         m.field "fubar", :string
-        m.field "swank", :text
-      end
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText" do |m|
-        m.field "fubar", :text
       end
     end
-  end
-  after :all do
-    Object.send(:remove_const, :FooHistory)
-  end
-
-  before(:each) do
     @test_object = FooHistory.new
     @test_object.save
   end
-  after(:each) do
+  after do
     @test_object.delete
+    Object.send(:remove_const, :FooHistory)
   end
-  it "should not clobber everything when setting a value" do
-    ds = @test_object.datastreams["someData"]
-    ds.fubar.should == []
-    ds.should_not be_nil
-    ds.fubar=['bar']
-    ds.fubar.should == ['bar']
-    @test_object.save
 
-    @test_object.pid.should_not be_nil
+  it "should not clobber everything when setting a value" do
+    @test_object.someData.fubar=['initial']
+    @test_object.save!
 
     x = FooHistory.find(@test_object.pid)
-    ds2 = x.datastreams["someData"]
-    ds2.fubar.should == ['bar']
-    ds2.fubar = ["meh"]
-    ds2.fubar.should == ["meh"]
-    x.save
+    x.someData.fubar = ["replacement"] # set a new value
+    x.save!
+
+
     x = FooHistory.find(@test_object.pid)
-    x.datastreams['someData'].fubar.should == ["meh"]
+    x.someData.fubar.should == ["replacement"] # recall the value
     x.save
   end
 end

data/spec/integration/om_datastream_spec.rb

@@ -3,31 +3,21 @@ require "solrizer"
 
 describe ActiveFedora::OmDatastream do
   
-  before(:all) do
-    class HydrangeaArticle2 < ActiveFedora::Base
-      # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-      has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream
-
-      # A place to put extra metadata values
-      has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
-        m.field 'collection', :string
-      end
-    end
-
-  end
-
-  after(:all) do
-    Object.send(:remove_const, :HydrangeaArticle2)
-  end
-
   describe "an new instance with a inline datastream" do
     before do 
-      @obj = HydrangeaArticle2.new
+      class HydrangeaArticle3 < ActiveFedora::Base
+        # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
+        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X'
+
+      end
+
+      @obj = HydrangeaArticle3.new
       @obj.save
       @obj.descMetadata.should be_inline
     end
     after do
       @obj.destroy
+      Object.send(:remove_const, :HydrangeaArticle3)
     end
     it "should not be changed when no fields have been set" do
       @obj.descMetadata.should_not be_content_changed
@@ -36,108 +26,138 @@ describe ActiveFedora::OmDatastream do
       @obj.descMetadata.title = 'Foobar'
       @obj.descMetadata.should be_content_changed
     end
-  end
+    describe "#changed?" do
+      it "should not be changed if the new xml matches the old xml" do
+        @pid = "hydrangea:fixture_mods_article2"
+        @test_object = HydrangeaArticle3.find(@pid)
 
+        @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
+        @test_object.descMetadata.should_not be_changed
+      end
 
-  describe "#changed?" do
-    it "should not be changed if the new xml matches the old xml" do
-      @pid = "hydrangea:fixture_mods_article2"
-      @test_object = HydrangeaArticle2.find(@pid)
+      it "should not be changed if there are minor differences in whitespace" do
+        obj = HydrangeaArticle3.new
+        obj.descMetadata.content = "<a>1</a>"
+        obj.save
+        obj.descMetadata.should_not be_changed
+        obj.descMetadata.content = "<a>1</a>\n"
+        obj.descMetadata.should_not be_changed
+      end
+    end
+  end
 
-      @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
-      @test_object.descMetadata.should_not be_changed
+
+  describe "an instance that is a managed datastream" do
+    before(:all) do
+      class HydrangeaArticle2 < ActiveFedora::Base
+        # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
+        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream
+      end
     end
 
+    after(:all) do
+      Object.send(:remove_const, :HydrangeaArticle2)
+    end
 
-    it "should not be changed if there are minor differences in whitespace" do
+    describe "#changed?" do
+      it "should not be changed if the new xml matches the old xml" do
+        @pid = "hydrangea:fixture_mods_article2"
+        @test_object = HydrangeaArticle2.find(@pid)
 
-      obj = HydrangeaArticle2.new
-      obj.descMetadata.content = "<a>1</a>"
-      obj.save
-      obj.descMetadata.should_not be_changed
-      obj.descMetadata.content = "<a>1</a>\n"
-      obj.descMetadata.should_not be_changed
+        @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
+        @test_object.descMetadata.should_not be_changed
+      end
 
+      it "should be changed if there are minor differences in whitespace" do
+        obj = HydrangeaArticle2.new
+        obj.descMetadata.content = "<a>1</a>"
+        obj.save
+        obj.descMetadata.should_not be_changed
+        obj.descMetadata.content = "<a>1</a>\n"
+        obj.descMetadata.should be_changed
+      end
     end
-  end
 
-  describe "empty datastream content" do
-    it "should not break when there is empty datastream content" do
-      obj = HydrangeaArticle2.new
-      obj.descMetadata.content = ""
-      obj.save
 
-    end
-  end
 
-  describe '.term_values' do
-    before do
-      @pid = "hydrangea:fixture_mods_article2"
-      @test_object = HydrangeaArticle2.find(@pid)
-      @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
-      @test_object.save
-      @test_object = HydrangeaArticle2.find(@pid)
-      @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
-    end
+    describe "empty datastream content" do
+      it "should not break when there is empty datastream content" do
+        obj = HydrangeaArticle2.new
+        obj.descMetadata.content = ""
+        obj.save
 
-    it "should return the same values whether getting from solr or Fedora" do
-      @test_solr_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
-      @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
-      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
-      @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
-      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
-      @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
-      ar = @test_solr_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
-      ar.length.should == 4
-      ar.include?("Creator").should == true
-      ar.include?("Contributor").should == true
-      ar.include?("Funder").should == true
-      ar.include?("Host").should == true
-
-      @test_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
-      @test_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
-      @test_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
-      @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
-      @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
-      @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
-      ar = @test_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
-      ar.length.should == 4
-      ar.include?("Creator").should == true
-      ar.include?("Contributor").should == true
-      ar.include?("Funder").should == true
-      ar.include?("Host").should == true
+      end
     end
-  end
-  
-  describe '.update_values' do
-    before do
-      @pid = "hydrangea:fixture_mods_article2"
-      @test_object = HydrangeaArticle2.find(@pid)
-      @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
-      @test_object.save
-      @test_object = HydrangeaArticle2.find(@pid)
+
+    describe '.term_values' do
+      before do
+        @pid = "hydrangea:fixture_mods_article2"
+        @test_object = HydrangeaArticle2.find(@pid)
+        @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+        @test_object.save
+        @test_object = HydrangeaArticle2.find(@pid)
+        @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
+      end
+
+      it "should return the same values whether getting from solr or Fedora" do
+        @test_solr_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+        @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+        @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+        ar = @test_solr_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+        ar.length.should == 4
+        ar.include?("Creator").should == true
+        ar.include?("Contributor").should == true
+        ar.include?("Funder").should == true
+        ar.include?("Host").should == true
+
+        @test_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+        @test_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+        @test_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+        @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+        @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+        @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+        ar = @test_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+        ar.length.should == 4
+        ar.include?("Creator").should == true
+        ar.include?("Contributor").should == true
+        ar.include?("Funder").should == true
+        ar.include?("Host").should == true
+      end
     end
+    
+    describe '.update_values' do
+      before do
+        @pid = "hydrangea:fixture_mods_article2"
+        @test_object = HydrangeaArticle2.find(@pid)
+        @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+        @test_object.save
+        @test_object = HydrangeaArticle2.find(@pid)
+      end
 
-    it "should not be dirty after .update_values is saved" do
-      @test_object.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
-      @test_object.datastreams["descMetadata"].should be_changed
-      @test_object.save
-      @test_object.datastreams["descMetadata"].should_not be_changed
-      @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
-    end    
-  end
+      it "should not be dirty after .update_values is saved" do
+        @test_object.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
+        @test_object.datastreams["descMetadata"].should be_changed
+        @test_object.save
+        @test_object.datastreams["descMetadata"].should_not be_changed
+        @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
+      end    
+    end
 
 
-  describe ".to_solr" do
-    before do
-      object = HydrangeaArticle2.new
-      object.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
-      object.save!
-      @test_object = HydrangeaArticle2.find(object.pid)
+    describe ".to_solr" do
+      before do
+        object = HydrangeaArticle2.new
+        object.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
+        object.save!
+        @test_object = HydrangeaArticle2.find(object.pid)
 
-    end
-    it "should solrize terms with :type=>'date' to *_dt solr terms" do
-      @test_object.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
+      end
+      it "should solrize terms with :type=>'date' to *_dt solr terms" do
+        @test_object.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
+      end
     end
   end
 end

data/spec/unit/datastreams_spec.rb

@@ -177,9 +177,10 @@ describe ActiveFedora::Datastreams do
 
   describe "#dc" do
     it "should be the DC datastream" do
-      m = mock
-      subject.stub(:datastreams => { 'DC' => m})
-      subject.dc.should == m
+      subject.dc.should be_kind_of ActiveFedora::Datastream
+    end
+    it "should be an inline datastream" do
+      subject.dc.controlGroup.should == 'X'
     end
   end
 

data/spec/unit/nom_datastream_spec.rb

@@ -22,6 +22,10 @@ describe ActiveFedora::NomDatastream do
       subject.to_solr['a_s'].should include('123')
       subject.to_solr['b_s'].should include('asdf')
     end
+
+    it "should be a managed datastream" do
+      subject.controlGroup.should == 'M'
+    end
   end
 
   describe "with options for .set_terminology" do
@@ -54,4 +58,4 @@ describe ActiveFedora::NomDatastream do
     end
 
   end
-end
+end

data/spec/unit/om_datastream_spec.rb

@@ -31,11 +31,10 @@ describe ActiveFedora::OmDatastream do
     @test_ds.stub(:new? => false)
   end
   
-  after(:each) do
-  end
-
   its(:metadata?) { should be_true}
 
+  its(:controlGroup) { should == "M"}
+
   it "should include the Solrizer::XML::TerminologyBasedSolrizer for .to_solr support" do
     ActiveFedora::OmDatastream.included_modules.should include(OM::XML::TerminologyBasedSolrizer)
   end
@@ -175,7 +174,7 @@ describe ActiveFedora::OmDatastream do
       @test_ds.stub(:new? => true)
       @test_ds.stub(:ng_xml_changed? => true)
       @test_ds.stub(:to_xml => "fake xml")
-      @mock_repo.should_receive(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
+      @mock_repo.should_receive(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
 
       @test_ds.serialize!
       @test_ds.save

data/spec/unit/rels_ext_datastream_spec.rb

@@ -24,6 +24,7 @@ describe ActiveFedora::RelsExtDatastream do
   end
 
   its(:metadata?) { should be_true}
+  its(:controlGroup) { should == "X"}
 
   describe "#mimeType" do
     it 'should use the application/rdf+xml mime type' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc5
+  version: 6.0.0.rc6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -242,14 +242,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement