valkyrie-sequel 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c82c0908c1a17e60365ffe3b82936ffed1c168ccc40183d78fc60000b4e7da
-  data.tar.gz: 434ff68cfb53eab85acc6cbe6eefe691d27eea0e01e0249475b97675c0da5f68
+  metadata.gz: 496f6b385edcc29f60fee0e1aecd6c932e2f320b409485c42bac7b7091099c0d
+  data.tar.gz: 6f1140aa0b3625ce987748a94a478f0f4df8e1e3ef4be34ed0ef88bd36cc28dc
 SHA512:
-  metadata.gz: 1bf48b6add481dcd51d4f02f3a0454d8144f6d39106a264510e5f02c0764769344cdb343a8f05038b94614d79b3b16cc0430a25a683f5b0f047cca7d8c072768
-  data.tar.gz: 00a6c97708c6f3653497f158d1a0aded088a73908d9559c4f276ae02f2768826a2ddb7306fa41ed5a1d146062f196f63995b5a7f6f0f4bbcc39c4e569e695446
+  metadata.gz: 3c36213fca14199daea5605a8921757ac03e2255d65b6fd0a14c0cfab35a7ef6e84a20f644e5c09484e119ddc6266c29bd69d97c2abca6f90d90c5b16b483b08
+  data.tar.gz: 1a6eaf749712845d9af4a412fc9c07a7530b93d699efdbb9a10c4f6466bbf2451518de0475f959fcbdb69f270ef590e7ca19592db16533881d4d38140c901e80

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# changelog
+
+## 3.0.0
+
+https://github.com/samvera-labs/valkyrie-sequel/compare/v2.2.1...main
+
+- support Valkyrie 3.x (@tpendragon, @no-reply)
+- support `resource_class_resolver` in `resource_klass` (@marrus-sh, [#48](https://github.com/samvera-labs/valkyrie-sequel/pull/48))

data/lib/valkyrie/sequel/persister.rb

@@ -8,9 +8,9 @@ module Valkyrie::Sequel
       @adapter = adapter
     end
 
-    def save(resource:)
+    def save(resource:, external_resource: false)
       object_attributes = resource_factory.from_resource(resource: resource)
-      output = create_or_update(resource: resource, attributes: object_attributes)
+      output = create_or_update(resource: resource, attributes: object_attributes, external_resource: external_resource)
       resource_factory.to_resource(object: output)
     end
 
@@ -41,6 +41,7 @@ module Valkyrie::Sequel
           grouped_resources = resources.group_by(&:optimistic_locking_enabled?)
           locked_resources = grouped_resources[true] || []
           unlocked_resources = grouped_resources[false] || []
+
           CompositePersister.new(
             [
               SaveAllPersister.new(resources: locked_resources, relation: locking_relation, resource_factory: resource_factory),
@@ -98,6 +99,7 @@ module Valkyrie::Sequel
           output
         end
       end
+
       class CompositePersister
         attr_reader :persisters
         def initialize(persisters)
@@ -121,16 +123,23 @@ module Valkyrie::Sequel
 
     private
 
-    def create_or_update(resource:, attributes:)
+    def create_or_update(resource:, attributes:, external_resource:)
       attributes[:updated_at] = Time.now.utc
       attributes[:created_at] ||= Time.now.utc
-      return create(resource: resource, attributes: attributes) unless resource.persisted? && !exists?(id: attributes[:id])
-      update(resource: resource, attributes: attributes)
+      if exists?(id: attributes[:id])
+        update(resource: resource, attributes: attributes)
+      else
+        if !external_resource && resource.persisted?
+          # This resource has been deleted in the meantime, error.
+          raise Valkyrie::Persistence::ObjectNotFoundError, "The object #{resource.id} is previously persisted but not found at save time." unless exists?(id: attributes[:id])
+        end
+        create(resource: resource, attributes: attributes)
+      end
     end
 
     def create(resource:, attributes:)
       attributes[:lock_version] = 0 if resource.optimistic_locking_enabled? && resources.columns.include?(:lock_version)
-      Array(resources.returning.insert(attributes)).first
+      Array(resources.returning.insert(attributes)).first # rubocop:disable Rails/SkipsModelValidations
     end
 
     def update(resource:, attributes:)
@@ -146,7 +155,7 @@ module Valkyrie::Sequel
     end
 
     def exists?(id:)
-      resources.select(1).first(id: id).nil?
+      !resources.select(1).first(id: id).nil?
     end
   end
 end

data/lib/valkyrie/sequel/resource_factory/orm_converter.rb

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

data/lib/valkyrie/sequel/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Valkyrie
   module Sequel
-    VERSION = "2.2.1"
+    VERSION = "3.0.0"
   end
 end

data/valkyrie-sequel.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sequel", "~> 5.0"
   spec.add_dependency "sequel_pg", "~> 1.0"
-  spec.add_dependency "valkyrie", ">= 2.1", "< 2.3"
+  spec.add_dependency "valkyrie", "~> 3.0"
   spec.add_dependency "oj", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie-sequel
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Trey Pendragon
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -42,22 +42,16 @@ dependencies:
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +176,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -203,7 +198,7 @@ files:
 homepage: https://github.com/samvera-labs/valkyrie-sequel
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Valkyrie::MetadataAdapter for Postgres using Sequel.
 test_files: []