veri 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02bcadafc5e2561e169ce65e920a7009f7549a0dfc1b5199cd471c01a8deac6f
-  data.tar.gz: 9e8b74e83ea6882c5289f6109c9b4f2e8c492874f4ff9794315be7602410ea4a
+  metadata.gz: a4fcb8a0d60277a1b18a9c23114d96c19472794ee47c02d62445248ff30f16f0
+  data.tar.gz: fa8eb3f99daf00c2c7c338350f14d3014ab855923e6977581d60e376c9dc3222
 SHA512:
-  metadata.gz: d7dedc00870041d1271c9c680226533030672546666bfac8a4fc0f5c7d26b4ff0eacd138b9edcb4418e017fd09e642e011b1dd06bb68ec69e2e3a4b96fc9805d
-  data.tar.gz: 492b0c906f34d2f091030c1d3425d21fbc5442c18080107deafe1397079f8b060609be0fd224324987ff502f1f55dcf0a9be08434f387dca2579e148ce478966
+  metadata.gz: d21bba8f857717fd6e9c54b1444c23feb2f5dea73dccda0ca3d661155b6a79d2901b8f4a58717bdb28527d6e1576222688fd802da86c18e86055d301e6c2003f
+  data.tar.gz: a3547cee5d2bf4190fc95f923177da126e4f478ef8dc052d49bbdc524515be211d05ab21a0636fd373edb9b7d24b76049e7ef40bf826d667e85226da0b4ab7b1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.3.1
+
+### Misc
+
+- Minor improvements and code cleanup
+- Relaxed dependency versions
+
 ## v0.3.0
 
 ### Breaking

data/lib/veri/configuration.rb

@@ -11,46 +11,42 @@ module Veri
             default: :argon2,
             reader: true,
             constructor: -> (value) do
-              Veri::Inputs.process(
+              Veri::Inputs::HashingAlgorithm.new(
                 value,
-                as: :hashing_algorithm,
                 error: Veri::ConfigurationError,
                 message: "Invalid hashing algorithm `#{value.inspect}`, supported algorithms are: #{Veri::Configuration::HASHERS.keys.join(", ")}"
-              )
+              ).process
             end
     setting :inactive_session_lifetime,
             default: nil,
             reader: true,
             constructor: -> (value) do
-              Veri::Inputs.process(
+              Veri::Inputs::Duration.new(
                 value,
-                as: :duration,
                 optional: true,
                 error: Veri::ConfigurationError,
                 message: "Invalid inactive session lifetime `#{value.inspect}`, expected an instance of ActiveSupport::Duration or nil"
-              )
+              ).process
             end
     setting :total_session_lifetime,
             default: 14.days,
             reader: true,
             constructor: -> (value) do
-              Veri::Inputs.process(
+              Veri::Inputs::Duration.new(
                 value,
-                as: :duration,
                 error: Veri::ConfigurationError,
                 message: "Invalid total session lifetime `#{value.inspect}`, expected an instance of ActiveSupport::Duration"
-              )
+              ).process
             end
     setting :user_model_name,
             default: "User",
             reader: true,
             constructor: -> (value) do
