active-fedora 9.7.0 → 9.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02451c4f7df1542ec57c845259cc21eefd0aff2b
-  data.tar.gz: a689c5b349b6e55b1e63af345f1e81eac669e51a
+  metadata.gz: b84c2ad365e0934c1c9a6900e855dad6e3e0fb89
+  data.tar.gz: 138dc99577501a383818150e1e3ce25622312d90
 SHA512:
-  metadata.gz: 6e5b2b77aa673793101dfe20d17d7b6b58a8e936d10d5d9bd5d1285f392ada51b25808a89d1dd147dc6827868110d22ce868337b2b078e7ecd20b61ad5d9445f
-  data.tar.gz: cb38ad07691ed932faa31de89fdc1278b6b8f581e251fd9fd37a84a1fdc9c61b2c5a80eb889c90b3ff85c6553b70941b07e4db680f7ff21df3ee2ab0e778eff7
+  metadata.gz: 045396d2d76fc88b5f1ceb99340cb5dfebf6b0af631c13f2ae22d15c5de243758aeaf0717221cb202f310b846b2541f588e941741a081e8f16a71577c214ef76
+  data.tar.gz: 42aa7a98b66b0dcc517aa67ec26889b84850bc195d2f7d6b444520f0de9afc890a5144e553906982e6181542a129d616f8d9cfec36bd02f49d8a54d0d84a2a68

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  RunRailsCops: true
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
   Include:
     - '**/Rakefile'
@@ -9,10 +9,6 @@ AllCops:
     - 'script/**/*'
     - 'vendor/**/*'
 
-Lint/RescueException:
-  Exclude:
-    - 'lib/active_fedora/ldp_cache.rb'
-
 Lint/HandleExceptions:
   Exclude:
     - 'spec/unit/**/*'
@@ -184,9 +180,6 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
-Style/HashSyntax:
-  Exclude:
-
 Style/GlobalVars:
   Exclude:
     - 'spec/**/*'
@@ -210,6 +203,9 @@ Style/FileName:
     - 'lib/active-fedora.rb'
     - 'spec/samples/hydra-mods_article_datastream.rb'
 
+Rails:
+  Enabled: true
+
 Rails/Output:
   Exclude:
     - 'lib/generators/**/*'
@@ -242,4 +238,3 @@ RSpec/DescribeClass:
 RSpec/DescribedClass:
   Exclude:
     - 'spec/unit/finder_methods_spec.rb'
-

data/History.txt

@@ -1,3 +1,12 @@
+v9.7.1
+ 2016-01-22 : The jcr/mix versionable predicate is no longer used [Adam Wead]
+ 
+ 2016-01-22 : Add detail to SolrQueryBuilder.construct_query_for_pids deprecation warning [David Chandek-Stark]
+ 
+ 2016-01-21 : Updating to the latest Rubocop [Michael J. Giarlo]
+ 
+ 2015-12-04 : Adds :PID property to ActiveFedora::RDF::Fcrepo::Model vocab [David Chandek-Stark]
+
 v9.7.0
  2015-11-25 : Allowing access to the gone? method from outside the object [Carolyn Cole]
  

data/lib/active_fedora.rb

@@ -209,9 +209,9 @@ module ActiveFedora #:nodoc:
         return config_options[:environment]
       elsif defined?(Rails.env) && !Rails.env.nil?
         return Rails.env.to_s
-      elsif defined?(ENV['environment']) && !(ENV['environment'].nil?)
+      elsif defined?(ENV['environment']) && !ENV['environment'].nil?
         return ENV['environment']
-      elsif defined?(ENV['RAILS_ENV']) && !(ENV['RAILS_ENV'].nil?)
+      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
         ENV['environment'] = 'development'

data/lib/active_fedora/association_hash.rb

@@ -44,8 +44,8 @@ module ActiveFedora
     def key?(key)
       keys.include?(key) || keys.map(&:to_s).include?(key)
     end
-    alias_method :include?, :key?
-    alias_method :has_key?, :key?
+    alias include? key?
+    alias has_key? key?
 
     def values
       keys.map { |k| self[k] }

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

@@ -1,7 +1,7 @@
 require 'active_fedora/associations'
 module ActiveFedora::Associations::Builder
   class CollectionAssociation < Association #:nodoc:
