conjur-api 2.2.3 → 2.3.1

data/lib/conjur/api.rb

@@ -12,6 +12,7 @@ require 'conjur/acts_as_asset'
 require 'conjur/authn-api'
 require 'conjur/authz-api'
 require 'conjur/core-api'
+require 'conjur-api/version'
 
 class RestClient::Resource
   include Conjur::Escape

data/lib/conjur/role.rb

@@ -32,17 +32,30 @@ module Conjur
       end
     end
     
-    def grant_to(member, admin_option = false, options = {})
+    def grant_to(member, *args)
+      if Conjur::API::VERSION < "3.0.0"
+        options = args[-1]
+        if args.length > 1
+          warning = "WARNING: Deprecated arguments to grant_to. Please put admin_option in the options hash."
+          options[:admin_option] = args[0]
+        end
+
+        unless options.nil? || options.is_a?(Hash)
+          warning = "WARNING: Deprecated arguments to grant_to. Please put admin_option in the options hash."
+          options = { admin_option: options }
+        end
+      else
+        raise "Please remove the deprecated API in 3.0 and change the method signature to grant_to(member, options)"
+      end
+
       log do |logger|
+        logger << warning if warning
         logger << "Granting role #{identifier} to #{member}"
-        if admin_option
-          logger << " with admin option"
-        end
-        unless options.empty?
-          logger << " and extended options #{options.to_json}"
+        unless options.blank?
+          logger << " with options #{options.to_json}"
         end
       end
-      self["?members&member=#{query_escape member}&admin_option=#{query_escape admin_option}"].put(options)
+      self["?members&member=#{query_escape member}"].put(options)
     end
 
     def revoke_from(member, options = {})

data/lib/conjur-api/version.rb

@@ -1,5 +1,6 @@
 module Conjur
   class API
-    VERSION = "2.2.3"
+    VERSION = "2.3.1"
+    # Note: when bumping major version, please remove compatibility code in role#grant_to
   end
 end

data/spec/lib/role_spec.rb

@@ -1,27 +1,57 @@
 require 'spec_helper'
 
-shared_examples_for "properties" do
-  subject { role }
-  its(:kind) { should == kind }
-  its(:id) { should == id }
-end
-
 describe Conjur::Role do
   let(:account) { "the-account" }
-  context "#new" do
-    let(:kind) { "test" }
-    let(:role) { Conjur::API.new_from_token({ 'data' => 'the-login' }).role([ account, kind, id ].join(":")) }
+  let(:kind) { "test" }
+  let(:role) { Conjur::API.new_from_token({ 'data' => 'the-login' }).role([ account, kind, id ].join(":")) }
+  subject { role }
+
+  describe ".new" do
     context "with plain id" do
       let(:id) { "foo" }
-      context "credentials" do
-        subject { role }
-        its(:options) { should == {:headers=>{:authorization=>"Token token=\"eyJkYXRhIjoidGhlLWxvZ2luIn0=\""}, :username=>'the-login'} }
-      end
-      it_should_behave_like "properties"
+      its(:options) { should == {:headers=>{:authorization=>"Token token=\"eyJkYXRhIjoidGhlLWxvZ2luIn0=\""}, :username=>'the-login'} }
+      its(:kind) { should == kind }
+      its(:id) { should == id }
     end
+
     context "with more complex id" do
       let(:id) { "foo/bar" }
-      it_should_behave_like "properties"
+      its(:kind) { should == kind }
+      its(:id) { should == id }
     end
   end
-end
+
+  let(:id) { "role/id" }
+
+  describe "#grant_to" do
+    it "should take hash as the second argument and put it" do
+      members = double "members request"
+      subject.should_receive(:[]).with('?members&member=other').and_return(members)
+      members.should_receive(:put).with admin_option: true
+      subject.grant_to "other", admin_option: true
+    end
+
+    it "works without arguments" do
+      members = double "members request"
+      subject.should_receive(:[]).with('?members&member=other').and_return(members)
+      members.should_receive(:put).with nil
+      subject.grant_to "other"
+    end
+
+    context deprecated: 'v3' do # remove in 3.0
+      it "should also accept the deprecated argument format with extra options" do
+        members = double "members request"
+        subject.should_receive(:[]).with('?members&member=other').and_return(members)
+        members.should_receive(:put).with admin_option: true, foo: 'bar'
+        subject.grant_to "other", true, foo: 'bar'
+      end
+
+      it "should also accept the deprecated argument format without extra options" do
+        members = double "members request"
+        subject.should_receive(:[]).with('?members&member=other').and_return(members)
+        members.should_receive(:put).with admin_option: true, foo: 'bar'
+        subject.grant_to "other", true, foo: 'bar'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3721927865223886977
+      hash: -1659157987203846410
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3721927865223886977
+      hash: -1659157987203846410
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24