valkyrie 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b458c0bf12323ee7593ba335f9b11d933bbf3bc8e2dd1174f2a682e0be10c7
-  data.tar.gz: 59ec4d50795fa715b260fd77b773a4113d90731ae12719d8ed35d494f600f056
+  metadata.gz: 06e5a897c18679418660d531ae88c69f4ed675289080ddf712a52d2efa700344
+  data.tar.gz: 78c96247bff42a505751b299f3314c4028240c2e68ac727d42cb71d1f92ab8af
 SHA512:
-  metadata.gz: 9625fb7adb62fd504dde9e216a4b86b10c3054258f3363eb717da22e5bd1a81c8dc72608022739311a5b914528d9ac045dd66063148ec58da1de63e5cda08575
-  data.tar.gz: 4692ea78e86c4a8a74ddbea67c2b74660f7c7a2f4d69efd0c6755f6f2ba9258620eeaa7d03f1455b24a81e4c61dff5533f47072db6f9945eff92d1779696df6e
+  metadata.gz: dcbf37ca3daa89d25bf7c28d0d1684c2959fb6d26eff6ba8ca427b64f6a4413774702dd588a19e797648266b26786f526eb3b6423a2aeb48d78e8a0d4c6603f5
+  data.tar.gz: 20dc3cc1aacd225b29eec0d2cdafe8bc42c7d46b0bdbd4ad81af75dae79017477fb116b00320c9d4be4bf5e7aa5fcd23b6a88c8d4b5c7ac7dbaeb436ebed8caa

data/.circleci/config.yml

@@ -67,6 +67,10 @@ workflows:
   version: 2
   build:
     jobs:
+      - build:
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.3
+          name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
           ruby: 2.6.3
@@ -100,6 +104,10 @@ workflows:
               only:
                 - master
     jobs:
+      - build:
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.3
+          name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
           ruby: 2.6.3

data/.docker-stack/valkyrie-development/docker-compose.yml

@@ -8,13 +8,13 @@ volumes:
   solr_index:
 services:
   fedora4:
-    image: nulib/fcrepo4:4.7.5
+    image: samvera/fcrepo4:4.7.5
     volumes:
     - fedora4:/data
     ports:
     - 8986:8080
   fedora5:
-    image: nulib/fcrepo4:5.0.0
+    image: samvera/fcrepo4:5.1.0
     volumes:
     - fedora5:/data
     ports:

data/.docker-stack/valkyrie-test/docker-compose.yml

@@ -8,13 +8,13 @@ volumes:
   solr_index:
 services:
   fedora4:
-    image: nulib/fcrepo4:4.7.5
+    image: samvera/fcrepo4:4.7.5
     volumes:
     - fedora4:/data
     ports:
     - 8988:8080
   fedora5:
-    image: nulib/fcrepo4:5.0.0
+    image: samvera/fcrepo4:5.1.0
     volumes:
     - fedora5:/data
     ports:

data/Appraisals

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+appraise "activerecord-6-0" do
+  gem "activerecord", "~> 6.0.0"
+end
+
 appraise "activerecord-5-2" do
   gem "activerecord", "~> 5.2.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v2.0.2 2019-10-17
+
+## Changes since last release
+
+* Fix nil not persisting with the ActiveRecord adapter.
+  [tpendragon](https://github.com/tpendragon)
+* Define setters when building a Resource schema with `.attributes`
+  [no-reply](https://github.com/no-reply)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[coblej](https://github.com/coblej)
+
 # v2.0.1 2019-07-03
 
 ## Changes since last release

data/gemfiles/activerecord_6_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+
+gemspec path: "../"

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

@@ -20,7 +20,7 @@ module Valkyrie::Persistence::Postgres
         orm_object.internal_resource = resource.internal_resource
         process_lock_token(orm_object)
         orm_object.disable_optimistic_locking! unless resource.optimistic_locking_enabled?
-        orm_object.metadata.merge!(attributes)
+        orm_object.metadata = attributes
       end
     end
 

data/lib/valkyrie/resource.rb

@@ -13,6 +13,7 @@ module Valkyrie
   # @see https://github.com/samvera-labs/valkyrie/wiki/ChangeSets-and-Dirty-Tracking Validation and change tracking is provided by change sets
   #
   # @see lib/valkyrie/specs/shared_specs/resource.rb
+  # rubocop:disable Metrics/ClassLength
   class Resource < Dry::Struct
     include Draper::Decoratable
     # Allows a Valkyrie::Resource to be instantiated without providing every
@@ -48,13 +49,34 @@ module Valkyrie
       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
+
       type = type.meta(ordered: true) if name == :member_ids
       super(name, type)
     end
 
+    # @param [Hash{Symbol => Dry::Types::Type}] new_schema
+    # @return [Dry::Struct]
+    # @raise [RepeatedAttributeError] when trying to define attribute with the
+    #   same name as previously defined one
+    # @see #attribute
+    # @note extends {Dry::Struct} by adding `#attr=` style setters
+    def self.attributes(new_schema)
+      super
+
+      new_schema.each_key do |key|
+        key = key.to_s.chomp('?')
+        next if instance_methods.include?("#{key}=".to_sym)
+
+        class_eval(<<-RUBY)
+          def #{key}=(value)
+            set_value("#{key}".to_sym, value)
+          end
+        RUBY
+      end
+
+      self
+    end
+
     def self.reserved_attributes
       [:id, :internal_resource, :created_at, :updated_at, :new_record]
     end
@@ -166,4 +188,5 @@ module Valkyrie
 
     class ReservedAttributeError < StandardError; end
   end
+  # rubocop:enable Metrics/ClassLength
 end

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

@@ -56,6 +56,14 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     output = persister.save(resource: resource)
 
     expect(output.single_value).to eq "A single value"
+
+    reloaded = query_service.find_by(id: output.id)
+
+    reloaded.single_value = nil
+    persister.save(resource: reloaded)
+    reloaded = query_service.find_by(id: reloaded.id)
+
+    expect(reloaded.single_value).to eq nil
   end
 
   it "returns nil for an unset single value" do

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/tasks/dev.rake

@@ -9,7 +9,7 @@ namespace :server do
     SolrWrapper.wrap(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')) do |solr|
       solr.with_collection(name: "blacklight-core-test", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
         FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data", version: "4.7.5", instance_directory: "tmp/fcrepo4")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", version: "5.0.0", instance_directory: "tmp/fcrepo5")).wrap do |_other_repo|
+          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", version: "5.1.0", instance_directory: "tmp/fcrepo5")).wrap do |_other_repo|
             puts "Setup solr & Fedora"
             loop do
               sleep(1)
@@ -40,7 +40,7 @@ namespace :server do
     SolrWrapper.wrap(shared_solr_opts.merge(port: 8983, instance_dir: 'tmp/blacklight-core')) do |solr|
       solr.with_collection(name: "blacklight-core", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
         FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "tmp/fcrepo4-dev-data", version: "4.7.5")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8996, fcrepo_home_dir: "tmp/fcrepo5-dev-data", version: "5.0.0")).wrap do |_fcrepo|
+          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8996, fcrepo_home_dir: "tmp/fcrepo5-dev-data", version: "5.1.0")).wrap do |_fcrepo|
             puts "Setup solr & Fedora"
             loop do
               sleep(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -452,6 +452,7 @@ files:
 - db/seeds.rb
 - gemfiles/activerecord_5_1.gemfile
 - gemfiles/activerecord_5_2.gemfile
+- gemfiles/activerecord_6_0.gemfile
 - lib/config/database_connection.rb
 - lib/generators/valkyrie/resource_generator.rb
 - lib/generators/valkyrie/templates/resource.rb.erb