lib/pairtree/identifier.rb in rpairtree-0.2.0 vs lib/pairtree/identifier.rb in rpairtree-0.3.0

@@ -1,52 +1,51 @@
-# encoding: utf-8
 module Pairtree
   class Identifier
     ENCODE_REGEX = Regexp.compile("[\"*+,<=>?\\\\^|]|[^\x21-\x7e]", nil)
     DECODE_REGEX = Regexp.compile("\\^(..)", nil)
 
     ##
     # Encode special characters within an identifier
     # @param [String] id The identifier
     def self.encode id
-      id.gsub(ENCODE_REGEX) { |c| char2hex(c) }.tr('/:.', '=+,')
+      id.gsub(ENCODE_REGEX) { |c| char2hex(c) }.tr("/:.", "=+,")
     end
 
     ##
     # Decode special characters within an identifier
     # @param [String] id The identifier
     def self.decode id
-      input = id.tr('=+,', '/:.').bytes.to_a
+      input = id.tr("=+,", "/:.").bytes.to_a
       intermediate = []
       while input.first
         if input.first == 94
           h = []
           input.shift
           h << input.shift
           h << input.shift
-          intermediate << h.pack('c*').hex
+          intermediate << h.pack("c*").hex
         else
           intermediate << input.shift
         end
       end
-      result = intermediate.pack('c*')
+      result = intermediate.pack("c*")
       if result.respond_to? :force_encoding
-        result.force_encoding('UTF-8')
+        result.force_encoding("UTF-8")
       end
       result
     end
 
     ##
     # Convert a character to its pairtree hexidecimal representation
     # @param [Char] c The character to convert
     def self.char2hex c
-      c.unpack('H*')[0].scan(/../).map { |x| "^#{x}"}.join('')
+      c.unpack1("H*").scan(/../).map { |x| "^#{x}" }.join("")
     end
 
     ##
     # Convert a pairtree hexidecimal string to its character representation
     # @param [String] h The hexidecimal string to convert
     def self.hex2char h
-       '' << h.delete('^').hex
+      "" << h.delete("^").hex
     end
   end
 end