mdqt 0.4.0 → 0.5.0

data/lib/mdqt/client/metadata_service.rb

@@ -15,6 +15,7 @@ module MDQT
       require 'active_support/cache/file_store'
       require 'active_support/cache/mem_cache_store'
       require 'active_support/logger'
+      require 'active_support/notifications'
 
       require_relative './metadata_response'
 
@@ -24,7 +25,7 @@ module MDQT
         @store_config = options[:cache_store]
         @verbose = options[:verbose] ? true : false
         @explain = options[:explain] ? true : false
-        @tls_cert_check  = options[:tls_cert_check] ? true : false
+        @tls_cert_check = options[:tls_cert_check] ? true : false
       end
 
       def base_url
@@ -38,17 +39,39 @@ module MDQT
         begin
           http_response = connection.get do |req|
             req.url request_path(entity_id)
-            req.options.timeout = 100
-            req.options.open_timeout = 5
+            req.options.timeout = 1000
+            req.options.open_timeout = 60
           end
         rescue Faraday::ConnectionFailed => oops
           abort "Error - can't connect to MDQ service at URL #{base_url}: #{oops.to_s}"
+        rescue Faraday::TimeoutError => oops
+          abort "Error - connection to #{base_url} timed out!"
         end
 
         MetadataResponse.new(entity_id, base_url, http_response, explain: explain?)
 
       end
 
+      def exists?(entity_id)
+
+        entity_id = prepare_id(entity_id)
+
+        begin
+          http_response = connection.head do |req|
+            req.url request_path(entity_id)
+            req.options.timeout = 1000
+            req.options.open_timeout = 60
+          end
+        rescue Faraday::ConnectionFailed => oops
+          abort "Error - can't connect to MDQ service at URL #{base_url}: #{oops.to_s}"
+        rescue Faraday::TimeoutError => oops
+          abort "Error - connection to #{base_url} timed out!"
+        end
+
+        http_response.status == 200
+
+      end
+
       def prepare_id(id)
         case id
         when :all, "", nil
@@ -96,10 +119,12 @@ module MDQT
       end
 
       def tidy_cache!
-        cache_type.cleanup
+        return unless cache_store
+        cache_store.cleanup
       end
 
       def purge_cache!
+        return unless cache_store
         cache_store.clear
       end
 
@@ -119,11 +144,17 @@ module MDQT
           faraday.request :url_encoded
           faraday.use FaradayMiddleware::Gzip
           faraday.use FaradayMiddleware::FollowRedirects
-          faraday.use :http_cache, faraday_cache_config if cache?
+          if cache?
+            faraday.use :http_cache,
+                        store: cache_store,
+                        shared_cache: false,
+                        serializer: Marshal,
+                        instrumenter: ActiveSupport::Notifications
+          end
           faraday.ssl.verify = tls_cert_check?
-          faraday.headers['Accept']         = 'application/samlmetadata+xml'
+          faraday.headers['Accept'] = 'application/samlmetadata+xml'
           faraday.headers['Accept-Charset'] = 'utf-8'
-          faraday.headers['User-Agent']     = "MDQT v#{MDQT::VERSION}"
+          faraday.headers['User-Agent'] = "MDQT v#{MDQT::VERSION}"
           #faraday.response :logger
           faraday.adapter :typhoeus
         end
@@ -140,16 +171,6 @@ module MDQT
         end
       end
 
-      def faraday_cache_config
-        {
-            store: cache_store,
-            shared_cache: false,
-            serializer: Marshal,
-            #logger: cache_logger,
-            instrumenter: ActiveSupport::Notifications
-        }
-      end
-
       def cache_logger
         verbose? ? Logger.new('mdqt_cache.log') : nil
       end

data/lib/mdqt/client.rb

@@ -28,6 +28,7 @@ module MDQT
       @cache_type = options[:cache_type] || :none
 
       @md_service = MetadataService.new(@base_url, verbose: @verbose, cache_type: @cache_type, explain: @explain, tls_cert_check: tls_cert_check?)
+      @md_service.tidy_cache!
 
     end
 
@@ -39,6 +40,10 @@ module MDQT
       md_service.get(entity_id)
     end
 
+    def exists?(entity_id)
+      md_service.exists?(entity_id)
+    end
+
     def transform_uri(uri)
       MDQT::Client::IdentifierUtils.transform_uri(uri)
     end

data/lib/mdqt/version.rb

@@ -1,3 +1,3 @@
 module MDQT
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/mdqt.gemspec

@@ -32,25 +32,26 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'commander', "~>4.4"
-  spec.add_dependency 'faraday', "~>0.15"
-  spec.add_dependency 'faraday_middleware', "~>0.12"
-  spec.add_dependency 'faraday-http-cache', "~>2.0"
-  spec.add_dependency 'typhoeus', "~>1.3"
-  spec.add_dependency 'activesupport', "~>5.2"
-  spec.add_dependency 'dalli', "~>2.7"
-  spec.add_dependency 'pastel', "~>0.7"
-  spec.add_dependency 'terminal-table', "~>1.8"
+  spec.add_dependency 'commander', "~>4.6"
+  spec.add_dependency 'faraday', "~>1.8"
+  spec.add_dependency 'faraday_middleware', "~>1.2"
+  spec.add_dependency 'faraday-http-cache', "~>2.2"
+  spec.add_dependency 'typhoeus', "~>1.4"
+  spec.add_dependency 'activesupport', "~>6.1"
+  spec.add_dependency 'dalli', "~>3.0"
+  spec.add_dependency 'pastel', "~>0.8"
+  spec.add_dependency 'terminal-table', "~>3.0"
+  spec.add_dependency 'concurrent-ruby-ext', "1.1.9"
 
 
   #spec.add_dependency 'xmldsig'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "cucumber", "~> 3.1"
-  spec.add_development_dependency "aruba", "~> 0.14"
-  spec.add_development_dependency "vcr", "~>  4.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "cucumber", "~> 7.1"
+  spec.add_development_dependency "aruba", "~> 2.0"
+  spec.add_development_dependency "vcr", "~>  6.0"
   spec.add_development_dependency "yard", "~> 0.9"
-  spec.add_development_dependency "yard-cucumber", "~> 4.0"
+  #spec.add_development_dependency "yard-cucumber", "~> 4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdqt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Pete Birkinshaw
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -16,210 +16,224 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: Library and commandline utility for downloading SAML metadata from MDQ
   services
 email:
@@ -257,11 +257,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -271,17 +274,27 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- cucumber.yml
 - exe/mdqt
 - lib/mdqt.rb
 - lib/mdqt/cli.rb
 - lib/mdqt/cli/base.rb
+- lib/mdqt/cli/cache_control.rb
 - lib/mdqt/cli/check.rb
 - lib/mdqt/cli/compliance.rb
 - lib/mdqt/cli/defaults.rb
+- lib/mdqt/cli/entities.rb
+- lib/mdqt/cli/exists.rb
 - lib/mdqt/cli/get.rb
+- lib/mdqt/cli/list.rb
+- lib/mdqt/cli/ln.rb
+- lib/mdqt/cli/ls.rb
+- lib/mdqt/cli/rename.rb
 - lib/mdqt/cli/reset.rb
+- lib/mdqt/cli/services.rb
 - lib/mdqt/cli/stream.rb
 - lib/mdqt/cli/transform.rb
+- lib/mdqt/cli/url.rb
 - lib/mdqt/cli/version.rb
 - lib/mdqt/client.rb
 - lib/mdqt/client/identifier_utils.rb
@@ -304,7 +317,7 @@ homepage: https://github.com/Digital-Identity-Labs/mdqt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -319,9 +332,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Library and commandline utility for accessing MDQ services
 test_files: []