valkyrie 2.0.0.RC5 → 2.0.0.RC6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785deb077ba05ca2933bbb8696744609b8a870726b183e09e6a405c9a325360e
-  data.tar.gz: 69af3b44c709c5b8cccdfdbeaa9bb0176fd17f3786d503262867e97df5ab4ff2
+  metadata.gz: 1336b38de11dafb9436b6f04cf20438f2bbdde2662a9f1e4fb17214b29b2628e
+  data.tar.gz: bf96fa3e361a65d700d01a293f149c62f27b48ea3a952b60bdc2e5907ab4a86d
 SHA512:
-  metadata.gz: 77b7c6314d7c41ec81dd7b6b9c9efeebc98e5b870a97374d7bc4571137604a2b7f4b7c88cac58a717ea873dc48d3e64a8bad0f3f03ddd0fe08a5f5d4e8c70ea4
-  data.tar.gz: e918e7516ace50406db02f8198eb87c0a7c29f531cc573aa0a8f9586ef6b20537abe9cb05f005d19ae1777d02a1a76ad4fc9efb3e7d89fa82830920a5b770e01
+  metadata.gz: 838ce2eda7f2966055f0b26d467ca92d567c90372b2a020b4eab64fc86d7cfdca7a9f7d0775885a101e19b1885682beeb1a49386e934a41eca2b6b7f23492878
+  data.tar.gz: 5a8567646b98d942e96582a0212b823f23d603c18fe25c5e78284bd5e73f9aed4867c7c1ab0559ce8f8235d452e7f3c23cc73ffc39ff6c4feeb83693fc2bf188

data/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "2.6.2"
+        default: "2.6.3"
         type: "string"
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
@@ -69,11 +69,11 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
@@ -85,11 +85,11 @@ workflows:
           name: "Ruby2-5_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-1"
   nightly:
     triggers:
@@ -102,11 +102,11 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
@@ -118,9 +118,9 @@ workflows:
           name: "Ruby2-5_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-1"

data/CHANGELOG.md

@@ -1,3 +1,75 @@
+# v2.0.0 2018-04-27
+
+## Changes since last release
+
+* Make LDP optional (Add `gem ldp` to Gemfile if using Fedora)
+* Make ActiveRecord optional (Add `gem activerecord` to Gemfile if using
+  Postgres)
+* Make RSolr optional (Add `gem rsolr` to Gemfile if using Solr)
+* Remove deprecated `standardize_query_result` argument.
+* Remove deprecated `Valkyrie::ID#to_uri`
+* Remove ActiveFedora as a dependency.
+* Remove deprecated `Valkyrie::Persistence::Fedora::PermissiveSchema.alternate_ids`
+* Remove deprecated `Valkyrie::Persistence::Fedora::PermissiveSchema.references`
+* Upgrade `dry-types` to `0.13.x`
+* Fedora Adapter default is now version 5.
+* Require a symbol key when instantiating a Valkyrie::Resource (string keys are no longer valid)
+* Remove deprecated `type.member()` method (use `type.of()`)
+* Remove deprecated `Valkyrie::Types::Int` (use `Valkyrie::Types::Integer`)
+
+## Changes Without Deprecations in `1.6.0`
+
+1. Overriding an attribute getter no longer changes the output of `to_h`. If
+   you've overridden something via `def title; "overwritten"; end`, then `to_h`
+   will now have what was set via the setter or initializer, not `overwritten`.
+2. Setting attribute values via overriding instance variables no longer works.
+   Please use `#set_value` if you need dynamic setting, as this will be a stable
+   API.
+3. `Valkyrie::Resource#to_h` no longer includes keys with `nil` values.
+
+## Upgrade Guide
+
+1. Upgrade Valkyrie to `1.6.0` in your application, run tests, and fix all
+   deprecations output to console.
+2. Upgrade Valkyrie to `2.0.0` in your application.
+3. Failing tests at this point are likely due to behavior in the "Changes
+   Without Deprecations" section above. If you have any trouble, please contact
+   us in the #valkyrie channel in [Samvera Slack](http://slack.samvera.org/).
+
+## New Product Owner
+
+All of us who have been part of the Valkyrie project so far would like to thank
+[Carolyn Cole](https://github.com/carolyncole) for her role so far as Product Owner.
+We'd like to welcome [Kate Lynch](https://github.com/kelynch), who will be
+taking over effective immediately!
+
+## Special Thanks
+
+This is the first major version of Valkyrie since 1.0 over a year ago. A lot of
+work has gone into it, and I'd like to take the chance to thank everyone
+involved for their contributions in the last year:
+
+
+[DanCoughlin](https://github.com/DanCoughlin)
+[awead](https://github.com/awead)
+[cam156](https://github.com/cam156)
+[carolyncole](https://github.com/carolyncole)
+[cjcolvar](https://github.com/cjcolvar)
+[dgcliff](https://github.com/dgcliff)
+[escowles](https://github.com/escowles)
+[hackmastera](https://github.com/hackmastera)
+[jeremyf](https://github.com/jeremyf)
+[jrgriffiniii](https://github.com/jrgriffiniii)
+[kelynch](https://github.com/kelynch)
+[mbklein](https://github.com/mbklein)
+[mjgiarlo](https://github.com/mjgiarlo)
+[mtribone](https://github.com/mtribone)
+[no-reply](https://github.com/no-reply)
+[ojlyytinen](https://github.com/ojlyytinen)
+[revgum](https://github.com/revgum)
+[stkenny](https://github.com/stkenny)
+[tpendragon](https://github.com/tpendragon)
+
 # v1.6.0 2018-04-17
 
 ## Changes since last release

data/README.md

@@ -17,7 +17,7 @@ Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samv
 ## Primary Contacts
 
 ### Product Owner
-[Carolyn Cole](https://github.com/cam156)
+[Kate Lynch](https://github.com/kelynch)
 
 ### Technical Lead
 [Trey Pendragon](https://github.com/tpendragon)
@@ -103,11 +103,11 @@ end
 ```
 
 The initializer registers four `Valkyrie::MetadataAdapter` instances for storing metadata:
-* `:postgres` which stores metadata in a PostgreSQL database
-* `:solr` which stores metadata in a Solr Index
 * `:fedora` which stores metadata in a Fedora server.
 * `:memory` which stores metadata in an in-memory cache (this cache is not persistent, so it is only
-  appropriate for testing)
+  appropriate for testing).
+* `:postgres` which stores metadata in a PostgreSQL database.
+* `:solr` which stores metadata in a Solr Index.
 
 Other adapter options include `Valkyrie::Persistence::BufferedPersister` for buffering in memory before bulk
 updating another persister, `Valkyrie::Persistence::CompositePersister` for storing in more than one adapter

data/lib/valkyrie.rb

@@ -6,9 +6,7 @@ require 'active_support/core_ext'
 require 'dry-types'
 require 'dry-struct'
 require 'draper'
-require 'active_record'
 require 'reform'
-require 'reform/active_record'
 require 'rdf'
 require 'valkyrie/rdf_patches'
 require 'json/ld'

data/lib/valkyrie/change_set.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 require 'reform/form/coercion'
+require 'reform/form/orm'
+require 'reform/form/active_model'
 require 'reform/form/active_model/validations'
+require 'reform/form/active_model/model_reflections'
+require 'reform/form/active_model/form_builder_methods'
 module Valkyrie
   ##
   # Standard change set object for Valkyrie.
@@ -16,7 +20,9 @@ module Valkyrie
   class ChangeSet < Reform::Form
     include Reform::Form::ORM
     include Reform::Form::ModelReflections
+    include Reform::Form::ActiveModel
     include Reform::Form::ActiveModel::Validations
+    include Reform::Form::ActiveModel::FormBuilderMethods
     feature Coercion
     class_attribute :fields
     self.fields = []
@@ -62,6 +68,9 @@ module Valkyrie
       fields
     end
 
+    # Override reflect_on_association so SimpleForm can work.
+    def self.reflect_on_association(*_args); end
+
     # Returns value for a given property.
     # @param key [Symbol]
     def [](key)

data/lib/valkyrie/persistence.rb

@@ -31,6 +31,7 @@ module Valkyrie
     require 'valkyrie/persistence/composite_persister'
     require 'valkyrie/persistence/delete_tracking_buffer'
     require 'valkyrie/persistence/buffered_persister'
+    require 'valkyrie/persistence/shared'
     autoload :Postgres, 'valkyrie/persistence/postgres'
     autoload :Solr, 'valkyrie/persistence/solr'
     autoload :Fedora, 'valkyrie/persistence/fedora'

data/lib/valkyrie/persistence/fedora/persister/model_converter.rb

@@ -201,8 +201,8 @@ module Valkyrie::Persistence::Fedora
         end
 
         def self.ordered?(value)
-          return false unless value.resource.class.schema[value.key]
-          value.resource.class.schema[value.key].meta.try(:[], :ordered)
+          return false unless value.resource.class.attribute_names.include?(value.key)
+          value.resource.ordered_attribute?(value.key)
         end
 
         delegate :subject, to: :value

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

@@ -171,7 +171,7 @@ module Valkyrie::Persistence::Fedora
       end
 
       def ordered_property?(resource:, property:)
-        resource.class.schema[property].meta.try(:[], :ordered)
+        resource.ordered_attribute?(property)
       end
   end
 end

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

@@ -157,7 +157,7 @@ module Valkyrie::Persistence::Memory
       end
 
       def ordered_property?(resource:, property:)
-        resource.class.schema[property].meta.try(:[], :ordered)
+        resource.ordered_attribute?(property)
       end
   end
 end

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

@@ -79,157 +79,7 @@ module Valkyrie::Persistence::Postgres
       # Responsible for converting `metadata` JSON-B field in
       # {Valkyrie::Persistence::Postgres::ORM::Resource} into an acceptable hash
       # for {Valkyrie::Resource}
-      class RDFMetadata
-        attr_reader :metadata
-
-        # @param [Hash] metadata
-        def initialize(metadata)
-          # nil hash values are handled by the default state in dry-types
-          # anyways, so don't bother processing them here.
-          @metadata = metadata.compact
-        end
-
-        # Convert the database attribute values and map these to the existing keys in the Valkyrie Resource metadata
-        # @return [Hash]
-        def result
-          Hash[
-            metadata.map do |key, value|
-              [key, PostgresValue.for(value).result]
-            end
-          ]
-        end
-
-        # Abstract base class for mapping PostgreSQL database field values to Valkyrie Resource attributes
-        class PostgresValue < ::Valkyrie::ValueMapper
-        end
-
-        # Converts {RDF::Literal} typed-literals from JSON-LD stored into an
-        #   {RDF::Literal}
-        class HashValue < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value is a Hash containing the key "@value"
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.is_a?(Hash) && value["@value"]
-          end
-
-          # Constructs a RDF::Literal object using the Object keyed to "@value"
-          # in the value Hash, as well as the language keyed to "@language" and
-          # datatype keyed to "@type"
-          # @return [RDF::Literal]
-          def result
-            RDF::Literal.new(value["@value"],
-                             language: value["@language"],
-                             datatype: value["@type"])
-          end
-        end
-
-        # Converts stored IDs into {Valkyrie::ID}s
-        class IDValue < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value is a Hash containing the key "id" (excluding those storing the Valkyrie Resource type)
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.is_a?(Hash) && value["id"] && !value["internal_resource"]
-          end
-
-          # Constructs a Valkyrie::ID object using the String keyed to "id" in the value
-          # @return [Valkyrie::ID]
-          def result
-            Valkyrie::ID.new(value["id"])
-          end
-        end
-
-        # Converts stored URIs into {RDF::URI}s
-        class URIValue < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value is a Hash containing the key "@id"
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.is_a?(Hash) && value["@id"]
-          end
-
-          # Constructs a RDF::URI object using the URI keyed to @id in the value
-          # @return [RDF::URI]
-          def result
-            ::RDF::URI.new(value["@id"])
-          end
-        end
-
-        # Converts nested records into {Valkyrie::Resource}s
-        class NestedRecord < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value is a Hash containing multiple keys
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.is_a?(Hash) && value.keys.length > 1
-          end
-
-          # Generates a Hash derived from the RDFMetadata for the value
-          # @return [Hash]
-          def result
-            RDFMetadata.new(value).result.symbolize_keys
-          end
-        end
-
-        # Handles iterating over arrays of values and converting each value.
-        class EnumeratorValue < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value has enumerable behavior
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.respond_to?(:each)
-          end
-
-          # Convert the elements in the enumerable value in Valkyrie attribute values
-          # Casts single-valued arrays to the first value, letting Types::Set and
-          # Types::Array handle converting it back.
-          # @return [Array<Object>]
-          def result
-            if value.length == 1
-              calling_mapper.for(value.first).result
-            else
-              value.map do |value|
-                calling_mapper.for(value).result
-              end
-            end
-          end
-        end
-
-        # Converts Date strings to `DateTime`
-        class DateValue < ::Valkyrie::ValueMapper
-          PostgresValue.register(self)
-
-          # Determines whether or not a value is an ISO 8601 datestamp String
-          # e. g. 1970-01-01
-          # @param [Object] value
-          # @return [Boolean]
-          def self.handles?(value)
-            return false unless value.is_a?(String)
-            return false unless value[4] == "-"
-            year = value.to_s[0..3]
-            return false unless year.length == 4 && year.to_i.to_s == year
-            DateTime.iso8601(value)
-          rescue
-            false
-          end
-
-          # Generates a Time object in the UTC from the datestamp string value
-          # @return [Time]
-          def result
-            DateTime.iso8601(value).utc
-          end
-        end
+      class RDFMetadata < ::Valkyrie::Persistence::Shared::JSONValueMapper
       end
   end
 end

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

@@ -237,7 +237,7 @@ module Valkyrie::Persistence::Postgres
       end
 
       def ordered_property?(resource:, property:)
-        resource.class.schema[property].meta.try(:[], :ordered)
+        resource.ordered_attribute?(property)
       end
   end
 end

data/lib/valkyrie/persistence/shared.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module Valkyrie::Persistence
+  module Shared
+    require 'valkyrie/persistence/shared/json_value_mapper'
+  end
+end

data/lib/valkyrie/persistence/shared/json_value_mapper.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+module Valkyrie::Persistence::Shared
+  # Converts a hash representation of a Resource back into a Resource.
+  # Often useful for converting back from JSON.
+  class JSONValueMapper
+    attr_reader :metadata
+
+    # @param [Hash] metadata
+    def initialize(metadata)
+      # nil hash values are handled by the default state in dry-types
+      # anyways, so don't bother processing them here.
+      @metadata = metadata.compact
+    end
+
+    # Convert the database attribute values and map these to the existing keys in the Valkyrie Resource metadata
+    # @return [Hash]
+    def result
+      Hash[
+        metadata.map do |key, value|
+          [key, PostgresValue.for(value).result]
+        end
+      ]
+    end
+
+    # Abstract base class for mapping PostgreSQL database field values to Valkyrie Resource attributes
+    class PostgresValue < ::Valkyrie::ValueMapper
+    end
+
+    # Converts {RDF::Literal} typed-literals from JSON-LD stored into an
+    #   {RDF::Literal}
+    class HashValue < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value is a Hash containing the key "@value"
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        value.is_a?(Hash) && value["@value"]
+      end
+
+      # Constructs a RDF::Literal object using the Object keyed to "@value"
+      # in the value Hash, as well as the language keyed to "@language" and
+      # datatype keyed to "@type"
+      # @return [RDF::Literal]
+      def result
+        RDF::Literal.new(value["@value"],
+                         language: value["@language"],
+                         datatype: value["@type"])
+      end
+    end
+
+    # Converts stored IDs into {Valkyrie::ID}s
+    class IDValue < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value is a Hash containing the key "id" (excluding those storing the Valkyrie Resource type)
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        value.is_a?(Hash) && value["id"] && !value["internal_resource"]
+      end
+
+      # Constructs a Valkyrie::ID object using the String keyed to "id" in the value
+      # @return [Valkyrie::ID]
+      def result
+        Valkyrie::ID.new(value["id"])
+      end
+    end
+
+    # Converts stored URIs into {RDF::URI}s
+    class URIValue < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value is a Hash containing the key "@id"
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        value.is_a?(Hash) && value["@id"]
+      end
+
+      # Constructs a RDF::URI object using the URI keyed to @id in the value
+      # @return [RDF::URI]
+      def result
+        ::RDF::URI.new(value["@id"])
+      end
+    end
+
+    # Converts nested records into {Valkyrie::Resource}s
+    class NestedRecord < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value is a Hash containing multiple keys
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        value.is_a?(Hash) && value.keys.length > 1
+      end
+
+      # Generates a Hash derived from the JSON for the value
+      # @return [Hash]
+      def result
+        Valkyrie::Persistence::Shared::JSONValueMapper.new(value).result.symbolize_keys
+      end
+    end
+
+    # Handles iterating over arrays of values and converting each value.
+    class EnumeratorValue < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value has enumerable behavior
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        value.respond_to?(:each)
+      end
+
+      # Convert the elements in the enumerable value in Valkyrie attribute values
+      # Casts single-valued arrays to the first value, letting Types::Set and
+      # Types::Array handle converting it back.
+      # @return [Array<Object>]
+      def result
+        if value.length == 1
+          calling_mapper.for(value.first).result
+        else
+          value.map do |value|
+            calling_mapper.for(value).result
+          end
+        end
+      end
+    end
+
+    # Converts Date strings to `DateTime`
+    class DateValue < ::Valkyrie::ValueMapper
+      PostgresValue.register(self)
+
+      # Determines whether or not a value is an ISO 8601 datestamp String
+      # e. g. 1970-01-01
+      # @param [Object] value
+      # @return [Boolean]
+      def self.handles?(value)
+        return false unless value.is_a?(String)
+        return false unless value[4] == "-"
+        year = value.to_s[0..3]
+        return false unless year.length == 4 && year.to_i.to_s == year
+        DateTime.iso8601(value)
+      rescue
+        false
+      end
+
+      # Generates a Time object in the UTC from the datestamp string value
+      # @return [Time]
+      def result
+        DateTime.iso8601(value).utc
+      end
+    end
+  end
+end

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

@@ -120,7 +120,7 @@ module Valkyrie::Persistence::Solr
       end
 
       def ordered_property?(resource:, property:)
-        resource.class.schema[property].meta.try(:[], :ordered)
+        resource.ordered_attribute?(property)
       end
   end
 end

data/lib/valkyrie/resource.rb

@@ -19,15 +19,7 @@ module Valkyrie
     # available key, and makes sure the defaults are set up if no value is
     # given.
     def self.allow_nonexistent_keys
-      nil_2_undef = ->(v) { v.nil? ? Dry::Types::Undefined : v }
-      transform_types do |type|
-        current_meta = type.meta.merge(omittable: true)
-        if type.default?
-          type.constructor(nil_2_undef).meta(current_meta)
-        else
-          type.meta(current_meta)
-        end
-      end
+      transform_types(&:omittable)
     end
 
     # Overridden to provide default attributes.
@@ -36,7 +28,7 @@ module Valkyrie
       super(subclass)
       subclass.allow_nonexistent_keys
       subclass.attribute :id, Valkyrie::Types::ID.optional, internal: true
-      subclass.attribute :internal_resource, Valkyrie::Types::Any.default(subclass.to_s), internal: true
+      subclass.attribute :internal_resource, Valkyrie::Types::Any.default(subclass.to_s.freeze), internal: true
       subclass.attribute :created_at, Valkyrie::Types::DateTime.optional, internal: true
       subclass.attribute :updated_at, Valkyrie::Types::DateTime.optional, internal: true
       subclass.attribute :new_record, Types::Bool.default(true), internal: true
@@ -44,7 +36,7 @@ module Valkyrie
 
     # @return [Array<Symbol>] Array of fields defined for this class.
     def self.fields
-      schema.keys.without(:new_record)
+      attribute_names.without(:new_record)
     end
 
     # Define an attribute. Attributes are used to describe resources.
@@ -53,7 +45,9 @@ module Valkyrie
     # @note Overridden from {Dry::Struct} to make the default type
     #   {Valkyrie::Types::Set}
     def self.attribute(name, type = Valkyrie::Types::Set.optional, internal: false)
-      raise ReservedAttributeError, "#{name} is a reserved attribute and defined by Valkyrie::Resource, do not redefine it." if reserved_attributes.include?(name.to_sym) && schema[name] && !internal
+      raise ReservedAttributeError, "#{name} is a reserved attribute and defined by Valkyrie::Resource, do not redefine it." if reserved_attributes.include?(name.to_sym) &&
+                                                                                                                                attribute_names.include?(name.to_sym) &&
+                                                                                                                                !internal
       define_method("#{name}=") do |value|
         set_value(name, value)
       end
@@ -94,7 +88,11 @@ module Valkyrie
     end
 
     def attributes
-      super.dup.freeze
+      Hash[self.class.attribute_names.map { |x| [x, nil] }].merge(super).freeze
+    end
+
+    def __attributes__
+      Hash[@attributes].freeze
     end
 
     def dup
@@ -158,7 +156,12 @@ module Valkyrie
     # @param key [#to_sym] the name of the attribute to set
     # @param value [] the value to set key to.
     def set_value(key, value)
-      @attributes[key.to_sym] = self.class.schema[key.to_sym].call(value)
+      @attributes[key.to_sym] = self.class.schema.key(key.to_sym).type.call(value)
+    end
+
+    # Returns if an attribute is set as ordered.
+    def ordered_attribute?(key)
+      self.class.schema.key(key).type.meta.try(:[], :ordered)
     end
 
     class ReservedAttributeError < StandardError; end

data/lib/valkyrie/specs/shared_specs/resource.rb

@@ -76,7 +76,6 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       resource.my_property = "test"
 
       expect(resource[:my_property]).to eq ["test"]
-      resource_klass.schema.delete(:my_property)
     end
     it "returns nil for non-existent properties" do
       resource = resource_klass.new
@@ -90,10 +89,17 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       resource.other_property = "test"
 
       expect(resource["other_property"]).to eq ["test"]
-      resource_klass.schema.delete(:other_property)
+
+      unset_key(resource_klass, :other_property)
     end
   end
 
+  def unset_key(resource_klass, property)
+    resource_klass.schema(Dry::Types::Schema.new(Hash, **resource_klass.schema.options, keys: resource_klass.schema.keys.select { |x| x.name != property }, meta: resource_klass.schema.meta))
+    resource_klass.instance_variable_set(:@attribute_names, nil)
+    resource_klass.allow_nonexistent_keys
+  end
+
   describe "#set_value" do
     it "can set a value" do
       resource_klass.attribute :set_value_property unless resource_klass.schema.key?(:set_value_property)
@@ -104,7 +110,7 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       expect(resource.set_value_property).to eq ["test"]
       resource.set_value("set_value_property", "testing")
       expect(resource.set_value_property).to eq ["testing"]
-      resource_klass.schema.delete(:set_value_property)
+      unset_key(resource_klass, :set_value_property)
     end
   end
 
@@ -115,14 +121,14 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       resource = resource_klass.new(symbol_property: "bla")
 
       expect(resource.symbol_property).to eq ["bla"]
-      resource_klass.schema.delete(:symbol_property)
+      unset_key(resource_klass, :symbol_property)
     end
     it "can not set values with string properties" do
       resource_klass.attribute :string_property unless resource_klass.schema.key?(:string_property)
 
       resource = nil
       expect(resource).not_to respond_to :string_property
-      resource_klass.schema.delete(:string_property)
+      unset_key(resource_klass, :string_property)
     end
   end
 
@@ -137,7 +143,22 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       expect(resource.attributes[:internal_resource]).to eq resource_klass.to_s
       expect { resource.attributes.dup[:internal_resource] = "bla" }.not_to output.to_stderr
 
-      resource_klass.schema.delete(:bla)
+      unset_key(resource_klass, :bla)
+      resource = resource_klass.new
+      expect(resource.attributes).not_to have_key(:bla)
+    end
+  end
+
+  describe "#__attributes__" do
+    it "returns all defined attributes, but doesn't add nil keys" do
+      resource_klass.attribute :bla unless resource_klass.schema.key?(:bla)
+
+      resource = resource_klass.new
+      expect(resource.__attributes__).to be_frozen
+      expect(resource.__attributes__).not_to have_key :bla
+      expect(resource.__attributes__).to have_key :internal_resource
+
+      unset_key(resource_klass, :bla)
     end
   end
 end

data/lib/valkyrie/types.rb

@@ -15,10 +15,10 @@ module Valkyrie
   # @note Not all Dry::Types built-in types are supported in Valkyrie
   # @see https://github.com/samvera-labs/valkyrie/wiki/Supported-Data-Types List of types supported in Valkyrie
   module Types
-    include Dry::Types.module
+    include Dry.Types(default: :nominal)
 
     # Valkyrie::ID
-    ID = Dry::Types::Definition
+    ID = Dry::Types::Nominal
          .new(Valkyrie::ID)
          .constructor do |input|
       if input.respond_to?(:each)
@@ -40,7 +40,7 @@ module Valkyrie
     end
 
     # Valkyrie::URI
-    URI = Dry::Types::Definition
+    URI = Dry::Types::Nominal
           .new(RDF::URI)
           .constructor do |input|
       if input.present?
@@ -52,7 +52,7 @@ module Valkyrie
 
     # Optimistic Lock Token
     OptimisticLockToken =
-      Dry::Types::Definition
+      Dry::Types::Nominal
       .new(::Valkyrie::Persistence::OptimisticLockToken)
       .constructor do |input|
         Valkyrie::Persistence::OptimisticLockToken.deserialize(input)
@@ -96,13 +96,6 @@ module Valkyrie
       def of(type)
         super.default([].freeze)
       end
-
-      # Override optional to provide a default because without it an
-      # instantiated Valkyrie::Resource's internal hash does not have values for
-      # every possible attribute, resulting in `MissingAttributeError`.
-      def optional
-        super.default(nil)
-      end
     end
     Array.singleton_class.include(ArrayDefault)
     Set.singleton_class.include(ArrayDefault)

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.0.0.RC5"
+  VERSION = "2.0.0.RC6"
 end

data/valkyrie.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct'
   spec.add_dependency 'draper'
   spec.add_dependency 'activemodel'
-  spec.add_dependency 'dry-types', '~> 0.13.0'
+  spec.add_dependency 'dry-types', '~> 1.0'
   spec.add_dependency 'rdf'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'railties' # To use generators and engines
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
   spec.add_dependency 'rdf-vocab'
+  spec.add_dependency 'disposable', '~> 0.4.5'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.0.0.RC5
+  version: 2.0.0.RC6
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: disposable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -474,6 +488,8 @@ files:
 - lib/valkyrie/persistence/postgres/query_service.rb
 - lib/valkyrie/persistence/postgres/resource_converter.rb
 - lib/valkyrie/persistence/postgres/resource_factory.rb
+- lib/valkyrie/persistence/shared.rb
+- lib/valkyrie/persistence/shared/json_value_mapper.rb
 - lib/valkyrie/persistence/solr.rb
 - lib/valkyrie/persistence/solr/composite_indexer.rb
 - lib/valkyrie/persistence/solr/metadata_adapter.rb