active-fedora 11.1.3 → 11.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6fbb07414e2177fa95ea8349817976b1b37a765c
-  data.tar.gz: 6d2310b2bd54270c779e9f3c183b3aad790b68ad
+SHA256:
+  metadata.gz: 2a1b653e61034a472c59722925334b0cfa2d83391a5e8f7ed89678fab2f729ac
+  data.tar.gz: 4cd25e244f319ea0eb84e0ea5c5067fc967764695073062ea510c0222dc7814b
 SHA512:
-  metadata.gz: 4fa39573b64bac45e116fbe334e657ef3f1b01e15a8a93cade30080c4d55fa2628e2b5de5bb15482880951f401fcea90b5736744ee141190f4ee03847015edd0
-  data.tar.gz: 14bf26166bc2d0a1e52455686a952922748036d3dd6a756be9e9264c3802032420ce0a0ddc608dcbb49050cea8d26ac3e339b38e3250b2177df4718e1eea2592
+  metadata.gz: 86a88288dede46d2a4fe40f1924434004b8f74d0b5452058c9f4aef8256d3147edc4fa62d2a6d1a626451e4cb16b78f9785b8564a694e1c4ded7b03409fdc752
+  data.tar.gz: daeb70527556e50848a9407e9dabaf2e5a051c6e942d5a49e01b4c90b6c3d61f92cdae307a781fe3b1d1a957943dd0eeeaa4a1b479f52addc0202154cec4e3aa

data/.rubocop.yml

@@ -106,7 +106,6 @@ Style/AndOr:
 Style/AccessorMethodName:
   Exclude:
     - 'lib/active_fedora/with_metadata/metadata_node.rb'
-    - 'lib/active_fedora/predicates.rb'
     - 'lib/active_fedora/fedora_attributes.rb'
     - 'lib/active_fedora/attribute_methods/dirty.rb'
     - 'lib/active_fedora/associations/has_many_association.rb'
@@ -207,7 +206,6 @@ Style/ClassVars:
     - 'spec/unit/finder_methods_spec.rb'
     - 'spec/unit/base_spec.rb'
     - 'spec/integration/indexing_spec.rb'
-    - 'lib/active_fedora/predicates.rb'
     - 'lib/active_fedora/identifiable.rb'
 
 Style/SignalException:
@@ -266,3 +264,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/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 cache: bundler
 sudo: false
-rvm: 2.4.0
+rvm: 2.4.1
 matrix:
   include:
-    - rvm: 2.3.3
-      env: "RAILS_VERSION=4.2.7.1"
-    - env: "RSOLR_VERSION=2.0.0.pre1"
+    - rvm: 2.3.4
+      env: "RAILS_VERSION=4.2.8"
+    - env: "RSOLR_VERSION=2.0.1"
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 before_install:

data/History.txt

@@ -1,3 +1,9 @@
+v11.2.1
+2017-06-12 — Bump LDP version to ~> 0.7.0 [Justin Coyne]
+
+v11.2.0
+(History is missing)
+
 v11.1.2
 2017-01-25: Eager load all the code in eager_load blocks [Justin Coyne]
 

data/README.md

@@ -81,7 +81,7 @@ solr_wrapper
 To start FCRepo, open another shell and run:
 
 ```bash
-fcrepo_wrapper -p 8984
+fcrepo_wrapper -p 8986
 ```
 
 Now you’re ready to run the tests. In the directory where active\_fedora

data/active-fedora.gemspec

@@ -20,20 +20,21 @@ Gem::Specification.new do |s|
   s.add_dependency "activemodel", '>= 4.2', '< 6'
   s.add_dependency "active-triples", '~> 0.11.0'
   s.add_dependency "deprecation"
-  s.add_dependency "ldp", '~> 0.6.0'
+  s.add_dependency "ldp", '~> 0.7.0'
+  s.add_dependency "ruby-progressbar", '~> 1.0'
 
   s.add_development_dependency "rails"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
-  s.add_development_dependency "solr_wrapper", "~> 0.15"
+  s.add_development_dependency "solr_wrapper", "~> 1.0"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.0"
   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/aggregation/list_source.rb

@@ -80,7 +80,7 @@ module ActiveFedora
           # Set node subjects to a term in AF JUST so that AF will persist the
           # sub-graphs.
           # TODO: Find a way to fix this.
-          self.nodes = nil
+          resource.set_value(:nodes, [])
           self.nodes += graph.subjects.to_a
           ordered_self.changes_committed!
         end

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/attached_files.rb

@@ -33,7 +33,11 @@ module ActiveFedora
       resource.query(subject: resource, predicate: ::RDF::Vocab::LDP.contains).objects.map(&:to_s)
     end
 
