fedora-migrate 0.3.0 → 0.4.0

data/spec/integration/versions_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe "Versions" do
-
+describe FedoraMigrate::ObjectMover do
   let(:source) { FedoraMigrate.source.connection.find("sufia:rb68xc089") }
-  let(:mover)  { FedoraMigrate::ObjectMover.new source, ExampleModel::MigrationObject.new }
+  let(:mover)  { described_class.new source, ExampleModel::MigrationObject.new }
 
   subject do
     mover.migrate
@@ -11,23 +10,22 @@ describe "Versions" do
   end
 
   # Query the metadata node for a given version and return its hasDateCreatedByApplication expressed as an integer
-  def date_created_by_application version
+  def date_created_by_application(version)
     uri = subject.content.versions.with_label(version).uri
-    response = ActiveFedora.fedora.connection.get(uri+"/fcr:metadata")
+    response = ActiveFedora.fedora.connection.get(uri + "/fcr:metadata")
     graph = ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
     value = graph.query(predicate: RDF::URI("http://www.loc.gov/premis/rdf/v1#hasDateCreatedByApplication")).first.object.to_s
     DateTime.iso8601(value).to_i
   end
 
   def desc_metadata_source_versions
-    source.datastreams["descMetadata"].versions.sort { |a,b| a.createDate <=> b.createDate }
+    source.datastreams["descMetadata"].versions.sort { |a, b| a.createDate <=> b.createDate }
   end
 
-  it "should be migrated in the order they were created with their original creation dates" do
+  it "is migrated in the order they were created with their original creation dates" do
     pending "Requires fix to Fedora 4.4; awaiting release"
     expect(desc_metadata_source_versions[0].createDate.to_i).to eql date_created_by_application("version1")
     expect(desc_metadata_source_versions[1].createDate.to_i).to eql date_created_by_application("version2")
     expect(desc_metadata_source_versions[2].createDate.to_i).to eql date_created_by_application("version3")
   end
-
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'fedora-migrate'
 require 'equivalent-xml/rspec_matchers'
 require 'support/example_model'
 require 'active_fedora/cleaner'
+require 'rspec/its'
 
 require 'http_logger'
 ActiveFedora::Base.logger = Logger.new(STDERR)
@@ -32,16 +33,15 @@ RSpec.configure do |config|
   # Have a clean slate for every test
   config.before(:each) do
     ActiveFedora::Cleaner.clean!
-    ActiveFedora::SolrService.instance.conn.delete_by_query('*:*', params: {'softCommit' => true})
+    ActiveFedora::SolrService.instance.conn.delete_by_query('*:*', params: { 'softCommit' => true })
     FileUtils.rm_rf(FedoraMigrate::MigrationReport::DEFAULT_PATH)
   end
 
   config.order = :random
 
   config.include ExampleModel
-
 end
 
-def load_fixture file
+def load_fixture(file)
   File.open("spec/fixtures/datastreams/#{file}")
 end

data/spec/support/example_model.rb

@@ -1,43 +1,42 @@
-# Shenanigans because we're not in a Rails environment and we need to load bits of 
+# Shenanigans because we're not in a Rails environment and we need to load bits of
 # code that depend on Rails in order to test migrating objects.
 Hydra::Engine.config.autoload_paths.each { |path| $LOAD_PATH.unshift path }
 # in gem version 2.4, .find_by_name isn't pulling up gems given in the Gemfile
 # as opposed to those in the gemspec file.
 # This is a workaround:
 Gem::Specification.all.each do |g|
-  HAC_DIR = g.gem_dir if g.name.match("hydra-access-controls")
-  HCL_DIR = g.gem_dir if g.name.match("hydra-collections")
-  HCR_DIR = g.gem_dir if g.name.match("hydra-core")
-  BKL_DIR = g.gem_dir if g.name.match("blacklight")
+  HAC_DIR = g.gem_dir if g.name == "hydra-access-controls"
+  HCL_DIR = g.gem_dir if g.name == "hydra-collections"
+  HCR_DIR = g.gem_dir if g.name == "hydra-core"
+  BKL_DIR = g.gem_dir if g.name == "blacklight"
 end
 
 # Load Rails-specific bits of blacklight
