valkyrie 1.7.1 → 2.0.0.RC1

data/Rakefile

@@ -57,14 +57,8 @@ namespace :db do
       scope   = ENV['SCOPE']
       verbose_was = ActiveRecord::Migration.verbose
       ActiveRecord::Migration.verbose = verbose
-      if ActiveRecord::Migrator.respond_to?(:migrate)
-        ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
-          scope.blank? || scope == migration.scope
-        end
-      else
-        ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
-          scope.blank? || scope == migration.scope
-        end
+      ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
+        scope.blank? || scope == migration.scope
       end
       ActiveRecord::Base.clear_cache!
     ensure

data/lib/valkyrie.rb

@@ -14,6 +14,7 @@ require 'valkyrie/rdf_patches'
 require 'json/ld'
 require 'logger'
 require 'rdf/vocab'
+require 'rails'
 
 module Valkyrie
   require 'valkyrie/id'
@@ -48,15 +49,11 @@ module Valkyrie
   end
 
   def environment
-    if const_defined?(:Rails) && Rails.respond_to?(:env)
-      Rails.env
-    else
-      ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
-    end
+    Rails.env
   end
 
   def config_root_path
-    if const_defined?(:Rails) && Rails.respond_to?(:root)
+    if const_defined?(:Rails) && Rails.root
       Rails.root
     else
       Pathname.new(Dir.pwd)
@@ -71,11 +68,6 @@ module Valkyrie
     @logger = logger
   end
 
-  def warn_about_standard_queries!
-    warn "[DEPRECATION] Please enable query normalization to avoid inconsistent results between different adapters by adding `standardize_query_results: true` to your environment block" \
-     " in config\/valkyrie.yml. This will be the behavior in Valkyrie 2.0."
-  end
-
   class Config < OpenStruct
     def initialize(hsh = {})
       super(defaults.merge(hsh))
@@ -89,40 +81,13 @@ module Valkyrie
       Valkyrie::StorageAdapter.find(super.to_sym)
     end
 
-    # @api public
-    #
-    # The returned anonymous method (e.g. responds to #call) has a signature of
-    # an unamed parameter that is a string. Calling the anonymous method should
-    # return a Valkyrie::Resource from which Valkyrie will map the persisted
-    # data into.
-    #
-    # @return [#call] with method signature of 1
-    #
-    # @see #default_resource_class_resolver for full interface
-    def resource_class_resolver
-      super
-    end
-
-    # @!attribute [w] resource_class_resolver=
-    #   The setter for #resource_class_resolver; see it's implementation
-
     private
 
       def defaults
         {
-          standardize_query_result: false,
-          resource_class_resolver: method(:default_resource_class_resolver)
         }
       end
-
-      # String constantize is a "by convention" factory. This works, but assumes
-      # the ruby class once used to persist is the model used to now reify.
-      #
-      # @param [String] class_name
-      def default_resource_class_resolver(class_name)
-        class_name.constantize
-      end
   end
 
-  module_function :config, :logger, :logger=, :config_root_path, :environment, :warn_about_standard_queries!, :config_file, :config_hash
+  module_function :config, :logger, :logger=, :config_root_path, :environment, :config_file, :config_hash
 end

data/lib/valkyrie/id.rb

@@ -21,14 +21,6 @@ module Valkyrie
     end
     alias == eql?
 
-    # @deprecated Please use {.uri_for} instead
-    def to_uri
-      return RDF::Literal.new(id.to_s, datatype: RDF::URI("http://example.com/valkyrie_id")) if id.to_s.include?("://")
-      warn "[DEPRECATION] `to_uri` is deprecated and will be removed in the next major release. " \
-           "Called from #{Gem.location_of_caller.join(':')}"
-      ::RDF::URI(ActiveFedora::Base.id_to_uri(id))
-    end
-
     protected
 
       def state

data/lib/valkyrie/persistence/fedora.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
+#
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Fedora
   module Fedora
