conjur-api 2.1.4 → 2.1.5

data/lib/conjur-api/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   class API
-    VERSION = "2.1.4"
+    VERSION = "2.1.5"
   end
 end

data/lib/conjur/acts_as_asset.rb

@@ -2,11 +2,11 @@ module Conjur
   module ActsAsAsset
     def self.included(base)
       base.instance_eval do
-        include ActsAsResource
-        include HasAttributes
-        include Exists
         include HasId
+        include Exists
         include HasOwner
+        include ActsAsResource
+        include HasAttributes
       end
     end
   end

data/lib/conjur/acts_as_resource.rb

@@ -6,7 +6,8 @@ module Conjur
     end
     
     def resource_kind
-      self.class.name.split("::")[1..-1].join('-').downcase
+      require 'active_support/core_ext'
+      self.class.name.split("::")[-1].underscore.split('/').join('-')
     end
 
     def resource_id

data/lib/conjur/api.rb

@@ -18,6 +18,10 @@ class RestClient::Resource
   include Conjur::LogSource
   extend  Conjur::BuildFromResponse
   
+  def to_json(options = {})
+    {}
+  end
+  
   def path_components
     require 'uri'
     URI.parse(self.url).path.split('/').map{|e| URI.unescape e}

data/lib/conjur/base.rb

@@ -20,9 +20,16 @@ module Conjur
     class << self
       # 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(':') ]
+        if id.is_a?(Hash)
+          tokens = id['id'].split(':')
+          [ id['account'], 'roles', tokens[0], tokens[1..-1].join(':') ]
+        elsif id.is_a?(String)
+          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(':') ]
+        else
+          raise "Unexpected class #{id.class} for #{id}"
+        end
       end
 
       def new_from_key(username, api_key)

data/lib/conjur/has_attributes.rb

@@ -1,5 +1,9 @@
 module Conjur
   module HasAttributes
+    def to_json(options = {})
+      attributes
+    end
+
     def attributes=(a); @attributes = a; end
     def attributes
       return @attributes if @attributes

data/lib/conjur/has_id.rb

@@ -1,5 +1,9 @@
 module Conjur
   module HasId
+    def to_json(options = {})
+      { id: id }
+    end
+  
     def id
       path_components[-1]
     end    

data/lib/conjur/role.rb

@@ -1,3 +1,5 @@
+require 'conjur/role_grant'
+
 module Conjur
   class Role < RestClient::Resource
     include Exists
@@ -61,8 +63,8 @@ module Conjur
     end
     
     def members
-      JSON.parse(self["?members"].get(options)).collect do |id|
-        Role.new(Conjur::Authz::API.host, self.options)[Conjur::API.parse_role_id(id).join('/')]
+      JSON.parse(self["?members"].get(options)).collect do |json|
+        RoleGrant.parse_from_json(json, self.options)
       end
     end
   end

data/lib/conjur/role_grant.rb

@@ -0,0 +1,11 @@
+module Conjur
+  RoleGrant = Struct.new(:member, :grantor, :admin_option) do
+    class << self
+      def parse_from_json(json, credentials)
+        member = Role.new(Conjur::Authz::API.host, credentials)[Conjur::API.parse_role_id(json['member']).join('/')]
+        grantor = Role.new(Conjur::Authz::API.host, credentials)[Conjur::API.parse_role_id(json['grantor']).join('/')]
+        RoleGrant.new(member, grantor, json['admin_option'])
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -178,6 +178,7 @@ files:
 - lib/conjur/path_based.rb
 - lib/conjur/resource.rb
 - lib/conjur/role.rb
+- lib/conjur/role_grant.rb
 - lib/conjur/secret.rb
 - lib/conjur/standard_methods.rb
 - lib/conjur/token_cache.rb
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1925645782265443931
+      hash: -713472322401587532
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1925645782265443931
+      hash: -713472322401587532
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24