Refactor error handling examples and improve code consistency; add missing commas in various classes

Author: eliasjpr

examples/error_handling_example.cr

@@ -60,7 +60,7 @@ class SessionManager
 
   # Example: Create session with error handling
   def create_user_session(user_id : Int64, username : String) : Bool
-    begin
+
       session = @session.create
       session.data.user_id = user_id
       session.data.username = username
@@ -78,12 +78,12 @@ class SessionManager
     rescue ex : Exception
       Log.error { "Unexpected error creating session: #{ex.message}" }
       false
-    end
+
   end
 
   # Example: Load session with error handling
   def load_user_session : UserSession?
-    begin
+
       @session.load_from(HTTP::Cookies.new) # In real app, pass actual cookies
       @session.data
     rescue ex : Session::SessionExpiredException
@@ -102,7 +102,7 @@ class SessionManager
     rescue ex : Exception
       Log.error { "Unexpected error loading session: #{ex.message}" }
       nil
-    end
+
   end
 
   # Example: Update session with retry logic
@@ -131,7 +131,7 @@ class SessionManager
 
   # Example: Delete session with error handling
   def delete_user_session : Bool
-    begin
+
       @session.delete
       Log.info { "Deleted user session" }
       true
@@ -142,12 +142,12 @@ class SessionManager
     rescue ex : Exception
       Log.warn { "Error deleting session: #{ex.message}" }
       false
-    end
+
   end
 
   # Example: Check session health
   def check_session_health : Bool
-    begin
+
       if store = @session.as?(Session::RedisStore(UserSession))
         store.healthy?
       else
@@ -156,7 +156,7 @@ class SessionManager
     rescue ex : Exception
       Log.warn { "Health check failed: #{ex.message}" }
       false
-    end
+
   end
 
   # Example: Clean up expired sessions (for memory store)
@@ -189,21 +189,21 @@ class SessionManager
   end
 
   private def create_new_session : UserSession?
-    begin
+
       @session.create
       @session.data
     rescue ex : Exception
       Log.error { "Failed to create new session: #{ex.message}" }
       nil
-    end
+
   end
 
   private def clear_corrupted_session
-    begin
+
       @session.delete
     rescue ex : Exception
       Log.warn { "Failed to clear corrupted session: #{ex.message}" }
-    end
+
   end
 end
 

spec/connection_pool_spec.cr

@@ -64,7 +64,7 @@ if REDIS_AVAILABLE
       config = Session::ConnectionPoolConfig.new(size: 2, redis_host: REDIS_HOST)
       pool = Session::ConnectionPool.new(config)
 
-      pool.with_connection { |c| c.ping }
+      pool.with_connection(&.ping)
 
       stats = pool.stats
       stats[:available].should eq 2

spec/cookie_store_spec.cr

@@ -18,9 +18,8 @@ describe Session::CookieStore do
       store[session.session_id] = session
 
       # The cookie value should be encrypted, not plain JSON
-      cookie = store.cookies[store.data_key]?
-      cookie.should_not be_nil
-      cookie.not_nil!.value.should_not contain("session_id")
+      cookie = store.cookies[store.data_key]
+      cookie.value.should_not contain("session_id")
     end
   end
 

src/cluster.cr

@@ -25,7 +25,7 @@ module Session
       @type : ClusterMessageType,
       @session_id : String,
       @node_id : String,
-      @timestamp : Time = Time.utc
+      @timestamp : Time = Time.utc,
     )
     end
   end

src/configuration.cr

@@ -17,7 +17,7 @@ module Session
       @local_cache_enabled : Bool = true,
       @local_cache_ttl : Time::Span = 30.seconds,
       @local_cache_max_size : Int32 = 10_000,
-      @subscribe_timeout : Time::Span = 5.seconds
+      @subscribe_timeout : Time::Span = 5.seconds,
     )
     end
   end

src/connection_pool.cr

@@ -16,7 +16,7 @@ module Session
       @redis_host : String = "localhost",
       @redis_port : Int32 = 6379,
       @redis_database : Int32 = 0,
-      @redis_password : String? = nil
+      @redis_password : String? = nil,
     )
     end
   end

src/message/encryptor.cr

@@ -18,7 +18,7 @@ module Message
       @fallback_digest : Symbol? = :sha1,
       @use_kdf : Bool = false,
       @kdf_iterations : Int32 = 100_000,
-      @kdf_salt : String = "session_kdf_salt"
+      @kdf_salt : String = "session_kdf_salt",
     )
       @verifier = Verifier.new(@secret, digest: @digest, fallback_digest: @fallback_digest)
       @block_size = 16

src/message/verifier.cr

@@ -33,30 +33,16 @@ module Message
     def verified(signed_message : String) : String?
       json_data = ::Base64.decode_string(signed_message)
       data, digest = Tuple(String, String).from_json(json_data)
-
-      if valid_message?(data.to_s, digest.to_s)
-        String.new(decode(data.to_s))
-      elsif valid_message_with_fallback?(data.to_s, digest.to_s)
-        log_fallback_warning
-        String.new(decode(data.to_s))
-      end
+      decode_verified(data.to_s, digest.to_s)
     rescue JSON::ParseException | Base64::Error
       begin
         data, digest = signed_message.split("--", 2)
       rescue IndexError
         return nil
       end
 
-      if (data && digest).nil?
-        return nil
-      end
-
-      if valid_message?(data.to_s, digest.to_s)
-        String.new(decode(data.to_s))
-      elsif valid_message_with_fallback?(data.to_s, digest.to_s)
-        log_fallback_warning
-        String.new(decode(data.to_s))
-      end
+      return nil if (data && digest).nil?
+      decode_verified(data.to_s, digest.to_s)
     rescue ex : ArgumentError
       return if ex.message =~ %r{invalid base64}
       raise ex
@@ -97,6 +83,15 @@ module Message
       encode({data, generate_digest(data)}.to_json)
     end
 
+    private def decode_verified(data : String, digest : String) : String?
+      if valid_message?(data, digest)
+        String.new(decode(data))
+      elsif valid_message_with_fallback?(data, digest)
+        log_fallback_warning
+        String.new(decode(data))
+      end
+    end
+
     private def encode(data) : String
       ::Base64.urlsafe_encode(data)
     end

src/retry.cr

@@ -15,7 +15,7 @@ module Session
     def initialize(
       @failure_threshold : Int32 = 5,
       @reset_timeout : Time::Span = 30.seconds,
-      @half_open_max_calls : Int32 = 1
+      @half_open_max_calls : Int32 = 1,
     )
     end
   end
@@ -182,7 +182,7 @@ module Session
       @base_delay : Time::Span = 100.milliseconds,
       @max_delay : Time::Span = 5.seconds,
       @backoff_multiplier : Float64 = 2.0,
-      @jitter : Float64 = 0.1
+      @jitter : Float64 = 0.1,
     )
     end
   end