-    CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove]
+    CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove].freeze
 
     self.valid_options += [
       :before_add, :after_add, :before_remove, :after_remove

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

@@ -52,7 +52,7 @@ module ActiveFedora::Associations::Builder
           send(name).delete_all
         end
       end
-      alias_method :define_nullify_dependency_method, :define_delete_all_dependency_method
+      alias define_nullify_dependency_method define_delete_all_dependency_method
 
       def define_restrict_dependency_method
         name = self.name

data/lib/active_fedora/associations/collection_association.rb

@@ -129,7 +129,7 @@ module ActiveFedora
       def to_ary
         load_target.dup
       end
-      alias_method :to_a, :to_ary
+      alias to_a to_ary
 
       def build(attributes = {}, &block)
         if attributes.is_a?(Array)

data/lib/active_fedora/associations/collection_proxy.rb

@@ -835,7 +835,7 @@ module ActiveFedora
         @association.include?(record)
       end
 
-      alias_method :new, :build
+      alias new build
 
       def proxy_association
         @association
@@ -845,17 +845,17 @@ module ActiveFedora
       def scope
         @association.scope
       end
-      alias_method :spawn, :scope
+      alias spawn scope
 
       def to_ary
         load_target.dup
       end
-      alias_method :to_a, :to_ary
+      alias to_a to_ary
 
       def <<(*records)
         proxy_association.concat(records) && self
       end
-      alias_method :push, :<<
+      alias push <<
 
       def clear
         delete_all

data/lib/active_fedora/associations/directly_contains_one_association.rb

@@ -98,13 +98,9 @@ module ActiveFedora
         # Returns the RDF node that contains metadata like RDF.type assertions for the record
         # Sometimes this is the record, other times it's record.metadata_node
         def metadata_node_for_record(record)
-          if record.respond_to?(:type) && record.respond_to?(:set_value)
-            return record
-          elsif record.respond_to?(:metadata_node)
-            return record.metadata_node
-          else
-            raise ArgumentError, "record must either have a metadata node or must respond to .type"
-          end
+          return record if record.respond_to?(:type) && record.respond_to?(:set_value)
+          return record.metadata_node if record.respond_to?(:metadata_node)
+          raise ArgumentError, "record must either have a metadata node or must respond to .type"
         end
     end
   end

data/lib/active_fedora/associations/has_many_association.rb

@@ -69,40 +69,33 @@ module ActiveFedora
 
         # Deletes the records according to the <tt>:dependent</tt> option.
         def delete_records(records, method)
-          if method == :destroy
-            records.each(&:destroy)
-          else
-            # Find all the records that point to this and nullify them
-            # keys  = records.map { |r| r[reflection.association_primary_key] }
-            # scope = scoped.where(reflection.association_primary_key => keys)
+          return records.each(&:destroy) if method == :destroy
+          # Find all the records that point to this and nullify them
+          # keys  = records.map { |r| r[reflection.association_primary_key] }
+          # scope = scoped.where(reflection.association_primary_key => keys)
 
-            if method == :delete_all
-              raise "Not Implemented"
-              # update_counter(-scope.delete_all)
-            else
+          raise "Not Implemented" if method == :delete_all # update_counter(-scope.delete_all)
 
-              if reflection.inverse_of # Can't get an inverse when class_name: 'ActiveFedora::Base' is supplied
-                inverse = reflection.inverse_of
-                records.each do |record|
-                  next unless record.persisted?
-                  if inverse.collection?
-                    # Remove from a has_and_belongs_to_many
-                    record.association(inverse.name).delete(@owner)
-                  elsif inverse.klass == ActiveFedora::Base
-                    record[inverse.foreign_key] = nil
-                  else
-                    # Remove from a belongs_to
-                    record[reflection.foreign_key] = nil
-                  end
-                  # Check to see if the object still exists (may be already deleted).
-                  # In Rails, they do this with an update_all to avoid callbacks and validations, we may need the same.
-                  record.save! if record.class.exists?(record.id)
-                end
+          if reflection.inverse_of # Can't get an inverse when class_name: 'ActiveFedora::Base' is supplied
+            inverse = reflection.inverse_of
+            records.each do |record|
+              next unless record.persisted?
+              if inverse.collection?
+                # Remove from a has_and_belongs_to_many
+                record.association(inverse.name).delete(@owner)
+              elsif inverse.klass == ActiveFedora::Base
+                record[inverse.foreign_key] = nil
+              else
+                # Remove from a belongs_to
+                record[reflection.foreign_key] = nil
               end
-
-              # update_counter(-scope.update_all(reflection.foreign_key => nil))
+              # Check to see if the object still exists (may be already deleted).
+              # In Rails, they do this with an update_all to avoid callbacks and validations, we may need the same.
+              record.save! if record.class.exists?(record.id)
             end
           end
+
+          # update_counter(-scope.update_all(reflection.foreign_key => nil))
         end
     end
   end

data/lib/active_fedora/associations/indirectly_contains_association.rb

@@ -30,7 +30,7 @@ module ActiveFedora
           target.map(&:id)
         else
           owner.resource.query(predicate: predicate)
-            .map { |s| ActiveFedora::Base.uri_to_id(s.object) } | target.map(&:id)
+               .map { |s| ActiveFedora::Base.uri_to_id(s.object) } | target.map(&:id)
         end
       end
 

data/lib/active_fedora/autosave_association.rb

@@ -75,7 +75,7 @@ module ActiveFedora
   module AutosaveAssociation
     extend ActiveSupport::Concern
 
-    ASSOCIATION_TYPES = %w( HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains)
+    ASSOCIATION_TYPES = %w( HasMany BelongsTo HasAndBelongsToMany DirectlyContains IndirectlyContains).freeze
 
     module AssociationBuilderExtension #:nodoc:
       def self.included(base)

data/lib/active_fedora/base.rb

@@ -1,4 +1,4 @@
-SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?
+SOLR_DOCUMENT_ID = "id".freeze unless defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 require 'active_support/descendants_tracker'
 require 'active_fedora/errors'

data/lib/active_fedora/callbacks.rb

@@ -216,7 +216,7 @@ module ActiveFedora
       :before_save, :around_save, :after_save, :before_create, :around_create,
       :after_create, :before_update, :around_update, :after_update,
       :before_destroy, :around_destroy, :after_destroy
-    ]
+    ].freeze
 
     included do
       extend ActiveModel::Callbacks

