1pass 0.1.1 → 0.1.2

data/lib/1pass/version.rb

@@ -1,3 +1,3 @@
 module OnePass
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/encryption_key.rb

@@ -12,15 +12,15 @@ class EncryptionKey
 	end
 
 	def get(identifier)
-		@items.select {|ek| ek.identifier == identifier}.first
+		@items.select {|ek| ek.identifier == identifier || ek.level == identifier}.first
 	end
 end
 
 class EncryptionKeyItem
-	attr_reader :identifier, :decrypted_master_key
+	attr_reader :identifier, :level, :decrypted_master_key
 
 	def initialize(hash_)
-		@identifier, @data, @validation, @iterations = hash_.values_at("identifier", "data", "validation", "iterations")
+		@identifier, @data, @validation, @iterations, @level = hash_.values_at("identifier", "data", "validation", "iterations", "level")
 	end
 
 	def unlock(password)

data/lib/key.rb

@@ -7,14 +7,16 @@ class Key
 	end
 
 	def initialize(hash_)
-		@key_id, @encrypted, @type_name = hash_.values_at("keyID", "encrypted", "typeName")
+		@key_id, @encrypted, @type_name, @security_level = hash_.values_at("keyID", "encrypted", "typeName", "securityLevel")
+		@type = types[@type_name] || Password
 	end
 
 	def decrypt(encryption_key)
-		decrypted_master_key = encryption_key.get(@key_id).decrypted_master_key
+		encryption_key_item = encryption_key.get(@key_id) || encryption_key.get(@security_level)
+		decrypted_master_key = encryption_key_item.decrypted_master_key
 		return unless decrypted_master_key
-		decrypted_content = JSON.parse Decrypt.decrypt_ssl(decrypted_master_key, @encrypted)
-		types[@type_name].new decrypted_content
+		decrypted_content = JSON.parse Decrypt.decrypt_ssl(decrypted_master_key, @encrypted)		
+		@type.new decrypted_content
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 1pass
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 797335186741412980
+      hash: 3607015952039489117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,11 +83,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 797335186741412980
+      hash: 3607015952039489117
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: 1pass-0.1.1
+summary: 1pass-0.1.2
 test_files: []