active-fedora 11.1.4 → 11.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680a242f0b724c0f1159629c8881a1e90df14f85
-  data.tar.gz: 9631a6201e7c3cf4c76c6fa1688c0087af8377ca
+  metadata.gz: b127c21e13c24e017a536d3babf9e442bd1ae4eb
+  data.tar.gz: c75ce470aac8faf4a8b729f624f0ee8062997610
 SHA512:
-  metadata.gz: c43409e731c3d9d9e1dc7b0d785ba233a33fe3f5204c49914a3c1bbd1aa29b4bb065bbad994c3cf97b382a0c89f685b8670c89689abb47d8d6433dc82094f051
-  data.tar.gz: f6227e309593c643a0d2d7234925478a869e99c1acd07f0376e2a81cf588373ebbea25af536ac9a30cc729b60fa21b56bc95c79659559c845420261baa8f9dfa
+  metadata.gz: ae7951d53fb1f44bdd749e953c12e53c3984f9161fe8988ae6c92bd3ccc8ef0505fb2c27764f46c88a880d5ed5af7e9019aa4d52e1d68747ac36db58fc05640d
+  data.tar.gz: 5a664cea927d252abe59a7993b9ba3ea63ad5e89e360cfea72f1281722c965062a9a08ab8340b3d0fd301278c053a6f6b57b17ac1028de9f24e093f5dec8a75e

data/.rubocop.yml

@@ -266,3 +266,6 @@ RSpec/DescribedClass:
 
 RSpec/NotToNot:
   Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,20 +1,23 @@
-require: rubocop-rspec
-
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-08-25 16:34:38 -0700 using RuboCop version 0.42.0.
+# on 2017-02-28 19:30:31 -0600 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 116
-# Configuration parameters: Max.
-RSpec/ExampleLength:
+# Offense count: 211
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 577
+
+# Offense count: 65
+RSpec/BeforeAfterAll:
   Enabled: false
 
-# Offense count: 40
-RSpec/LeadingSubject:
+# Offense count: 114
+# Configuration parameters: Max.
+RSpec/ExampleLength:
   Enabled: false
 
 # Offense count: 15
@@ -32,24 +35,76 @@ RSpec/MessageChain:
   Exclude:
     - 'spec/unit/file_spec.rb'
 
-# Offense count: 218
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: allow, expect
-RSpec/MessageExpectation:
-  Enabled: false
-
-# Offense count: 238
+# Offense count: 241
 RSpec/MultipleExpectations:
   Max: 8
 
-# Offense count: 394
-# Configuration parameters: MaxNesting.
+# Offense count: 181
+# Configuration parameters: Max.
 RSpec/NestedGroups:
   Enabled: false
 
+# Offense count: 24
+RSpec/ScatteredSetup:
+  Exclude:
+    - 'spec/integration/base_spec.rb'
+    - 'spec/integration/direct_container_spec.rb'
+    - 'spec/integration/has_and_belongs_to_many_associations_spec.rb'
+    - 'spec/integration/indexing_spec.rb'
+    - 'spec/integration/indirect_container_spec.rb'
+    - 'spec/integration/json_serialization_spec.rb'
+    - 'spec/unit/attached_files_spec.rb'
+    - 'spec/unit/base_spec.rb'
+    - 'spec/unit/loadable_from_json_spec.rb'
+    - 'spec/unit/rdf/indexing_service_spec.rb'
+
 # Offense count: 94
 RSpec/SubjectStub:
-  Enabled: false
+  Exclude:
+    - 'spec/integration/associations_spec.rb'
+    - 'spec/integration/autosave_association_spec.rb'
+    - 'spec/integration/versionable_spec.rb'
+    - 'spec/unit/attached_files_spec.rb'
+    - 'spec/unit/base_extra_spec.rb'
+    - 'spec/unit/file_configurator_spec.rb'
+    - 'spec/unit/file_spec.rb'
+    - 'spec/unit/has_and_belongs_to_many_association_spec.rb'
+    - 'spec/unit/persistence_spec.rb'
+    - 'spec/unit/solr_config_options_spec.rb'
+    - 'spec/unit/validations_spec.rb'
 
