hash_redactor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06df12c559b02000c59bf5b0def300658df235b8
-  data.tar.gz: 66865c0f0b2f15f34348edd808125a0ab773bcfa
+  metadata.gz: 21c05c3393cf49eaf7ebd8b45b872724bbb2344c
+  data.tar.gz: 11cf069f14be218a178bebb0acb646f0d293b4d1
 SHA512:
-  metadata.gz: 40a4818e9f57f318f0ea7d6dd60418cf3926824ce0910c2be946e8ec620445ec78a164f5774157b74befe56cc324dd1740f9a1975126caf13574bc8f55ddd709
-  data.tar.gz: 5b588047d2f5b796487f9377ae7c2dd0036b15f2d050fc21e9d09a1b4b1606fd55403641ebb890cffe8e33489266b8166146252fae9a6e414a520722d9bd0e7f
+  metadata.gz: cfb79ccabcef173c20cdaa045ae685215890df0559276f0915387abaa203088fd834d87d4c0973e8123466de8264fa0482d547b8f969722e90442da2b8e90645
+  data.tar.gz: 840f2ce58bec117ec31afebf3bc91f6001eb4647c400d8f2a724caea4349c7da8182dcd9ecb1ee39b66b33c85564f3cd6c7503111835b7ebec3ed4b6e1edf3fe

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # hash_redactor #
 
+##0.2.1 ##
+* Fixed: Add support for string keys (@chrisjensen)
+
 ##0.2.0 ##
 * Changed: encrypted_key and encrypted_attr_iv are removed during decryption (@chrisjensen)
 

data/lib/hash_redactor/hash_redactor.rb

@@ -41,27 +41,11 @@ module HashRedactor
 			  when :remove
 				nil
 			  when :digest
-				result_key = (hash_key.to_s + '_digest').to_sym
-
-				result[result_key] = Digest::SHA256.base64digest(
-											result[hash_key].to_s + options[:digest_salt])
+			  	digest(result, hash_key, options)
 			  when :encrypt
-				raise "No encryption key specified. Please pass :encryption_key in options to new or redact" unless options[:encryption_key]
-			  
-				crypt_key = options[:encryption_key]
-				iv = SecureRandom.random_bytes(12)
-				data_key = ('encrypted_' + hash_key.to_s).to_sym
-				iv_key = ('encrypted_' + hash_key.to_s + '_iv').to_sym
-			
-				encrypted_value = EncryptorInterface.encrypt(:data, result[hash_key], iv: iv, key: crypt_key)
-				
-				encrypted_value = [encrypted_value].pack(options[:encode]) if options[:encode]
-				iv = [iv].pack(options[:encode_iv]) if options[:encode_iv]
-			
-				result[data_key] = encrypted_value
-				result[iv_key] = iv
+				encrypt(result, hash_key, options)
 			  else
-				raise "redact called with unknown operation on #{hash_key.to_s}: #{how.to_s}"
+				raise "redact called with unknown operation on #{hash_key}: #{how}"
 			end
 
 			result.delete hash_key
@@ -70,6 +54,38 @@ module HashRedactor
   
 		result
 	  end
+	  
+	  def digest(hash, hash_key, options)
+	  	digest_key = hash_key.to_s + '_digest'
+	  	digest_key = digest_key.to_sym if hash_key.is_a? Symbol
+	  
+		hash[digest_key] = Digest::SHA256.base64digest(
+									hash[hash_key].to_s + options[:digest_salt])
+	  end
+	  
+	  def encrypt(hash, hash_key, options)
+		raise "No encryption key specified. Please pass :encryption_key in options to new or redact" unless options[:encryption_key]
+	  
+		data_key = 'encrypted_' + hash_key.to_s
+		iv_key = 'encrypted_' + hash_key.to_s + '_iv'
+		
+		if hash_key.is_a? Symbol
+			data_key = data_key.to_sym
+			iv_key = iv_key.to_sym
+		end
+	
+		crypt_key = options[:encryption_key]
+		iv = SecureRandom.random_bytes(12)
+		
+		encrypted_value = EncryptorInterface.encrypt(:data,
+							 hash[hash_key], iv: iv, key: crypt_key)
+		
+		encrypted_value = [encrypted_value].pack(options[:encode]) if options[:encode]
+		iv = [iv].pack(options[:encode_iv]) if options[:encode_iv]
+	
+		hash[data_key] = encrypted_value
+		hash[iv_key] = iv
+	  end
 
 	  def decrypt(data, opts = {})
 	    options = @options.merge opts
@@ -84,30 +100,39 @@ module HashRedactor
   
 		redact_hash.each do |hash_key,how|
 		  if (how == :encrypt)
-			data_key = ('encrypted_' + hash_key.to_s).to_sym
-			iv_key = ('encrypted_' + hash_key.to_s + '_iv').to_sym
+		    decrypt_value(result, hash_key, options)
+		  end
+		end
+  
+		result
+	  end
+	  
+	  def decrypt_value(result, hash_key, options)
+		data_key = 'encrypted_' + hash_key.to_s
+		iv_key = 'encrypted_' + hash_key.to_s + '_iv'
+		
+		if hash_key.is_a? Symbol
+		  data_key = data_key.to_sym
+		  iv_key = iv_key.to_sym
+		end
 
-			if (data.has_key? data_key)
-			  iv = result[iv_key]
-			  crypt_key = options[:encryption_key]
+		if (result.has_key? data_key)
+		  iv = result[iv_key]
+		  crypt_key = options[:encryption_key]
 
-			  encrypted_value = result[data_key]
+		  encrypted_value = result[data_key]
 
-			  # Decode if necessary
-			  iv = iv.unpack(options[:encode_iv]).first if options[:encode_iv]
-			  encrypted_value = encrypted_value.unpack(options[:encode]).first if options[:encode]
+		  # Decode if necessary
+		  iv = iv.unpack(options[:encode_iv]).first if options[:encode_iv]
+		  encrypted_value = encrypted_value.unpack(options[:encode]).first if options[:encode]
 
-			  decrypted_value = EncryptorInterface.decrypt(:data, encrypted_value,
-				   iv: iv, key: crypt_key)
-		
-			  result[hash_key] = decrypted_value
-			  result.delete data_key
-			  result.delete iv_key
-			end
-		  end
+		  decrypted_value = EncryptorInterface.decrypt(:data, encrypted_value,
+			   iv: iv, key: crypt_key)
+	
+		  result[hash_key] = decrypted_value
+		  result.delete data_key
+		  result.delete iv_key
 		end
-  
-		result
 	  end
   end
 

data/lib/hash_redactor/version.rb

@@ -1,3 +1,3 @@
 module HashRedactor
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_redactor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_encrypted