tachiban 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2e100df48cb7de260705114b0c7d282bf2e67f8073442d987cb0295e985d48
-  data.tar.gz: 810a6b68cef7fd9177ef3083b05b0cc083eaecbc26e02b0621194c7f8c582db3
+  metadata.gz: 4f726149a2c73b44a9eb4ead5ea276752babfe6e627b71ff059604c1c3a81581
+  data.tar.gz: a598cc9a3425cfd5b5fc9f27e9abd3b1e32a8fbf9bcc6707e4f93ebb069a9739
 SHA512:
-  metadata.gz: b884dd3638bc74fb54ccd11a1957d5fa6d4b32bf5a20aff39cfc300ce794069d4812b1decef520a2f31db2b91e2c4d41424e1747b4892b8321b67c0680dbe4e5
-  data.tar.gz: 64b5a67347b6cfc4c62ef3df0afb8e21305ef140807334ebbf3748fba2d8d9445d014b385735434fa238fb1b441df00b4e341156e78e9650b3df16e962779a91
+  metadata.gz: 75a5e0d5e5596859d868a29368fbb228d20badf0f67eca13dbcbf6f00b56c579f22da3b5855fc3f14577dcb61cf75ce000c6e802586639a0c1269a8a3681277a
+  data.tar.gz: e559a58ebd9907225906166d222da3f95e5071e7d2cb2ae3f00ea2763502911d20aceadb1f89e909565a2ecd71014034000abac46d2086942b2fa56675f281aa

data/README.md

@@ -1,8 +1,8 @@
 # Tachiban
 
