daidan 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da756040fd2fcaebe748b6533b4216bcb25aae4a554c018e81e05380b4e721e4
-  data.tar.gz: 634513d9b7ce3588e35155ddfaee1dfafa83ccac14b6b866d6373417d42ba4ee
+  metadata.gz: 7dc0f5d42394d742a6917422c54096702538d959efe4e88f2b8c9337ef8b737c
+  data.tar.gz: 3949477b36461799a0c135bca07ed02627d9d5f482bd7bdcac30ab7dacb07612
 SHA512:
-  metadata.gz: a13f2d9507e15a8a8810e802766f25a614d9a005d424efe7413d9415a23b57a856a1a408099af54132103bcda77dc581a7fb8b2818c1b73c54237e7acf621aef
-  data.tar.gz: e63537fab9ec1ad7d94b0f3d5191e211d66a46bd99a6eab7de6c72557146c0efee4551f7cc319b736a1f6f852b5043e7292881fa64dad31b39cb52ba09dac005
+  metadata.gz: 5c5e8a583d4df3a37d90d1b81ace49474488ba7872d8caa92ed1cce7dda6dc176915044a3fd7c8289ff14cde2254cb71a47f1dd1ca63ec9041bf29a79c2b359a
+  data.tar.gz: 3c80d8788e84979fe7917e94c83c50e771c2448b9830286c1384cb3a1af62e8c7159090fbb7680ef697463717d6325ab123e9e96e32673008226c3246e921402

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
-## [0.1.0] - YYYY-MM-DD
+## [0.1.0] - 2024-12-19
 
 - Initial release with core features:
   - GraphQL schema support
   - Resource generator for models, migrations, and types
   - Middleware for JWT authentication
   - Database connection handling
+
+## [0.2.0] - 2025-01-12
+
+- Improved core features:
+  - Added expiration date to JWT authentication mechanism
+  - Added hooks to Daidan::BaseMutation
+  - Added unit tests for Daidan::Application and generator classes

data/Gemfile

@@ -9,5 +9,7 @@ gem 'dotenv'
 gem 'graphql'
 gem 'jwt'
 gem 'rake'
+gem 'rack'
+gem 'rspec'
 gem 'sequel'
 gem 'zeitwerk'

data/Gemfile.lock

@@ -14,6 +14,7 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     bigdecimal (3.1.8)
+    diff-lcs (1.5.1)
     dotenv (3.1.7)
     fiber-storage (1.0.0)
     graphql (2.4.8)
@@ -21,7 +22,21 @@ GEM
       fiber-storage
     jwt (2.9.3)
       base64
+    rack (3.1.8)
     rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     sequel (5.87.0)
       bigdecimal
     zeitwerk (2.7.1)
@@ -36,7 +51,9 @@ DEPENDENCIES
   dotenv
   graphql
   jwt
+  rack
   rake
+  rspec
   sequel
   zeitwerk
 

data/daidan.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = 'daidan'
-  spec.version = '0.1.0'
+  spec.version = '0.2.0'
   spec.authors = ['Bernard Cesarz']
   spec.email = ['cesarzb@protonmail.com']
 
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata['changelog_uri'] = 'https://github.com/cesarzb/daidan/blob/main/CHANGELOG.md'
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   spec.metadata['license_uri'] = 'https://opensource.org/licenses/MIT'
+  spec.platform = Gem::Platform::RUBY
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |file|

data/lib/daidan/graphql/mutations/base_mutation.rb

@@ -1,4 +1,28 @@
 module Daidan
   class BaseMutation < GraphQL::Schema::Mutation
+    def resolve(**args)
+      call_hook(:before_mutation, **args)
+      result = execute_mutation(**args)
+      call_hook(:after_mutation, **args)
+      result
+    rescue StandardError => e
+      handle_error(e)
+    end
+
+    private
+
+    def execute_mutation(**_args)
+      raise NotImplementedError, 'Implement mutation logic.'
+    end
+
+    def call_hook(hook_name, **args)
+      return unless respond_to?(hook_name, true)
+
+      method(hook_name).arity == 0 ? send(hook_name) : send(hook_name, **args)
+    end
+
+    def handle_error(error)
+      raise GraphQL::ExecutionError, "Error occured during mutation: #{error.message}"
+    end
   end
 end

data/lib/daidan/graphql/mutations/login_user.rb

@@ -11,10 +11,17 @@ module Daidan
 
       raise GraphQL::ExecutionError, 'Invalid email or password' unless user && user.authenticate(password)
 
-      payload = { user_id: user.id }
+      exp_time = Time.now.to_i + (24 * 60 * 60)
+      payload = {
+        user_id: user.id,
+        exp: exp_time
+      }
 
       token = JWT.encode(payload, ENV['JWT_SECRET'], 'HS256')
-      { token: token, user: user }
+      {
+        token: token,
+        user: user
+      }
     end
   end
 end

data/lib/daidan/middleware/jwt_authentication.rb

@@ -7,12 +7,20 @@ module Daidan
 
       def call(env)
         auth_header = env['HTTP_AUTHORIZATION']
+
         if auth_header && auth_header.start_with?('Bearer ')
           token = auth_header.split(' ').last
-
           begin
-            payload, = JWT.decode(token, ENV['JWT_SECRET'], true, { algorithm: 'HS256' })
+            payload, = JWT.decode(
+              token,
+              ENV['JWT_SECRET'],
+              true,
+              algorithm: 'HS256'
+            )
+
             env['current_user_id'] = payload['user_id']
+          rescue JWT::ExpiredSignature
+            env['current_user_id'] = nil
           rescue JWT::DecodeError
             env['current_user_id'] = nil
           end

data/lib/daidan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Daidan
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: daidan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
-original_platform: ''
 authors:
 - Bernard Cesarz
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt