fedora-migrate 0.3.0 → 0.4.0

data/spec/unit/mover_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
 describe FedoraMigrate::Mover do
-
   it { is_expected.to respond_to :source }
   it { is_expected.to respond_to :target }
   it { is_expected.to respond_to :options }
 
   describe "#new" do
     context "with two arguments" do
-      subject { FedoraMigrate::Mover.new("foo", "bar") }
+      subject { described_class.new("foo", "bar") }
       specify "has a source" do
         expect(subject.source).to eql("foo")
       end
@@ -18,14 +17,14 @@ describe FedoraMigrate::Mover do
     end
 
     context "with options" do
-      subject { FedoraMigrate::Mover.new("foo", "bar", {option: "optional"}) }
+      subject { described_class.new("foo", "bar", option: "optional") }
       specify "it has an option" do
-        expect(subject.options).to eql({option: "optional"})
+        expect(subject.options).to eql(option: "optional")
       end
     end
 
     context "with optional arguments" do
-      subject { FedoraMigrate::Mover.new("foo") }
+      subject { described_class.new("foo") }
       specify "has a source" do
         expect(subject.source).to eql("foo")
       end
@@ -39,35 +38,34 @@ describe FedoraMigrate::Mover do
     context "with a Rubydora object" do
       let(:id)      { "rb68xc11m" }
       let(:object)  { FedoraMigrate.source.connection.find("sufia:#{id}") }
-      subject { FedoraMigrate::Mover.id_component(object) }
+      subject { described_class.id_component(object) }
       it { is_expected.to eql(id) }
     end
     context "with a URI" do
       let(:object)  { RDF::URI.new("foo:bar") }
-      subject { FedoraMigrate::Mover.id_component(object) }
+      subject { described_class.id_component(object) }
       it { is_expected.to eql("bar") }
     end
     context "with a string" do
       let(:object)  { "foo:bar" }
-      subject { FedoraMigrate::Mover.id_component(object) }
+      subject { described_class.id_component(object) }
       it { is_expected.to eql("bar") }
     end
   end
 
   describe "#id_component" do
     context "with a source" do
-      subject { FedoraMigrate::Mover.new("source:pid").id_component }
+      subject { described_class.new("source:pid").id_component }
       it { is_expected.to eql("pid") }
     end
     context "object, but no source" do
-      subject { FedoraMigrate::Mover.new.id_component("source:pid") }
+      subject { described_class.new.id_component("source:pid") }
       it { is_expected.to eql("pid") }
     end
     context "neither object, nor source" do
       specify "raises an error" do
-        expect { FedoraMigrate::Mover.new.id_component }.to raise_error(FedoraMigrate::Errors::MigrationError)
+        expect { described_class.new.id_component }.to raise_error(FedoraMigrate::Errors::MigrationError)
       end
     end
   end
-
 end

data/spec/unit/object_mover_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe FedoraMigrate::ObjectMover do
-
-  before do
-    allow_any_instance_of(FedoraMigrate::ObjectMover).to receive(:create_target_model).and_return("foo")
-  end
+  let(:mock_target) { double("Target", id: "1234") }
+  before { allow_any_instance_of(described_class).to receive(:target).and_return(mock_target) }
 
   describe "#new" do
     it { is_expected.to respond_to :source }
@@ -13,24 +11,19 @@ describe FedoraMigrate::ObjectMover do
   end
 
   describe "#prepare_target" do
-    subject do
-      FedoraMigrate::ObjectMover.new("source", double("Target", id: nil)).prepare_target
-    end
-    it "should call the before hook and save the target" do
-      expect_any_instance_of(FedoraMigrate::ObjectMover).to receive(:before_object_migration)
+    subject { described_class.new("source", double("Target", id: nil)).prepare_target }
+    it "calls the before hook and save the target" do
+      expect_any_instance_of(described_class).to receive(:before_object_migration)
       expect(subject).to be nil
     end
   end
 
   describe "#complete_target" do
