conjur-api 2.1.5 → 2.1.6

data/lib/conjur-api/version.rb

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

data/lib/conjur/authn-api.rb

@@ -11,7 +11,7 @@ module Conjur
           when 'test', 'development'
             "http://localhost:#{Conjur.service_base_port}"
           else
-            "https://authn-#{Conjur.stack}-conjur.herokuapp.com"
+            "https://authn-#{Conjur.account}-conjur.herokuapp.com"
           end
         end
       end

data/lib/conjur/core-api.rb

@@ -19,7 +19,7 @@ module Conjur
           when 'test', 'development'
             "http://localhost:#{Conjur.service_base_port + 200}"
           else
-            "https://core-#{Conjur.stack}-conjur.herokuapp.com"
+            "https://core-#{Conjur.account}-conjur.herokuapp.com"
           end
         end
       end

data/lib/conjur/resource.rb

@@ -47,7 +47,7 @@ module Conjur
           end
         end
         
-        self["?grant&privilege=#{query_escape p}&role=#{query_escape role}"].post(options)
+        self["?permit&privilege=#{query_escape p}&role=#{query_escape role}"].post(options)
       end
     end
     
@@ -59,7 +59,7 @@ module Conjur
             logger << " with options #{options.to_json}"
           end
         end
-        self["?revoke&privilege=#{query_escape p}&role=#{query_escape role}"].post(options)
+        self["?deny&privilege=#{query_escape p}&role=#{query_escape role}"].post(options)
       end
     end
     

data/lib/conjur/standard_methods.rb

@@ -26,7 +26,7 @@ module Conjur
     end
     
     def standard_show(host, type, id)
-      "Conjur::#{type.to_s.classify}".constantize.new(host, credentials)[ [type.to_s.pluralize, path_escape(id)].join('/') ]
+      "Conjur::#{type.to_s.classify}".constantize.new(host, credentials)[ [type.to_s.pluralize, fully_escape(id)].join('/') ]
     end
   end
 end

data/spec/lib/api_spec.rb

@@ -13,37 +13,25 @@ shared_examples_for "API endpoint" do
       should == "http://localhost:#{Conjur.service_base_port + port_offset}"
     end
   end
-  context "in stage" do
-    before(:each) do
-      Conjur.stub(:env).and_return "stage"
-    end
-    its "default_host" do
-      should == "https://#{service_name}-stage-conjur.herokuapp.com"
-    end
-  end
-  context "in ci" do
-    before(:each) do
-      Conjur.stub(:env).and_return "ci"
-    end
-    its "default_host" do
-      should == "https://#{service_name}-ci-conjur.herokuapp.com"
-    end
-  end
-  context "in production" do
-    before(:each) do
-      Conjur.stub(:env).and_return "production"
-    end
-    its "default_host" do
-      should == "https://#{service_name}-v3-conjur.herokuapp.com"
-    end
-  end
-  context "in named production version" do
-    before(:each) do
-      Conjur.stub(:env).and_return "production"
-      Conjur.stub(:stack).and_return "waffle"
+  context "'ci' account" do
+    before {
+      Conjur.stub(:account).and_return 'ci'
+    }
+    context "in stage" do
+      before(:each) do
+        Conjur.stub(:env).and_return "stage"
+      end
+      its "default_host" do
+        should == "https://#{service_name}-ci-conjur.herokuapp.com"
+      end
     end
-    its "default_host" do
-      should == "https://#{service_name}-waffle-conjur.herokuapp.com"
+    context "in ci" do
+      before(:each) do
+        Conjur.stub(:env).and_return "ci"
+      end
+      its "default_host" do
+        should == "https://#{service_name}-ci-conjur.herokuapp.com"
+      end
     end
   end
 end
@@ -58,7 +46,45 @@ describe Conjur::API do
     context "of authz service" do
       let(:port_offset) { 100 }
       let(:api) { Conjur::Authz::API }
-      it_should_behave_like "API endpoint"
+      subject { api }
+      context "'ci' account" do
+        before {
+          Conjur.stub(:account).and_return 'ci'
+        }
+        context "in stage" do
+          before(:each) do
+            Conjur.stub(:env).and_return "stage"
+          end
+          its "default_host" do
+            should == "https://authz-stage-conjur.herokuapp.com"
+          end
+        end
+        context "in ci" do
+          before(:each) do
+            Conjur.stub(:env).and_return "ci"
+          end
+          its "default_host" do
+            should == "https://authz-ci-conjur.herokuapp.com"
+          end
+        end
+      end
+      context "in production" do
+        before(:each) do
+          Conjur.stub(:env).and_return "production"
+        end
+        its "default_host" do
+          should == "https://authz-v3-conjur.herokuapp.com"
+        end
+      end
+      context "in named production version" do
+        before(:each) do
+          Conjur.stub(:env).and_return "production"
+          Conjur.stub(:stack).and_return "waffle"
+        end
+        its "default_host" do
+          should == "https://authz-waffle-conjur.herokuapp.com"
+        end
+      end
     end
     context "of core service" do
       let(:port_offset) { 200 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-30 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: -713472322401587532
+      hash: 294077507062460443
 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: -713472322401587532
+      hash: 294077507062460443
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24