conjur-api 4.6.0 → 4.6.1

data/lib/conjur-api/version.rb

@@ -20,6 +20,6 @@
 #
 module Conjur
   class API
-    VERSION = "4.6.0"
+    VERSION = "4.6.1"
   end
 end

data/lib/conjur/api/resources.rb

@@ -28,11 +28,8 @@ module Conjur
       end
     end
     
-    def resource identifier
-      paths = path_escape(identifier).split(':')
-      raise ArgumentError, "Expected at least 3 tokens in resource identifier '#{identifier}'" if paths.length < 3
-      path = [ paths[0], 'resources', paths[1], paths[2..-1].join(':') ].flatten.join('/')
-      Resource.new(Conjur::Authz::API.host, credentials)[path]
+    def resource resource
+      Resource.new(Conjur::Authz::API.host, credentials)[self.class.parse_resource_id(resource).join('/')]
     end
 
     # Return all visible resources.

data/lib/conjur/configuration.rb

@@ -139,7 +139,7 @@ module Conjur
         URI.join(appliance_url + '/', service_name).to_s
       else
         case env
-        when 'test', 'development'
+        when 'test', 'development', 'appliance'
           "http://localhost:#{service_base_port + service_port_offset}"
         else
           "https://#{service_name}-#{stack}-conjur.herokuapp.com"
@@ -152,7 +152,7 @@ module Conjur
         URI.join(appliance_url + '/', service_name).to_s
       else
         case env
-        when 'test', 'development'
+        when 'test', 'development', 'appliance'
           "http://localhost:#{service_base_port + service_port_offset}"
         else
           "https://#{service_name}-#{account}-conjur.herokuapp.com"

data/spec/api/resources_spec.rb

@@ -15,6 +15,13 @@ describe Conjur::API, api: :dummy do
       res = api.resource "some-account:a-kind:the-id"
       res.url.should == "#{authz_host}/some-account/resources/a-kind/the-id"
     end
+    it "accepts an account-less resource" do
+      res = api.resource "a-kind:the-id"
+      res.url.should == "#{authz_host}/#{account}/resources/a-kind/the-id"
+    end
+    it "rejects an underspecified resource" do
+      expect { api.resource "the-id" }.to raise_error(/at least two tokens in the-id/)
+    end
   end
 
   describe '.resources' do

data/spec/lib/api_spec.rb

@@ -162,6 +162,14 @@ describe Conjur::API do
           should == "https://authz-v4-conjur.herokuapp.com"
         end
       end
+      context "in appliance" do
+        before(:each) do
+          Conjur::Configuration.any_instance.stub(:env).and_return "appliance"
+        end
+        its "host" do
+          should == "http://localhost:5100"
+        end
+      end
       context "in named production version" do
         before(:each) do
           Conjur::Configuration.any_instance.stub(:env).and_return "production"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3859174285940063267
+      hash: -564295811495519523
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25