-    # Deprecation to allow us to make pg an optional dependency
-    path = Bundler.definition.gemfiles.first
-    matches = File.readlines(path).select { |l| l =~ /gem ['"]ldp\b/ }
-    if matches.empty?
-      warn "[DEPRECATION] ldp will not be included as a dependency in Valkyrie's gemspec as of the next major release. Please add the gem directly to your Gemfile if you use a fedora adapter."
-    end
-    require 'active_fedora'
+    require 'active_triples'
+    require 'ldp'
     require 'valkyrie/persistence/fedora/permissive_schema'
     require 'valkyrie/persistence/fedora/metadata_adapter'
     require 'valkyrie/persistence/fedora/persister'

data/lib/valkyrie/persistence/fedora/list_node.rb

@@ -63,7 +63,7 @@ module Valkyrie::Persistence::Fedora
       g.proxy_in = proxy_in.try(:uri)
       g.next = self.next.try(:rdf_subject)
       g.prev = prev.try(:rdf_subject)
-      g.graph
+      g
     end
 
     # Resolves the URI for the value of the list expression
@@ -104,10 +104,10 @@ module Valkyrie::Persistence::Fedora
         # Populates attributes for the LinkedNode
         # @param instance [ListNode]
         def populate(instance)
-          instance.proxy_for = resource.proxy_for
-          instance.proxy_in = resource.proxy_in
-          instance.next_uri = resource.next
-          instance.prev_uri = resource.prev
+          instance.proxy_for = resource.proxy_for.first
+          instance.proxy_in = resource.proxy_in.first
+          instance.next_uri = resource.next.first
+          instance.prev_uri = resource.prev.first
         end
 
         private
@@ -115,33 +115,16 @@ module Valkyrie::Persistence::Fedora
           # Constructs a set of triples using ActiveTriples as objects
           # @return [Valkyrie::Persistence::Fedora::ListNode::Resource]
           def resource
-            @resource ||= Resource.new(uri, graph: graph)
+            @resource ||= Resource.new(uri, data: graph)
           end
       end
 
       # Class for providing a set of triples modeling linked list nodes
-      class Resource
-        def self.property(property, predicate:)
-          define_method property do
-            graph.query([uri, predicate, nil]).objects.first
-          end
-
-          define_method "#{property}=" do |val|
-            return if val.nil?
-            graph << [uri, predicate, val]
-          end
-        end
-
-        property :proxy_for, predicate: ::RDF::Vocab::ORE.proxyFor
-        property :proxy_in, predicate: ::RDF::Vocab::ORE.proxyIn
-        property :next, predicate: ::RDF::Vocab::IANA.next
-        property :prev, predicate: ::RDF::Vocab::IANA.prev
-
-        attr_reader :graph, :uri
-        def initialize(uri, graph: RDF::Graph.new)
-          @uri = uri
-          @graph = graph
-        end
+      class Resource < ActiveTriples::Resource
+        property :proxy_for, predicate: ::RDF::Vocab::ORE.proxyFor, cast: false
+        property :proxy_in, predicate: ::RDF::Vocab::ORE.proxyIn, cast: false
+        property :next, predicate: ::RDF::Vocab::IANA.next, cast: false
+        property :prev, predicate: ::RDF::Vocab::IANA.prev, cast: false
       end
   end
 end

data/lib/valkyrie/persistence/fedora/metadata_adapter.rb

@@ -15,13 +15,11 @@ module Valkyrie::Persistence::Fedora
     # @param [String] base_path
     # @param [Valkyrie::Persistence::Fedora::PermissiveSchema] schema
     # @param [Integer] fedora_version
-    def initialize(connection:, base_path: "/", schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new, fedora_version: 4)
+    def initialize(connection:, base_path: "/", schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new, fedora_version: 5)
       @connection = connection
       @base_path = base_path
       @schema = schema
       @fedora_version = fedora_version
-
-      warn "[DEPRECATION] `fedora_version` will default to 5 in the next major release." unless fedora_version
     end
 
     # Construct the query service object using this adapter
@@ -78,10 +76,5 @@ module Valkyrie::Persistence::Fedora
     def connection_prefix
       "#{connection.http.url_prefix}/#{base_path}"
     end
-
-    def standardize_query_result?
-      Valkyrie.warn_about_standard_queries! if Valkyrie.config.standardize_query_result != true
-      Valkyrie.config.standardize_query_result == true
-    end
   end
 end

data/lib/valkyrie/persistence/fedora/permissive_schema.rb

@@ -22,27 +22,11 @@ module Valkyrie::Persistence::Fedora
       uri_for(:id)
     end
 
-    # @deprecated Please use {.uri_for} instead
-    def self.alternate_ids
-      warn "[DEPRECATION] `alternate_ids` is deprecated and will be removed in the next major release. " \
-           "It was never used internally - please use `uri_for(:alternate_ids)` " \
-           "Called from #{Gem.location_of_caller.join(':')}"
-      uri_for(:alternate_ids)
-    end
-
     # @return [RDF::URI]
     def self.member_ids
       uri_for(:member_ids)
     end
 
-    # @deprecated Please use {.uri_for} instead
-    def self.references
-      warn "[DEPRECATION] `references` is deprecated and will be removed in the next major release. " \
-           "It was never used internally - please use `uri_for(:references)` " \
-           "Called from #{Gem.location_of_caller.join(':')}"
-      uri_for(:references)
-    end
-
     # @return [RDF::URI]
     def self.valkyrie_bool
       uri_for(:valkyrie_bool)

data/lib/valkyrie/persistence/fedora/query_service.rb

@@ -29,7 +29,7 @@ module Valkyrie::Persistence::Fedora
 
     # (see Valkyrie::Persistence::Memory::QueryService#find_many_by_ids)
     def find_many_by_ids(ids:)
-      ids = ids.uniq if adapter.standardize_query_result?
+      ids = ids.uniq
       ids.map do |id|
         begin
           find_by(id: id)
@@ -43,7 +43,7 @@ module Valkyrie::Persistence::Fedora
     def find_parents(resource:)
       content = content_with_inbound(id: resource.id)
       parent_ids = content.graph.query([nil, RDF::Vocab::ORE.proxyFor, nil]).map(&:subject).map { |x| x.to_s.gsub(/#.*/, '') }.map { |x| adapter.uri_to_id(x) }
-      parent_ids.uniq! if adapter.standardize_query_result?
+      parent_ids.uniq!
       parent_ids.lazy.map do |id|
         find_by(id: id)
       end
@@ -111,10 +111,8 @@ module Valkyrie::Persistence::Fedora
     # Find all resources referencing a given resource (e. g. parents)
     # *This is done by iterating through the ID of each resource referencing the resource in the query, and requesting each resource over the HTTP*
     # *Also, an initial request is made to find the URIs of the resources referencing the resource in the query*
-    def find_inverse_references_by(resource: nil, id: nil, property:)
-      raise ArgumentError, "Provide resource or id" unless resource || id
-      ensure_persisted(resource) if resource
-      resource ||= find_by(id: id)
+    def find_inverse_references_by(resource:, property:)
+      ensure_persisted(resource)
       if ordered_property?(resource: resource, property: property)
         find_inverse_references_by_ordered(resource: resource, property: property)
       else
@@ -133,14 +131,14 @@ module Valkyrie::Persistence::Fedora
         content = content_with_inbound(id: resource.id)
         property_uri = adapter.schema.predicate_for(property: property, resource: nil)
         ids = content.graph.query([nil, property_uri, adapter.id_to_uri(resource.id)]).map(&:subject).map { |x| x.to_s.gsub(/#.*/, '') }.map { |x| adapter.uri_to_id(x) }
-        ids.uniq! if adapter.standardize_query_result?
+        ids.uniq!
         ids.lazy.map { |id| find_by(id: id) }
       end
 
       def find_inverse_references_by_ordered(resource:, property:)
         content = content_with_inbound(id: resource.id)
         ids = content.graph.query([nil, ::RDF::Vocab::ORE.proxyFor, adapter.id_to_uri(resource.id)]).map(&:subject).map { |x| x.to_s.gsub(/#.*/, '') }.map { |x| adapter.uri_to_id(x) }
-        ids.uniq! if adapter.standardize_query_result?
+        ids.uniq!
         ids.lazy.map { |id| find_by(id: id) }.select { |o| o[property].include?(resource.id) }
       end
 

data/lib/valkyrie/persistence/memory/metadata_adapter.rb

@@ -29,10 +29,5 @@ module Valkyrie::Persistence::Memory
     def id
       @id ||= Valkyrie::ID.new(Digest::MD5.hexdigest(self.class.to_s))
     end
-
-    def standardize_query_result?
-      Valkyrie.warn_about_standard_queries! if Valkyrie.config.standardize_query_result != true
-      Valkyrie.config.standardize_query_result == true
-    end
   end
 end

data/lib/valkyrie/persistence/memory/persister.rb

@@ -86,7 +86,7 @@ module Valkyrie::Persistence::Memory
       def generate_lock_token(resource)
         return unless resource.optimistic_locking_enabled?
         token = Valkyrie::Persistence::OptimisticLockToken.new(adapter_id: adapter.id, token: Time.now.to_r)
-        resource.send("#{Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK}=", token)
+        resource.set_value(Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK, token)
       end
 
       # Check whether a resource is current.

data/lib/valkyrie/persistence/memory/query_service.rb

@@ -36,10 +36,7 @@ module Valkyrie::Persistence::Memory
     def find_by_alternate_identifier(alternate_identifier:)
       alternate_identifier = Valkyrie::ID.new(alternate_identifier.to_s) if alternate_identifier.is_a?(String)
       validate_id(alternate_identifier)
-      cache.select do |_key, resource|
-        next unless resource[:alternate_ids]
-        resource[:alternate_ids].include?(alternate_identifier)
-      end.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
+      cache.select { |_key, resource| resource[:alternate_ids].include?(alternate_identifier) }.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
     end
 
     # Get a batch of resources by ID.
@@ -47,7 +44,7 @@ module Valkyrie::Persistence::Memory
     # @raise [ArgumentError] Raised when any ID is not a String or a Valkyrie::ID
     # @return [Array<Valkyrie::Resource>] All requested objects that were found
     def find_many_by_ids(ids:)
-      ids = ids.uniq if adapter.standardize_query_result?
+      ids = ids.uniq
       ids.map do |id|
         begin
           find_by(id: id)
@@ -100,7 +97,7 @@ module Valkyrie::Persistence::Memory
           nil
         end
       end.reject(&:nil?)
-      refs.uniq! if adapter.standardize_query_result? && !ordered_property?(resource: resource, property: property)
+      refs.uniq! unless ordered_property?(resource: resource, property: property)
       refs
     end
 
@@ -113,12 +110,10 @@ module Valkyrie::Persistence::Memory
     # @return [Array<Valkyrie::Resource>] All resources in the persistence backend
     #   which have the ID of the given `resource` in their `property` property. Not
     #   in order.
-    def find_inverse_references_by(resource: nil, id: nil, property:)
-      raise ArgumentError, "Provide resource or id" unless resource || id
-      ensure_persisted(resource) if resource
-      id ||= resource.id
+    def find_inverse_references_by(resource:, property:)
+      ensure_persisted(resource)
       find_all.select do |obj|
-        Array.wrap(obj[property]).include?(id)
+        Array.wrap(obj[property]).include?(resource.id)
       end
     end
 

data/lib/valkyrie/persistence/postgres.rb

@@ -1,21 +1,8 @@
 # frozen_string_literal: true
+#
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Postgres
   module Postgres
-    # :nocov:
-    # Deprecation to allow us to make pg an optional dependency
-    path = Bundler.definition.gemfiles.first
-    matches = File.readlines(path).select { |l| l =~ /gem ['"]pg\b/ }
-    if matches.empty?
-      warn "[DEPRECATION] pg will not be included as a dependency in Valkyrie's gemspec as of the next major release. Please add the gem directly to your Gemfile if you use a postgres adapter."
-    end
-    matches = File.readlines(path).select { |l| l =~ /gem ['"]activerecord\b/ }
-    if matches.empty?
-      warn "[DEPRECATION] activerecord will not be included as a dependency in Valkyrie's gemspec as of the next major release." \
-        "Please add the gem directly to your Gemfile if you use a postgres adapter."
-    end
-    # :nocov:
-
     require 'valkyrie/persistence/postgres/metadata_adapter'
   end
 end

data/lib/valkyrie/persistence/postgres/metadata_adapter.rb

@@ -35,10 +35,5 @@ module Valkyrie::Persistence::Postgres
         Valkyrie::ID.new(Digest::MD5.hexdigest(to_hash))
       end
     end
-
-    def standardize_query_result?
-      Valkyrie.warn_about_standard_queries! if Valkyrie.config.standardize_query_result != true
-      Valkyrie.config.standardize_query_result == true
-    end
   end
 end

data/lib/valkyrie/persistence/postgres/orm_converter.rb

@@ -56,7 +56,7 @@ module Valkyrie::Persistence::Postgres
       # Retrieve the Class used to construct the Valkyrie Resource
       # @return [Class]
       def resource_klass
-        Valkyrie.config.resource_class_resolver.call(internal_resource)
+        internal_resource.constantize
       end
 
       # Access the String for the Valkyrie Resource type within the attributes

data/lib/valkyrie/persistence/postgres/persister.rb

@@ -19,15 +19,7 @@ module Valkyrie::Persistence::Postgres
     #   was modified in the database between been read into memory and persisted
     def save(resource:)
       orm_object = resource_factory.from_resource(resource: resource)
-      orm_object.transaction do
-        orm_object.save!
-        if resource.id && resource.id.to_s != orm_object.id
-          warn "[DEPRECATION] Postgres' primary key column can not save with the given ID #{resource.id}. " \
-            "For now a new ID has been assigned (#{orm_object.id}), but in the next major version this will throw an exception and not save. " \
-            "To avoid this warning, set the ID to be nil via `resource.id = nil` before you save it. \n" \
-            "Called from #{Gem.location_of_caller.join(':')}"
-        end
-      end
+      orm_object.save!
       resource_factory.to_resource(object: orm_object)
     rescue ActiveRecord::StaleObjectError
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."

data/lib/valkyrie/persistence/postgres/query_service.rb

@@ -112,11 +112,9 @@ module Valkyrie::Persistence::Postgres
     # @param [Valkyrie::Resource] resource
     # @param [String] property
     # @return [Array<Valkyrie::Resource>]
-    def find_inverse_references_by(resource: nil, id: nil, property:)
-      raise ArgumentError, "Provide resource or id" unless resource || id
-      ensure_persisted(resource) if resource
-      id ||= resource.id
-      internal_array = "{\"#{property}\": [{\"id\": \"#{id}\"}]}"
+    def find_inverse_references_by(resource:, property:)
+      ensure_persisted(resource)
+      internal_array = "{\"#{property}\": [{\"id\": \"#{resource.id}\"}]}"
       run_query(find_inverse_references_query, internal_array)
     end
 
@@ -191,7 +189,7 @@ module Valkyrie::Persistence::Postgres
     # @return [String]
     def find_references_query
       <<-SQL
-        SELECT #{adapter.standardize_query_result? ? 'DISTINCT' : ''} member.* FROM orm_resources a,
+        SELECT DISTINCT member.* FROM orm_resources a,
         jsonb_array_elements(a.metadata->?) AS b(member)
         JOIN orm_resources member ON (b.member->>'id')::#{id_type} = member.id WHERE a.id = ?
       SQL