valkyrie 1.2.0.rc2 → 1.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0ce0917b94c4102aec4a20c07ad0a2d9bb8abbec21c87c91ffe3100ee266e5ee
-  data.tar.gz: 11ab274a94c6510b0910a5cf16552244eb693daf1bc595c2f9db91480279ca8a
+SHA1:
+  metadata.gz: 2bdfa295f55a450caed436ffff2d8b9a6986a1e5
+  data.tar.gz: c3b3f15e4e01c2fe25f22782333a0fde3ec6670a
 SHA512:
-  metadata.gz: 42c1aa0891d23c99092328e0b9ff7eb8e305c25b3210b9f0d64c0493b6f9ad0c55eb091a2cd481bb4212b3ab8eb148cd3ca949e52963549734dde508a11fa411
-  data.tar.gz: 30ed893f5b392f4c765950e003aec192039ce3d53147c8428997df492e64836cd47382414b2cd0141eb5f8f265583ad040823c8037144c498ac8e60307b36611
+  metadata.gz: 14554e9715fc52dbab93da0fccc5f37d946254d4a1fad6a15b75cb459d6e1834b4c5b3881032d15f482245b489dd61e78e01747b74360066a83dc42e2d5702d2
+  data.tar.gz: d5b9aea4fecdf6b30bb340397dcf24ae38fca2b8da316dafa461a7349392003d1d8c35f7da8905a1da2900446bb09c6e0f746155fc86a05e87033b23f52ed3de

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.2.0.RC3 2018-08-15
+
+## Changes since last release
+
+* Fix for postgres optimistic locking.
+
 # v1.2.0.RC2 2018-08-10
 
 ## Changes since last release

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

@@ -419,26 +419,6 @@ module Valkyrie::Persistence::Fedora
           end
         end
 
-        # Casts the value of the RDF literal into an Applicator for Valkyrie::Persistence::OptimisticLockToken objects
-        # @return [Applicator]
-        class ValkyrieOptimisticLockToken < ::Valkyrie::ValueMapper
-          FedoraValue.register(self)
-
-          # Determines whether or not a Property statement is an RDF literal typed for Valkyrie Optimistic Lock Token literals
-          # @param [Property] value
-          # @return [Boolean]
-          def self.handles?(value)
-            value.statement.object.is_a?(RDF::Literal) && value.statement.object.datatype == PermissiveSchema.optimistic_lock_token
-          end
-
-          # Casts the value of the RDF literal into an Applicator for Valkyrie::Persistence::OptimisticLockToken objects
-          # @return [Applicator]
-          def result
-            value.statement.object = Valkyrie::Persistence::OptimisticLockToken.new(adapter_id: value.adapter.id, token: value.statement.object.to_s)
-            calling_mapper.for(Property.new(statement: value.statement, scope: value.scope, adapter: value.adapter)).result
-          end
-        end
-
         # Casts the value of the RDF literal into an Applicator for URIs referencing Valkyrie Resources
         # @return [Applicator]
         class InternalURI < ::Valkyrie::ValueMapper

data/lib/valkyrie/persistence/postgres/orm/resource.rb

@@ -14,6 +14,14 @@ module Valkyrie::Persistence::Postgres
     #   @return [String] Name of {Valkyrie::Resource} model - used for casting.
     #
     class Resource < ActiveRecord::Base
+      def disable_optimistic_locking!
+        @disable_optimistic_locking = true
+      end
+
+      def locking_enabled?
+        return false if @disable_optimistic_locking
+        true
+      end
     end
   end
 end

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

@@ -19,6 +19,7 @@ module Valkyrie::Persistence::Postgres
       orm_class.find_or_initialize_by(id: resource.id && resource.id.to_s).tap do |orm_object|
         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)
       end
     end

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "1.2.0.rc2"
+  VERSION = "1.2.0.rc3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.2.0.rc3
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -575,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital