misty 1.1.0 → 1.2.0

data/test/unit/service_helper.rb

@@ -1,4 +1,4 @@
-require 'misty/http/client'
+require 'misty/client_pack'
 
 def request_header
   {'Accept' => 'application/json; q=1.0'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -130,10 +130,12 @@ files:
 - lib/misty/auth.rb
 - lib/misty/auth/auth_v2.rb
 - lib/misty/auth/auth_v3.rb
+- lib/misty/auth/errors.rb
 - lib/misty/auth/name.rb
 - lib/misty/autoload.rb
+- lib/misty/client.rb
+- lib/misty/client_pack.rb
 - lib/misty/cloud.rb
-- lib/misty/http/client.rb
 - lib/misty/http/direct.rb
 - lib/misty/http/header.rb
 - lib/misty/http/method_builder.rb
@@ -153,6 +155,7 @@ files:
 - lib/misty/openstack/cinder/v3.rb
 - lib/misty/openstack/designate/designate_v2.rb
 - lib/misty/openstack/designate/v2.rb
+- lib/misty/openstack/extension.rb
 - lib/misty/openstack/freezer/freezer_v1.rb
 - lib/misty/openstack/freezer/v1.rb
 - lib/misty/openstack/glance/glance_v1.rb
@@ -210,10 +213,10 @@ files:
 - test/unit/auth/name_test.rb
 - test/unit/auth_helper.rb
 - test/unit/auth_test.rb
+- test/unit/client_test.rb
 - test/unit/cloud/requests_test.rb
 - test/unit/cloud/services_test.rb
 - test/unit/cloud_test.rb
-- test/unit/http/client_test.rb
 - test/unit/http/direct_test.rb
 - test/unit/http/header_test.rb
 - test/unit/http/method_builder_test.rb
@@ -221,6 +224,7 @@ files:
 - test/unit/microversion_test.rb
 - test/unit/misty_test.rb
 - test/unit/openstack/APIs_test.rb
+- test/unit/openstack/extension_test.rb
 - test/unit/service_helper.rb
 - test/unit/services_test.rb
 - test/unit/test_helper.rb

data/lib/misty/http/client.rb

@@ -1,108 +0,0 @@
-require 'misty/http/net_http'
-require 'misty/http/method_builder'
-require 'misty/http/request'
-require 'misty/http/direct'
-require 'misty/http/header'
-
-module Misty
-  module HTTP
-    class Client
-      class Options
-        attr_accessor :base_path, :base_url, :headers, :interface, :region_id,
-                      :service_names, :ssl_verify_mode, :version
-      end
-
-      class InvalidDataError < StandardError; end
-
-      include Misty::HTTP::NetHTTP
-      include Misty::HTTP::MethodBuilder
-      include Misty::HTTP::Request
-      include Misty::HTTP::Direct
-
-      INTERFACES = %w{admin public internal}
-
-      attr_reader :headers, :microversion
-
-      def requests
-        list = []
-        self.class.api.each do |_path, verbs|
-          verbs.each do |_verb, requests|
-            list << requests
-          end
-        end
-        list.flatten.sort
-      end
-
-      # Options - Values shown are the default
-      #   Base path can be forced (Not recommended, mainly used for test purposes)
-      #    :base_path => nil
-      #   URL can be forced (Helps when setup is broken)
-      #    :base_url => nil
-      #   Optional headers
-      #    :headers => {}
-      #   Endpoint type (admin, public or internal)
-      #    :interface => "public"
-      #   Region ID
-      #    :region_id => "regionOne"
-      #   Service name
-      #    The Service names are pre defined but more can be added using this option.
-      #    :service_name
-      #   SSL Verify Mode
-      #    :ssl_verify_mode => true
-      #   (micro)version: Can be numbered (3.1) or by state (CURRENT, LATEST or SUPPORTED)
-      #     :version => "CURRENT"
-      def initialize(auth, config, options = {})
-        @auth = auth
-        @config = config
-        @options = setup(options)
-        @uri = URI.parse(@auth.get_url(@options.service_names, @options.region_id, @options.interface))
-        @base_path = @options.base_path ? @options.base_path : @uri.path
-        @base_path = @base_path.chomp('/')
-        @version = nil
-        @microversion = false
-        @headers = Misty::HTTP::Header.new(@config.headers.get.clone)
-        @headers.add('X-Auth-Token' => @auth.get_token.to_s)
-        @headers.add(microversion_header) if microversion
-        @headers.add(@options.headers) unless @options.headers.empty?
-      end
-
-      # Sub classes to override
-      # When a catalog provides a base path and the Service API definition containts the generic equivalent as prefix
-      # then the preifx is redundant and must be removed from the path.
-      # For example:
-      # Catalog provides 'http://192.0.2.21:8004/v1/48985e6b8da145699d411f12a3459fca'
-      # and Service API has '/v1/{tenant_id}/stacks'
-      # then the path prefix is ignored and path is only '/stacks'
-      def self.prefix_path_to_ignore
-        ''
-      end
-
-      private
-
-      def baseclass
-        self.class.to_s.split('::')[-1]
-      end
-
-      def setup(params)
-        options = Options.new()
-        options.base_path           = params[:base_path]       ? params[:base_path] : nil
-        options.base_url            = params[:base_url]        ? params[:base_url] : nil
-        options.headers             = params[:headers]         ? params[:headers] : {}
-        options.interface           = params[:interface]       ? params[:interface] : @config.interface
-        options.region_id           = params[:region_id]       ? params[:region_id] : @config.region_id
-        options.service_names       = params[:service_name]    ? self.class.service_names << params[:service_name] : self.class.service_names
-        options.ssl_verify_mode     = params[:ssl_verify_mode].nil? ? @config.ssl_verify_mode : params[:ssl_verify_mode]
-        options.version             = params[:version]         ? params[:version] : 'CURRENT'
-
-        unless INTERFACES.include?(options.interface)
-          raise InvalidDataError, "Options ':interface' must be one of #{INTERFACES}"
-        end
-
-        unless options.ssl_verify_mode == !!options.ssl_verify_mode
-          raise InvalidDataError, "Options ':ssl_verify_mode' must be a boolean"
-        end
-        options
-      end
-    end
-  end
-end