-require BKL_DIR+'/app/controllers/concerns/blacklight/request_builders'
-require BKL_DIR+'/app/controllers/concerns/blacklight/search_helper'
+require BKL_DIR + '/app/controllers/concerns/blacklight/request_builders'
+require BKL_DIR + '/app/controllers/concerns/blacklight/search_helper'
 
 # Load Rails-specific bits of hydra-access-controls
-require HAC_DIR+'/app/vocabularies/acl'
-require HAC_DIR+'/app/vocabularies/hydra/acl'
-require HAC_DIR+'/app/models/role_mapper'
-require HAC_DIR+'/app/models/ability'
-require HAC_DIR+'/app/models/hydra/access_controls/access_control_list'
-require HAC_DIR+'/app/models/hydra/access_controls/permission'
-require HAC_DIR+'/app/models/hydra/access_controls/embargo'
-require HAC_DIR+'/app/models/hydra/access_controls/lease'
-require HAC_DIR+'/app/models/concerns/hydra/with_depositor'
-require HAC_DIR+'/app/services/hydra/lease_service'
-require HAC_DIR+'/app/services/hydra/embargo_service'
-require HAC_DIR+'/app/validators/hydra/future_date_validator'
+require HAC_DIR + '/app/vocabularies/acl'
+require HAC_DIR + '/app/vocabularies/hydra/acl'
+require HAC_DIR + '/app/models/role_mapper'
+require HAC_DIR + '/app/models/ability'
+require HAC_DIR + '/app/models/hydra/access_controls/access_control_list'
+require HAC_DIR + '/app/models/hydra/access_controls/permission'
+require HAC_DIR + '/app/models/hydra/access_controls/embargo'
+require HAC_DIR + '/app/models/hydra/access_controls/lease'
+require HAC_DIR + '/app/models/concerns/hydra/with_depositor'
+require HAC_DIR + '/app/services/hydra/lease_service'
+require HAC_DIR + '/app/services/hydra/embargo_service'
+require HAC_DIR + '/app/validators/hydra/future_date_validator'
 
 # Loading hydra-collections
 require 'hydra-collections'
-require HCR_DIR+'/app/models/concerns/hydra/model_methods'
-require HCL_DIR+'/app/models/concerns/hydra/collections/metadata'
-require HCL_DIR+'/app/models/concerns/hydra/collections/relations'
-require HCL_DIR+'/app/models/concerns/hydra/collection'
+require HCR_DIR + '/app/models/concerns/hydra/model_methods'
+require HCL_DIR + '/app/models/concerns/hydra/collections/metadata'
+require HCL_DIR + '/app/models/concerns/hydra/collections/relations'
+require HCL_DIR + '/app/models/concerns/hydra/collection'
 
 module ExampleModel
-
   class RDFProperties < ActiveFedora::Base
     property :title, predicate: ::RDF::DC.title do |index|
       index.as :stored_searchable, :facetable
@@ -95,5 +94,4 @@ module ExampleModel
   class Collection < ActiveFedora::Base
     include Hydra::Collection
   end
-
 end

data/spec/unit/content_mover_spec.rb

@@ -1,32 +1,31 @@
 require 'spec_helper'
 
 describe FedoraMigrate::ContentMover do
-
   let(:nil_source) { double("Source", content: nil, dsid: "datastream") }
   let(:source) do
-    double("Source", 
-      content: "foo", 
-      dsid: "datastream",
-      label: "label",
-      mimeType: "mimetype",
-      createDate: Time.new(1993, 02, 24, 12, 0, 0, "+09:00")  # Rubydora returns Time objects for datastreams' creation dates
-    )
+    double("Source",
+           content: "foo",
+           dsid: "datastream",
+           label: "label",
+           mimeType: "mimetype",
+           createDate: Time.new(1993, 02, 24, 12, 0, 0, "+09:00") # Rubydora returns Time objects for datastreams' creation dates
+          )
   end
   let(:target) { double("Target", content: "", original_name: nil, mime_type: nil) }
 
   describe "#migrate" do
     context "without content" do
-      subject { FedoraMigrate::ContentMover.new(nil_source, target).migrate }
+      subject { described_class.new(nil_source, target).migrate }
       it "reports a nil source" do
         expect(subject).to be_kind_of FedoraMigrate::ContentMover::Report
         expect(subject.error).to eql "Nil source -- it's probably defined in the target but not present in the source"
       end
     end
     context "with content" do
-      subject { FedoraMigrate::ContentMover.new(source, target).migrate }
+      subject { described_class.new(source, target).migrate }
       before do
-        allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:move_content).and_return(true)
-        allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:insert_date_created_by_application).and_return(true)
+        allow_any_instance_of(described_class).to receive(:move_content).and_return(true)
+        allow_any_instance_of(described_class).to receive(:insert_date_created_by_application).and_return(true)
       end
       it { is_expected.to be_kind_of FedoraMigrate::ContentMover::Report }
     end
@@ -37,38 +36,38 @@ describe FedoraMigrate::ContentMover do
       allow(target).to receive(:content=).with("foo")
       allow(target).to receive(:original_name=).with("label")
       allow(target).to receive(:mime_type=).with("mimetype")
-      allow(target).to receive(:save).and_return(true)   
+      allow(target).to receive(:save).and_return(true)
     end
-    subject do  
-      FedoraMigrate::ContentMover.new(source, target).move_content
+    subject do
+      described_class.new(source, target).move_content
     end
     context "with a valid checksum" do
-      before { allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:valid?).and_return(true) }
+      before { allow_any_instance_of(described_class).to receive(:valid?).and_return(true) }
       it { is_expected.to be nil }
     end
     context "with an invalid checksum" do
-      before { allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:valid?).and_return(false) }
+      before { allow_any_instance_of(described_class).to receive(:valid?).and_return(false) }
       it { is_expected.to eql "Failed checksum" }
     end
   end
 
   describe "#insert_date_created_by_application" do
-    subject { FedoraMigrate::ContentMover.new(source, target).insert_date_created_by_application }
+    subject { described_class.new(source, target).insert_date_created_by_application }
     context "with a successful update" do
       let(:successful_status) { double("Result", status: 204) }
-      before { allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:perform_sparql_insert).and_return(successful_status) }
+      before { allow_any_instance_of(described_class).to receive(:perform_sparql_insert).and_return(successful_status) }
       it { is_expected.to be nil }
     end
     context "with an unsuccessful update" do
       let(:unsuccessful_status) { double("Result", status: 404, body: "Error!") }
-      before { allow_any_instance_of(FedoraMigrate::ContentMover).to receive(:perform_sparql_insert).and_return(unsuccessful_status) }
+      before { allow_any_instance_of(described_class).to receive(:perform_sparql_insert).and_return(unsuccessful_status) }
       it { is_expected.to eql "There was a problem with sparql 404 Error!" }
     end
   end
 
   describe "#sparql_insert" do
     let(:sample_sparql_query) do
-<<-EOF
+      <<-EOF
 PREFIX premis: <http://www.loc.gov/premis/rdf/v1#>
 PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
 DELETE WHERE { ?s premis:hasDateCreatedByApplication ?o } ;
