conjur-api 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e054378922433060af0dadcc8c2abb3ceabb3054
-  data.tar.gz: 0b023d98362297b31c29cce5136c5de77aefde1d
+  metadata.gz: c77dcb84929bf1b03154a61752fd524697df3e8a
+  data.tar.gz: 6f0b27e201fa2163c2b4a22ec9a049acdf35fca8
 SHA512:
-  metadata.gz: a8d2c6a4ef70523dfb251ffc539d023aff3220469524baa029c1d277bc3619b1350e0480d9583b14356541f62c8ec9dae8f2ce4b681d616ef7021d33056a81ce
-  data.tar.gz: e96fd20bf4a8c08e9eb184baa5d11413aed385d27dbee962bfda971d341082b7c9420c6503eb31ab9722dbafdd76c4c2bbe92db2aed1d20fcc60f6dde5fde95b
+  metadata.gz: bfb7d75912573aa7d9d5b5f4e7f99efe12c7e3fb00c5180cda222847452400867a70238d68523204a85aec1a1f3a244c742962d78c3bf70645b435911fd9f36a
+  data.tar.gz: a9fb06b58b10115e307d132c6ebc444bd681ffd67093be5c45c0126851f93d69464b357b1e5e376388343b9763b9af1a19a02b319e264e37f3a3eea175c99dbc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+* Patch rest-client's patch of mime-types to support lazy loading
+* Remove 'wrong' dependency for faster loading
+
 # v4.11.0
 
 * Fixed bug retrieving `Variable#version_count`

data/conjur-api.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency 'rest-client', '= 1.6.7' # with newer versions adding certificates to OpenSSL does not work
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'wrong'
   
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'spork'

data/lib/conjur-api/version.rb

@@ -1,5 +1,4 @@
-#
-# Copyright (C) 2013 Conjur Inc
+# Copyright (C) 2013-2014 Conjur Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -17,9 +16,9 @@
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
+
 module Conjur
   class API
-    VERSION = "4.11.0"
+    VERSION = "4.11.1"
   end
 end

data/lib/conjur/base.rb

@@ -21,7 +21,8 @@
 require 'rest-client'
 require 'json'
 require 'base64'
-require 'wrong'
+
+require 'conjur/patches/rest-client'
 
 require 'conjur/exists'
 require 'conjur/has_attributes'
@@ -39,7 +40,6 @@ module Conjur
     include LogSource
     include StandardMethods
     include Cast
-    include Wrong
 
     class << self
       # Parse a role id into [ account, 'roles', kind, id ]
@@ -115,7 +115,8 @@ module Conjur
 
       @token ||= Conjur::API.authenticate(@username, @api_key)
 
-      assert { token_valid? }
+      fail "obtained token is invalid" unless token_valid? # sanity check
+
       return @token
     end
     

data/lib/conjur/patches/rest-client.rb

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2014 Conjur Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# RestClient monkey patches MIME::Types, breaking it in certain situations.
+# Let's make check if it did and fix it if so.
+# Cf. https://github.com/rest-client/rest-client/pull/346
+
+if MIME::Types.respond_to? :type_for_extension
+  class MIME::Types
+    def self.type_for_extension ext
+      candidates = of ext
+      candidates.empty? ? ext : candidates[0].content_type
+    end
+  end
+end

data/reqspeed.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# a hackish script to gauge the time it takes to load various components
+
+$require_level = 0
+alias :orig_require :require
+def require(file)
+  rl = $require_level
+  r0 = Time.now
+  $require_level += 1
+  r = orig_require(file)
+  $require_level -=1
+  c = caller[0][/.*?:[^:]+/]
+  c = '' unless c =~ /conjur/
+  printf "%5.02f %s %s %s\n", Time.now - r0, '-' * rl, file, c + (r ? '' : ' (already required)')
+  r
+end
+
+#$:.prepend 'lib'
+
+require ARGV.first

data/spec/vendor/rest_client_spec.rb

@@ -0,0 +1,86 @@
+# Copyright (C) 2014 Conjur Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'spec_helper'
+require 'tempfile'
+
+# RestClient monkey patches MIME::Types, breaking it in certain situations.
+# Let's make sure we monkey patch the monkey patch if necessary.
+
+describe RestClient::Request do
+  shared_examples :restclient do
+    it "can be initialized" do
+      expect { RestClient::Request.new method: 'GET', url: 'http://example.com' }.to_not raise_error
+    end
+  end
+
+  def reinit_mime_types!
+    # pretend to initialize MIME::Types from scratch
+    MIME::Types.instance_variable_set :@__types__, nil
+    MIME::Types.send :remove_const, :VERSION # to suppress a warning
+    load 'mime/types.rb'
+  end
+
+  def with_env vals, &block
+    olds = Hash[vals.keys.zip ENV.values_at *vals.keys]
+    ENV.update vals
+    yield if block_given?
+    ENV.update olds
+  end
+
+  around do |ex|
+    with_env 'RUBY_MIME_TYPES_CACHE' => cache,
+        'RUBY_MIME_TYPES_LAZY_LOAD' => lazy.to_s do
+      reinit_mime_types!
+      ex.run
+    end
+  end
+
+  context "with plain MIME::Types config" do
+    let(:cache) { nil }
+    let(:lazy) { false }
+    include_examples :restclient
+  end
+
+  context "with lazy MIME::Types loading" do
+    let(:cache) { nil }
+    let(:lazy) { true }
+    include_examples :restclient
+  end
+
+  context "using MIME::Types cache" do
+    let(:cache) do
+      tf = Tempfile.new('mimecache')
+      path = tf.path
+
+      tf.unlink # delete so mimetypes doesn't try to read it
+      # create the cache
+      with_env 'RUBY_MIME_TYPES_CACHE' => path,
+          'RUBY_MIME_TYPES_LAZY_LOAD' => 'false' do
+        reinit_mime_types!
+      end
+
+      return path
+    end
+
+    after { File.unlink cache }
+    let(:lazy) { false }
+    include_examples :restclient
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -39,20 +39,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wrong
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +242,7 @@ files:
 - lib/conjur/layer.rb
 - lib/conjur/log.rb
 - lib/conjur/log_source.rb
+- lib/conjur/patches/rest-client.rb
 - lib/conjur/path_based.rb
 - lib/conjur/pubkeys-api.rb
 - lib/conjur/resource.rb
@@ -265,6 +252,7 @@ files:
 - lib/conjur/standard_methods.rb
 - lib/conjur/user.rb
 - lib/conjur/variable.rb
+- reqspeed.rb
 - spec/api/authn_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/hosts_spec.rb
@@ -298,6 +286,7 @@ files:
 - spec/vcr_cassettes/Conjur_Resource/_create/with_path-like_identifier.yml
 - spec/vcr_cassettes/Conjur_Resource/_create/with_un-encoded_path-like_identifier.yml
 - spec/vcr_cassettes/Conjur_Resource/_create/with_uuid_identifier.yml
+- spec/vendor/rest_client_spec.rb
 homepage: https://github.com/conjurinc/api-ruby/
 licenses:
 - MIT
@@ -360,4 +349,5 @@ test_files:
 - spec/vcr_cassettes/Conjur_Resource/_create/with_path-like_identifier.yml
 - spec/vcr_cassettes/Conjur_Resource/_create/with_un-encoded_path-like_identifier.yml
 - spec/vcr_cassettes/Conjur_Resource/_create/with_uuid_identifier.yml
+- spec/vendor/rest_client_spec.rb
 has_rdoc: