valkyrie-sequel 2.2.1 → 3.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c82c0908c1a17e60365ffe3b82936ffed1c168ccc40183d78fc60000b4e7da
-  data.tar.gz: 434ff68cfb53eab85acc6cbe6eefe691d27eea0e01e0249475b97675c0da5f68
+  metadata.gz: b6d42b77cece523b4eeacf7f4853bc20e0fac7f5b8df24e742ae4ef1e6b7df12
+  data.tar.gz: 6edac9cf3f494640dfe74e062dd3760d9f0386d8d3b60dcf2ea7f01190e3fc3d
 SHA512:
-  metadata.gz: 1bf48b6add481dcd51d4f02f3a0454d8144f6d39106a264510e5f02c0764769344cdb343a8f05038b94614d79b3b16cc0430a25a683f5b0f047cca7d8c072768
-  data.tar.gz: 00a6c97708c6f3653497f158d1a0aded088a73908d9559c4f276ae02f2768826a2ddb7306fa41ed5a1d146062f196f63995b5a7f6f0f4bbcc39c4e569e695446
+  metadata.gz: 53f9dc78cec19cb0eaac3e7001eaf2f8d2cf8c29e3ec10795fa0f1b69162ba34d8a237582c9f7345022fc0d82d422eac490be84eb8596f39941b2dffad2af812
+  data.tar.gz: 51faaaad25361de2f20885dafa49307a56bb75bd91a2a907607ae4228bef125764acf7d6ef162a34c2fbc50270ff3a6e5a5b1922074c33030a0415a2b4e97d87

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
 
@@ -121,11 +121,18 @@ 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:)
@@ -146,7 +153,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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Valkyrie
   module Sequel
-    VERSION = "2.2.1"
+    VERSION = "3.0.0-beta.1"
   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.0-beta.1"
   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.pre.beta.1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.0.pre.beta.1
   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.0.pre.beta.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -214,11 +208,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Valkyrie::MetadataAdapter for Postgres using Sequel.