data/lib/active_fedora/change_set.rb

@@ -59,8 +59,7 @@ module ActiveFedora
     end
 
     def internal?
-      value.object.to_s.start_with?("http://www.jcp.org") ||
-        value.object.to_s.start_with?("http://fedora.info") ||
+      value.object.to_s.start_with?("http://www.jcp.org", "http://fedora.info") ||
         value.predicate.to_s.start_with?("http://fedora.info")
     end
   end

data/lib/active_fedora/datastreams/nokogiri_datastreams.rb

@@ -15,12 +15,12 @@ module ActiveFedora
 
       def ng_xml
         @ng_xml ||= begin
-          if new_record?
-            ## Load up the template
-            xml = self.class.xml_template
-          else
-            xml = Nokogiri::XML::Document.parse(remote_content)
-          end
+          xml = if new_record?
+                  ## Load up the template
+                  self.class.xml_template
+                else
+                  Nokogiri::XML::Document.parse(remote_content)
+                end
           self.class.decorate_ng_xml xml
         end
       end

data/lib/active_fedora/file.rb

@@ -188,6 +188,11 @@ module ActiveFedora
       false
     end
 
+    def self.relation
+      FileRelation.new(self)
+    end
+    private_class_method :relation
+
     protected
 
       # The string to prefix all solr fields with. Override this method if you want
@@ -198,10 +203,6 @@ module ActiveFedora
 
     private
 
-      def self.relation
-        FileRelation.new(self)
-      end
-
       # Rack::Test::UploadedFile is often set via content=, however it's not an IO, though it wraps an io object.
       def behaves_like_io?(obj)
         [IO, Tempfile, StringIO].any? { |klass| obj.is_a? klass } || (defined?(Rack) && obj.is_a?(Rack::Test::UploadedFile))

data/lib/active_fedora/file_configurator.rb

@@ -149,14 +149,12 @@ module ActiveFedora
     # Given the solr_config that's been loaded for this environment,
     # determine which solr url to use
     def solr_url(solr_config)
+      return solr_config[:url] if solr_config.key?(:url)
+      return solr_config['url'] if solr_config.key?('url')
       if @index_full_text == true && solr_config.key?(:fulltext) && solr_config[:fulltext].key?('url')
-        return solr_config[:fulltext]['url']
+        solr_config[:fulltext]['url']
       elsif solr_config.key?(:default) && solr_config[:default].key?('url')
-        return solr_config[:default]['url']
-      elsif solr_config.key?('url')
-        return solr_config['url']
-      elsif solr_config.key?(:url)
-        return solr_config[:url]
+        solr_config[:default]['url']
       else
         raise URI::InvalidURIError
       end
@@ -208,11 +206,8 @@ module ActiveFedora
     # Checks the existing fedora_config.path to see if there is a solr.yml there
     def check_fedora_path_for_solr
       path = ::File.dirname(self.path) + "/solr.yml"
-      if ::File.file? path
-        return path
-      else
-        return nil
-      end
+      return unless ::File.file? path
+      path
     end
 
     def predicate_config

data/lib/active_fedora/fixity_service.rb

@@ -52,7 +52,7 @@ module ActiveFedora
       # See https://jira.duraspace.org/browse/FCREPO-1247
       # @param [String] uri
       def encoded_url(uri)
-        if uri.match("fcr:versions")
+        if uri =~ /fcr:versions/
           uri.gsub(/fcr:versions/, "fcr%3aversions")
         else
           uri

data/lib/active_fedora/indexing_service.rb

@@ -39,9 +39,9 @@ module ActiveFedora
       Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'active_fedora_model', object.class.inspect, :stored_sortable)
-      solr_doc.merge!(QueryResultBuilder::HAS_MODEL_SOLR_FIELD => object.has_model)
-      solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => object.id)
-      solr_doc.merge!(self.class.profile_solr_name => profile_service.new(object).export)
+      solr_doc[QueryResultBuilder::HAS_MODEL_SOLR_FIELD] = object.has_model
+      solr_doc[SOLR_DOCUMENT_ID.to_sym] = object.id
+      solr_doc[self.class.profile_solr_name] = profile_service.new(object).export
       object.declared_attached_files.each do |name, file|
         solr_doc.merge! file.to_solr(solr_doc, name: name.to_s)
       end

data/lib/active_fedora/ldp_cache.rb

@@ -29,7 +29,7 @@ module ActiveFedora
       end
 
       response
-    rescue Exception => e
+    rescue StandardError => e
       reset_cache_settings
       raise e
     end

data/lib/active_fedora/model.rb

@@ -1,4 +1,4 @@
-SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
+SOLR_DOCUMENT_ID = "id".freeze unless defined?(SOLR_DOCUMENT_ID)
 
 module ActiveFedora
   # = ActiveFedora
@@ -17,14 +17,13 @@ module ActiveFedora
       ActiveFedora.class_from_string(model_value)
     end
 
-    private
-
-      def self.class_exists?(class_name)
-        return false if class_name.empty?
-        klass = class_name.constantize
-        return klass.is_a?(Class)
-      rescue NameError
-        return false
-      end
+    def self.class_exists?(class_name)
+      return false if class_name.empty?
+      klass = class_name.constantize
+      return klass.is_a?(Class)
+    rescue NameError
+      return false
+    end
+    private_class_method :class_exists?
   end
 end

data/lib/active_fedora/nested_attributes.rb

@@ -113,7 +113,7 @@ module ActiveFedora
 
       # Attribute hash keys that should not be assigned as normal attributes.
       # These hash keys are nested attributes implementation details.
-      UNASSIGNABLE_KEYS = %w( id _destroy )
+      UNASSIGNABLE_KEYS = %w( id _destroy ).freeze
 
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
         options = nested_attributes_options[association_name]

data/lib/active_fedora/nom_datastream.rb

@@ -34,11 +34,11 @@ module ActiveFedora
         term.values.each do |v|
           Array(term.options[:index]).each do |index_as|
             solr_doc[index_as] ||= []
-            if v.is_a? Nokogiri::XML::Node
-              solr_doc[index_as] << v.text
-            else
-              solr_doc[index_as] << v
-            end
+            solr_doc[index_as] << if v.is_a? Nokogiri::XML::Node
+                                    v.text
+                                  else
+                                    v
+                                  end
           end
         end
       end

data/lib/active_fedora/om_datastream.rb

@@ -13,8 +13,8 @@ module ActiveFedora
     include OM::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
     include Datastreams::NokogiriDatastreams
 
-    alias_method(:om_term_values, :term_values) unless method_defined?(:om_term_values)
-    alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
+    alias om_term_values term_values unless method_defined?(:om_term_values)
+    alias om_update_values update_values unless method_defined?(:om_update_values)
 
     def default_mime_type
       'text/xml'

data/lib/active_fedora/persistence.rb

@@ -37,7 +37,7 @@ module ActiveFedora
       save
     end
 
-    alias_method :update_attributes, :update
+    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.
@@ -186,7 +186,7 @@ module ActiveFedora
       end
 
       def base_path_for_resource
-        init_root_path if self.has_uri_prefix?
+        init_root_path if has_uri_prefix?
         root_resource_path
       end
 

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -76,7 +76,7 @@ module ActiveFedora
       :title,
       :type,
       :valid
-    ] # removed :format
+    ].freeze # removed :format
     DCTERMS.freeze
 
     # Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist

data/lib/active_fedora/rdf/fcrepo.rb

@@ -157,6 +157,12 @@ module ActiveFedora::RDF
                comment: %(indicates the owner of an object).freeze,
                label: "ownerId".freeze,
                type: "rdf:Property".freeze
+      property :PID,
+               comment: %(the Fedora 3 PID for an object).freeze,
+               label: "PID".freeze,
+               domain: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+               range: "xsd:string".freeze,
+               type: "rdf:Property".freeze
       property :state,
                comment: %(indicates the state of the object or datastream).freeze,
                label: "state".freeze,

data/lib/active_fedora/rdf/persistence.rb

@@ -10,7 +10,7 @@ module ActiveFedora
     module Persistence
       extend ActiveSupport::Concern
 
-      BASE_URI = 'info:fedora/'
+      BASE_URI = 'info:fedora/'.freeze
 
       included do
         configure base_uri: BASE_URI unless base_uri
@@ -25,7 +25,7 @@ module ActiveFedora
 
       # Overrides ActiveTriples::Resource
       def persisted?
-        @persisted ||= (!datastream.new_record?)
+        @persisted ||= !datastream.new_record?
       end
     end
   end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -122,7 +122,7 @@ module ActiveFedora
                     end
     end
 
-    alias_method :graph, :resource
+    alias graph resource
 
     def refresh_attributes
       @resource = nil

data/lib/active_fedora/reflection.rb

@@ -217,7 +217,7 @@ module ActiveFedora
         [self]
       end
 
-      alias_method :source_macro, :macro
+      alias source_macro macro
 
       def has_inverse?
         inverse_name
@@ -265,8 +265,8 @@ module ActiveFedora
         end
       end
 
-      VALID_AUTOMATIC_INVERSE_MACROS = [:has_many, :has_and_belongs_to_many, :belongs_to]
-      INVALID_AUTOMATIC_INVERSE_OPTIONS = [:conditions, :through, :polymorphic, :foreign_key]
+      VALID_AUTOMATIC_INVERSE_MACROS = [:has_many, :has_and_belongs_to_many, :belongs_to].freeze
+      INVALID_AUTOMATIC_INVERSE_OPTIONS = [:conditions, :through, :polymorphic, :foreign_key].freeze
 
       private
 

data/lib/active_fedora/relation.rb

@@ -5,7 +5,7 @@ module ActiveFedora
 
     attr_reader :loaded
     attr_accessor :default_scoped
-    alias_method :loaded?, :loaded
+    alias loaded? loaded
 
     attr_accessor :values, :klass
 
@@ -129,7 +129,7 @@ module ActiveFedora
 
     private
 
-      VALID_FIND_OPTIONS = [:order, :limit, :start, :conditions, :cast]
+      VALID_FIND_OPTIONS = [:order, :limit, :start, :conditions, :cast].freeze
 
       def apply_finder_options(options)
         relation = clone

data/lib/active_fedora/solr_query_builder.rb

@@ -2,114 +2,116 @@ module ActiveFedora
   module SolrQueryBuilder
     PARSED_SUFFIX = '_tesim'.freeze
 
-    # Construct a solr query for a list of ids
-    # This is used to get a solr response based on the list of ids in an object's RELS-EXT relationhsips
-    # If the id_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
-    # @param [Array] id_array the ids that you want included in the query
-    def self.construct_query_for_ids(id_array)
-      ids = id_array.reject(&:blank?)
-      return "id:NEVER_USE_THIS_ID" if ids.empty?
-      "{!terms f=#{SOLR_DOCUMENT_ID}}#{ids.join(',')}"
-    end
+    class << self
+      # Construct a solr query for a list of ids
+      # This is used to get a solr response based on the list of ids in an object's RELS-EXT relationhsips
+      # If the id_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
+      # @param [Array] id_array the ids that you want included in the query
+      def construct_query_for_ids(id_array)
+        ids = id_array.reject(&:blank?)
+        return "id:NEVER_USE_THIS_ID" if ids.empty?
+        "{!terms f=#{SOLR_DOCUMENT_ID}}#{ids.join(',')}"
+      end
 
-    # Create a raw query clause suitable for sending to solr as an fq element
-    # @param [String] key
-    # @param [String] value
-    def self.raw_query(key, value)
-      "_query_:\"{!raw f=#{key}}#{value.gsub('"', '\"')}\""
-    end
+      # Create a raw query clause suitable for sending to solr as an fq element
+      # @param [String] key
+      # @param [String] value
+      def raw_query(key, value)
+        "_query_:\"{!raw f=#{key}}#{value.gsub('"', '\"')}\""
+      end
 
-    def self.solr_name(*args)
-      Solrizer.default_field_mapper.solr_name(*args)
-    end
+      def solr_name(*args)
+        Solrizer.default_field_mapper.solr_name(*args)
+      end
 
-    # Create a query with a clause for each key, value
-    # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
-    # @param [String] join_with ('AND') the value we're joining the clauses with
-    # @example
-    #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'
-    #   # => _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ComplexCollection" OR _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ActiveFedora_Base"
-    #
-    #   construct_query_for_rel [[Book.reflect_on_association(:library), "foo/bar/baz"]]
-    def self.construct_query_for_rel(field_pairs, join_with = ' AND ')
-      field_pairs = field_pairs.to_a if field_pairs.is_a? Hash
-      construct_query(property_values_to_solr(field_pairs), join_with)
-    end
+      # Create a query with a clause for each key, value
+      # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
+      # @param [String] join_with ('AND') the value we're joining the clauses with
+      # @example
+      #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'
+      #   # => _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ComplexCollection" OR _query_:"{!raw f=has_model_ssim}info:fedora/afmodel:ActiveFedora_Base"
+      #
+      #   construct_query_for_rel [[Book.reflect_on_association(:library), "foo/bar/baz"]]
+      def construct_query_for_rel(field_pairs, join_with = ' AND ')
+        field_pairs = field_pairs.to_a if field_pairs.is_a? Hash
+        construct_query(property_values_to_solr(field_pairs), join_with)
+      end
 
-    # Construct a solr query from a list of pairs (e.g. [field name, values])
-    # @param [Array<Array>] field_pairs a list of pairs of property name and values
-    # @param [String] join_with ('AND') the value we're joining the clauses with
-    # @return [String] a solr query
-    # @example
-    #   construct_query([['library_id_ssim', '123'], ['owner_ssim', 'Fred']])
-    #   # => "_query_:\"{!raw f=library_id_ssim}123\" AND _query_:\"{!raw f=owner_ssim}Fred\""
-    def self.construct_query(field_pairs, join_with = ' AND ')
-      pairs_to_clauses(field_pairs).join(join_with)
-    end
+      # Construct a solr query from a list of pairs (e.g. [field name, values])
+      # @param [Array<Array>] field_pairs a list of pairs of property name and values
+      # @param [String] join_with ('AND') the value we're joining the clauses with
+      # @return [String] a solr query
+      # @example
+      #   construct_query([['library_id_ssim', '123'], ['owner_ssim', 'Fred']])
+      #   # => "_query_:\"{!raw f=library_id_ssim}123\" AND _query_:\"{!raw f=owner_ssim}Fred\""
+      def construct_query(field_pairs, join_with = ' AND ')
+        pairs_to_clauses(field_pairs).join(join_with)
+      end
 
-    private
+      private
 
-      # @param [Array<Array>] pairs a list of (key, value) pairs. The value itself may
-      # @return [Array] a list of solr clauses
-      def self.pairs_to_clauses(pairs)
-        pairs.flat_map do |field, value|
-          condition_to_clauses(field, value)
+        # @param [Array<Array>] pairs a list of (key, value) pairs. The value itself may
+        # @return [Array] a list of solr clauses
+        def pairs_to_clauses(pairs)
+          pairs.flat_map do |field, value|
+            condition_to_clauses(field, value)
+          end
         end
-      end
 
-      # @param [String] field
-      # @param [String, Array<String>] values
-      # @return [Array<String>]
-      def self.condition_to_clauses(field, values)
-        values = Array(values)
-        values << nil if values.empty?
-        values.map do |value|
-          if value.present?
-            if parsed?(field)
-              # If you do a raw query on a parsed field you won't get the matches you expect.
-              "#{field}:#{solr_escape(value)}"
+        # @param [String] field
+        # @param [String, Array<String>] values
+        # @return [Array<String>]
+        def condition_to_clauses(field, values)
+          values = Array(values)
+          values << nil if values.empty?
+          values.map do |value|
+            if value.present?
+              if parsed?(field)
+                # If you do a raw query on a parsed field you won't get the matches you expect.
+                "#{field}:#{solr_escape(value)}"
+              else
+                raw_query(field, value)
+              end
             else
-              raw_query(field, value)
+              # Check that the field is not present. In SQL: "WHERE field IS NULL"
+              "-#{field}:[* TO *]"
             end
-          else
-            # Check that the field is not present. In SQL: "WHERE field IS NULL"
-            "-#{field}:[* TO *]"
           end
         end
-      end
 
-      def self.parsed?(field)
-        field.end_with?(PARSED_SUFFIX)
-      end
+        def parsed?(field)
+          field.end_with?(PARSED_SUFFIX)
+        end
 
-      # Adds esaping for spaces which are not handled by RSolr.solr_escape
-      # See rsolr/rsolr#101
-      def self.solr_escape(terms)
-        RSolr.solr_escape(terms).gsub(/\s+/, "\\ ")
-      end
+        # Adds esaping for spaces which are not handled by RSolr.solr_escape
+        # See rsolr/rsolr#101
+        def solr_escape(terms)
+          RSolr.solr_escape(terms).gsub(/\s+/, "\\ ")
+        end
 
-      # Given a list of pairs (e.g. [field name, values]), convert the field names
-      # to solr names
-      # @param [Array<Array>] pairs a list of pairs of property name and values
-      # @return [Hash] map of solr fields to values
-      # @example
-      #   property_values_to_solr([['library_id', '123'], ['owner', 'Fred']])
-      #   # => [['library_id_ssim', '123'], ['owner_ssim', 'Fred']]
-      def self.property_values_to_solr(pairs)
-        pairs.each_with_object([]) do |(property, value), list|
-          list << [solr_field(property), value]
+        # Given a list of pairs (e.g. [field name, values]), convert the field names
+        # to solr names
+        # @param [Array<Array>] pairs a list of pairs of property name and values
+        # @return [Hash] map of solr fields to values
+        # @example
+        #   property_values_to_solr([['library_id', '123'], ['owner', 'Fred']])
+        #   # => [['library_id_ssim', '123'], ['owner_ssim', 'Fred']]
+        def property_values_to_solr(pairs)
+          pairs.each_with_object([]) do |(property, value), list|
+            list << [solr_field(property), value]
+          end
         end
