rbzk 0.1.6 → 0.1.8

data/lib/rbzk/cli/config.rb

@@ -42,7 +42,7 @@ module RBZK
       def save
         # Create the directory if it doesn't exist
         FileUtils.mkdir_p(File.dirname(@config_file))
-        
+
         # Save the configuration
         File.open(@config_file, 'w') do |f|
           f.write(YAML.dump(@config))
@@ -68,7 +68,7 @@ module RBZK
           begin
             config = YAML.load_file(@config_file)
             return DEFAULT_CONFIG.merge(config) if config.is_a?(Hash)
-          rescue => e
+          rescue StandardError => e
             warn "Error loading configuration file: #{e.message}"
           end
         end

data/lib/rbzk/constants.rb

@@ -2,7 +2,7 @@
 
 module RBZK
   module Constants
-    USHRT_MAX = 65535
+    USHRT_MAX = 65_535
 
     # Command codes
     CMD_DB_RRQ = 7 # Read in some kind of data from the machine
@@ -121,8 +121,8 @@ module RBZK
     # Machine constants
     # These values are in little-endian format when packed
     # 0x5050 = 'PP' in ASCII when packed as '<H'
-    MACHINE_PREPARE_DATA_1 = 20560 # 0x5050 = 'P' + 'P'*256 in little-endian
+    MACHINE_PREPARE_DATA_1 = 20_560 # 0x5050 = 'P' + 'P'*256 in little-endian
     # 0x7D82 = 0x827D in little-endian format
-    MACHINE_PREPARE_DATA_2 = 32130 # 0x7D82
+    MACHINE_PREPARE_DATA_2 = 32_130 # 0x7D82
   end
 end

data/lib/rbzk/exceptions.rb

@@ -4,19 +4,25 @@ module RBZK
   class ZKError < StandardError; end
 
   class ZKNetworkError < ZKError
-    def initialize(msg = "Network error")
+    def initialize(msg = 'Network error')
       super
     end
   end
 
   class ZKErrorConnection < ZKError
-    def initialize(msg = "Connection error")
+    def initialize(msg = 'Connection error')
       super
     end
   end
 
   class ZKErrorResponse < ZKError
-    def initialize(msg = "Invalid response")
+    def initialize(msg = 'Invalid response')
+      super
+    end
+  end
+
+  class ZKErrorExists < ZKError
+    def initialize(msg = 'Data already exists')
       super
     end
   end

data/lib/rbzk/finger.rb

@@ -4,7 +4,7 @@ module RBZK
   class Finger
     attr_accessor :uid, :fid, :valid, :template, :size
 
-    def initialize(uid, fid, valid, template = "")
+    def initialize(uid, fid, valid, template = '')
       @uid = uid
       @fid = fid
       @valid = valid

data/lib/rbzk/user.rb

@@ -4,7 +4,7 @@ module RBZK
   class User
     attr_accessor :uid, :user_id, :name, :privilege, :password, :group_id, :card
 
-    @@encoding = "UTF-8"
+    @@encoding = 'UTF-8'
 
     def self.encoding=(encoding)
       @@encoding = encoding
@@ -17,7 +17,7 @@ module RBZK
     # Match Python's User constructor exactly
     # In Python:
     # def __init__(self, uid, name, privilege, password='', group_id='', user_id='', card=0):
-    def initialize(uid = 0, name = "", privilege = 0, password = "", group_id = "", user_id = "", card = 0)
+    def initialize(uid = 0, name = '', privilege = 0, password = '', group_id = '', user_id = '', card = 0)
       @uid = uid
       @name = name
       @privilege = privilege
@@ -30,20 +30,20 @@ module RBZK
     # Pack the user data into a binary string for ZK6 devices (size 29)
     def repack29
       [2, @uid, @privilege].pack('CS<C') +
-      @password.encode(@@encoding, invalid: :replace, undef: :replace).ljust(5, "\x00")[0...5] +
-      @name.encode(@@encoding, invalid: :replace, undef: :replace).ljust(8, "\x00")[0...8] +
-      [@card, 0, @group_id.to_i, 0, @user_id.to_i].pack('L<CS<S<L<')
+        @password.encode(@@encoding, invalid: :replace, undef: :replace).ljust(5, "\x00")[0...5] +
+        @name.encode(@@encoding, invalid: :replace, undef: :replace).ljust(8, "\x00")[0...8] +
+        [@card, 0, @group_id.to_i, 0, @user_id.to_i].pack('L<CS<S<L<')
     end
 
     # Pack the user data into a binary string for ZK8 devices (size 73)
     def repack73
       [2, @uid, @privilege].pack('CS<C') +
-      @password.encode(@@encoding, invalid: :replace, undef: :replace).ljust(8, "\x00")[0...8] +
-      @name.encode(@@encoding, invalid: :replace, undef: :replace).ljust(24, "\x00")[0...24] +
-      [@card, 1].pack('L<C') +
-      @group_id.to_s.encode(@@encoding, invalid: :replace, undef: :replace).ljust(7, "\x00")[0...7] +
-      "\x00" +
-      @user_id.to_s.encode(@@encoding, invalid: :replace, undef: :replace).ljust(24, "\x00")[0...24]
+        @password.encode(@@encoding, invalid: :replace, undef: :replace).ljust(8, "\x00")[0...8] +
+        @name.encode(@@encoding, invalid: :replace, undef: :replace).ljust(24, "\x00")[0...24] +
+        [@card, 1].pack('L<C') +
+        @group_id.to_s.encode(@@encoding, invalid: :replace, undef: :replace).ljust(7, "\x00")[0...7] +
+        "\x00" +
+        @user_id.to_s.encode(@@encoding, invalid: :replace, undef: :replace).ljust(24, "\x00")[0...24]
     end
 
     # Check if the user is disabled

data/lib/rbzk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBZK
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end