@@ -78,8 +77,7 @@ INSERT {
 WHERE { }
 EOF
     end
-    subject { FedoraMigrate::ContentMover.new(source, target).sparql_insert }
+    subject { described_class.new(source, target).sparql_insert }
     it { is_expected.to eql sample_sparql_query }
   end
-
 end

data/spec/unit/datastream_mover_spec.rb

@@ -1,39 +1,35 @@
 require 'spec_helper'
 
 describe FedoraMigrate::DatastreamMover do
-
   describe "#post_initialize" do
     specify "a target is required" do
-      expect{subject.new}.to raise_error(StandardError)
+      expect { subject.new }.to raise_error(StandardError)
     end
   end
 
   describe "#versionable?" do
-
-    let(:versionable_target)     { instance_double("Target", :versionable? => true) }
-    let(:non_versionable_target) { instance_double("Target", :versionable? => false) }
+    let(:versionable_target)     { instance_double("Target", versionable?: true) }
+    let(:non_versionable_target) { instance_double("Target", versionable?: false) }
 
     context "by default" do
-      subject { FedoraMigrate::DatastreamMover.new("foo","bar") }
-      it { is_expected.to_not be_versionable }
+      subject { described_class.new("foo", "bar") }
+      it { is_expected.not_to be_versionable }
     end
     context "when the datastream is not versionable" do
-      subject { FedoraMigrate::DatastreamMover.new("source", non_versionable_target) }
-      it { is_expected.to_not be_versionable }
+      subject { described_class.new("source", non_versionable_target) }
+      it { is_expected.not_to be_versionable }
     end
     context "when the datastream is versionable" do
-      subject { FedoraMigrate::DatastreamMover.new("source", versionable_target) }
+      subject { described_class.new("source", versionable_target) }
       it { is_expected.to be_versionable }
       context "but you want to override that" do
         subject do
-          mover = FedoraMigrate::DatastreamMover.new("source", versionable_target)
+          mover = described_class.new("source", versionable_target)
           mover.versionable = false
           return mover
         end
-        it { is_expected.to_not be_versionable }
+        it { is_expected.not_to be_versionable }
       end
     end
-  
   end
-
 end

data/spec/unit/datastream_verification_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe FedoraMigrate::DatastreamVerification do
-
   class TestSubject
     include FedoraMigrate::DatastreamVerification
-    def initialize datastream
+    def initialize(datastream)
       @datastream = datastream
       @source = datastream
     end
@@ -17,24 +16,24 @@ describe FedoraMigrate::DatastreamVerification do
     context "that match Fedora4's checksum" do
       subject { TestSubject.new(good_binary_source) }
       before  { allow(subject).to receive(:target_checksum).once.and_return("foo") }
-      it      { is_expected.to have_matching_checksums }
+      it      { is_expected.to be_matching_checksums }
       it      { is_expected.to be_valid }
     end
     context "that do not match Fedora4's checksum" do
       subject { TestSubject.new(bad_binary_source) }
       before  { allow(subject).to receive(:target_checksum).twice.and_return("bar") }
-      it      { is_expected.to_not be_valid }
+      it      { is_expected.not_to be_valid }
     end
     context "when the checksum is missing" do
       subject { TestSubject.new(missing_checksum) }
       context "and a newly calculated checksum matches" do
         before { allow(subject).to receive(:target_checksum).twice.and_return(Digest::SHA1.hexdigest("foo")) }
-        it     { is_expected.to have_matching_checksums }
+        it     { is_expected.to be_matching_checksums }
         it     { is_expected.to be_valid }
       end
       context "and a newly calculated checksum does not match" do
         before { expect_any_instance_of(TestSubject).to receive(:target_checksum).twice.and_return(Digest::SHA1.hexdigest("bar")) }
-        it     { is_expected.to_not be_valid }
+        it     { is_expected.not_to be_valid }
       end
     end
   end
@@ -43,12 +42,11 @@ describe FedoraMigrate::DatastreamVerification do
     subject { TestSubject.new(double("Datastream", checksum: "invalid", mimeType: "text/xml", content: "<bar></bar>")) }
     context "when the datastream content is correctly altered upon migration" do
       before  { allow(subject).to receive(:target_content).once.and_return("<?xml version=\"1.0\"?>\n<bar></bar>") }
-      it      { is_expected.to have_matching_nokogiri_checksums }
+      it      { is_expected.to be_matching_nokogiri_checksums }
     end
     context "when the datastream content is incorrectly altered upon migration" do
       before { allow(subject).to receive(:target_content).once.and_return("<?xml version=\"1.0\"?>\n<baz></baz>") }
-      it     { is_expected.to_not have_matching_nokogiri_checksums }
+      it     { is_expected.not_to be_matching_nokogiri_checksums }
     end
   end
-
 end

data/spec/unit/dates_mover_spec.rb

@@ -4,10 +4,9 @@ describe FedoraMigrate::DatesMover do
   let(:target) { ExampleModel::RDFObject.new }
   let(:source) { instance_double('Source', createdDate: 'yesterday', lastModifiedDate: 'today') }
 
-  subject { FedoraMigrate::DatesMover.new(source, target) }
+  subject { described_class.new(source, target) }
 
   describe '#migrate' do
-
     it 'migrates the create and mod dates' do
       subject.migrate
       expect(target.date_uploaded).to eq 'yesterday'
@@ -17,7 +16,7 @@ describe FedoraMigrate::DatesMover do
     context "when the source methods don't exist" do
       let(:source) { instance_double('Source with no date methods') }
       it 'gracefully does nothing' do
-        expect{ subject.migrate }.to_not raise_error
+        expect { subject.migrate }.not_to raise_error
         expect(target.date_uploaded).to be_nil
         expect(target.date_modified).to be_nil
       end
@@ -26,7 +25,7 @@ describe FedoraMigrate::DatesMover do
     context "when the target methods don't exist" do
       let(:target) { instance_double('Target with no date methods') }
       it 'gracefully does nothing' do
-        expect{ subject.migrate }.to_not raise_error
+        expect { subject.migrate }.not_to raise_error
       end
     end
   end

data/spec/unit/fedora_migrate_spec.rb

@@ -1,19 +1,15 @@
 require 'spec_helper'
 
 describe FedoraMigrate do
-
   describe "Fedora3 / " do
-
     describe "configuration" do
-      subject { FedoraMigrate.fedora_config }
+      subject { described_class.fedora_config }
       it { is_expected.to be_kind_of ActiveFedora::Config }
     end
 
     describe "connection" do
-      subject { FedoraMigrate.source }
+      subject { described_class.source }
       it { is_expected.to be_kind_of FedoraMigrate::RubydoraConnection }
     end
-
   end
-
 end

data/spec/unit/file_configurator_spec.rb

@@ -1,17 +1,13 @@
 require 'spec_helper'
 
 describe FedoraMigrate::FileConfigurator do
-
   subject { FedoraMigrate.configurator }
 
   describe "#fedora3_config" do
-
-    it "should use the values from the yml file" do
-      expect(subject.fedora3_config[:user]).to      eql "fedoraAdmin"
-      expect(subject.fedora3_config[:password]).to  eql "fedoraAdmin"
-      expect(subject.fedora3_config[:url]).to       eql "http://localhost:8983/fedora3"
+    it "uses the values from the yml file" do
+      expect(subject.fedora3_config[:user]).to eql "fedoraAdmin"
+      expect(subject.fedora3_config[:password]).to eql "fedoraAdmin"
+      expect(subject.fedora3_config[:url]).to eql "http://localhost:8983/fedora3"
     end
-
   end
-
 end

data/spec/unit/migration_options_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe FedoraMigrate::MigrationOptions do
-
   class TestCase
     include FedoraMigrate::MigrationOptions
   end
@@ -66,7 +65,7 @@ describe FedoraMigrate::MigrationOptions do
     context "with a list of pids" do
       let(:blacklist) { ["pid1, pid2"] }
       subject do
-        TestCase.new.tap do |example| 
+        TestCase.new.tap do |example|
           example.options = { blacklist: blacklist }
         end
       end
@@ -75,5 +74,4 @@ describe FedoraMigrate::MigrationOptions do
       end
     end
   end
-
 end

data/spec/unit/migration_report_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe FedoraMigrate::MigrationReport do
-
   let(:path)            { "spec/fixtures/reports/sample" }
   let(:default_path)    { "migration_report" }
-  let(:existing_report) { FedoraMigrate::MigrationReport.new(path) }
-  let(:new_report)      { FedoraMigrate::MigrationReport.new }
+  let(:existing_report) { described_class.new(path) }
+  let(:new_report)      { described_class.new }
 
   context "with an existing report" do
     subject { existing_report }
@@ -23,7 +22,7 @@ describe FedoraMigrate::MigrationReport do
       it { is_expected.to include("scholarsphere:6395wb555", "scholarsphere:x346dm27k") }
     end
     describe "::failures" do
-      subject { existing_report.failures }    
+      subject { existing_report.failures }
       context "when the report contains failed migrations" do
         it { is_expected.to eq 2 }
       end
@@ -33,13 +32,13 @@ describe FedoraMigrate::MigrationReport do
       it { is_expected.to eq 5 }
     end
     describe "::report_failures" do
-      subject { existing_report.report_failures }   
+      subject { existing_report.report_failures }
       it { is_expected.to be_kind_of(String) }
     end
     describe "::save" do
       let(:individual_report) { Hash.new }
       let(:pid) { "some:pid" }
-      it "should write the report" do
+      it "writes the report" do
         expect(File).to receive(:write).with("migration_report/some_pid.json", "{\n}")
         new_report.save(pid, individual_report)
       end