+# Offense count: 20
+# Configuration parameters: IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/unit/association_hash_spec.rb'
+    - 'spec/unit/files_hash_spec.rb'
+    - 'spec/unit/query_spec.rb'
+    - 'spec/unit/schema_indexing_strategy_spec.rb'
+    - 'spec/unit/solr_config_options_spec.rb'
+    - 'spec/unit/solr_service_spec.rb'
+
+# Offense count: 3
+Rails/FilePath:
+  Exclude:
+    - 'lib/active_fedora/file_configurator.rb'
+    - 'spec/unit/file_configurator_spec.rb'
+
+# Offense count: 2
+Security/MarshalLoad:
+  Exclude:
+    - 'spec/integration/marshal_spec.rb'
+
+# Offense count: 20
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Enabled: false
+
+# Offense count: 20
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
+  Exclude:
+    - 'spec/integration/associations_spec.rb'
+    - 'spec/unit/ordered_spec.rb'
+    - 'spec/unit/orders/ordered_list_spec.rb'

data/active-fedora.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.8'
-  s.add_development_dependency "rubocop", '~> 0.42.0'
-  s.add_development_dependency "rubocop-rspec", '~> 1.8.0'
+  s.add_development_dependency "rubocop", '~> 0.47.1'
+  s.add_development_dependency "rubocop-rspec", '~> 1.12.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/lib/active_fedora.rb

@@ -196,11 +196,11 @@ module ActiveFedora #:nodoc:
     #  ActiveFedora.environment => "test"
     def environment
       if config_options.fetch(:environment, nil)
-        return config_options[:environment]
+        config_options[:environment]
       elsif defined?(Rails.env) && !Rails.env.nil?
-        return Rails.env.to_s
+        Rails.env.to_s
       elsif defined?(ENV['environment']) && !ENV['environment'].nil?
-        return ENV['environment']
+        ENV['environment']
       elsif defined?(ENV['RAILS_ENV']) && !ENV['RAILS_ENV'].nil?
         raise "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'"
       else

data/lib/active_fedora/associations/association.rb

@@ -202,8 +202,7 @@ module ActiveFedora
         # the target is stale.
         #
         # This is only relevant to certain associations, which is why it returns nil by default.
-        def stale_state
-        end
+        def stale_state; end
 
         def build_record(attributes)
           reflection.build_association(attributes) do |record|

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -22,7 +22,9 @@ module ActiveFedora
         # Update the membership triples (and no other triples) on the the owner's resource
         if owner.persisted?
           pattern = ::RDF::Query::Pattern.new(predicate: options[:predicate])
-          new_resource = owner.dup.reload.resource
+          new_resource = ActiveFedora::Base.uncached do
+            owner.dup.reload.resource
+          end
           owner.resource.delete_insert([pattern], new_resource.query(pattern))
         end
         super

data/lib/active_fedora/associations/builder/association.rb

@@ -63,8 +63,7 @@ module ActiveFedora::Associations::Builder
       name
     end
 
-    def self.define_extensions(_model, _name)
-    end
+    def self.define_extensions(_model, _name); end
 
     def self.define_callbacks(model, reflection)
       if dependent = reflection.options[:dependent]

data/lib/active_fedora/associations/null_validator.rb

@@ -2,7 +2,6 @@ module ActiveFedora::Associations
   ##
   # An association type validator which does no validation.
   class NullValidator
-    def self.validate!(_reflection, _object)
-    end
+    def self.validate!(_reflection, _object); end
   end
 end

data/lib/active_fedora/containers/container.rb

@@ -28,7 +28,6 @@ module ActiveFedora
     private
 
       # Don't allow directly setting contained
-      def contained=(*_args)
-      end
+      def contained=(*_args); end
   end
 end

data/lib/active_fedora/file.rb

@@ -140,8 +140,7 @@ module ActiveFedora
     end
 
     # serializes any changed data into the content field
-    def serialize!
-    end
+    def serialize!; end
 
     def to_solr(solr_doc = {}, _opts = {})
       solr_doc

data/lib/active_fedora/file_configurator.rb

@@ -108,7 +108,7 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = YAML.load(config_erb)
+        fedora_yml = YAML.safe_load(config_erb)
       rescue Psych::SyntaxError => e
         raise "fedora.yml was found, but could not be parsed. " \
               "Error #{e.message}"
@@ -132,7 +132,7 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = YAML.load(config_erb)
+        solr_yml = YAML.safe_load(config_erb)
       rescue StandardError
         raise("solr.yml was found, but could not be parsed.\n")
       end