-              Veri::Inputs.process(
+              Veri::Inputs::NonEmptyString.new(
                 value,
-                as: :non_empty_string,
                 error: Veri::ConfigurationError,
                 message: "Invalid user model name `#{value.inspect}`, expected an ActiveRecord model name as a string"
-              )
+              ).process
             end
 
     HASHERS = {
@@ -64,12 +60,11 @@ module Veri
     end
 
     def user_model
-      Veri::Inputs.process(
+      Veri::Inputs::Model.new(
         user_model_name,
-        as: :model,
         error: Veri::ConfigurationError,
         message: "Invalid user model name `#{user_model_name}`, expected an ActiveRecord model name as a string"
-      )
+      ).process
     end
   end
 end

data/lib/veri/controllers/concerns/authentication.rb

@@ -34,11 +34,10 @@ module Veri
     end
 
     def log_in(authenticatable)
-      processed_authenticatable = Veri::Inputs.process(
+      processed_authenticatable = Veri::Inputs::Authenticatable.new(
         authenticatable,
-        as: :authenticatable,
         message: "Expected an instance of #{Veri::Configuration.user_model_name}, got `#{authenticatable.inspect}`"
-      )
+      ).process
 
       return false if processed_authenticatable.locked?
 

data/lib/veri/inputs/authenticatable.rb

@@ -0,0 +1,9 @@
+module Veri
+  module Inputs
+    class Authenticatable < Veri::Inputs::Base
+      private
+
+      def type = -> { self.class::Instance(Veri::Configuration.user_model) }
+    end
+  end
+end

data/lib/veri/inputs/base.rb

@@ -0,0 +1,33 @@
+require "dry-types"
+
+module Veri
+  module Inputs
+    class Base
+      include Dry.Types()
+
+      def initialize(value, optional: false, error: Veri::InvalidArgumentError, message: nil)
+        @value = value
+        @optional = optional
+        @error = error
+        @message = message
+      end
+
+      def process
+        type_checker = @optional ? type.call.optional : type.call
+        type_checker[@value]
+      rescue Dry::Types::CoercionError
+        raise_error
+      end
+
+      private
+
+      def type
+        raise NotImplementedError
+      end
+
+      def raise_error
+        raise @error, @message
+      end
+    end
+  end
+end

data/lib/veri/inputs/duration.rb

@@ -0,0 +1,9 @@
+module Veri
+  module Inputs
+    class Duration < Veri::Inputs::Base
+      private
+
+      def type = -> { self.class::Instance(ActiveSupport::Duration) }
+    end
+  end
+end

data/lib/veri/inputs/hashing_algorithm.rb

@@ -0,0 +1,9 @@
+module Veri
+  module Inputs
+    class HashingAlgorithm < Veri::Inputs::Base
+      private
+
+      def type = -> { self.class::Strict::Symbol.enum(:argon2, :bcrypt, :scrypt) }
+    end
+  end
+end

data/lib/veri/inputs/model.rb

@@ -0,0 +1,9 @@
+module Veri
+  module Inputs
+    class Model < Veri::Inputs::Base
+      private
+
+      def type = -> { self.class::Strict::Class.constructor { _1.try(:safe_constantize) }.constrained(lt: ActiveRecord::Base) }
+    end
+  end
+end

data/lib/veri/inputs/non_empty_string.rb

@@ -0,0 +1,9 @@
+module Veri
+  module Inputs
+    class NonEmptyString < Veri::Inputs::Base
+      private
+
+      def type = -> { self.class::Strict::String.constrained(min_size: 1) }
+    end
+  end
+end

data/lib/veri/models/concerns/authenticatable.rb

@@ -13,11 +13,7 @@ module Veri
     def update_password(password)
       update!(
         hashed_password: hasher.create(
-          Veri::Inputs.process(
-            password,
-            as: :non_empty_string,
-            message: "Expected a non-empty string, got `#{password.inspect}`"
-          )
+          Veri::Inputs::NonEmptyString.new(password, message: "Expected a non-empty string, got `#{password.inspect}`").process
         ),
         password_updated_at: Time.current
       )
@@ -25,11 +21,7 @@ module Veri
 
     def verify_password(password)
       hasher.verify(
-        Veri::Inputs.process(
-          password,
-          as: :non_empty_string,
-          message: "Expected a non-empty string, got `#{password.inspect}`"
-        ),
+        Veri::Inputs::NonEmptyString.new(password, message: "Expected a non-empty string, got `#{password.inspect}`").process,
         hashed_password
       )
     end

data/lib/veri/models/session.rb

@@ -26,12 +26,10 @@ module Veri
     alias terminate delete
 
     def update_info(request)
-      processed_request = Veri::Inputs.process(request, as: :request, error: Veri::Error)
-
       update!(
         last_seen_at: Time.current,
-        ip_address: processed_request.remote_ip,
-        user_agent: processed_request.user_agent
+        ip_address: request.remote_ip,
+        user_agent: request.user_agent
       )
     end
 
@@ -55,11 +53,10 @@ module Veri
       update!(
         shapeshifted_at: Time.current,
         original_authenticatable: authenticatable,
-        authenticatable: Veri::Inputs.process(
+        authenticatable: Veri::Inputs::Authenticatable.new(
           user,
-          as: :authenticatable,
           message: "Expected an instance of #{Veri::Configuration.user_model_name}, got `#{user.inspect}`"
-        )
+        ).process
       )
     end
 
@@ -79,10 +76,8 @@ module Veri
         new(
           hashed_token: Digest::SHA256.hexdigest(token),
           expires_at:,
-          authenticatable: Veri::Inputs.process(user, as: :authenticatable, error: Veri::Error)
-        ).update_info(
-          Veri::Inputs.process(request, as: :request, error: Veri::Error)
-        )
+          authenticatable: Veri::Inputs::Authenticatable.new(user, error: Veri::Error).process
+        ).update_info(request)
 
         token
       end