-    subject do
-      FedoraMigrate::ObjectMover.new("source", double("Target", id: nil)).complete_target
-    end
-    it "should call the after hook and save the target" do
-      expect_any_instance_of(FedoraMigrate::ObjectMover).to receive(:after_object_migration)
-      expect_any_instance_of(FedoraMigrate::ObjectMover).to receive(:save).and_return(true)
+    subject { described_class.new("source", double("Target", id: nil)).complete_target }
+    it "calls the after hook and save the target" do
+      expect_any_instance_of(described_class).to receive(:after_object_migration)
+      expect_any_instance_of(described_class).to receive(:save).and_return(true)
       expect(subject).to be true
     end
   end
-
 end

data/spec/unit/permissions_mover_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe FedoraMigrate::PermissionsMover do
-
   it { is_expected.to respond_to :rightsMetadata }
 
   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
 
@@ -14,12 +13,12 @@ describe FedoraMigrate::PermissionsMover do
     let(:target) { instance_double("Target") }
     let(:source) { instance_double("Source", content: "<rightsMetadata></rightsMetadata>") }
 
-    subject { FedoraMigrate::PermissionsMover.new(source, target) }
-    
-    it "should be FedoraMigrate::RightsMetadata datastream" do
+    subject { described_class.new(source, target) }
+
+    it "is FedoraMigrate::RightsMetadata datastream" do
       expect(subject.rightsMetadata).to be_kind_of FedoraMigrate::RightsMetadata
     end
-  
+
     context "with a user" do
       specify "reading" do
         expect(subject.read_users).to be_empty
@@ -30,7 +29,7 @@ describe FedoraMigrate::PermissionsMover do
       end
 
       specify "discovering" do
-        expect(subject.discover_users).to be_empty 
+        expect(subject.discover_users).to be_empty
       end
     end
 
@@ -44,10 +43,8 @@ describe FedoraMigrate::PermissionsMover do
       end
 
       specify "discovering" do
-        expect(subject.discover_groups).to be_empty 
+        expect(subject.discover_groups).to be_empty
       end
-    end 
-
+    end
   end
-
 end

data/spec/unit/rels_ext_datastream_mover_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe FedoraMigrate::RelsExtDatastreamMover do
-
   let(:file_id)  { "rb68xc11m" }
   let(:batch_id) { "rb68xc09k" }
   let(:source)   { FedoraMigrate.source.connection.find("sufia:#{file_id}") }
@@ -15,18 +14,18 @@ describe FedoraMigrate::RelsExtDatastreamMover do
 
     describe "#initialize" do
       context "without a target" do
-        subject { FedoraMigrate::RelsExtDatastreamMover.new(source).target }
+        subject { described_class.new(source).target }
         it { is_expected.to be_kind_of(ActiveFedora::Base) }
       end
       context "with a supplied target" do
-        subject { FedoraMigrate::RelsExtDatastreamMover.new(source, "a target").target }
+        subject { described_class.new(source, "a target").target }
         it { is_expected.to eql "a target" }
       end
     end
 
     describe "#migrate" do
       context "with an existing target" do
-        before  { FedoraMigrate::RelsExtDatastreamMover.new(source).migrate }
+        before  { described_class.new(source).migrate }
         subject { ActiveFedora::Base.find(file_id).ldp_source.graph.query([nil, ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, nil]) }
         it "migrates RDF relationships" do
           expect(subject.first.subject).to eq RDF::URI.new("http://localhost:8983/fedora/rest/test/#{file_id}")
@@ -39,8 +38,7 @@ describe FedoraMigrate::RelsExtDatastreamMover do
   context "with a non-existent target" do
     let(:error_message) { "Target object was not found in Fedora 4. Did you migrate it?" }
     it "raises an error" do
-      expect { FedoraMigrate::RelsExtDatastreamMover.new(source) }.to raise_error(FedoraMigrate::Errors::MigrationError, error_message)
+      expect { described_class.new(source) }.to raise_error(FedoraMigrate::Errors::MigrationError, error_message)
     end
   end
-
 end

data/spec/unit/repository_migrator_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe FedoraMigrate::RepositoryMigrator do
-
   let(:namespace) { "sufia" }
 
   it { is_expected.to respond_to(:source_objects) }