data/lib/active_fedora/indexers/null_indexer.rb

@@ -7,7 +7,6 @@ module ActiveFedora::Indexers
       self
     end
 
-    def index(_)
-    end
+    def index(_); end
   end
 end

data/lib/active_fedora/null_logger.rb

@@ -1,11 +1,9 @@
 module ActiveFedora
   class NullLogger < Logger
-    def initialize(*)
-    end
+    def initialize(*); end
 
     # allows all the usual logger method calls (warn, info, error, etc.)
-    def add(*)
-    end
+    def add(*); end
 
     # In the NullLogger there are no levels, so none of these should be true.
     [:debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|

data/lib/active_fedora/persistence.rb

@@ -205,8 +205,7 @@ module ActiveFedora
       end
 
       # Override to tie in an ID minting service
-      def assign_id
-      end
+      def assign_id; end
 
       # This is only used when creating a new record. If the object doesn't have an id
       # and assign_id can mint an id for the object, then assign it to the resource.
@@ -228,6 +227,7 @@ module ActiveFedora
         root_resource_path
       end
 
+      # Check to see if the :base_path (from fedora.yml) exists in Fedora. If it doesn't exist, then create it.
       def init_root_path
         path = root_resource_path.gsub(/^\//, "")
         ActiveFedora.fedora.connection.head(path)

data/lib/active_fedora/property.rb

@@ -7,7 +7,6 @@ module ActiveFedora
       @instance_variable_name = "@#{@name}"
     end
 
-    def field
-    end
+    def field; end
   end
 end

data/lib/active_fedora/type/value.rb

@@ -11,8 +11,7 @@ module ActiveFedora
         @limit = limit
       end
 
-      def type # :nodoc:
-      end
+      def type; end
 
       # Converts a value from database input to the appropriate ruby type. The
       # return value of this method will be returned from
@@ -102,8 +101,7 @@ module ActiveFedora
         [self.class, precision, scale, limit].hash
       end
 
-      def assert_valid_value(*)
-      end
+      def assert_valid_value(*); end
 
       private
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.4".freeze
+  VERSION = "11.1.5".freeze
 end

data/spec/integration/associations_spec.rb

@@ -16,8 +16,8 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :Person)
     end
 
-    let(:person) { Person.create }
     subject(:book) { Book.new(author: person) }
+    let(:person) { Person.create }
 
     it "goes" do
       book.save
@@ -511,8 +511,7 @@ describe ActiveFedora::Base do
             after_count(m.reload.library_books.count)
           end
 
-          def say_hi(_var)
-          end
+          def say_hi(_var); end
         end
         class Page < ActiveFedora::Base
           has_many :library_books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
@@ -524,14 +523,15 @@ describe ActiveFedora::Base do
       end
 
       describe "removing association" do
-        let(:p1) { Page.create }
-        let(:p2) { Page.create }
         subject(:book) do
           book = LibraryBook.create
           book.pages << p1 << p2
           book.save!
           book
         end
+        let(:p1) { Page.create }
+        let(:p2) { Page.create }
+
         it "saves between the before and after hooks" do
           expect(book).to receive(:before_count).with(1)
           expect(book).to receive(:after_count).with(0)

data/spec/integration/attached_files_spec.rb

@@ -37,11 +37,10 @@ describe ActiveFedora::AttachedFiles do
       end
     end
 
+    subject { ds.content }
     let(:file) { DSTest.create }
     let(:ds) { file.test_ds }
 
-    subject { ds.content }
-
     after do
       Object.send(:remove_const, :DSTest)
     end

data/spec/integration/collection_association_spec.rb

@@ -157,8 +157,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :Foo)
       end
 
-      let(:instance) { Foo::Container.new }
       subject { instance.items }
+      let(:instance) { Foo::Container.new }
 
       it { is_expected.to eq [] }
     end

data/spec/integration/direct_container_spec.rb

@@ -16,8 +16,8 @@ describe "Direct containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no files" do
-        let(:o) { FooHistory.new }
         subject { o.files }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }
@@ -124,8 +124,8 @@ describe "Direct containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no files" do
-        let(:o) { FooHistory.new }
         subject { o.files }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }

data/spec/integration/fedora_solr_sync_spec.rb

@@ -17,8 +17,8 @@ describe "fedora_solr_sync_issues" do
     Object.send(:remove_const, :ParentThing)
   end
 
