active-fedora 11.1.2 → 11.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27e9aa8b8f46d2a0e3207ba20da3aa25d553bac
-  data.tar.gz: 8aac94771d8015432aa789bf807e514c6211be15
+  metadata.gz: 6fbb07414e2177fa95ea8349817976b1b37a765c
+  data.tar.gz: 6d2310b2bd54270c779e9f3c183b3aad790b68ad
 SHA512:
-  metadata.gz: 7bc2ac85b840d7a5c8085a3d80d6407a6e3f315bf51fe7bd804b29818e375a939c9baf71560e6c1459f149d6cc6835af14e71128229d3255d87edaf818d3851e
-  data.tar.gz: d0c5f0849a3de8577174e28feda066fa61c53f5a8d30b6d27b6ffc1c2f4eb45c4c353a8ff6a188afb36eec98ebcac5f3111da7cbe0c51c9bd875b719b55420e7
+  metadata.gz: 4fa39573b64bac45e116fbe334e657ef3f1b01e15a8a93cade30080c4d55fa2628e2b5de5bb15482880951f401fcea90b5736744ee141190f4ee03847015edd0
+  data.tar.gz: 14bf26166bc2d0a1e52455686a952922748036d3dd6a756be9e9264c3802032420ce0a0ddc608dcbb49050cea8d26ac3e339b38e3250b2177df4718e1eea2592

data/.rubocop.yml

@@ -221,6 +221,10 @@ Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/active_fedora/file/attributes.rb'
 
+Performance/RedundantMerge:
+  Exclude:
+    - 'lib/active_fedora/railtie.rb'
+
 Rails:
   Enabled: true
 

data/CONTRIBUTING.md

@@ -3,6 +3,13 @@
 We want your help to make Project Hydra great.
 There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
+## Code of Conduct
+
+The Hydra community is dedicated to providing a welcoming and positive experience for all its
+members, whether they are at a formal gathering, in a social setting, or taking part in activities
+online.  Please see our [Code of Conduct](https://wiki.duraspace.org/display/hydra/Code+of+Conduct)
+for more information.
+
 ## Hydra Project Intellectual Property Licensing and Ownership
 
 All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
@@ -16,8 +23,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Reporting Issues
 * Making Changes
+* Documenting Code
+* Committing Changes
 * Submitting Changes
-* Merging Changes
+* Reviewing and Merging Changes
 
 ### Reporting Issues
 
@@ -38,8 +47,28 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Then checkout the new branch with `git checkout fix/master/my_contribution`.
   * Please avoid working directly on the `master` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make sure you have added sufficient tests and documentation for your changes.
+  * Test functionality with RSpec; est features / UI with Capybara.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+### Documenting Code
+
+* All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  * Documentation should seek to answer the question "why does this code exist?"
+* Document private / protected methods as desired.
+* If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
+  * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
+  * We will all be understanding of one another's time constraints in this area.
+* YARD examples:
+  * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
+  * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
+* [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
+
+### Committing changes
+
 * Make commits of logical units.
-  * Your commit should include a high level description of your work in HISTORY.textile 
+  * Your commit should include a high level description of your work in HISTORY.textile
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
@@ -60,7 +89,9 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
         class PostsController
           def index
-            respond_with Post.limit(10)
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
           end
         end
 
@@ -72,38 +103,53 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
       long to fit in 72 characters
 ```
 
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-* When you are ready to submit a pull request
-
 ### Submitting Changes
 
-[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
-  * It is likely a good idea to run your tests again.
-* Squash the commits for your branch into one commit
-  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
-  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * It is a good idea to run your tests again.
+* If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
+  * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 
-### Merging Changes
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+Common checks that may occur in our repositories:
+
+1. Travis CI - where our automated tests are running
+2. Hound CI - where we check for style violations
+3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
+
+If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
+
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+* Ask clarifying questions
+* State your understanding and expectations
+* Provide example code or alternate solutions, and explain why
+
+This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
 
-* It is considered "poor from" to merge your own request.
-* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
   * Does the commit message explain what is going on?
-  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
-  * Did the Travis tests complete successfully?
-* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
-* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+  * Does the description of the new/changed specs match your understanding of what the spec is doing?
+
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 

data/active-fedora.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.0'
 
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
-  s.add_dependency 'solrizer', '~> 3.4'
+  s.add_dependency 'solrizer', '>= 3.4', '< 5'
   s.add_dependency "activesupport", '>= 4.2.4', '< 6'
   s.add_dependency "activemodel", '>= 4.2', '< 6'
   s.add_dependency "active-triples", '~> 0.11.0'

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -17,6 +17,16 @@ module ActiveFedora
         record.base_path_for_resource = owner.uri.to_s
         super
       end
+
+      def reset
+        # 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
+          owner.resource.delete_insert([pattern], new_resource.query(pattern))
+        end
+        super
+      end
     end
   end
 end

data/lib/active_fedora/persistence.rb

@@ -41,6 +41,15 @@ module ActiveFedora
 
     alias update_attributes update
 
+    # Updates its receiver just like #update but calls #save! instead
+    # of +save+, so an exception is raised if the record is invalid and saving will fail.
+    def update!(attributes)
+      assign_attributes(attributes)
+      save!
+    end
+
+    alias update_attributes! update!
+
     # Deletes an object from Fedora and deletes the indexed record from Solr.
     # Delete does not run any callbacks, so consider using _destroy_ instead.
     # @param [Hash] opts

data/lib/active_fedora/railtie.rb

@@ -2,6 +2,10 @@ module ActiveFedora
   class Railtie < Rails::Railtie
     config.app_middleware.insert_after ::ActionDispatch::Callbacks,
                                        ActiveFedora::LdpCache
+    config.action_dispatch.rescue_responses.merge!(
+      "ActiveFedora::ObjectNotFoundError" => :not_found
+    )
+
     config.eager_load_namespaces << ActiveFedora
 
     initializer 'active_fedora.autoload', before: :set_autoload_paths do |app|

data/lib/active_fedora/relation/finder_methods.rb

@@ -112,7 +112,7 @@ module ActiveFedora
       result = search_with_conditions({ id: id }, opts)
 
       if result.empty?
-        raise ActiveFedora::ObjectNotFoundError, "Object #{id} not found in solr"
+        raise ActiveFedora::ObjectNotFoundError, "Object '#{id}' not found in solr"
       end
 
       result.first
@@ -191,10 +191,15 @@ module ActiveFedora
       def load_from_fedora(id, cast)
         raise ActiveFedora::ObjectNotFoundError if id.empty?
         resource = ActiveFedora.fedora.ldp_resource_service.build(klass, id)
-        raise ActiveFedora::ObjectNotFoundError if resource.new?
+        raise_record_not_found_exception!(id) if resource.new?
         class_to_load(resource, cast).allocate.init_with_resource(resource) # Triggers the find callback
       end
 
+      def raise_record_not_found_exception!(id)
+        name = @klass.name
+        raise ActiveFedora::ObjectNotFoundError, "Couldn't find #{name} with 'id'=#{id}"
+      end
+
       def class_to_load(resource, cast)
         if @klass == ActiveFedora::Base && cast == false
           ActiveFedora::Base

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.2".freeze
+  VERSION = "11.1.3".freeze
 end

data/spec/integration/basic_contains_association_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedora::Base do
-  let(:model) { Source.new }
-
+describe ActiveFedora::Associations::BasicContainsAssociation do
   context "with a file" do
     before do
       class Source < ActiveFedora::Base
@@ -10,6 +8,8 @@ describe ActiveFedora::Base do
       end
     end
 
+    let(:model) { Source.new }
+
     after do
       Object.send(:remove_const, :Source)
     end
@@ -104,5 +104,18 @@ describe ActiveFedora::Base do
           .and change { Thing.count }.by(-2)
       end
     end
+
+    describe "#reload" do
+      before do
+        model.save!
+        child = model.contains.create(title: ['title 1'])
+        model.reload # Cause the model to load its graph that contains the child ids.
+        ActiveFedora::Base.find(child.id).destroy
+      end
+
+      it "can reload without attempting to load any deleted objects" do
+        expect { model.contains.reload }.not_to raise_error
+      end
+    end
   end
 end

data/spec/unit/finder_methods_spec.rb

@@ -101,7 +101,7 @@ describe ActiveFedora::FinderMethods do
       end
 
       it "returns the document" do
-        expect { finder.search_by_id('x') }.to raise_error ActiveFedora::ObjectNotFoundError
+        expect { finder.search_by_id('x') }.to raise_error ActiveFedora::ObjectNotFoundError, "Object 'x' not found in solr"
       end
     end
   end

data/spec/unit/query_spec.rb

@@ -56,7 +56,7 @@ describe ActiveFedora::Base do
     describe "with :cast false" do
       describe "and an id is specified" do
         it "raises an exception if it is not found" do
-          expect { SpecModel::Basic.find("_ID_") }.to raise_error ActiveFedora::ObjectNotFoundError
+          expect { SpecModel::Basic.find("_ID_") }.to raise_error ActiveFedora::ObjectNotFoundError, "Couldn't find SpecModel::Basic with 'id'=_ID_"
         end
       end
     end

data/spec/unit/validations_spec.rb

@@ -41,11 +41,34 @@ describe ActiveFedora::Base do
   end
 
   describe "#save!" do
-    before { allow(validation_stub).to receive(:_create_record) } # prevent saving to Fedora/Solr
+    before { expect(validation_stub).to receive(:_create_record) } # prevent saving to Fedora/Solr
 
     it "validates only once" do
       expect(validation_stub).to receive(:perform_validations).once.and_return(true)
       validation_stub.save!
     end
   end
+
+  describe "#update!" do
+    before do
+      allow(validation_stub).to receive(:new_record?).and_return(false)
+    end
+    context "when validations work" do
+      it "saves the record" do
+        expect(validation_stub).to receive(:_update_record) # prevent saving to Fedora/Solr
+        expect(validation_stub).to receive(:perform_validations).once.and_return(true)
+        validation_stub.update!(fubar: ['here'], swank: 'long enough')
+        expect(validation_stub.fubar).to eq ['here']
+      end
+    end
+
+    context "when validations fail" do
+      it "raises an error" do
+        expect(validation_stub).not_to receive(:_update_record)
+        expect(validation_stub).to receive(:perform_validations).once.and_return(false)
+        expect { validation_stub.update!(fubar: ['here'], swank: 'long enough') }.to raise_error ActiveFedora::RecordInvalid
+        expect(validation_stub.fubar).to eq ['here']
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.2
+  version: 11.1.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -36,16 +36,22 @@ dependencies:
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement