ridley 0.5.0 → 0.5.1

data/lib/ridley/connection.rb

@@ -90,8 +90,8 @@ module Ridley
     def initialize(options = {})
       self.class.validate_options(options)
 
-      @client_name      = options.fetch(:client_name)
-      @client_key       = options.fetch(:client_key)
+      @client_name      = options[:client_name]
+      @client_key       = File.expand_path(options[:client_key])
       @organization     = options[:organization]
       @thread_count     = (options[:thread_count] || DEFAULT_THREAD_COUNT)
       @ssh              = (options[:ssh] || Hash.new)

data/lib/ridley/resources/data_bag_item.rb

@@ -168,7 +168,7 @@ module Ridley
     #
     # @return [Hash] decrypted attributes
     def decrypt
-      decrypted_hash = Hash[attributes.map { |key, value| [key, decrypt_value(value)] }]
+      decrypted_hash = Hash[attributes.map { |key, value| [key, key == "id" ? value : decrypt_value(value)] }]
       self.attributes = HashWithIndifferentAccess.new(decrypted_hash)
     end
 

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/unit/ridley/connection_spec.rb

@@ -121,6 +121,12 @@ describe Ridley::Connection do
           subject.new(config)
         }.should raise_error(Ridley::Errors::ClientKeyFileNotFound)
       end
+
+      it "expands the path of the client_key" do
+        config[:client_key] = "~/"
+
+        subject.new(config).client_key.should_not == "~/"
+      end
     end
 
     describe "::sync" do

data/spec/unit/ridley/resources/data_bag_item_spec.rb

@@ -41,13 +41,22 @@ describe Ridley::DataBagItem do
   end
 
   describe "#decrypt" do
-    it "decrypts an encrypted item" do
+    before(:each) do
       encrypted_data_bag_secret = File.read(fixtures_path.join("encrypted_data_bag_secret").to_s)
       connection.stub(:encrypted_data_bag_secret).and_return(encrypted_data_bag_secret)
+    end
 
+    it "decrypts an encrypted value" do
       subject.attributes[:test] = "Xk0E8lV9r4BhZzcg4wal0X4w9ZexN3azxMjZ9r1MCZc="
       subject.decrypt
       subject.attributes[:test][:database][:username].should == "test"
     end
+
+    it "does not decrypt the id field" do
+      id = "dbi_id"
+      subject.attributes[:id] = id
+      subject.decrypt
+      subject.attributes[:id].should == id
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1699037666768544565
+      hash: 4545606646369102038
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23