-  let(:parent) { ParentThing.create }
   subject(:child) { ChildThing.create parent: parent }
+  let(:parent) { ParentThing.create }
 
   before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, child.uri).delete }
 

data/spec/integration/generators/fedora_generator_spec.rb

@@ -4,7 +4,7 @@ require 'generators/active_fedora/config/fedora/fedora_generator'
 describe ActiveFedora::Config::FedoraGenerator do
   describe "#fcrepo_wrapper_config" do
     let(:generator) { described_class.new }
-    let(:files_to_test) {[
+    let(:files_to_test) { [
       'config/fcrepo_wrapper_test.yml',
       '.fcrepo_wrapper'
     ]}

data/spec/integration/generators/solr_generator_spec.rb

@@ -4,7 +4,7 @@ require 'generators/active_fedora/config/solr/solr_generator'
 describe ActiveFedora::Config::SolrGenerator do
   describe "#solr_wrapper_config" do
     let(:generator) { described_class.new }
-    let(:files_to_test) {[
+    let(:files_to_test) { [
       'config/solr_wrapper_test.yml',
       '.solr_wrapper'
     ]}

data/spec/integration/has_many_associations_spec.rb

@@ -28,17 +28,17 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       context "when the owner is not saved, and potential targets (Books) exist" do
+        subject { library.books.count }
         let!(:book) { Book.create }
         let(:library) { Library.new }
-        subject { library.books.count }
         # it excludes the books that aren't associated
         it { is_expected.to eq 0 }
       end
 
       context "when the owner is saved with associations" do
+        subject { library.reload; library.books.count }
         let(:book) { Book.create }
         let!(:library) { Library.create(books: [book]) }
-        subject { library.reload; library.books.count }
         # it excludes the books that are associated
         it { is_expected.to eq 1 }
       end
@@ -55,13 +55,13 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       context "loading the association prior to a save that affects the association" do
-        let(:library) { Library.new }
         before do
           Book.create
           library.books
           library.save
         end
         subject { library.books.size }
+        let(:library) { Library.new }
         it { is_expected.to eq 0 }
       end
     end
@@ -396,8 +396,6 @@ describe ActiveFedora::Associations::HasManyAssociation do
         Object.send(:remove_const, :Library)
       end
 
-      let(:library) { Library.create }
-
       before do
         library.books.create(title: ["Great Book"])
         library.books.first.title = ["Better book"]
@@ -405,6 +403,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       subject(:books) { library.books(true) }
+      let(:library) { Library.create }
 
       it "saves the new title" do
         expect(books.first.title).to eq ["Better book"]

data/spec/integration/indirect_container_spec.rb

@@ -114,8 +114,8 @@ describe "Indirect containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no related_objects" do
-        let(:o) { FooHistory.new }
         subject { o.related_objects }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }
@@ -263,8 +263,8 @@ describe "Indirect containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no related_objects" do
-        let(:o) { FooHistory.new }
         subject { o.related_objects }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }

data/spec/integration/solr_hit_spec.rb

@@ -11,6 +11,7 @@ describe ActiveFedora::SolrHit do
     Object.send(:remove_const, :Foo)
   end
 
+  subject(:solr_hit) { described_class.new(doc) }
   let(:another) { Foo.create }
 
   let!(:obj) { Foo.create!(
@@ -19,7 +20,6 @@ describe ActiveFedora::SolrHit do
   ) }
 
   let(:doc) { obj.to_solr }
-  subject(:solr_hit) { described_class.new(doc) }
 
   describe "#reify" do
     let(:solr_reified) { solr_hit.reify }

data/spec/integration/versionable_spec.rb

@@ -32,6 +32,8 @@ describe ActiveFedora::Versionable do
     end
 
     describe 'sorting versions' do
+      subject(:graph) { ActiveFedora::VersionsGraph.new }
+
       before do
         allow(graph).to receive(:fedora_versions) { versions }
       end
@@ -40,8 +42,6 @@ describe ActiveFedora::Versionable do
       let(:version2) { instance_double(ActiveFedora::VersionsGraph::ResourceVersion, uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e790373a67-c9ee-447d-b740-4faa882b1a1f', label: 'version2', created: '2015-04-02T19:54:45.96Z') }
       let(:versions) { [version1, version2] }
 
-      subject(:graph) { ActiveFedora::VersionsGraph.new }
-
       it 'sorts by DateTime' do
         expect(graph.first).to eq version2
       end

data/spec/unit/attached_files_spec.rb

@@ -110,20 +110,25 @@ describe ActiveFedora::AttachedFiles do
   end
 
   describe "#accessor_name" do
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'abc')).to eq 'abc'
+    subject { af_base.send(:accessor_name, value) }
+    context "with lowercase" do
+      let(:value) { 'abc' }
+      it { is_expected.to eq 'abc' }
     end
 
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'ARCHIVAL_XML')).to eq 'ARCHIVAL_XML'
+    context "with uppercase" do
+      let(:value) { 'ARCHIVAL_XML' }
+      it { is_expected.to eq 'ARCHIVAL_XML' }
     end
 
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'descMetadata')).to eq 'descMetadata'
+    context "with camelcase" do
+      let(:value) { 'descMetadata' }
+      it { is_expected.to eq 'descMetadata' }
     end
 
