conjur-api 2.1.2 → 2.1.3

data/lib/conjur-api/version.rb

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

data/lib/conjur/acts_as_asset.rb

@@ -6,6 +6,7 @@ module Conjur
         include HasAttributes
         include Exists
         include HasId
+        include HasOwner
       end
     end
   end

data/lib/conjur/acts_as_role.rb

@@ -1,7 +1,15 @@
 module Conjur
   module ActsAsRole
     def roleid
-      self.attributes['roleid'] or raise "roleid attribute not found"
+      [ 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

data/lib/conjur/base.rb

@@ -3,6 +3,7 @@ require 'json'
 
 require 'conjur/exists'
 require 'conjur/has_attributes'
+require 'conjur/has_owner'
 require 'conjur/path_based'
 require 'conjur/escape'
 require 'conjur/log'

data/lib/conjur/core-api.rb

@@ -2,6 +2,14 @@ module Conjur
   module Core
     class API < Conjur::API
       class << self
+        def conjur_account
+          info['account'] or raise "No account field in #{info.inspect}"
+        end
+        
+        def info
+          @info ||= JSON.parse RestClient::Resource.new(Conjur::Core::API.host)['info'].get
+        end
+        
         def host
           ENV['CONJUR_CORE_URL'] || default_host
         end

data/lib/conjur/group.rb

@@ -1,8 +1,6 @@
 module Conjur
   class Group < RestClient::Resource
-    include ActsAsResource
+    include ActsAsAsset
     include ActsAsRole
-    include HasId
-    include HasAttributes
   end
 end

data/lib/conjur/has_owner.rb

@@ -0,0 +1,17 @@
+module Conjur
+  module HasOwner
+    def self.included(base)
+      base.instance_eval do
+        include HasAttributes
+      end
+    end
+    
+    def userid
+      attributes['userid']
+    end    
+    
+    def ownerid
+      attributes['ownerid']
+    end    
+  end
+end

data/lib/conjur/secret.rb

@@ -1,9 +1,6 @@
 module Conjur
   class Secret < RestClient::Resource
-    include ActsAsResource
-    include HasAttributes
-    include Exists
-    include HasId
+    include ActsAsAsset
     
     def value
       self['value'].get.body

data/lib/conjur/user.rb

@@ -3,9 +3,7 @@ module Conjur
   end
   
   class User < RestClient::Resource
-    include HasId
-    include HasAttributes
-    include ActsAsResource
+    include ActsAsAsset
     include ActsAsUser
     
     alias login id

data/lib/conjur/variable.rb

@@ -1,9 +1,6 @@
 module Conjur
   class Variable < RestClient::Resource
-    include ActsAsResource
-    include HasAttributes
-    include Exists
-    include HasId
+    include ActsAsAsset
     
     def add_value value
       log do |logger|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -171,6 +171,7 @@ files:
 - lib/conjur/has_attributes.rb
 - lib/conjur/has_id.rb
 - lib/conjur/has_identifier.rb
+- lib/conjur/has_owner.rb
 - lib/conjur/host.rb
 - lib/conjur/log.rb
 - lib/conjur/log_source.rb
@@ -204,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -423708281748873360
+      hash: 357911271528207191
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -423708281748873360
+      hash: 357911271528207191
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24