-      end
 
-      # @param [String, ActiveFedora::Relation] field
-      # @return [String] the corresponding solr field for the string
-      def self.solr_field(field)
-        case field
-        when ActiveFedora::Reflection::AssociationReflection
-          field.solr_key
-        else
-          solr_name(field, :symbol)
+        # @param [String, ActiveFedora::Relation] field
+        # @return [String] the corresponding solr field for the string
+        def solr_field(field)
+          case field
+          when ActiveFedora::Reflection::AssociationReflection
+            field.solr_key
+          else
+            solr_name(field, :symbol)
+          end
         end
-      end
+    end
   end
 end

data/lib/active_fedora/solr_service.rb

@@ -10,7 +10,7 @@ module ActiveFedora
     def initialize(host, args)
       host = 'http://localhost:8080/solr' unless host
       args = { read_timeout: 120, open_timeout: 120 }.merge(args.dup)
-      args.merge!(url: host)
+      args[:url] = host
       @conn = RSolr.connect args
     end
 
@@ -71,7 +71,7 @@ module ActiveFedora
       end
 
       def construct_query_for_pids(id_array)
-        Deprecation.warn SolrService, "construct_query_for_pids is deprecated and will be removed in active-fedora 10.0"
+        Deprecation.warn SolrService, "SolrService.construct_query_for_pids is deprecated. Use SolrQueryBuilder.construct_query_for_ids instead. This will be removed in active-fedora 10.0"
         SolrQueryBuilder.construct_query_for_ids(id_array)
       end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.7.0"
+  VERSION = "9.7.1".freeze
 end

data/lib/active_fedora/versionable.rb

@@ -15,7 +15,7 @@ module ActiveFedora
     end
 
     def model_type
-      if self.respond_to?(:metadata)
+      if respond_to?(:metadata)
         metadata.ldp_source.graph.query(predicate: ::RDF.type).objects
       else
         resource.query(subject: resource.rdf_subject, predicate: ::RDF.type).objects
@@ -50,23 +50,17 @@ module ActiveFedora
       resp = ActiveFedora.fedora.connection.patch(versions.with_label(label).uri, nil)
       @versions = nil
       reload
-      refresh_attributes if self.respond_to?("refresh_attributes")
+      refresh_attributes if respond_to?("refresh_attributes")
       resp.success?
     end
 
     private
 
       def versions_request
-        resp = begin
-          ActiveFedora.fedora.connection.get(versions_uri)
-        rescue Ldp::NotFound
-          return ''
-        end
-        if !resp.success?
-          raise "unexpected return value #{resp.status} for when getting datastream content at #{uri}\n\t#{resp.body}"
-        elsif resp.headers['content-type'] != 'text/turtle'
-          raise "unknown response format. got '#{resp.headers['content-type']}', but was expecting 'text/turtle'"
-        end
+        return '' unless has_versions?
+        resp = ActiveFedora.fedora.connection.get(versions_uri)
+        raise ActiveFedoraError, status_message(resp) unless resp.success?
+        raise ActiveFedoraError, bad_headers(resp) unless resp.headers['content-type'] == 'text/turtle'
         resp.body
       end
 
@@ -81,5 +75,13 @@ module ActiveFedora
           "version" + (versions.all.count + 1).to_s
         end
       end
+
+      def status_message(response)
+        "Unexpected return value #{response.status} when retrieving datastream content at #{uri}\n\t#{response.body}"
+      end
+
+      def bad_headers(response)
+        "Unknown response format. Got '#{response.headers['content-type']}', but was expecting 'text/turtle'"
+      end
   end
 end

data/lib/active_fedora/versions_graph.rb

@@ -3,7 +3,7 @@ module ActiveFedora
     def all(opts = {})
       versions = fedora_versions
       unless opts[:include_auto_save]
-        versions.reject! { |version| version.label.match("auto") }
+        versions.reject! { |version| version.label =~ /auto/ }
       end
       versions.sort_by { |version| DateTime.parse(version.created) }
     rescue ArgumentError, NoMethodError

data/spec/integration/full_featured_model_spec.rb

@@ -140,7 +140,7 @@ describe ActiveFedora::Base do
 
     @dublin_core_sample_values.each_pair do |field, value|
       next if [:format, :type].include?(field) # format and type are methods declared on Object
-      expect(dublin_core_ds.send("#{field}")).to eq [value]
+      expect(dublin_core_ds.send(field.to_s)).to eq [value]
     end
   end
 