-    it "hash-erizes underscores" do
-      expect(af_base.send(:accessor_name, 'a-b')).to eq 'a_b'
+    context "with dashes" do
+      let(:value) { 'a-b' }
+      it { is_expected.to eq 'a_b' }
     end
   end
 

data/spec/unit/attributes_spec.rb

@@ -15,8 +15,8 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :BarHistory4)
     end
 
-    let(:obj) { BarHistory4.new(title: ['test1']) }
     subject(:history) { obj }
+    let(:obj) { BarHistory4.new(title: ['test1']) }
 
     describe "#attribute_names" do
       context "on an instance" do
@@ -60,8 +60,8 @@ describe ActiveFedora::Base do
           history.library = library
         end
 
-        let(:library) { BarHistory4.create }
         subject(:history) { BarHistory2.new }
+        let(:library) { BarHistory4.create }
 
         after do
           Object.send(:remove_const, :BarHistory2)

data/spec/unit/base_spec.rb

@@ -63,8 +63,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :FooHistory)
       end
 
-      let(:instance) { FooHistory.new(title: ['A label']) }
       subject { instance.rdf_label }
+      let(:instance) { FooHistory.new(title: ['A label']) }
 
       it { is_expected.to eq ['A label'] }
     end
@@ -88,8 +88,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :Creator)
       end
 
-      let(:instance) { Creator.new(foaf_name: ['Carolyn'], job: ['Developer']) }
       subject { instance.rdf_label }
+      let(:instance) { Creator.new(foaf_name: ['Carolyn'], job: ['Developer']) }
 
       it { is_expected.to eq ['Developer'] }
     end

data/spec/unit/callback_spec.rb

@@ -24,7 +24,7 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :CallbackStub)
   end
 
-  it "has after_initialize, before_save,after_save, before_create, after_create, after_update, before_update, before_destroy" do
+  it "has after_initialize, before_save, after_save, before_create, after_create" do
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive :b_create
     allow_any_instance_of(CallbackStub).to receive :a_create
@@ -34,7 +34,7 @@ describe ActiveFedora::Base do
     @cb.save
   end
 
-  it "has after_initialize, before_save,after_save, before_create, after_create, after_update, before_update, before_destroy" do
+  it "has after_initialize, before_save, after_save, before_create, after_create, after_update, before_update, before_destroy" do
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive(:b_create)
     allow_any_instance_of(CallbackStub).to receive(:a_create)

data/spec/unit/change_set_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::ChangeSet do
-  let(:change_set) { described_class.new(base, base.resource, base.changed_attributes.keys) }
-  subject { change_set }
+  subject(:change_set) { described_class.new(base, base.resource, base.changed_attributes.keys) }
 
   context "with an unchanged object" do
     let(:base) { ActiveFedora::Base.new }

data/spec/unit/collection_proxy_spec.rb

@@ -14,11 +14,12 @@ describe ActiveFedora::Associations::CollectionProxy do
   end
 
   describe "#spawn" do
