conjur-api 2.1.0 → 2.1.1

data/lib/conjur-api/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   class API
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/lib/conjur/acts_as_asset.rb

@@ -0,0 +1,12 @@
+module Conjur
+  module ActsAsAsset
+    def self.included(base)
+      base.instance_eval do
+        include ActsAsResource
+        include HasAttributes
+        include Exists
+        include HasId
+      end
+    end
+  end
+end

data/lib/conjur/api.rb

@@ -1,5 +1,6 @@
 require 'conjur/env'
 require 'conjur/base'
+require 'conjur/build_from_response'
 require 'conjur/acts_as_resource'
 require 'conjur/acts_as_role'
 require 'conjur/acts_as_user'
@@ -7,6 +8,7 @@ require 'conjur/log_source'
 require 'conjur/has_attributes'
 require 'conjur/has_identifier'
 require 'conjur/has_id'
+require 'conjur/acts_as_asset'
 require 'conjur/authn-api'
 require 'conjur/authz-api'
 require 'conjur/core-api'
@@ -14,6 +16,12 @@ require 'conjur/core-api'
 class RestClient::Resource
   include Conjur::Escape
   include Conjur::LogSource
+  extend  Conjur::BuildFromResponse
+  
+  def path_components
+    require 'uri'
+    URI.parse(self.url).path.split('/').map{|e| URI.unescape e}
+  end
   
   def username
     options[:user] || options[:username]

data/lib/conjur/build_from_response.rb

@@ -0,0 +1,18 @@
+module Conjur
+  module BuildFromResponse
+    def build_from_response(response, credentials)
+      new(response.headers[:location], credentials).tap do |obj|
+        obj.attributes = JSON.parse(response.body)
+        if obj.respond_to?(:resource_kind)
+          obj.log do |logger|
+            logger << "Created #{obj.resource_kind} #{obj.resource_id}"
+          end
+        elsif obj.respond_to?(:id)
+          obj.log do |logger|
+            logger << "Created #{self.name} #{obj.id}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/conjur/core-api.rb

@@ -9,7 +9,7 @@ module Conjur
         def default_host
           case Conjur.env
           when 'test', 'development'
-            "http://localhost:#{Conjur.service_base_port + 300}"
+            "http://localhost:#{Conjur.service_base_port + 200}"
           else
             "https://core-#{Conjur.stack}-conjur.herokuapp.com"
           end

data/lib/conjur/env.rb

@@ -16,7 +16,7 @@ module Conjur
   def stack
     ENV['CONJUR_STACK'] || case env
     when "production"
-      "v21"
+      "v3"
     else
       env
     end

data/lib/conjur/has_attributes.rb

@@ -20,6 +20,7 @@ module Conjur
     
     def invalidate(&block)
       yield
+    ensure
       @attributes = nil
     end
     

data/lib/conjur/has_id.rb

@@ -1,8 +1,7 @@
 module Conjur
   module HasId
     def id
-      require 'uri'
-      URI.unescape URI.parse(self.url).path.split('/')[-1]
+      path_components[-1]
     end    
   end
 end

data/lib/conjur/standard_methods.rb

@@ -14,14 +14,7 @@ module Conjur
       options ||= {}
       options[:id] = id if id
       resp = RestClient::Resource.new(host, credentials)[type.to_s.pluralize].post(options)
-      "Conjur::#{type.to_s.classify}".constantize.new(resp.headers[:location], credentials).tap do |obj|
-        obj.attributes = JSON.parse(resp.body)
-        if id.blank? && obj.respond_to?(:id)
-          log do |logger|
-            logger << "Created #{type} #{obj.id}"
-          end
-        end
-      end
+      "Conjur::#{type.to_s.classify}".constantize.build_from_response(resp, credentials)
     end
     
     def standard_list(host, type, options)

data/lib/conjur/token_cache.rb

@@ -15,7 +15,7 @@ module Conjur
           elsif token.nil?
             raise "Token is nil and no api_key is available to create it"
           else
-            $stderr.puts "Token is expired and no api_key is available to renew it"
+            $stderr.puts "Token will soon expire and no api_key is available to renew it"
           end
         end
         token
@@ -33,6 +33,7 @@ module Conjur
       
       # Expire tokens after 1 minute, even though they are valid for longer.
       def expired?(token, expiry = 1 * 60)
+        raise "No timestamp in token" unless token['timestamp']
         Time.parse(token["timestamp"]) + expiry < Time.now
       end
     end

data/spec/lib/api_spec.rb

@@ -34,7 +34,7 @@ shared_examples_for "API endpoint" do
       Conjur.stub(:env).and_return "production"
     end
     its "default_host" do
-      should == "https://#{service_name}-v2-conjur.herokuapp.com"
+      should == "https://#{service_name}-v3-conjur.herokuapp.com"
     end
   end
   context "in named production version" do
@@ -81,7 +81,7 @@ describe Conjur::API do
           Conjur::TokenCache.stub(:expired?).and_return true
         }
         it "should raise an error" do
-          $stderr.should_receive(:puts).with("Token is expired and no api_key is available to renew it")
+          $stderr.should_receive(:puts).with("Token will soon expire and no api_key is available to renew it")
           
           api.credentials
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -146,6 +146,7 @@ files:
 - features/ping_as_server.feature
 - features/ping_as_user.feature
 - lib/conjur-api/version.rb
+- lib/conjur/acts_as_asset.rb
 - lib/conjur/acts_as_resource.rb
 - lib/conjur/acts_as_role.rb
 - lib/conjur/acts_as_user.rb
@@ -161,6 +162,7 @@ files:
 - lib/conjur/authn-api.rb
 - lib/conjur/authz-api.rb
 - lib/conjur/base.rb
+- lib/conjur/build_from_response.rb
 - lib/conjur/core-api.rb
 - lib/conjur/env.rb
 - lib/conjur/escape.rb
@@ -202,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1471203965853689802
+      hash: 4047181916872803185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1471203965853689802
+      hash: 4047181916872803185
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24