conjur-api 2.2.1 → 2.2.2

data/lib/conjur-api/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   class API
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

data/lib/conjur/base.rb

@@ -20,15 +20,26 @@ module Conjur
     class << self
       # Parse a role id into [ account, 'roles', kind, id ]
       def parse_role_id(id)
+        parse_id id, 'roles'
+      end
+
+      # Parse a resource id into [ account, 'resources', kind, id ]
+      def parse_resource_id(id)
+        parse_id id, 'resources'
+      end
+      
+      def parse_id(id, kind)
         if id.is_a?(Hash)
           tokens = id['id'].split(':')
-          [ id['account'], 'roles', tokens[0], tokens[1..-1].join(':') ]
+          [ id['account'], kind, tokens[0], tokens[1..-1].join(':') ]
         elsif id.is_a?(String)
           paths = path_escape(id).split(':')
-          if paths.size == 2
+          if paths.size < 2
+            raise "Expecting at least two tokens in #{id}"
+          elsif paths.size == 2
             paths.unshift Conjur::Core::API.conjur_account
           end
-          [ paths[0], 'roles', paths[1], paths[2..-1].join(':') ]
+          [ paths[0], kind, paths[1], paths[2..-1].join(':') ]
         else
           raise "Unexpected class #{id.class} for #{id}"
         end

data/lib/conjur/exists.rb

@@ -4,6 +4,12 @@ module Conjur
       begin
         self.head(options)
         true
+      rescue RestClient::Forbidden
+        # rationale is: exists? should return true iff creating a resource with
+        # the same name would fail (not by client's fault). Why it would fail
+        # doesn't matter that much.
+        # (Plus, currently it always 403s when the resource exists but is unaccessible.)
+        true
       rescue RestClient::ResourceNotFound
         false
       end

data/spec/lib/exists_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Conjur::Exists do
+  subject { Object.new.tap {|o| o.send :extend, Conjur::Exists } }
+
+  context "when head returns 200" do
+    before { subject.stub head: "" }
+    its(:exists?) { should be_true }
+  end
+
+  context "when forbidden" do
+    before { subject.stub(:head) { raise RestClient::Forbidden }}
+    its(:exists?) { should be_true }
+  end
+
+  context "when not found" do
+    before { subject.stub(:head) { raise RestClient::ResourceNotFound }}
+    its(:exists?) { should be_false }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -186,6 +186,7 @@ files:
 - lib/conjur/user.rb
 - lib/conjur/variable.rb
 - spec/lib/api_spec.rb
+- spec/lib/exists_spec.rb
 - spec/lib/host_spec.rb
 - spec/lib/resource_spec.rb
 - spec/lib/role_spec.rb
@@ -208,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2312433878886306886
+      hash: -2465680462875231923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2312433878886306886
+      hash: -2465680462875231923
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -230,6 +231,7 @@ test_files:
 - features/ping_as_server.feature
 - features/ping_as_user.feature
 - spec/lib/api_spec.rb
+- spec/lib/exists_spec.rb
 - spec/lib/host_spec.rb
 - spec/lib/resource_spec.rb
 - spec/lib/role_spec.rb