+    subject { proxy.spawn }
+
     let(:reflection)  { ActiveFedora::Reflection.create(:has_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
     let(:association) { ActiveFedora::Associations::HasManyAssociation.new(Book.new, reflection) }
     let(:proxy)       { described_class.new(association) }
 
-    subject { proxy.spawn }
     it { is_expected.to be_instance_of ActiveFedora::Relation }
   end
 end

data/spec/unit/core_spec.rb

@@ -11,8 +11,8 @@ describe ActiveFedora::Base do
     end
   end
 
-  let(:library) { Library.create }
   subject(:book) { Book.new(library: library, title: "War and Peace", publisher: "Random House") }
+  let(:library) { Library.create }
 
   after do
     Object.send(:remove_const, :Book)
@@ -117,8 +117,8 @@ describe ActiveFedora::Base do
   end
 
   describe "id_to_uri" do
-    let(:id) { '123456w' }
     subject(:uri) { described_class.id_to_uri(id) }
+    let(:id) { '123456w' }
 
     context "with no custom proc is set" do
       it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/123456w" }
@@ -157,8 +157,8 @@ describe ActiveFedora::Base do
   end
 
   describe "uri_to_id" do
-    let(:uri) { "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
     subject(:uri_id) { described_class.uri_to_id(uri) }
+    let(:uri) { "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
 
     context "with no custom proc is set" do
       it { is_expected.to eq 'foo/123456w' }

data/spec/unit/default_model_mapper_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe ActiveFedora::DefaultModelMapper do
+  subject(:mapper) { described_class.new classifier_class: classifier, solr_field: solr_field, predicate: predicate }
   let(:classifier) { class_double(ActiveFedora::ModelClassifier) }
   let(:classifier_instance) { instance_double(ActiveFedora::ModelClassifier) }
   let(:solr_field) { 'solr_field' }
   let(:predicate) { 'info:predicate' }
-  subject(:mapper) { described_class.new classifier_class: classifier, solr_field: solr_field, predicate: predicate }
 
   describe '#classifier' do
     context 'with a solr document' do

data/spec/unit/file_path_builder_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe ActiveFedora::FilePathBuilder do
   describe ".build" do
-    let(:parent) { ActiveFedora::Base.new(id: '1234') }
     subject { described_class.build(parent, nil, 'FOO') }
+    let(:parent) { ActiveFedora::Base.new(id: '1234') }
 
     it { is_expected.to eq 'FOO1' }
 

data/spec/unit/file_spec.rb

@@ -1,29 +1,27 @@
 require 'spec_helper'
 
 describe ActiveFedora::File do
-  let(:file) { described_class.new }
-
-  subject(:af_file) { file }
+  subject(:af_file) { described_class.new }
 
   it { is_expected.not_to be_metadata }
 
   describe "#save!" do
     context "when updating metadata" do
       before do
-        file.content = 'foo'
-        file.save!
-        file.mime_type = 'application/pdf'
+        af_file.content = 'foo'
+        af_file.save!
+        af_file.mime_type = 'application/pdf'
       end
 
       it "Updates metadata" do
-        expect(file.metadata).to receive(:save)
-        file.save!
+        expect(af_file.metadata).to receive(:save)
+        af_file.save!
       end
     end
   end
 
   describe "#behaves_like_io?" do
-    subject { file.send(:behaves_like_io?, object) }
+    subject { af_file.send(:behaves_like_io?, object) }
 
     context "with a File" do
       let(:object) { File.new __FILE__ }
@@ -43,20 +41,20 @@ describe ActiveFedora::File do
   end
 
   describe "#uri" do
-    subject(:uri) { file.uri }
+    subject(:uri) { af_file.uri }
 
     context "when the file is in an ldp:BasicContainer" do
       let(:parent) { ActiveFedora::Base.new(id: '1234') }
 
       context "and it's initialized with the URI" do
-        let(:file) { described_class.new(parent.uri + "/FOO1") }
+        let(:af_file) { described_class.new(parent.uri + "/FOO1") }
         it "works" do
           expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
 
       context "and it's initialized with an ID" do
-        let(:file) { described_class.new(parent.id + "/FOO1") }
+        let(:af_file) { described_class.new(parent.id + "/FOO1") }
         it "works" do
           expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
@@ -184,12 +182,12 @@ describe ActiveFedora::File do
 
   context "when the file has local content" do
     before do
-      file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
-      file.content = "hi there"
+      af_file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
+      af_file.content = "hi there"
     end
 
     describe "#inspect" do
-      subject { file.inspect }
+      subject { af_file.inspect }
       it { is_expected.to eq "#<ActiveFedora::File uri=\"http://localhost:8983/fedora/rest/test/1234/abcd\" >" }
     end
   end
@@ -214,11 +212,11 @@ describe ActiveFedora::File do
   end
 
   context "original_name" do
-    subject { file.original_name }
+    subject { af_file.original_name }
 
     context "on a new file" do
       context "that has a name set locally" do
-        before { file.original_name = "my_image.png" }
+        before { af_file.original_name = "my_image.png" }
         it { is_expected.to eq "my_image.png" }
       end
 
@@ -252,7 +250,7 @@ describe ActiveFedora::File do
   end
 
   context "digest" do
-    subject { file.digest }
+    subject(:digest) { af_file.digest }
 
     context "on a new file" do
       it { is_expected.to be_empty }
@@ -274,11 +272,11 @@ describe ActiveFedora::File do
         predicate = ::RDF::URI("http://fedora.info/definitions/v4/repository#digest")
         object = RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")
         graph = ActiveTriples::Resource.new
-        graph << RDF::Statement.new(file.uri, predicate, object)
-        allow(file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
+        graph << RDF::Statement.new(af_file.uri, predicate, object)
+        allow(af_file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
       end
       it "falls back on fedora:digest if premis:hasMessageDigest is not present" do
-        expect(file.digest.first).to be_kind_of RDF::URI
+        expect(digest.first).to be_kind_of RDF::URI
       end
     end
   end
@@ -308,14 +306,14 @@ describe ActiveFedora::File do
   end
 
   describe "#create_date" do
-    subject { file.create_date }
+    subject { af_file.create_date }
     describe "when new record" do
       it { is_expected.to be_nil }
     end
     describe "when persisted" do
       before do
-        file.content = "foo"
-        file.save!
+        af_file.content = "foo"
+        af_file.save!
       end
       it { is_expected.to be_a(DateTime) }
     end

data/spec/unit/files_hash_spec.rb

@@ -10,13 +10,12 @@ describe ActiveFedora::FilesHash do
 
   after { Object.send(:remove_const, :FilesContainer) }
 
+  subject(:file_hash) { described_class.new(container) }
   let(:reflection) { instance_double(ActiveFedora::Reflection::MacroReflection) }
   let(:association) { instance_double(ActiveFedora::Associations::SingularAssociation, reader: object) }
   let(:object) { double('object') }
   let(:container) { FilesContainer.new }
 
-  subject(:file_hash) { described_class.new(container) }
-
   describe "#key?" do
     context 'when the key is present' do
       it "is true" do

data/spec/unit/filter_spec.rb

@@ -120,14 +120,14 @@ describe ActiveFedora::Associations::FilterAssociation do
   end
 
   describe "#delete" do
+    subject { image.members }
+
     let(:another_object) { TestObject.new }
     before do
       image.members = [test_object, test_collection, another_object]
       image.child_objects.delete(test_object)
     end
 
-    subject { image.members }
-
     it { is_expected.to contain_exactly test_collection, another_object }
   end
 end

data/spec/unit/fixity_service_spec.rb

@@ -11,8 +11,8 @@ describe ActiveFedora::FixityService do
 
   describe "initialize" do
     context "with a string" do
-      let(:uri) { 'http://path/to/resource' }
       subject { service.target }
+      let(:uri) { 'http://path/to/resource' }
       it { is_expected.to eq 'http://path/to/resource' }
     end
 

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -77,8 +77,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     before do
       class Collection < ActiveFedora::Base
         has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base", after_remove: :remove_member
-        def remove_member(_m)
-        end
+        def remove_member(_m); end
       end
 
       class Thing < ActiveFedora::Base

data/spec/unit/has_many_association_spec.rb

@@ -33,11 +33,11 @@ describe ActiveFedora::Associations::HasManyAssociation do
   end
 
   describe "#find_polymorphic_inverse" do
+    subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
+
     let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
-    subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
-
     context "when a has_many is present" do
       before do
         # :books must come first, so that we can test that is being passed over in favor of :contents

data/spec/unit/indexing_spec.rb

@@ -53,9 +53,8 @@ describe ActiveFedora::Indexing do
       Object.send(:remove_const, :SpecNode)
     end
 
-    let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
-
     subject(:solr_doc) { test_object.to_solr }
+    let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
 
     it "indexs the rdf properties" do
       expect(solr_doc).to include('title_tesim' => ['first title'], 'abstract_ssi' => 'The abstract')

data/spec/unit/inheritance_spec.rb

@@ -17,8 +17,9 @@ describe ActiveFedora::Base do
       has_subresource 'barstream', class_name: 'MyDS'
     end
   end
-  let(:f) { Foo.new }
+
   subject(:attached_files) { f.attached_files }
+  let(:f) { Foo.new }
 
   it "doesn't overwrite stream specs" do
     expect(attached_files.values).to match_array [MyDS, MySample]

data/spec/unit/model_classifier_spec.rb

@@ -10,8 +10,8 @@ describe ActiveFedora::ModelClassifier do
     end
   end
 
-  let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
   subject(:classifier) { described_class.new class_names }
+  let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
 
   describe ".class_from_string" do
     it "returns class constants based on strings" do

data/spec/unit/pathing_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   describe ".uri_prefix" do
-    let(:path) { "foo" }
-
     before do
       class FooHistory < ActiveFedora::Base
         def uri_prefix
@@ -18,6 +16,7 @@ describe ActiveFedora::Base do
     end
 
     subject(:history) { FooHistory.new(title: ["Root foo"]) }
+    let(:path) { "foo" }
 
     it { is_expected.to have_uri_prefix }
 

data/spec/unit/query_result_builder_spec.rb

@@ -5,8 +5,7 @@ describe ActiveFedora::QueryResultBuilder do
     before(:all) do
       class AudioRecord < ActiveFedora::Base
         attr_accessor :id
-        def self.connection_for_id(_id)
-        end
+        def self.connection_for_id(_id); end
       end
       @sample_solr_hits = [{ "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] },
                            { "id" => "my:_ID2_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] },

data/spec/unit/query_spec.rb

@@ -242,9 +242,9 @@ describe ActiveFedora::Base do
   end
 
   describe '#search_with_conditions' do
+    subject(:search_with_conditions) { klass.search_with_conditions(conditions) }
     let(:mock_result) { double('Result') }
     let(:klass) { SpecModel::Basic }
-    subject(:search_with_conditions) { klass.search_with_conditions(conditions) }
 
     before do
       expect(ActiveFedora::SolrService).to receive(:query)

data/spec/unit/reflection_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe ActiveFedora::Reflection::AssociationReflection do
   describe "#derive_foreign_key" do
+    subject { instance.send :derive_foreign_key }
     let(:name) { 'dummy' }
     let(:options) { { inverse_of: :default_permissions } }
     let(:active_fedora) { instance_double(ActiveFedora::Base) }
-    subject { instance.send :derive_foreign_key }
 
     context "when a has_many" do
       let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }
@@ -26,10 +26,10 @@ describe ActiveFedora::Reflection::AssociationReflection do
     end
 
     after { Object.send(:remove_const, :Dummy) }
+    subject { instance.send :automatic_inverse_of }
     let(:name) { 'dummy' }
     let(:options) { { as: 'foothing' } }
     let(:active_fedora) { instance_double(ActiveFedora::Base) }
-    subject { instance.send :automatic_inverse_of }
 
     context "when a has_many" do
       let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }

data/spec/unit/solr_hit_spec.rb

@@ -4,8 +4,7 @@ describe ActiveFedora::SolrHit do
   before(:all) do
     class AudioRecord < ActiveFedora::Base
       attr_accessor :id
-      def self.connection_for_id(_id)
-      end
+      def self.connection_for_id(_id); end
     end
   end
 

data/spec/unit/sparql_insert_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe ActiveFedora::SparqlInsert do
-  let(:change_set) { ActiveFedora::ChangeSet.new(base, base.resource, base.changed_attributes.keys) }
   subject(:sparql_insert) { described_class.new(change_set.changes) }
+  let(:change_set) { ActiveFedora::ChangeSet.new(base, base.resource, base.changed_attributes.keys) }
 
   context "with a changed object" do
     before do

data/spec/unit/with_metadata/metadata_node_spec.rb

@@ -24,8 +24,8 @@ describe ActiveFedora::WithMetadata::MetadataNode do
   end
 
   describe "changes_for_update" do
-    let(:changes_for_update) { node.send(:changes_for_update) }
     subject { changes_for_update }
+    let(:changes_for_update) { node.send(:changes_for_update) }
 
     context "when type is not set" do
       it { is_expected.to eq({}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.4
+  version: 11.1.5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -280,28 +280,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.0
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -684,7 +684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.