@@ -90,12 +85,11 @@ module Veri
       def prune(user = nil)
         scope = if user
                   where(
-                    authenticatable: Veri::Inputs.process(
+                    authenticatable: Veri::Inputs::Authenticatable.new(
                       user,
-                      as: :authenticatable,
                       optional: true,
                       message: "Expected an instance of #{Veri::Configuration.user_model_name} or nil, got `#{user.inspect}`"
-                    )
+                    ).process
                   )
                 else
                   all
@@ -112,11 +106,10 @@ module Veri
       end
 
       def terminate_all(user)
-        Veri::Inputs.process(
+        Veri::Inputs::Authenticatable.new(
           user,
-          as: :authenticatable,
           message: "Expected an instance of #{Veri::Configuration.user_model_name}, got `#{user.inspect}`"
-        ).veri_sessions.delete_all
+        ).process.veri_sessions.delete_all
       end
     end
   end

data/lib/veri/version.rb

@@ -1,3 +1,3 @@
 module Veri
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/lib/veri.rb

@@ -7,13 +7,18 @@ require_relative "veri/password/argon2"
 require_relative "veri/password/bcrypt"
 require_relative "veri/password/scrypt"
 
-require_relative "veri/inputs"
+require_relative "veri/inputs/base"
+require_relative "veri/inputs/authenticatable"
+require_relative "veri/inputs/duration"
+require_relative "veri/inputs/hashing_algorithm"
+require_relative "veri/inputs/model"
+require_relative "veri/inputs/non_empty_string"
 require_relative "veri/configuration"
 
 module Veri
   class Error < StandardError; end
-  class ConfigurationError < Veri::Error; end
   class InvalidArgumentError < Veri::Error; end
+  class ConfigurationError < Veri::InvalidArgumentError; end
 
   delegate :configure, to: Veri::Configuration
   module_function :configure

data/veri.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "argon2", "~> 2.0"
   spec.add_dependency "bcrypt", "~> 3.0"
-  spec.add_dependency "dry-configurable", "~> 1.3"
-  spec.add_dependency "dry-types", "~> 1.8"
+  spec.add_dependency "dry-configurable", "~> 1.1"
+  spec.add_dependency "dry-types", "~> 1.7"
   spec.add_dependency "rails", ">= 7.1", "< 8.1"
   spec.add_dependency "scrypt", "~> 3.0"
   spec.add_dependency "user_agent_parser", "~> 2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veri
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - enjaku4
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,12 @@ files:
 - lib/veri.rb
 - lib/veri/configuration.rb
 - lib/veri/controllers/concerns/authentication.rb
-- lib/veri/inputs.rb
+- lib/veri/inputs/authenticatable.rb
+- lib/veri/inputs/base.rb
+- lib/veri/inputs/duration.rb
+- lib/veri/inputs/hashing_algorithm.rb
+- lib/veri/inputs/model.rb
+- lib/veri/inputs/non_empty_string.rb
 - lib/veri/models/concerns/authenticatable.rb
 - lib/veri/models/session.rb
 - lib/veri/password/argon2.rb
@@ -159,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Minimal cookie-based authentication library for Ruby on Rails
 test_files: []

data/lib/veri/inputs.rb

@@ -1,31 +0,0 @@
-require "dry-types"
-
-module Veri
-  module Inputs
-    extend self
-
-    include Dry.Types()
-
-    TYPES = {
-      hashing_algorithm: -> { self::Strict::Symbol.enum(:argon2, :bcrypt, :scrypt) },
-      duration: -> { self::Instance(ActiveSupport::Duration) },
-      non_empty_string: -> { self::Strict::String.constrained(min_size: 1) },
-      model: -> { self::Strict::Class.constructor { _1.try(:safe_constantize) || _1 }.constrained(lt: ActiveRecord::Base) },
-      authenticatable: -> { self::Instance(Veri::Configuration.user_model) },
-      request: -> { self::Instance(ActionDispatch::Request) }
-    }.freeze
-
-    def process(value, as:, optional: false, error: Veri::InvalidArgumentError, message: nil)
-      checker = type_for(as)
-      checker = checker.optional if optional
-
-      checker[value]
-    rescue Dry::Types::CoercionError => e
-      raise error, message || e.message
-    end
-
-    private
-
-    def type_for(name) = Veri::Inputs::TYPES.fetch(name).call
-  end
-end