active-fedora 6.7.8 → 6.8.0

data/spec/samples/models/seminar.rb

@@ -1,29 +1,29 @@
 require 'active-fedora'
 
-class Seminar 
-  
+class Seminar
+
     include ActiveFedora::Model
-    
+
     # Imitating DataMapper ...
-    
-    relationship "parts", :is_part_of, [:seminar_audio_file], :inbound => true 
-    #has n, :parts, {:predicate => :is_part_of, :likely_types => [:seminar_audio_file], :inbound => true}  
+
+    relationship 'parts', :is_part_of, [:seminar_audio_file], :inbound => true
+    #has n, :parts, {:predicate => :is_part_of, :likely_types => [:seminar_audio_file], :inbound => true}
     # OR
-    # has_parts [:seminar_audio_file] 
-    
-    property "title_wylie",          :text  # Note: reserving title_tibetan for actual UTF-8 tibetan text
-    property "title_english",         :text
-    property "original_media_format",      :text
-    property "original_media_number_of_units",      :integer
-    property "author_name_wylie",  :text
-    property "author_name_english",     :text
-    property "location",    :string
-    property "date_recorded",   :date
-    property "file_name", :string
-    property "duration",      :string
-    property "file_size",    :integer
-    property "restriction",   :text
-    property "uri",   :string
-    property "notes", :text
-  
-end
+    # has_parts [:seminar_audio_file]
+
+    property 'title_wylie',          :text  # Note: reserving title_tibetan for actual UTF-8 tibetan text
+    property 'title_english',         :text
+    property 'original_media_format',      :text
+    property 'original_media_number_of_units',      :integer
+    property 'author_name_wylie',  :text
+    property 'author_name_english',     :text
+    property 'location',    :string
+    property 'date_recorded',   :date
+    property 'file_name', :string
+    property 'duration',      :string
+    property 'file_size',    :integer
+    property 'restriction',   :text
+    property 'uri',   :string
+    property 'notes', :text
+
+end

data/spec/samples/models/seminar_audio_file.rb

@@ -1,32 +1,32 @@
 require 'active-fedora'
 
 class SeminarAudioFile
-  
+
     include ActiveFedora::Model
-  
+
     # Imitating DataMapper ...
-    
-    relationship "parent", :is_part_of, :seminar
+
+    relationship 'parent', :is_part_of, :seminar
     #has n, :parents, {:predicate => :is_part_of, :likely_types => [:seminar]}
     # OR
     # is_part_of :seminar
-    
-    property "date_recorded",   :date
-    property "file_name", :string
-    property "duration",  :string
-    property "uri", :string
-    property "notes", :text
+
+    property 'date_recorded',   :date
+    property 'file_name', :string
+    property 'duration',  :string
+    property 'uri', :string
+    property 'notes', :text
 
     # TODO: Figure out how to declare access restrictions
     #property "restriction", :text
-    set_restrictions ["public", "private"]
-        
+    set_restrictions ['public', 'private']
+
     # A file_size property doesn't make sense when you have both compressed and uncompressed in the same object!
-    # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway    
+    # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway
     #property "file_size", :integer
 
-    datastream "compressed", ["audio/mpeg"], :multiple => true
-    datastream "uncompressed", ["audio/wav", "audio/aiff"], :multiple => true
-    
-  
+    datastream 'compressed', ['audio/mpeg'], :multiple => true
+    datastream 'uncompressed', ['audio/wav', 'audio/aiff'], :multiple => true
+
+
 end

data/spec/samples/oral_history_sample_model.rb

@@ -1,30 +1,30 @@
-require "active_fedora"
+require 'active_fedora'
 class OralHistorySampleModel < ActiveFedora::Base
 
     #has_relationship "parts", :is_part_of, :inbound => true
-    
-    has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
-      m.field "narrator",  :string
-      m.field "interviewer", :string
-      m.field "transcript_editor", :text
-      m.field "bio", :string
-      m.field "notes", :text
-      m.field "hard_copy_availability", :text
-      m.field "hard_copy_location", :text
-      m.field "other_contributor", :string
-      m.field "restrictions", :text
-      m.field "series", :string
-      m.field "location", :string
+
+    has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
+      m.field 'narrator',  :string
+      m.field 'interviewer', :string
+      m.field 'transcript_editor', :text
+      m.field 'bio', :string
+      m.field 'notes', :text
+      m.field 'hard_copy_availability', :text
+      m.field 'hard_copy_location', :text
+      m.field 'other_contributor', :string
+      m.field 'restrictions', :text
+      m.field 'series', :string
+      m.field 'location', :string
     end
-    
-    has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream
 
-    has_metadata :name => "significant_passages", :type => ActiveFedora::SimpleDatastream do |m|
-      m.field "significant_passage", :text
+    has_metadata :name => 'dublin_core', :type => ActiveFedora::QualifiedDublinCoreDatastream
+
+    has_metadata :name => 'significant_passages', :type => ActiveFedora::SimpleDatastream do |m|
+      m.field 'significant_passage', :text
     end
-    
-    has_metadata :name => "sensitive_passages", :type => ActiveFedora::SimpleDatastream do |m|
-      m.field "sensitive_passage", :text
+
+    has_metadata :name => 'sensitive_passages', :type => ActiveFedora::SimpleDatastream do |m|
+      m.field 'sensitive_passage', :text
     end
 
 end

data/spec/samples/special_thing.rb

@@ -1,11 +1,11 @@
-require "samples/marpa-dc_datastream.rb"
+require 'samples/marpa-dc_datastream.rb'
 
 # This is an example of an ActiveFedora Model
 #
-# Some of the datastream ids were chosen based on the Hydra modeling conventions.  You don't have to follow them in your work.  
+# Some of the datastream ids were chosen based on the Hydra modeling conventions.  You don't have to follow them in your work.
 # ActiveFedora itself has no notion of those conventions, but we do encourage you to use them.
 #
-# The Hydra conventions encourage you to have a datastream with this dsid whose contents are descriptive metadata like MODS or Dublin Core.  They especially encourage MODS.  
+# The Hydra conventions encourage you to have a datastream with this dsid whose contents are descriptive metadata like MODS or Dublin Core.  They especially encourage MODS.
 # The descMetadata dsid is a Hydra convention for a datastream with descriptive metadata contents, like MODS or Dublin Core.  They especially encourage MODS.
 # The rightsMetadata dsid is also a convention provided by the Hydra Common Metadata "content model"
 #
@@ -13,32 +13,32 @@ require "samples/marpa-dc_datastream.rb"
 # Note that on the wiki, "content model" is often used to refer to Fedora CModels and/or abstract/notional models.  The Common Metadata content model is an example of this.
 # The wiki includes a page that attempts to shed some light on the question of "What is a content model?" https://wiki.duraspace.org/display/hydra/Don't+call+it+a+'content+model'!
 class SpecialThing < ActiveFedora::Base
-  
+
   #
   # DATASTREAMS
   #
-  
+
   # This declares a datastream with Datastream ID (dsid) of "descMetadata"
   # The descMetadata datastream is bound to the Hydra::ModsArticleDatastream class that's defined in lib/active_fedora/samples
   # Any time you load a Fedora object using an instance of SampleModel, the instance will assume its descMetadata datastream conforms to the assumptions in Hydra::ModsArticleDatastream class
-  has_metadata :name => "descMetadata", :type=> Hydra::ModsArticleDatastream
-  
+  has_metadata :name => 'descMetadata', :type => Hydra::ModsArticleDatastream
+
   # This declares a datastream with Datastream ID (dsid) of "rightsMetadata"
   # Like the descMetadata datastream, any time you load a Fedora object using an instance of SampleModel, the instance will assume its descMetadata datastream conforms to the assumptions in Hydra::RightsMetadataDatastream class
-  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadataDatastream
-  
+  has_metadata :name => 'rightsMetadata', :type => Hydra::RightsMetadataDatastream
+
   # This is not part of the Hydra conventions
   # Adding an extra datastream called "extraMetadataForFun" that is bound to the Marpa::DcDatastream class
-  has_metadata :name => "extraMetadataForFun", :type => Marpa::DcDatastream
-  
+  has_metadata :name => 'extraMetadataForFun', :type => Marpa::DcDatastream
+
   #
   # RELATIONSHIPS
   #
-  
+
   # This is an example of how you can add a custom relationship to a model
   # This will allow you to call .derivation on instances of the model to get the _outbound_ "hasDerivation" relationship in the RELS-EXT datastream
-  belongs_to :derivation, :property=>:has_derivation
+  belongs_to :derivation, :property => :has_derivation
 
   # This will allow you to call .inspirations on instances of the model to get a list of all of the objects that assert "hasDerivation" relationships pointing at this object
-  has_many :inspirations, :property=>:has_derivation
+  has_many :inspirations, :property => :has_derivation
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-ENV["environment"] ||= 'test'
-require "bundler/setup"
+ENV['environment'] ||= 'test'
+require 'bundler/setup'
 
 
 begin
@@ -17,31 +17,27 @@ require 'active-fedora'
 require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
 require 'samples/samples'
 
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
-$VERBOSE=nil
+$VERBOSE = nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml
 # You can load it from a different location by passing a file path as an argument.
 def restore_spec_configuration
-  ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
+  ActiveFedora.init(:fedora_config_path => File.join(File.dirname(__FILE__), '..', 'config', 'fedora.yml'))
 end
 restore_spec_configuration
 
 # Shut those Rails deprecation warnings up
-ActiveSupport::Deprecation.behavior= Proc.new { |message, callstack| }
-
-RSpec.configure do |config|
-  config.color_enabled = true
-end
+ActiveSupport::Deprecation.behavior = Proc.new { |message, callstack| }
 
 def fixture(file)
   File.open(File.join(File.dirname(__FILE__), 'fixtures', file), 'rb')
 end
 
 def solr_uri(uri)
-  uri.gsub(/(:)/, "\\:").gsub(/(\/)/,"\\/")
+  uri.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/')
 end

data/spec/support/an_active_model.rb

@@ -1,4 +1,4 @@
-shared_examples_for "An ActiveModel" do
+shared_examples_for 'An ActiveModel' do
   begin
     require 'minitest/unit'
     include Minitest::Assertions
@@ -16,7 +16,7 @@ shared_examples_for "An ActiveModel" do
   include ActiveModel::Lint::Tests
 
   ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
-    example m.gsub('_',' ') do
+    example m.tr('_', ' ') do
       send m
     end
   end

data/spec/support/mock_fedora.rb

@@ -1,45 +1,44 @@
 def mock_client
   return @mock_client if @mock_client
-  @mock_client = double("client")
-  @getter = double("getter")
-  @getter.stub(:get).and_return('')
-  @mock_client.stub(:[]).with("describe?xml=true").and_return('')
-  @mock_client 
+  @mock_client = double('client')
+  @getter = double('getter')
+  allow(@getter).to receive(:get).and_return('')
+  allow(@mock_client).to receive(:[]).with('describe?xml=true').and_return('')
+  @mock_client
 end
-  
-def stub_get(pid, datastreams=nil, record_exists=false)
+
+def stub_get(pid, datastreams = nil, record_exists = false)
   pid.gsub!(/:/, '%3A')
   if record_exists
-    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get=>'foobar'))
+    allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get => 'foobar'))
   else
-    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
+    allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
   end
-  mock_client.stub(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
+  allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
   datastreams ||= ['someData', 'withText', 'withText2', 'RELS-EXT']
   datastreams.each do |dsid|
-    mock_client.stub(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
+    allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
   end
 end
 
-def stub_ingest(pid=nil)
+def stub_ingest(pid = nil)
   n = pid ? pid.gsub(/:/, '%3A') : nil
-  mock_client.should_receive(:[]).with("objects/#{n || 'new'}").and_return(double("ingester", :post=>pid))
+  expect(mock_client).to receive(:[]).with("objects/#{n || 'new'}").and_return(double('ingester', :post => pid))
 end
 
 def stub_add_ds(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    client = mock_client.stub(:[]).with do |params|
+    client = allow(mock_client).to receive(:[]).with(no_args) do |params|
       /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)
     end
-    client.and_return(double("ds_adder", :post=>pid, :get=>''))
+    client.and_return(double('ds_adder', :post => pid, :get => ''))
   end
 end
 
 def stub_get_content(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    mock_client.stub(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double("content_accessor", :post=>pid, :get=>''))
+    allow(mock_client).to receive(:[]).with(no_args) { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double('content_accessor', :post => pid, :get => ''))
   end
 end
-

data/spec/unit/active_fedora_spec.rb

@@ -4,106 +4,106 @@ require 'config_helper'
 # For testing Module-level methods like ActiveFedora.init
 
 describe ActiveFedora do
-  
+
   after :all do
     unstub_rails
     # Restore to default fedora configs
     restore_spec_configuration
   end
 
-  describe "initialization methods" do
-    describe "environment" do
-      it "should use config_options[:environment] if set" do
-        ActiveFedora.stub(:config_options => {:environment=>"ballyhoo"})
-        ActiveFedora.environment.should eql("ballyhoo")
+  describe 'initialization methods' do
+    describe 'environment' do
+      it 'should use config_options[:environment] if set' do
+        ActiveFedora.stub(:config_options => {:environment => 'ballyhoo'})
+        expect(ActiveFedora.environment).to eql('ballyhoo')
       end
 
-      it "should use Rails.env if no config_options and Rails.env is set" do
-        stub_rails(:env => "bedbugs")
+      it 'should use Rails.env if no config_options and Rails.env is set' do
+        stub_rails(:env => 'bedbugs')
         ActiveFedora.stub(:config_options => {})
-        ActiveFedora.environment.should eql("bedbugs")
+        expect(ActiveFedora.environment).to eql('bedbugs')
         unstub_rails
       end
 
       it "should use ENV['environment'] if neither config_options nor Rails.env are set" do
-        ENV['environment'] = "wichita"
+        ENV['environment'] = 'wichita'
         ActiveFedora.stub(:config_options => {})
-        ActiveFedora.environment.should eql("wichita")
-        ENV['environment']='test'
+        expect(ActiveFedora.environment).to eql('wichita')
+        ENV['environment'] = 'test'
       end
 
       it "should use ENV['RAILS_ENV'] and log a warning if none of the above are set" do
-        ENV['environment']=nil
-        ENV['RAILS_ENV'] = "rails_env"
-        lambda {ActiveFedora.environment}.should raise_error(RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'")
-        ENV['environment']='test'
+        ENV['environment'] = nil
+        ENV['RAILS_ENV'] = 'rails_env'
+        expect {ActiveFedora.environment}.to raise_error(RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'")
+        ENV['environment'] = 'test'
       end
 
-      it "should be development if none of the above are present" do
-        ENV['environment']=nil
+      it 'should be development if none of the above are present' do
+        ENV['environment'] = nil
         ENV['RAILS_ENV'] = nil
         ActiveFedora.stub(:config_options => {})
-        ActiveFedora.environment.should == 'development'
-        ENV['environment']="test"
+        expect(ActiveFedora.environment).to eq('development')
+        ENV['environment'] = 'test'
       end
     end
   end
-  
-  describe ".init" do
-    
+
+  describe '.init' do
+
     after(:all) do
       # Restore to default fedora configs
-      ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
+      ActiveFedora.init(:environment => 'test', :fedora_config_path => File.join(File.dirname(__FILE__), '..', '..', 'config', 'fedora.yml'))
     end
 
-    describe "outside of rails" do
-       it "should load the passed config if explicit config passed in as a string" do
-        ActiveFedora.init(:fedora_config_path=>'./spec/fixtures/rails_root/config/fedora.yml', :environment => 'test')
-        ActiveFedora.config.credentials.should == {:url=> "http://testhost.com:8983/fedora", :user=>'fedoraAdmin', :password=>'fedoraAdmin'}
+    describe 'outside of rails' do
+       it 'should load the passed config if explicit config passed in as a string' do
+        ActiveFedora.init(:fedora_config_path => './spec/fixtures/rails_root/config/fedora.yml', :environment => 'test')
+        expect(ActiveFedora.config.credentials).to eq({:url => 'http://testhost.com:8983/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin'})
       end
     end
 
-    describe "within rails" do
+    describe 'within rails' do
 
       after(:all) do
         unstub_rails
       end
 
-      describe "versions prior to 3.0" do
-        describe "with explicit config path passed in" do
-          it "should load the specified config path" do
-            fedora_config="test:\n  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
+      describe 'versions prior to 3.0' do
+        describe 'with explicit config path passed in' do
+          it 'should load the specified config path' do
+            fedora_config = "test:\n  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
             solr_config = "test:\n  default:\n    url: http://foosolr:8983"
 
-            fedora_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/fedora.yml"))
-            solr_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/solr.yml"))
-            pred_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/predicate_mappings.yml"))
-            
-            File.stub(:open).with(fedora_config_path).and_return(fedora_config)
-            File.stub(:open).with(solr_config_path).and_return(solr_config)
-            ActiveFedora::SolrService.stub(:load_mappings) #For the solrizer solr_mappings.yml
+            fedora_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/fedora.yml'))
+            solr_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/solr.yml'))
+            pred_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/predicate_mappings.yml'))
+
+            allow(File).to receive(:open).with(fedora_config_path).and_return(fedora_config)
+            allow(File).to receive(:open).with(solr_config_path).and_return(solr_config)
+            allow(ActiveFedora::SolrService).to receive(:load_mappings) #For the solrizer solr_mappings.yml
 
 
 #            ActiveSupport::Deprecation.should_receive(:warn).with("Configuring fedora with \":url\" without :user and :password is no longer supported.")
-            ActiveFedora.init(:fedora_config_path=>fedora_config_path,:solr_config_path=>solr_config_path)
-            ActiveFedora.solr.class.should == ActiveFedora::SolrService
+            ActiveFedora.init(:fedora_config_path => fedora_config_path, :solr_config_path => solr_config_path)
+            expect(ActiveFedora.solr.class).to eq(ActiveFedora::SolrService)
           end
         end
 
-        describe "with no explicit config path" do
-          it "should look for the file in the path defined at Rails.root" do
-            ActiveFedora::SolrService.stub(:load_mappings) #necessary or else it will load the solrizer config and it breaks other tests in the suite.
-            
-            stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
+        describe 'with no explicit config path' do
+          it 'should look for the file in the path defined at Rails.root' do
+            allow(ActiveFedora::SolrService).to receive(:load_mappings) #necessary or else it will load the solrizer config and it breaks other tests in the suite.
+
+            stub_rails(:root => File.join(File.dirname(__FILE__), '../fixtures/rails_root'))
             ActiveFedora.init()
-            ActiveFedora.config.credentials[:url].should == "http://testhost.com:8983/fedora"
+            expect(ActiveFedora.config.credentials[:url]).to eq('http://testhost.com:8983/fedora')
           end
         end
       end
     end
   end
-  
-  describe "#class_from_string" do
+
+  describe '#class_from_string' do
     before do
       module ParentClass
         class SiblingClass
@@ -112,20 +112,20 @@ describe ActiveFedora do
         end
       end
     end
-    it "should return class constants based on strings" do
-      ActiveFedora.class_from_string("Om").should == Om
-      ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy").should == ActiveFedora::RdfNode::TermProxy
-      ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode).should == ActiveFedora::RdfNode::TermProxy
+    it 'should return class constants based on strings' do
+      expect(ActiveFedora.class_from_string('Om')).to eq(Om)
+      expect(ActiveFedora.class_from_string('ActiveFedora::RdfNode::TermProxy')).to eq(ActiveFedora::RdfNode::TermProxy)
+      expect(ActiveFedora.class_from_string('TermProxy', ActiveFedora::RdfNode)).to eq(ActiveFedora::RdfNode::TermProxy)
     end
 
-    it "should find sibling classes" do
-      ActiveFedora.class_from_string("SiblingClass", ParentClass::OtherSiblingClass).should == ParentClass::SiblingClass
+    it 'should find sibling classes' do
+      expect(ActiveFedora.class_from_string('SiblingClass', ParentClass::OtherSiblingClass)).to eq(ParentClass::SiblingClass)
     end
 
     it "should raise a NameError if the class isn't found" do
       expect {
-        ActiveFedora.class_from_string("FooClass", ParentClass::OtherSiblingClass)
-      }.to raise_error NameError, "uninitialized constant FooClass"
+        ActiveFedora.class_from_string('FooClass', ParentClass::OtherSiblingClass)
+      }.to raise_error NameError, /uninitialized constant FooClass/
     end
   end
 end