game_validator 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9626f5c6e51a39dd043d2c82448f6ea9456fb9b395cd1b7995641a75cec75cd8
-  data.tar.gz: ff74cb46f6f0fdba636ef239b3aff7689be23c1c5afeb5ba00fa87ca056bf0f9
+  metadata.gz: bd90aaf91b77cf3e07547bab0e7b2ab215d91247a61dd1b2db3cc1970a6ddc51
+  data.tar.gz: d4f13f99c8cc2fd30b1fb6cbc12d2a7dec41d69030cb73b7aaf6f0367da74248
 SHA512:
-  metadata.gz: 95bdc1c1916115f7c37b8270d37b5386e9d1031fcaa017427370ef8557ff2d9a98351c833e66c7749fc2545597fc3b64490c84b033fbdd0060bb1d5a2cb7d134
-  data.tar.gz: 8347ff802a6a09cd005d688e718be4760120b1819abb7855d98b2b0e355539cf94cdd349109925fcea56c0cc58827eb8fc0e2d8e4fb3171a7569bf21f4e9d32c
+  metadata.gz: 5e1f12c87026ecbe1386fde7ff5a1c8afb8fa6340b952a08707a2fab65124a01d984fe50a61f3d2259cf21b8d12ae652fd6eba4121b5bb4a062eb8efda424b55
+  data.tar.gz: 7d06c2c9f5939529f97b0d084da7021233c0598e0b4218aeb8570849edf20b118f00dbed51f3e18faed079e8199fe04c6e11b05d6dc25fa81429c3cba89a5715

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    game_validator (0.5.1)
+    game_validator (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -79,9 +79,10 @@ full_validator = {
 In this fashion, you create the full validator as follows
 ```
 GameValidator::Validator::new(
-  validate_player_action_and_user: GameValidator::Validator::Base::new(legal_options: ['run', 'hide'], next_player_id: 1),
+  validate_player_action_and_user: GameValidator::Validator::Base::new(legal_options: ['run', 'hide'], next_player_id: 1, last_action_id: 1),
   full_validator_for: full_validator)
 ```
+Note the last_action_id option, to make sure that you are validating against the most recent action in the game.
 
 You can also wrap successful results from the validator, using GameValidator::Validator::ValidateToAction and GameValidator::Validator::Result
 ```
@@ -99,7 +100,6 @@ GameValidator::Validator::ValidateToAction::new(
     execute: DoStuff::new)})
 ```
 
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/game_validator.gemspec

@@ -2,7 +2,7 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "game_validator/version"
 
-Gem::Specification.new 'game_validator', '0.5.1' do |spec|
+Gem::Specification.new 'game_validator', '0.6.0' do |spec|
   spec.name          = 'game_validator'
   spec.version       = GameValidator::VERSION
   spec.authors       = ['Colin Horner']

data/lib/game_validator.rb

@@ -8,8 +8,9 @@ Types::Callable = Types.Constructor(Method) do |value|
   callable.call(value) # raises Dry::Types::ConstraintError if object doesn't respond to #call
   value.is_a?(Method) || value.is_a?(Proc) ? value : value.method(:call)
 end
-Types::ArrayOfCallable = ::Types::Array::of(::Types::Callable)
-Types::ArrayOfStrictInteger = ::Types::Array::of(::Types::Strict::Integer)
+Types::ArrayOfCallable = Types::Array::of(Types::Callable)
+Types::ArrayOfStrictInteger = Types::Array::of(Types::Strict::Integer)
+Types::ArrayOfString = Types::Array::of(Types::String)
 
 require 'game_validator/version'
 require 'game_validator/validator'

data/lib/game_validator/validator.rb

@@ -6,9 +6,9 @@ require 'game_validator/validator/full_validator_coercer'
 module GameValidator
   class Validator
     extend Dry::Initializer
-    option :validate_player_action_and_user, type: Types.Interface(:call)
+    option :validate_player_action_and_user, type: Types::Callable
     option :full_validator_for, type: Types::Hash
-    option :build_failure, type: Types.Interface(:call),
+    option :build_failure, type: Types::Callable,
       default: ->{GameValidator::Validator::Result::Failure::Builder::new}
 
     def call(action_hash:, user:)

data/lib/game_validator/validator/base.rb

@@ -7,12 +7,14 @@ Dry::Validation.load_extensions(:monads)
 module GameValidator
   class Validator
     class Base < Dry::Validation::Contract
-      option :legal_options, type: Types::Array.of(Types::String)
-      option :next_player_id, type: Types::Coercible::Integer
+      option :legal_options, type: Types::ArrayOfString
+      option :current_player_id, type: Types::Coercible::Integer
+      option :last_action_id, type: Types::Coercible::Integer
 
       params do
         required(:player_action).filled(:string)
         required(:user).filled(Types.Interface(:id, :admin?))
+        required(:last_action_id).filled(:integer)
       end
 
       rule(:player_action) do
@@ -22,10 +24,20 @@ module GameValidator
       end
 
       rule(:user) do
-        if !values[:user].id.eql?(next_player_id) && !values[:user].admin?
+        if !values[:user].id.eql?(current_player_id) && !values[:user].admin?
           key.failure({text: 'Not logged in', status: 401})
         end
       end
+
+      rule(:last_action_id) do
+        if values[:last_action_id] < last_action_id
+          key.failure({text: "last_action_id '#{values[:last_action_id]}' is obsolete",status: 409})
+        end
+
+        if values[:last_action_id] > last_action_id
+          key.failure({text: "last_action_id '#{values[:last_action_id]}' not a match",status: 400})
+        end
+      end
     end
   end
 end

data/lib/game_validator/version.rb

@@ -1,3 +1,3 @@
 module GameValidator
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: game_validator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Colin Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler