vault-tree 0.6.0 → 0.8.0

data/.gitignore

@@ -1,3 +1,5 @@
+Vagrantfile
+
 # Do not Check In Gemfile.lock
 Gemfile.lock
 

data/lib/vault-tree/contract/vault.rb

@@ -19,31 +19,23 @@ module VaultTree
     end
 
     def filler
-      KeywordInterpreter.new(properties['fill_with'], self).evaluate
+      interpret_keyword('fill_with')
     end
 
     def locking_key
-      VaultKey.new KeywordInterpreter.new(properties['lock_with'], self).evaluate
+      VaultKey.new interpret_keyword('lock_with')
     end
 
     def unlocking_key
-      VaultKey.new KeywordInterpreter.new(properties['unlock_with'], self).evaluate
+      VaultKey.new interpret_keyword('unlock_with')
     end
 
     def locked_contents
-      begin
-        already_locked? ? properties['contents'] : ciphertext(filler)
-      rescue RbNaCl::CryptoError => e
-        raise Exceptions::FailedLockAttempt.new(e, vault_id: id)
-      end
+      already_locked? ? properties['contents'] : ciphertext(filler)
     end
 
     def unlocked_contents
-      begin
-        plaintext properties['contents']
-      rescue RbNaCl::CryptoError => e
-        raise Exceptions::FailedUnlockAttempt.new(e, vault_id: id)
-      end
+      plaintext properties['contents']
     end
 
     def ciphertext(m)
@@ -58,5 +50,9 @@ module VaultTree
       ! (properties['contents'].nil? || properties['contents'].empty?)
     end
 
+    def interpret_keyword(prop_key)
+      KeywordInterpreter.new(properties[prop_key], self).evaluate
+    end
+
   end
 end

data/lib/vault-tree/contract/vault_list.rb

@@ -8,14 +8,22 @@ module VaultTree
     end
 
     def close_vault(id)
-      validate_vault(id)
-      update_vaults vault(id).close
-      self
+      begin
+        validate_vault(id)
+        update_vaults(id, vault(id).close)
+        self
+      rescue RbNaCl::CryptoError => e
+        raise Exceptions::FailedLockAttempt.new(e, vault_id: id)
+      end
     end
 
     def open_vault(id)
-      validate_vault(id)
-      vault(id).open
+      begin
+        validate_vault(id)
+        vault(id).open
+      rescue RbNaCl::CryptoError => e
+        raise Exceptions::FailedUnlockAttempt.new(e, vault_id: id)
+      end
     end
 
     def vault_closed?(id)
@@ -36,8 +44,8 @@ module VaultTree
       vaults_hash[id]['contents'].nil? || vaults_hash[id]['contents'].empty?
     end
 
-    def update_vaults(vault)
-      @vaults_hash[vault.id] = vault.properties unless vault.kind_of?(NullVault)
+    def update_vaults(id, vault)
+      @vaults_hash[id] = vault.properties unless vault.kind_of?(NullVault)
     end
 
     def vault(id)

data/lib/vault-tree/lock_smith.rb

@@ -1,4 +1,4 @@
-require 'rbnacl'
+require 'rbnacl/libsodium'
 require_relative 'lock_smith/assembled_shamir_key'
 
 module VaultTree

data/lib/vault-tree/version.rb

@@ -1,3 +1,3 @@
 module VaultTree
-  VERSION = '0.6.0'
+  VERSION = '0.8.0'
 end

data/spec/shamir_key_shares_spec.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-require 'JSON'
+require 'json'
 require_relative '../lib/vault-tree/lock_smith/shamir_key_shares'
 
 module VaultTree

data/vault-tree.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rbnacl", "2.0.0"
+  spec.add_dependency "rbnacl-libsodium"
   spec.add_dependency "secretsharing", "0.3"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-tree
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: secretsharing
   requirement: !ruby/object:Gem::Requirement