@@ -13,7 +12,7 @@ describe FedoraMigrate::RepositoryMigrator do
       let(:failing_report) { { "sufia:rb68xc089" => FedoraMigrate::RepositoryMigrator::SingleObjectReport.new(false, "objects", "relationships") } }
       before { allow_any_instance_of(FedoraMigrate::MigrationReport).to receive(:results).and_return(failing_report) }
       subject do
-        migrator = FedoraMigrate::RepositoryMigrator.new(namespace)
+        migrator = described_class.new(namespace)
         migrator.failures
       end
       it { is_expected.to be 1 }
@@ -22,7 +21,7 @@ describe FedoraMigrate::RepositoryMigrator do
       let(:passing_report) { { "sufia:rb68xc089" => FedoraMigrate::RepositoryMigrator::SingleObjectReport.new(true, "objects", "relationships") } }
       before { allow_any_instance_of(FedoraMigrate::MigrationReport).to receive(:results).and_return(passing_report) }
       subject do
-        migrator = FedoraMigrate::RepositoryMigrator.new(namespace)
+        migrator = described_class.new(namespace)
         migrator.failures
       end
       it { is_expected.to eql 0 }
@@ -35,15 +34,15 @@ describe FedoraMigrate::RepositoryMigrator do
       allow(subject).to receive(:failures).and_return(1)
     end
     context "without an explicit force" do
-      subject { FedoraMigrate::RepositoryMigrator.new(namespace) }
-      it "should not migrate relationships" do
+      subject { described_class.new(namespace) }
+      it "does not migrate relationships" do
         expect(subject.migrate_relationships).to eql("Relationship migration halted because 1 objects didn't migrate successfully.")
       end
     end
     context "with an explicit force" do
-      subject { FedoraMigrate::RepositoryMigrator.new(namespace, { force: true }) }
-      it "should migrate relationships" do
-        expect(subject.migrate_relationships).to_not be_nil
+      subject { described_class.new(namespace, force: true) }
+      it "migrates relationships" do
+        expect(subject.migrate_relationships).not_to be_nil
       end
     end
   end
@@ -57,21 +56,20 @@ describe FedoraMigrate::RepositoryMigrator do
   end
 
   context "with a given namespace" do
-    subject { FedoraMigrate::RepositoryMigrator.new(namespace) }
+    subject { described_class.new(namespace) }
     describe "#namespace" do
       specify "is the one provided" do
         expect(subject.namespace).to eql(namespace)
       end
     end
     describe "#source_objects" do
-      it "should reuturn an array of all digital objects from Rubydora" do
-        expect(subject.source_objects.collect { |o| o.pid }).to include("sufia:rb68xc089", "sufia:rb68xc11m")
+      it "reuturns an array of all digital objects from Rubydora" do
+        expect(subject.source_objects.collect(&:pid)).to include("sufia:rb68xc089", "sufia:rb68xc11m")
       end
-      it "should exclude fedora-system objects" do
-        expect(subject.source_objects).to_not include("fedora-system:ContentModel-3.0")
+      it "excludes fedora-system objects" do
+        expect(subject.source_objects).not_to include("fedora-system:ContentModel-3.0")
         expect(subject.source_objects.count).to eql 9
       end
     end
   end
-
 end

data/spec/unit/rubydora_connection_spec.rb

@@ -2,21 +2,20 @@ require 'spec_helper'
 
 describe FedoraMigrate::RubydoraConnection do
   describe 'initialize' do
-
-    let (:fedora_url) { "http://my.fedora3.instance" }
+    let(:fedora_url) { "http://my.fedora3.instance" }
 
     before do
       allow_any_instance_of(Rubydora::Repository).to receive(:check_repository_version!).and_return("3.8")
     end
 
     subject {
-      FedoraMigrate::RubydoraConnection.new timeout: 3600, validateChecksum: true, url: fedora_url
+      described_class.new timeout: 3600, validateChecksum: true, url: fedora_url
     }
 
     specify "a timeout" do
       expect(subject.connection.client.options[:timeout]).to eql(3600)
     end
