conjur-api 2.1.1 → 2.1.2

data/lib/conjur-api/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   class API
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

data/lib/conjur/acts_as_role.rb

@@ -1,8 +1,12 @@
 module Conjur
   module ActsAsRole
+    def roleid
+      self.attributes['roleid'] or raise "roleid attribute not found"
+    end
+    
     def role
       require 'conjur/role'
-      Conjur::Role.new("#{Conjur::Authz::API.host}/roles/#{path_escape roleid}", self.options)
+      Conjur::Role.new(Conjur::Authz::API.host, self.options)[Conjur::API.parse_role_id(self.roleid).join('/')]
     end
   end
 end

data/lib/conjur/api/groups.rb

@@ -2,6 +2,14 @@ require 'conjur/group'
 
 module Conjur
   class API
+    def groups
+      JSON.parse(RestClient::Resource.new(Conjur::Core::API.host, credentials)['groups'].get).collect do |json|
+        # TODO: remove this hack
+        json = JSON.parse json['json']
+        group(json['id'])
+      end
+    end
+
     def create_group(id, options = {})
       standard_create Conjur::Core::API.host, :group, id, options
     end

data/lib/conjur/base.rb

@@ -20,6 +20,7 @@ module Conjur
       # Parse a role id into [ account, 'roles', kind, id ]
       def parse_role_id(id)
         paths = path_escape(id).split(':')
+        raise "Expecting account:kind:id in role #{id}" unless paths.size >= 3
         [ paths[0], 'roles', paths[1], paths[2..-1].join(':') ]
       end
 

data/lib/conjur/group.rb

@@ -4,9 +4,5 @@ module Conjur
     include ActsAsRole
     include HasId
     include HasAttributes
-    
-    def roleid
-      "group:#{id}"
-    end
   end
 end

data/lib/conjur/host.rb

@@ -6,10 +6,6 @@ module Conjur
     include HasAttributes
     include ActsAsUser
     
-    def roleid
-      "host:#{id}"
-    end
-    
     def enrollment_url
       log do |logger|
         logger << "Fetching enrollment_url for #{id}"

data/lib/conjur/role.rb

@@ -9,6 +9,10 @@ module Conjur
     
     alias id identifier
     
+    def roleid
+      [ account, kind, identifier ].join(':')
+    end
+    
     def create(options = {})
       log do |logger|
         logger << "Creating role #{kind}:#{identifier}"
@@ -21,6 +25,7 @@ module Conjur
     
     def all(options = {})
       JSON.parse(self["?all"].get(options)).collect do |id|
+        id = [ id['account'], id['id'] ].join(':')
         Role.new(Conjur::Authz::API.host, self.options)[Conjur::API.parse_role_id(id).join('/')]
       end
     end

data/lib/conjur/user.rb

@@ -9,9 +9,5 @@ module Conjur
     include ActsAsUser
     
     alias login id
-
-    def roleid
-      [ 'user', id ].join(':')
-    end
   end
 end

data/spec/lib/api_spec.rb

@@ -61,7 +61,7 @@ describe Conjur::API do
       it_should_behave_like "API endpoint"
     end
     context "of core service" do
-      let(:port_offset) { 300 }
+      let(:port_offset) { 200 }
       let(:api) { Conjur::Core::API }
       it_should_behave_like "API endpoint"
     end    

data/spec/lib/user_spec.rb

@@ -12,10 +12,12 @@ describe Conjur::User do
       subject { user }
       its(:id) { should == login }
       its(:login) { should == login }
-      its(:roleid) { should == ["user", login].join(':') }
       its(:resource_id) { should == login }
       its(:resource_kind) { should == "user" }
       its(:options) { should == credentials }
+      specify {
+        lambda { user.roleid }.should raise_error
+      }
     end
     before {
       Conjur.stub(:account).and_return 'ci'
@@ -28,8 +30,11 @@ describe Conjur::User do
       user.resource
     end
     it "connects to a Role" do
+      user.stub(:roleid).and_return "ci:user:the-login"
+      
       require 'conjur/role'
-      Conjur::Role.should_receive(:new).with("#{Conjur::Authz::API.host}/roles/#{user.roleid}", credentials)
+      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")
       
       user.role
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047181916872803185
+      hash: -423708281748873360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4047181916872803185
+      hash: -423708281748873360
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24