-[![Join the chat at https://gitter.im/sebastjan-hribar/tachiban](https://badges.gitter.im/sebastjan-hribar/tachiban.svg)](https://gitter.im/sebastjan-hribar/tachiban?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Gem Version](https://badge.fury.io/rb/tachiban.svg)](https://badge.fury.io/rb/tachiban) [![Build Status](https://travis-ci.org/sebastjan-hribar/tachiban.svg?branch=master)](https://travis-ci.org/sebastjan-hribar/tachiban)
+[![Join the chat at https://gitter.im/sebastjan-hribar/tachiban](https://badges.gitter.im/sebastjan-hribar/tachiban.svg)](https://gitter.im/sebastjan-hribar/tachiban?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Gem Version](https://badge.fury.io/rb/tachiban.svg?kill_cache=1)](https://badge.fury.io/rb/tachiban)
 
-Tachiban (立ち番 - standing watch) provides simple authentication system for [Hanami web applications](http://hanamirb.org/) by using Argon2 for password hashing and
+Tachiban (立ち番 - standing watch) provides simple authentication system for [Hanami 2.x web applications](http://hanamirb.org/) by using Argon2 for password hashing and
 offers the following functionalities (with methods listed below
   under Methods by features):
 - Signup
@@ -12,7 +12,10 @@ offers the following functionalities (with methods listed below
 - Password reset
 - Authorization has been moved to [Rokku](https://github.com/sebastjan-hribar/rokku) 
 
-## Installation
+**Note:** For Hanami 1.3 support, see the [1.0.0 branch](https://github.com/sebastjan-hribar/tachiban/tree/1.0.0) or install Tachiban 1.0.
+
+
+## 1. Installation
 
  Add this line to your application's Gemfile:
 
@@ -28,21 +31,43 @@ Or install it yourself as:
 
     $ gem install tachiban
 
-Tachiban is already setup to be included by your Hanami application:
+
+Tachiban 2.0 needs to be included in the action:
 
 ```ruby
-::Hanami::Controller.configure do
-  prepare do
+# app/action.rb
+# auto_register: false
+# frozen_string_literal: true
+
+require "hanami/action"
+require "dry/monads"
+require "tachiban"
+
+module MyApplication
+  class Action < Hanami::Action
+    # Provide `Success` and `Failure` for pattern matching on operation results
+    include Dry::Monads[:result]
     include Hanami::Tachiban
+
+    handle_exception "ROM::TupleCountMismatchError" => :handle_not_found
+
+    private
+
+    def handle_not_found(request, response, exception)
+      response.status = 404
+      response.format = :html
+      response.body = "Not found"
+    end
   end
 end
 ```
 
-## Usage
+## 2. Usage
 
-### Prerequisites
+### 2.1 Prerequisites
 Prior to logging in or authenticating the user, retrieve the entity from the
-database and assign it to the instance variable of `@user`.
+database and assign it to a variable (e.g. `user`), which you then pass to
+the methods as required.
 
 In addition to that, the user entity must have the following attributes:
 
@@ -51,136 +76,225 @@ In addition to that, the user entity must have the following attributes:
 * **hashed_pass** (to hold the generated hashed password)
 
 
-### Usage
+### 2.2 Usage
 
-#### Signup
+#### 2.2.3 Signup
 To create a user with a hashed password use the `hashed_password(password)`
 method for the password and store it as the user's attribute `hashed_pass`.
 
 *Example*
 
 ```ruby
-# Create action for an entity
-def call(params)
-  password = params[:newuser][:password]
+# Create action for the user
+def handle(request, response)
+  password = request.params[:newuser][:password]
   hashed_pass = hashed_password(password)
-  repository = UserRepository.new
 
-  @user = repository.create(name: name, surname: surname, email: email,
-  hashed_pass: hashed_pass))
+  user = user_repo.create(name: name, surname: surname, email: email,
+  hashed_pass: hashed_pass)
 end
 ```
 
-#### Authentication and login
-To authenticate a user use the `authenticated?(input_password)` method and log
-them in with the `login` method. Authentication is successful if the user exists and passwords match.
+#### 2.2.4 Authentication and login
+To authenticate a user use the `authenticated?(input_password, user)` method and log
+them in with the `login(request, response, user_id, flash_message: nil, login_redirect_url: nil)` method.
+
+Authentication is successful if the user exists and passwords match. It's possible to provide your own flash message and / or redirect url. Otherwise, the **default values** will be used (see the table below).
 
-The user is logged in by setting the user object ID as the `session[:current_user]`.
-After the user is logged in the session start time is defined as
-`session[:session_start_time] = Time.now`. A default flash message is also
+The user is logged in by setting the user object ID as the `request.session[:current_user]`.
+After the user is logged in, the session start time is defined as
+`request.session[:session_start_time] = Time.now`. A default flash message is also
 assigned as 'You have been successfully logged in.'.
 
-The `session[:session_start_time]` is then used by the `session_expired?`
-method to determine whether the session has expired or not.
+The `request.session[:session_start_time]` is then used by the `session_expired?(request, response)` method to determine whether the session has expired or not.
 
-*Example of session creation for an entity*
+**_Example of session creation for an entity_**
 
 ```ruby
-# Create action for an entity session
-email = params[:entity_session][:email]
-password = params[:entity_session][:password]
+# Create action for the user session
+email = request.params[:entity_session][:email]
+password = request.params[:entity_session][:password]
 
-@user = EntityRepository.new.find_by_email(email)
-login if authenticated?(password)
+user = user_repo.find_by_email(email) #required by login
+login(request, response, user.id) if authenticated?(password, user)
 ```
 
-To check whether the user is logged in use the `check_for_logged_in_user` method.
-If the user is not logged in the `logout` method takes over.
+To check whether a user is logged in, use the `check_for_logged_in_user(request, response)` method. If the user is not logged in, the `logout(request, response, logout_redirect_url: nil)` method takes over.
 
 
-#### Session handling
+#### 2.2.5 Session handling
 Tachiban handles session expiration by checking if a session has
 expired and then restarts the session start time if the session
 is still valid or proceeds with the following if the session
 has expired:
 
-- setting the `session[:current_user]` to `nil`,
-- a flash message is set: `flash[:failed_notice] = "Your session has expired"`,
-- redirects to the `routes.root_path` which can be overwritten by assigning
-a different url to @redirect_url.
+- setting the `request.session[:current_user]` to `nil`,
+- a flash message is set: `response.flash[:failed_notice] = "Your session has expired"`,
+- redirects to the root path `/`, which can be overwritten.
 
 
-The `session_expired?` method compares the session start time
-increased for the defined `@validity_time` (set to 10 minutes
+The `session_expired?(request, validity_time: nil)` method compares the session start time
+increased for the defined `validity_time` (set to 10 minutes
 by default, but can be overwritten) with the current time.
 
-`handle_session` method:
+`handle_session(request, response, redirect_url: nil)` method:
 ```ruby
-  def handle_session
-    if session_expired?
-      @redirect_url ||= routes.root_path
-      session[:current_user] = nil
-      flash[:failed_notice] = "Your session has expired."
-      redirect_to @redirect_url
+  def handle_session(request, response, redirect_url: nil)
+    if session_expired?(request)
+      redirect_url ||= '/'
+      request.session[:current_user] = nil
+      response.flash[:failed_notice] ||= "Your session has expired."
+      response.redirect_to redirect_url
     else
-      restart_session_counter
+      restart_session_counter(request)
     end
   end
 ```
 
-*Example of session handling in a share code module*
+#### 2.2.6 Session handling in a share code module
+It is possible to enable session handling in a share code module as provided by Hanami.
+To do this, create an authentication module in **app/actions/authentication.rb**.
+The example below shows also how to custom values to replace default values in
+actions.
 
 ```ruby
-module Web
-  module HandleSession
-
-     def self.included(action)
-       action.class_eval do
-         before :handle_session
-       end
-     end
-
+module MyApplication
+  module Actions
+    module Authentication
+      def self.included(action_class)
+        action_class.class_eval do
+          before :check_for_logged_in_user
+          before :handle_session
+        end
+      end
+
+      private
+
+      def custom_handle_session_redirect_url
+        '/login'
+      end
+
+      def custom_logout_redirect_url
+        '/login'
+      end
+
+      def custom_login_redirect_url
+        '/'
+      end
+
+      def custom_session_validity_time
+        if ENV['HANAMI_ENV'] == 'test'
+          600
+        else
+          1800
+        end
+      end
+    end
   end
 end
 ```
+We can then simply include the `Authentication` module in actions, where required.
 
-
-#### Password reset
-The password reset feature provides a few simple methods to generate a
-token, email subject and body. It is also possible to specify and
-check the validity of the password reset url.
+However, if we include this in the base action class, it will be available in all
+actions and there is no need for separate includes in actions:
 
 ```ruby
-token # => "YbRucc8YUlFJrYYp04eQKQ"
-```
+#
+#
+module MyApplication
+  class Action < Hanami::Action
+    # Provide `Success` and `Failure` for pattern matching on operation results
+    include Dry::Monads[:result]
+    include Hanami::Tachiban
+    include MyApplication::Actions::Authentication
 
-```ruby
-email_subject(SomeApp) # => "SomeApp -- password reset request"
+    handle_exception "ROM::TupleCountMismatchError" => :handle_not_found
+
+    private
+#
+#
 ```
 
 
-Provide the base url, the token and the number and type of the time units
- for the validity of the link.
+**_Disabling the authentication shared module in specific actions_**
+
+Sometimes we might not want to check for authenticated user. For example,
+doing so in the `login` action will cause an infinite loop. There we can
+disable the module by overwriting the desired methods in the action:
 
 ```ruby
-body = email_body(base_url, url_token, 2, "hour")
-# => "Visit this url to reset your password: http://localhost:2300/passwordupdate/asdasdasdaerwrw.
-#     The url will be valid for 2 hour(s).")
+private
+
+def check_for_logged_in_user; end
+def handle_session; end
 ```
 
+#### 2.2.7 Password reset
+The password reset feature provides a few simple methods to:
+* generate a token, email subject and body (text and html part)
+* specify and check the validity of the password reset url and
+* set the default application name for the email subject (it can be
+overwritten or set as a ENV variable).
+
 The link validity must me specified in seconds. The method compares the
 current time with the time when the password reset link was sent increased
-by the link validity: `Time.now > @user.password_reset_sent_at + link_validity`
+by the link validity: `Time.now > user.password_reset_sent_at + link_validity`.
+
+
+```ruby
+token # => "YbRucc8YUlFJrYYp04eQKQ"
+```
+
+```ruby
+email_subject("SomeApp") # => "SomeApp -- password reset request"
+```
 
 ```ruby
 password_reset_url_valid?(link_validity)
 ```
 
-### Example of use in an application
-[Using Tachiban with a Hanami app](https://sebastjan-hribar.github.io/programming/2021/09/03/tachiban-with-hanami.html)
 
 
-### Changelog
+Provide the following values when building the email body: reset url, user's name,
+link validity, time unit and optionally the application name. Below is an example of
+html_body in a mailer class:
+
+```ruby
+html_body = email_body_html(
+          reset_url: reset_url,
+          user_name: "#{user.name} #{user.surname}",
+          link_validity: 2,
+          time_unit: "hour",
+          app_name: nil
+          )
+```
+
+### 3. Default values
+There are a few default values set which can be overwritten. See the table below.
+
+|Required by method      |Variable              |Default value                          |
+|---                     |---                   |---                                    |
+|login                   |flash_message         |'You have been successfully logged in.'|
+|login                   |login_redirect_url    |'/'                                    |
+|logout                  |logout_redirect_url   |'/login'                               |
+|session_expired?        |validity_time         |600                                    |
+|handle_session          |redirect_url          |'/'                                    |
+
+
+
+
+### 4. Changelog
+
+#### 2.0.0
+
+**Breaking Changes:**
+- Supports Hanami ~> 2.0 applications only.
+- Method signatures updated: `login`, `logout`, `check_for_logged_in_user`, and `handle_session` now require `(request, response)` parameters.
+- Methods `session_expired?` and `restart_session_counter` now require `(request)` parameter.
+- Tachiban must be explicitly included in the base action: `include Hanami::Tachiban`.
+- Tachiban 2.0.0 doesn't rely on instance variable like `@user` anymore. Instead, a `user` variable must be passed as an argument to a method.
+
+For Hanami 1.3 support, use Tachiban 1.0.
 
 #### 1.0.0
 

data/Rakefile

@@ -1,7 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "hanami/controller"
-require 'hanami/action/session'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/lib/tachiban/version.rb

@@ -1,3 +1,3 @@
 module Tachiban
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/tachiban.rb

@@ -28,8 +28,8 @@ private
   # - a user exists
   # - a user's hashed password from the database matches the input password
 
-    def authenticated?(input_pass)
-      @user && Argon2::Password.verify_password(input_pass, @user.hashed_pass)
+    def authenticated?(input_pass, user)
+      user && Argon2::Password.verify_password(input_pass, user.hashed_pass)
     end
 
   # The login method can be used in combination with the authenticated? method to
@@ -41,30 +41,30 @@ private
 
   # There are two defualt values set: one for flash message and
   # the other for redirect url. Both can be overwritten by assigning
-  # new values for @flash_message and @login_redirect_url.
+  # new values for flash_message and login_redirect_url arguments.
 
   # Example:
   # login if authenticated?(input_pass)
 
-    def login
-      session[:current_user] = @user.id
-      session[:session_start_time] = Time.now
-      @flash_message ||= 'You have been successfully logged in.'
-      flash[:success_notice] = @flash_message
-      @login_redirect_url ||= routes.root_path
-      redirect_to @login_redirect_url
+    def login(request, response, user_id, flash_message: nil, login_redirect_url: nil)
+      request.session[:current_user] = user_id
+      request.session[:session_start_time] = Time.now
+      flash_message ||= 'You have been successfully logged in.'
+      response.flash[:success_notice] = flash_message
+      login_redirect_url ||= "/"
+      response.redirect_to login_redirect_url
     end
 
   # The logout method sets the current user in the session to nil
   # and performs a redirect to the redirect_url which is set to
   # /login, but can be overwritten as needed with a specific url
-  # by setting a new value for @logout_redirect_url.
+  # by setting a new value for logout_redirect_url.
 
-    def logout
-      session[:current_user] = nil
-      session.clear
-      @logout_redirect_url ||= '/login'
-      redirect_to @logout_redirect_url
+    def logout(request, response, logout_redirect_url: nil)
+      request.session[:current_user] = nil
+      request.session.clear
+      logout_redirect_url ||= '/login'
+      response.redirect_to logout_redirect_url
     end
 
   # ### Authentication ###
@@ -73,8 +73,8 @@ private
   # request whether the user is logged in. If the user is not logged in
   # the logout method takes over.
 
-    def check_for_logged_in_user
-      logout unless session[:current_user]
+    def check_for_logged_in_user(request, response)
+      logout(request, response) unless request.session[:current_user]
     end
 
   # ### Session handling ###
@@ -86,18 +86,18 @@ private
   # increased for the defined validity time (set to 10 minutes
   # by default and can be overwritten) with the current time.
 
-    def session_expired?
-      if session[:current_user]
-        @validity_time ||= 600
-        session[:session_start_time] + @validity_time.to_i < Time.now
+    def session_expired?(request, validity_time: nil)
+      if request.session[:current_user]
+        validity_time ||= 600
+        request.session[:session_start_time] + validity_time.to_i < Time.now
       end
     end
 
   # The restart_session_counter method resets the session start time to
   # Time.now. It's used in the handle  session method.
 
-    def restart_session_counter
-      session[:session_start_time] = Time.now
+    def restart_session_counter(request)
+      request.session[:session_start_time] = Time.now
     end
 
     # The handle_session method is used to handle the incoming requests
@@ -109,40 +109,83 @@ private
     # If the session hasn't expired the restart_session_counter method is
     # called to reset the session start time.
 
-    def handle_session
-      if session_expired?
-        @redirect_url ||= routes.root_path
-        session[:current_user] = nil
-        flash[:failed_notice] = 'Your session has expired.'
-        redirect_to @redirect_url
+    def handle_session(request, response, redirect_url: nil)
+      if session_expired?(request)
+        redirect_url ||= "/"
+        request.session[:current_user] = nil
+        response.flash[:failed_notice] ||= 'Your session has expired.'
+        response.redirect_to redirect_url
       else
-        restart_session_counter
+        restart_session_counter(request)
       end
     end
 
   # ### Password reset ###
+    # The password reset functionalities include token generation, email subject,
+    # email body in the text as well as in the html format, checking the reset link
+    # validity and getting the app name.
+
     def token
       SecureRandom.urlsafe_base64
     end
 
     def email_subject(app_name)
+      app_name ||= default_app_name
       "#{app_name} -- password reset request"
     end
 
-    def email_body(url, token, link_validity, time_unit)
-      "Visit this url to reset your password: #{url}#{token}. \n
-      The url will be valid for #{link_validity} #{time_unit}(s)."
+    def email_body_text(reset_url:, user_name:, link_validity:, time_unit:, app_name: nil)
+      app_name ||= default_app_name
+    
+      <<~TEXT
+        Hello #{user_name},
+
+        Click the link below to reset your password:
+
+        #{reset_url}
+
+        This link will expire in #{link_validity} #{time_unit}(s).
+
+        Kind regards,
+        The #{app_name} Team
+      TEXT
+    end
+
+    def email_body_html(reset_url:, user_name:, link_validity:, time_unit:, app_name: nil)
+      app_name ||= default_app_name
+    
+      <<~HTML
+        <!DOCTYPE html>
+          <html>
+            <body style="font-family: Arial, sans-serif;">
+              <h2>Password reset request</h2>
+              <br>
+              <p>Hello #{user_name},</p>
+              <br>
+              <p>Click the button below to reset your password:</p>
+              <p>
+                <a href="#{reset_url}" style="background: #007bff; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px;">
+                  Reset Password
+                </a>
+              </p>
+              <br>
+              <p>Or copy this link: #{reset_url}</p>
+              <p style="color: #666; font-size: 12px;">This link expires in #{link_validity} #{time_unit}(s).</p>
+            </body>
+          </html>
+        HTML
     end
 
     # State the link_validity in seconds.
-    def password_reset_url_valid?(link_validity)
-      Time.now < @user.password_reset_sent_at + link_validity
+    def password_reset_url_valid?(link_validity, user)
+      Time.now < user.password_reset_sent_at + link_validity
+    end
+
+    def default_app_name
+      ENV.fetch("APP_NAME") { Hanami.app.namespace.to_s }
+    rescue
+      "Application"
     end
-  end
-end
 
-::Hanami::Controller.configure do
-  prepare do
-    include Hanami::Tachiban
   end
-end
+end

data/tachiban.gemspec

@@ -17,16 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "hanami-model", "~> 1.0"
-  spec.add_development_dependency "timecop", "0.8.1"
-  spec.add_development_dependency 'hanami-controller', "~> 1.0"
-  spec.add_development_dependency 'hanami-router', "~> 1.0"
-  spec.add_development_dependency 'pry', "~> 0"
+  spec.add_development_dependency "timecop", "0.9.0"
+  spec.add_development_dependency 'hanami', "~> 2.0"
+  spec.add_development_dependency 'pry', "~> 0.16.0"
 
   spec.add_runtime_dependency "argon2", "~> 2.3"
-  spec.add_runtime_dependency 'hanami-controller', "~> 1.0"
-  spec.add_runtime_dependency 'hanami-router', "~> 1.0"
-end
+  spec.add_runtime_dependency 'hanami', "~> 2.0"
+  spec.add_runtime_dependency "hanami-controller", "~> 2.0"
+end

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tachiban
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sebastjan Hribar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2026-03-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,76 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: hanami-model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: hanami-controller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: hanami-router
+  name: hanami
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: argon2
   requirement: !ruby/object:Gem::Requirement
@@ -143,34 +95,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: hanami-controller
+  name: hanami
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: hanami-router
+  name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: 
+        version: '2.0'
+description:
 email:
 - sebastjan.hribar@gmail.com
 executables:
@@ -197,7 +149,7 @@ homepage: https://github.com/sebastjan-hribar/tachiban
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Tachiban provides simple password hashing for user authentication with Argon2
   for Hanami web applications.