-      
+
     specify "validate a checksum" do
       expect(subject.connection.config[:validateChecksum]).to be true
     end
@@ -24,6 +23,5 @@ describe FedoraMigrate::RubydoraConnection do
     specify "a Fedora3 url" do
       expect(subject.connection.client.url).to eql fedora_url
     end
-
   end
 end

data/spec/unit/target_constructor_spec.rb

@@ -1,34 +1,28 @@
 require 'spec_helper'
 
 describe FedoraMigrate::TargetConstructor do
-
+  let(:mock_source) { instance_double("Source", models: list, pid: "pid:1234") }
   context "with one qualified model" do
     let(:list) { ["info:fedora/fedora-system:FedoraObject-3.0", "info:fedora/afmodel:String"] }
-    subject { FedoraMigrate::TargetConstructor.new(list).build }
-    it "should choose the one that is valid" do
-      expect(subject.target).to eql String
-    end
+    subject { described_class.new(mock_source) }
+    its(:target) { is_expected.to eql String }
   end
 
   context "with multiple qualified models" do
     let(:list) { ["info:fedora/fedora-system:FedoraObject-3.0", "info:fedora/afmodel:Array", "info:fedora/afmodel:String"] }
-    subject { FedoraMigrate::TargetConstructor.new(list).build }
-    it "should choose the first one that is valid" do
-      expect(subject.target).to eql Array
-    end
+    subject { described_class.new(mock_source) }
+    its(:target) { is_expected.to eql Array }
   end
 
   context "with a single qualified model" do
-    subject { FedoraMigrate::TargetConstructor.new("info:fedora/afmodel:Array").build }
-    it "should be valid" do
-      expect(subject.target).to eql Array
-    end
+    let(:list) { "info:fedora/afmodel:Array" }
+    subject { described_class.new(mock_source) }
+    its(:target) { is_expected.to eql Array }
   end
 
   context "with multiple unqualified models" do
     let(:list) { ["info:fedora/fedora-system:FedoraObject-3.0", "info:fedora/fedora-system:FooObject"] }
-    subject { FedoraMigrate::TargetConstructor.new(list).build.target }
-    it { is_expected.to be_nil }
+    subject { described_class.new(mock_source) }
+    its(:target) { is_expected.to be_nil }
   end
-
 end

data/tasks/dev.rake

@@ -2,12 +2,20 @@ require 'fedora-migrate'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'jettywrapper'
+require 'rubocop/rake_task'
+
 Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/migrate.zip"
 
 RSpec::Core::RakeTask.new(:spec)
 
+desc 'Run style checker'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.requires << 'rubocop-rspec'
+  task.fail_on_error = true
+end
+
 desc "Run continuous integration tests"
-task ci: ['jetty:clean'] do
+task ci: [:rubocop, 'jetty:clean'] do
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task['fixtures:load'].invoke

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedora-migrate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Migrates data (models, datastreams, content) from a Fedora3 repository
   to Fedora4
 email:
@@ -146,6 +160,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -210,6 +226,7 @@ files:
 - spec/fixtures/reports/sample/scholarsphere_6395wb555.json
 - spec/fixtures/reports/sample/scholarsphere_x346dm27k.json
 - spec/integration/content_versions_spec.rb
+- spec/integration/custom_target_spec.rb
 - spec/integration/fedora3_interface_spec.rb
 - spec/integration/missing_relationships_spec.rb
 - spec/integration/object_migration_spec.rb
@@ -256,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Migrate Hydra-based repository data from Fedora3 to Fedora4
@@ -292,6 +309,7 @@ test_files:
 - spec/fixtures/reports/sample/scholarsphere_6395wb555.json
 - spec/fixtures/reports/sample/scholarsphere_x346dm27k.json
 - spec/integration/content_versions_spec.rb
+- spec/integration/custom_target_spec.rb
 - spec/integration/fedora3_interface_spec.rb
 - spec/integration/missing_relationships_spec.rb
 - spec/integration/object_migration_spec.rb