game_validator 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e3f324917b46d542868516b19cae218850e8599a4c0ae32aabc2e8534bdf76
-  data.tar.gz: e7b4b68f0bf8b4fe37421ed6ee3b8749bcb8f9a07f5344bf020b5632ce1b76c9
+  metadata.gz: f73953ca1bcfcc58ac40040a66c320acc8800e7b17dd6dcc32c8158ece1de8f0
+  data.tar.gz: 7c2a2ffd96f83f279ed0ccb439ebfde8c6ae61b5cd0f9725835e609f41019e51
 SHA512:
-  metadata.gz: b01fb1013aae4f2cdbded8ced72af6a5f02f06026acaba11efd7d4bb1a1e85eb9609d03dd1bf37a71e2b6fa354a00876e246fd320cc079b0f25f7e886bff9632
-  data.tar.gz: 1fd0f020305734494a12a61739f2acdf295755d93d65439895a94f0cf2143e148d589ca0751c2bb9253e433a3e73dfc7edb2ddff9c348eade0929c3a071ed2d2
+  metadata.gz: a816556fee3fbba5550cfa893727991a5898956902c73aabf099d1e88fbc3fa3e2a7fff78a58de503bd22a0111f4258f4b57bcbcc858fdc4cea61fa3e8ca0623
+  data.tar.gz: f1d5bd1b69fda219e77424d322c1c5f769fe53590df8cbb9fb0eebba4667bb81b5039ade87c4278bad35d50448360a20cca6c7c96b7460116ab1e2f8bd30a15b

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    game_validator (0.3.0)
+    game_validator (0.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
@@ -26,19 +26,17 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer
-    dry-schema (1.5.6)
+    dry-schema (1.6.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
-      dry-types (~> 1.4)
-    dry-types (1.4.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     dry-validation (1.6.0)
@@ -59,10 +57,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
@@ -79,4 +77,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.2
+   2.2.15

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.4.0' do |spec|
+Gem::Specification.new 'game_validator', '0.6.1' do |spec|
   spec.name          = 'game_validator'
   spec.version       = GameValidator::VERSION
   spec.authors       = ['Colin Horner']

data/lib/game_validator.rb

@@ -3,6 +3,15 @@ require 'dry-types'
 module Types
   include Dry.Types()
 end
+callable = Types.Interface(:call)
+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::ArrayOfString = Types::Array::of(Types::String)
+Types::CoercibleNonnegativeInteger = Types::Coercible::Integer.constrained(gteq: 0)
 
 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/validator/result.rb

@@ -13,7 +13,7 @@ module GameValidator
       end
 
       def call(**args)
-        @execute.(to_h, args)
+        @execute.(to_h.merge(args))
       end
     end
   end

data/lib/game_validator/version.rb

@@ -1,3 +1,3 @@
 module GameValidator
-  VERSION = '0.4.0'
+  VERSION = '0.6.1'
 end

metadata

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