lib/encryptor.rb in encryptor-1.0.1 vs lib/encryptor.rb in encryptor-1.1.0

@@ -1,51 +1,50 @@
 require 'openssl'
 
-module Huberry
-  module Encryptor
-    # The default options to use when calling the <tt>encrypt</tt> and <tt>decrypt</tt> methods
-    #
-    # Defaults to { :algorithm => 'aes-256-cbc' }
-    #
-    # Run 'openssl list-cipher-commands' in your terminal to view a list all cipher algorithms that are supported on your platform
-    class << self; attr_accessor :default_options; end
-    self.default_options = { :algorithm => 'aes-256-cbc' }
-    
-    # Encrypts a <tt>:value</tt> with a specified <tt>:key</tt>
-    #
-    # Optionally accepts <tt>:iv</tt> and <tt>:algorithm</tt> options
-    #
-    # Example
-    #
-    #   encrypted_value = Huberry::Encryptor.encrypt(:value => 'some string to encrypt', :key => 'some secret key')
-    def self.encrypt(options)
-      crypt :encrypt, options
-    end
-    
-    # Decrypts a <tt>:value</tt> with a specified <tt>:key</tt>
-    #
-    # Optionally accepts <tt>:iv</tt> and <tt>:algorithm</tt> options
-    #
-    # Example
-    #
-    #   decrypted_value = Huberry::Encryptor.decrypt(:value => 'some encrypted string', :key => 'some secret key')
-    def self.decrypt(options)
-      crypt :decrypt, options
-    end
-    
-    protected
-    
-      def self.crypt(cipher_method, options = {})
-        options = default_options.merge(options)
-        cipher = OpenSSL::Cipher::Cipher.new(options[:algorithm])
-        cipher.send(cipher_method)
-        if options[:iv]
-          cipher.key = options[:key]
-          cipher.iv = options[:iv]
-        else
-          cipher.pkcs5_keyivgen(options[:key])
-        end
-        result = cipher.update(options[:value])
-        result << cipher.final
-      end
+module Encryptor
+  # The default options to use when calling the <tt>encrypt</tt> and <tt>decrypt</tt> methods
+  #
+  # Defaults to { :algorithm => 'aes-256-cbc' }
+  #
+  # Run 'openssl list-cipher-commands' in your terminal to view a list all cipher algorithms that are supported on your platform
+  def self.default_options
+    @default_options ||= { :algorithm => 'aes-256-cbc' }
   end
+  
+  # Encrypts a <tt>:value</tt> with a specified <tt>:key</tt>
+  #
+  # Optionally accepts <tt>:iv</tt> and <tt>:algorithm</tt> options
+  #
+  # Example
+  #
+  #   encrypted_value = Huberry::Encryptor.encrypt(:value => 'some string to encrypt', :key => 'some secret key')
+  def self.encrypt(options)
+    crypt :encrypt, options
+  end
+  
+  # Decrypts a <tt>:value</tt> with a specified <tt>:key</tt>
+  #
+  # Optionally accepts <tt>:iv</tt> and <tt>:algorithm</tt> options
+  #
+  # Example
+  #
+  #   decrypted_value = Huberry::Encryptor.decrypt(:value => 'some encrypted string', :key => 'some secret key')
+  def self.decrypt(options)
+    crypt :decrypt, options
+  end
+  
+  protected
+  
+    def self.crypt(cipher_method, options = {})
+      options = default_options.merge(options)
+      cipher = OpenSSL::Cipher::Cipher.new(options[:algorithm])
+      cipher.send(cipher_method)
+      if options[:iv]
+        cipher.key = options[:key]
+        cipher.iv = options[:iv]
+      else
+        cipher.pkcs5_keyivgen(options[:key])
+      end
+      result = cipher.update(options[:value])
+      result << cipher.final
+    end
 end
\ No newline at end of file