+    # Load any undeclared relationships or has_subresource relationships.  These are non-idiomatic LDP
+    # because we are going to find the subresource by knowing it's subpath ahead of time.
+    # Does nothing if this object is using idiomatic basic containment, by declaring `is_a_container`
     def load_attached_files
+      return if reflections[:contains] && reflections[:contains].macro == :is_a_container
       contains_assertions.each do |file_uri|
         path = file_uri.to_s.sub(uri + '/', '')
         next if association(path.to_sym)

data/lib/active_fedora/attributes/property_builder.rb

@@ -16,7 +16,7 @@ module ActiveFedora::Attributes
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
           if value.present? && !value.respond_to?(:each)
-            raise ArgumentError, "You attempted to set the property `#{name}' to a scalar value. However, this property is declared as being multivalued."
+            raise ArgumentError, "You attempted to set the property `#{name}' of \#{id} to a scalar value. However, this property is declared as being multivalued."
           end
           set_value(:#{name}, value)
         end
@@ -28,7 +28,7 @@ module ActiveFedora::Attributes
         def #{name}(*args)
           vals = get_values(:#{name})
           return nil unless vals
-          raise ActiveFedora::ConstraintError, "Expected \\"#{name}\\" to have 0-1 statements, but there are \#{vals.size}" if vals.size > 1
+          raise ActiveFedora::ConstraintError, "Expected \\"#{name}\\" of \#{id} to have 0-1 statements, but there are \#{vals.size}" if vals.size > 1
           vals.first
         end
       CODE
@@ -46,7 +46,7 @@ module ActiveFedora::Attributes
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)
           if value.respond_to?(:each) # singular
-            raise ArgumentError, "You attempted to set the property `#{name}' to an enumerable value. However, this property is declared as singular."
+            raise ArgumentError, "You attempted to set the property `#{name}' of \#{id} to an enumerable value. However, this property is declared as singular."
           end
           set_value(:#{name}, value)
         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

@@ -40,7 +40,7 @@ module ActiveFedora
           id = ActiveFedora::Associations::IDComposite.new([identifier], translate_uri_to_id).first
           @ldp_source = build_ldp_resource id
         else
-          raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{uri.class}"
+          raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{identifier.class}"
         end
 
         @attributes = {}.with_indifferent_access
@@ -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, [], [], true) # allow YAML aliases
       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, [], [], true) # allow YAML aliases
       rescue StandardError
         raise("solr.yml was found, but could not be parsed.\n")
       end

data/lib/active_fedora/fixity_service.rb

@@ -2,26 +2,57 @@ module ActiveFedora
   class FixityService
     extend ActiveSupport::Concern
 
-    attr_accessor :target, :response
+    attr_accessor :target
 
-    # @param [String, RDF::URI] target url for a Fedora resource
+    # @param [String, RDF::URI] target url for a Fedora resource.
     def initialize(target)
       raise ArgumentError, 'You must provide a uri' unless target
       @target = target.to_s
     end
 
-    # Executes a fixity check on Fedora and saves the Faraday::Response.
+    def response
+      @response ||= fixity_response_from_fedora
+    end
+
+    # For backwards compat, check always insists on doing a new request.
+    # you might want verified? instead which uses a cached request.
     # @return true or false
     def check
-      @response = fixity_response_from_fedora
+      @response = nil
+      verified?
+    end
+
+    # Executes a fixity check on Fedora
+    # @return true or false
+    def verified?
       status.include?(success)
     end
 
+    # An array of 1 or more literals reported by Fedora.
+    # See 'success' for which one indicates fixity check is good.
     def status
       fixity_graph.query(predicate: premis_status_predicate).map(&:object) +
         fixity_graph.query(predicate: fedora_status_predicate).map(&:object)
     end
 
+    # the currently calculated checksum, as a string URI, like
+    # "urn:sha1:09a848b79f86f3a4f3f301b8baafde455d6f8e0e"
+    def expected_message_digest
+      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasMessageDigest).first.try(:object).try(:to_s)
+    end
+
+    # integer, as reported by fedora. bytes maybe?
+    def expected_size
+      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasSize).first.try(:object).try(:to_s).try(:to_i)
+    end
+
+    # Fedora response as an ::RDF::Graph object. Public API, so consumers
+    # can do with it what they will, especially if future fedora versions
+    # add more things to it.
+    def response_graph
+      fixity_graph
+    end
+
     private
 
       def premis_status_predicate
@@ -46,7 +77,7 @@ module ActiveFedora
       end
 
       def fixity_graph
-        ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
+        @fixity_graph ||= ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
       end
 
       # See https://jira.duraspace.org/browse/FCREPO-1247

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