valkyrie-sequel 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147de175c6560bcb1836553dd0c5c3e94908c5f8
-  data.tar.gz: e48b68150de3a5ed8efb8ac4064866db769227ee
+  metadata.gz: d6e9fe995f047640837186d5468d2c13c1a4bde5
+  data.tar.gz: 2802d8cdee2d9bc7a029be53053a8d2df0e56358
 SHA512:
-  metadata.gz: 546160cf2ab0d62a4e2196bc8f390510999cc8e2e9e74e6aa3f483eec6c2f236b45103361d37c31f98d84cf4a45fbf4dd98cbe6cf389ad20aefe594eb7326a6f
-  data.tar.gz: 396c775f741c4d972e372c5400cd9f23236dac76c983e5d3183553726c745e3bf30be4dbf4dbb17e456d1ee29fbc8eaa551d0e3dc8f7d929e5bddd0629ab688c
+  metadata.gz: bb9d0289ef5b574b75447c06531416f306db195ad9a3e213cba51ab4671bd3cf62504a107f5647f6a6f2262b45805d832ad88bfbbf5252d3b953d2a2963dd743
+  data.tar.gz: 9d38118312e0e27e71c8035b40eabc23c15719bbe33b87d4deb2e99fc1347f95384e457ee1480ebbab71d6072eff3750281dc96b8a8fc933ca6639365da27c13

data/.rubocop.yml

@@ -20,3 +20,6 @@ Metrics/ClassLength:
 Metrics/ParameterLists:
   Exclude:
     - 'lib/valkyrie/sequel/metadata_adapter.rb'
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/valkyrie/sequel/persister_spec.rb'

data/lib/valkyrie/sequel/persister.rb

@@ -61,7 +61,7 @@ module Valkyrie::Sequel
           resources.returning.insert_conflict(
             target: :id,
             update: update_branches,
-            update_where: { Sequel[:orm_resources][:lock_version] => Sequel[:excluded][:lock_version] }
+            update_where: { Sequel.function(:coalesce, Sequel[:orm_resources][:lock_version], 0) => Sequel[:excluded][:lock_version] }
           )
         end
 
@@ -69,7 +69,7 @@ module Valkyrie::Sequel
           {
             metadata: Sequel[:excluded][:metadata],
             internal_resource: Sequel[:excluded][:internal_resource],
-            lock_version: Sequel[:excluded][:lock_version] + 1,
+            lock_version: Sequel.function(:coalesce, Sequel[:excluded][:lock_version], 0) + 1,
             created_at: Sequel[:excluded][:created_at],
             updated_at: Time.now.utc
           }
@@ -109,6 +109,7 @@ module Valkyrie::Sequel
         end
       end
     end
+
     def delete(resource:)
       resources.where(id: resource.id.to_s).delete
       resource
@@ -135,8 +136,8 @@ module Valkyrie::Sequel
       def update(resource:, attributes:)
         relation = resources.where(id: attributes[:id])
         if resource.optimistic_locking_enabled?
-          relation = relation.where(lock_version: attributes[:lock_version]) if attributes[:lock_version]
-          attributes[:lock_version] = (Sequel[:lock_version] + 1)
+          relation = relation.where(Sequel.function(:coalesce, :lock_version, 0) => attributes[:lock_version] || 0)
+          attributes[:lock_version] = (Sequel.function(:coalesce, :lock_version, 0) + 1)
         end
         attributes.delete(:lock_version) if attributes[:lock_version].nil?
         output = relation.returning.update(attributes)

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

@@ -27,6 +27,7 @@ module Valkyrie::Sequel
       # Construct the optimistic lock token using the adapter and lock version for the Resource
       # @return [Valkyrie::Persistence::OptimisticLockToken]
       def lock_token
+        return nil unless object[:lock_version].present?
         @lock_token ||=
           Valkyrie::Persistence::OptimisticLockToken.new(
             adapter_id: resource_factory.adapter_id,

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

@@ -25,7 +25,7 @@ module Valkyrie::Sequel
       # @param [ORM::Resource] orm_object
       def process_lock_token(orm_object)
         return unless resource.respond_to?(Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK)
-        postgres_token = resource[Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK].find do |token|
+        postgres_token = (resource[Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK] || []).find do |token|
           token.adapter_id == resource_factory.adapter_id
         end
         return unless postgres_token

data/lib/valkyrie/sequel/version.rb

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

data/valkyrie-sequel.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sequel"
   spec.add_dependency "sequel_pg"
-  spec.add_dependency "valkyrie", "~> 1.5.0.RC1"
+  spec.add_dependency "valkyrie", '>= 1.5.0', '< 3.0.0'
   spec.add_dependency "oj"
   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-sequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -42,16 +42,22 @@ dependencies:
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.0.RC1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.0.RC1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement