conjur-api 2.1.7 → 2.1.8

data/lib/conjur-api/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   class API
-    VERSION = "2.1.7"
+    VERSION = "2.1.8"
   end
 end

data/lib/conjur/acts_as_resource.rb

@@ -2,7 +2,7 @@ module Conjur
   module ActsAsResource
     def resource
       require 'conjur/resource'
-      Conjur::Resource.new(Conjur::Authz::API.host, self.options)[[ Conjur.account, 'resources', path_escape(resource_kind), path_escape(resource_id) ].join('/')]
+      Conjur::Resource.new(Conjur::Authz::API.host, self.options)[[ core_conjur_account, 'resources', path_escape(resource_kind), path_escape(resource_id) ].join('/')]
     end
     
     def resource_kind

data/lib/conjur/acts_as_role.rb

@@ -1,17 +1,13 @@
 module Conjur
   module ActsAsRole
     def roleid
-      [ conjur_account, role_kind, id ].join(':')
+      [ core_conjur_account, role_kind, id ].join(':')
     end
     
     def role_kind
       self.class.name.split('::')[-1].underscore
     end
     
-    def conjur_account
-      Conjur::Core::API.conjur_account
-    end
-    
     def role
       require 'conjur/role'
       Conjur::Role.new(Conjur::Authz::API.host, self.options)[Conjur::API.parse_role_id(self.roleid).join('/')]

data/lib/conjur/api.rb

@@ -17,6 +17,10 @@ class RestClient::Resource
   include Conjur::Escape
   include Conjur::LogSource
   extend  Conjur::BuildFromResponse
+
+  def core_conjur_account
+    Conjur::Core::API.conjur_account
+  end
   
   def to_json(options = {})
     {}

data/lib/conjur/base.rb

@@ -26,7 +26,7 @@ module Conjur
         elsif id.is_a?(String)
           paths = path_escape(id).split(':')
           if paths.size == 2
-            paths.unshift Conjur.account
+            paths.unshift Conjur::Core::API.conjur_account
           end
           [ paths[0], 'roles', paths[1], paths[2..-1].join(':') ]
         else

data/lib/conjur/resource.rb

@@ -30,7 +30,7 @@ module Conjur
 
     def delete(options = {})
       log do |logger|
-        logger << "Deleting resource #{kind} : #{identifier}"
+        logger << "Deleting resource #{kind}:#{identifier}"
         unless options.empty?
           logger << " with options #{options.to_json}"
         end
@@ -41,7 +41,7 @@ module Conjur
     def permit(privilege, role, options = {})
       eachable(privilege).each do |p|
         log do |logger|
-          logger << "Permitting #{p} on resource #{kind} : #{identifier} by #{role}"
+          logger << "Permitting #{p} on resource #{kind}:#{identifier} by #{role}"
           unless options.empty?
             logger << " with options #{options.to_json}"
           end
@@ -54,7 +54,7 @@ module Conjur
     def deny(privilege, role, options = {})
       eachable(privilege).each do |p|
         log do |logger|
-          logger << "Denying #{p} on resource #{kind} : #{identifier} by #{role}"
+          logger << "Denying #{p} on resource #{kind}:#{identifier} by #{role}"
           unless options.empty?
             logger << " with options #{options.to_json}"
           end

data/lib/conjur/standard_methods.rb

@@ -6,7 +6,8 @@ module Conjur
     
     def standard_create(host, type, id = nil, options = nil)
       log do |logger|
-        logger << "Creating #{type} #{id}"
+        logger << "Creating #{type}"
+        logger << " #{id}" if id
         unless options.blank?
           logger << " with options #{options.inspect}"
         end

data/spec/lib/api_spec.rb

@@ -37,6 +37,22 @@ shared_examples_for "API endpoint" do
 end
 
 describe Conjur::API do
+  context "parse_role_id" do
+    subject { Conjur::API }
+    specify {
+      Conjur::Core::API.should_receive(:conjur_account).and_return 'ci'      
+      subject.parse_role_id('foo:bar').should == [ 'ci', 'roles', 'foo', 'bar' ]
+    }
+    specify {
+      subject.parse_role_id('biz:foo:bar').should == [ 'biz', 'roles', 'foo', 'bar' ]
+    }
+    specify {
+      subject.parse_role_id('biz:foo:bar/12').should == [ 'biz', 'roles', 'foo', 'bar/12' ]
+    }
+    specify {
+      subject.parse_role_id('biz:foo:bar:12').should == [ 'biz', 'roles', 'foo', 'bar:12' ]
+    }
+  end
   context "host construction" do
     context "of authn service" do
       let(:port_offset) { 0 }

data/spec/lib/user_spec.rb

@@ -19,20 +19,17 @@ describe Conjur::User do
         lambda { user.roleid }.should raise_error
       }
     end
-    before {
-      Conjur.stub(:account).and_return 'ci'
-    }
     it "connects to a Resource" do
       require 'conjur/resource'
+      Conjur::Core::API.should_receive(:conjur_account).and_return 'ci'
       Conjur::Resource.should_receive(:new).with(Conjur::Authz::API.host, credentials).and_return resource = double(:resource)
       resource.should_receive(:[]).with("ci/resources/user/the-login")
       
       user.resource
     end
     it "connects to a Role" do
-      user.stub(:roleid).and_return "ci:user:the-login"
-      
       require 'conjur/role'
+      Conjur::Core::API.should_receive(:conjur_account).and_return 'ci'
       Conjur::Role.should_receive(:new).with(Conjur::Authz::API.host, credentials).and_return role = double(:role)
       role.should_receive(:[]).with("ci/roles/user/the-login")
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1531307827213414135
+      hash: 3260339129685537425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1531307827213414135
+      hash: 3260339129685537425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24