data/spec/integration/scoped_query_spec.rb

@@ -40,7 +40,7 @@ describe ActiveFedora::Querying do
         expect(result).to be_instance_of(Array)
         # this test is meaningless if the array length is zero
         expect(result.length > 0).to be true
-        expect(result).to all(be_an ModelIntegrationSpec::Basic)
+        expect(result).to all(be_an(ModelIntegrationSpec::Basic))
       end
     end
 
@@ -90,7 +90,7 @@ describe ActiveFedora::Querying do
         first_condition = { ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts' }
         second_condition = "foo_tesim:bar"
         where_values = ModelIntegrationSpec::Basic.where(first_condition)
-                       .where(second_condition).where_values
+                                                  .where(second_condition).where_values
         expect(where_values).to eq ["bar_tesim:Peanuts",
                                     "(foo_tesim:bar)"]
       end

data/spec/integration/versionable_spec.rb

@@ -75,9 +75,7 @@ describe ActiveFedora::Versionable do
         subject.create_version
       end
 
-      it "sets model_type to versionable" do
-        expect(subject.reload.model_type).to include ::RDF::URI.new('http://www.jcp.org/jcr/mix/1.0versionable')
-      end
+      it { is_expected.to have_versions }
 
       it "has one version" do
         expect(subject.versions).to be_kind_of ActiveFedora::VersionsGraph

data/spec/unit/forbidden_attributes_protection_spec.rb

@@ -4,7 +4,7 @@ describe ActiveFedora::Attributes, ".new" do
   before(:all) do
     class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
       attr_accessor :permitted
-      alias_method :permitted?, :permitted
+      alias permitted? permitted
 
       def initialize(attributes)
         super(attributes)

data/spec/unit/ntriples_datastream_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
         property :based_near, predicate: ::RDF::FOAF.based_near
         property :related_url, predicate: ::RDF::RDFS.seeAlso
       end
-      @subject = MyDatastream.new(ActiveFedora::Base.id_to_uri '/test:1/descMetadata')
+      @subject = MyDatastream.new(ActiveFedora::Base.id_to_uri('/test:1/descMetadata'))
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
     after do

data/spec/unit/persistence_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Persistence do
     context 'when a block is provided' do
       it 'passes the block to initialize' do
         expect_any_instance_of(ActiveFedora::Base).to receive(:save)
-        expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of ActiveFedora::Base)
+        expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of(ActiveFedora::Base))
       end
     end
   end

data/spec/unit/predicates_spec.rb

@@ -77,7 +77,7 @@ describe ActiveFedora::Predicates do
     expect(described_class.predicate_lookup(:is_part_of)).to eq "isPartOf"
     expect(described_class.predicate_lookup(:is_member_of)).to eq "isMemberOf"
     expect(described_class.predicate_lookup("isPartOfCollection")).to eq "isPartOfCollection"
-    described_class.predicate_config[:predicate_mapping].merge!("some_namespace" => { has_foo: "hasFOO" })
+    described_class.predicate_config[:predicate_mapping]["some_namespace"] = { has_foo: "hasFOO" }
     expect(described_class.find_predicate(:has_foo)).to eq ["hasFOO", "some_namespace"]
     expect(described_class.predicate_lookup(:has_foo, "some_namespace")).to eq "hasFOO"
     expect(lambda { described_class.predicate_lookup(:has_foo) }).to raise_error ActiveFedora::UnregisteredPredicateError

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::QualifiedDublinCoreDatastream do
-  DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source]
+  DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source].freeze
 
   let(:sample_xml) do "<dc xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:dcterms='http://purl.org/dc/terms/'>
           <dcterms:type xsi:type='DCMITYPE'>sound</dcterms:type>

data/spec/unit/solr_config_options_spec.rb

@@ -14,14 +14,14 @@ describe ActiveFedora do
 
   describe "SOLR_DOCUMENT_ID" do
     before(:all) do
-      SOLR_DOCUMENT_ID = "MY_SAMPLE_ID"
+      SOLR_DOCUMENT_ID = "MY_SAMPLE_ID".freeze
     end
     after(:all) do
-      SOLR_DOCUMENT_ID = "id"
+      SOLR_DOCUMENT_ID = "id".freeze
     end
     it "is used by ActiveFedora::Base.to_solr" do
       allow(@test_object).to receive(:id).and_return('changeme:123')
-      SOLR_DOCUMENT_ID = "MY_SAMPLE_ID"
+      SOLR_DOCUMENT_ID = "MY_SAMPLE_ID".freeze
       expect(@test_object.to_solr[SOLR_DOCUMENT_ID.to_sym]).to eq 'changeme:123'
       expect(@test_object.to_solr[:id]).to be_nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.7.0
+  version: 9.7.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -638,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.