game_validator 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919eea6127e5739639bfd7034cf90ac44f4686dcc98fe8bd05d5cec91214458e
-  data.tar.gz: 2169e75bd4797488853984472902d076da7c032eee445ba89ad02a5db98f7fac
+  metadata.gz: bd90aaf91b77cf3e07547bab0e7b2ab215d91247a61dd1b2db3cc1970a6ddc51
+  data.tar.gz: d4f13f99c8cc2fd30b1fb6cbc12d2a7dec41d69030cb73b7aaf6f0367da74248
 SHA512:
-  metadata.gz: c9002a19d864067465f51a27cf344087d75f94b22704e2b6bccb07d38d3b9c2d56470bddac6a13a90874b7f8c34feb8e88a2afdf5b318294e0b6a7e6c1ff7438
-  data.tar.gz: 41e821d0ab7d559142a95dce2afd1032a4926a846e0be6d338f65abbc74804310668e922176940244eebbef5d096a994f5ea80e1832a7aa825fbf16b16307ab7
+  metadata.gz: 5e1f12c87026ecbe1386fde7ff5a1c8afb8fa6340b952a08707a2fab65124a01d984fe50a61f3d2259cf21b8d12ae652fd6eba4121b5bb4a062eb8efda424b55
+  data.tar.gz: 7d06c2c9f5939529f97b0d084da7021233c0598e0b4218aeb8570849edf20b118f00dbed51f3e18faed079e8199fe04c6e11b05d6dc25fa81429c3cba89a5715

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    game_validator (0.2.0)
+    game_validator (0.6.0)
 
 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

data/README.md

@@ -79,9 +79,26 @@ 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
+```
+class DoStuff
+  def call(change_orders:, **args)
+    # do stuff
+    change_orders
+  end
+end
+
+GameValidator::Validator::ValidateToAction::new(
+  validator: some_regular validator,
+  wrap: ->(successful_result){GameValidator::Validator::Result::new(
+    result: successful_result,
+    execute: DoStuff::new)})
+```
 
 ## Development
 

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.3.0' 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

@@ -3,6 +3,14 @@ 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)
 
 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:)
@@ -17,7 +17,7 @@ module GameValidator
       result = validate_player_action_and_user.(a)
       return build_failure.(errors: result.errors) if result.failure?
       validate = full_validator_for[[a[:player_action], a[:user].admin?]]
-      result = validate.(a)
+      result = validate.(action_hash)
       return build_failure.(errors: result.errors) if result.failure?
       result
     end

data/lib/game_validator/validator/base.rb

@@ -1,20 +1,20 @@
 # frozen string_literal: true
 
 require 'dry-validation'
-require 'dry-initializer'
 
 Dry::Validation.load_extensions(:monads)
 
 module GameValidator
   class Validator
     class Base < Dry::Validation::Contract
-      extend Dry::Initializer
-      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
@@ -24,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/validator/validate_to_action.rb

@@ -0,0 +1,20 @@
+# frozen string_literal: true
+
+require 'dry-initializer'
+
+module GameValidator
+  class Validator
+    class ValidateToAction
+      extend Dry::Initializer
+      option :validate, type: Types.Interface(:call)
+      option :wrap, type: Types.Interface(:call)
+
+      def call(action_hash)
+        result = validate.(action_hash)
+        result = wrap.(result) if result.success?
+        result
+      end
+    end
+  end
+end
+

data/lib/game_validator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: game_validator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Colin Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,6 +148,7 @@ files:
 - lib/game_validator/validator/result/failure.rb
 - lib/game_validator/validator/result/failure/builder.rb
 - lib/game_validator/validator/result/failure/node.rb
+- lib/game_validator/validator/validate_to_action.rb
 - lib/game_validator/version.rb
 homepage: 
 licenses: