ruby-esi 0.3.0 → 0.5.0

data/lib/ruby-esi/api/wars_api.rb

@@ -3,15 +3,12 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
-require 'uri'
-
 module ESI
   class WarsApi
     attr_accessor :api_client
@@ -37,7 +34,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :max_war_id Only return wars with ID smaller than this
-    # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
+    # @return [Array<(Array<Integer>, Integer, Hash)>] Array<Integer> data, response status code and response headers
     def get_wars_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: WarsApi.get_wars ...'
@@ -49,31 +46,33 @@ module ESI
       local_var_path = '/wars/'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'max_war_id'] = opts[:'max_war_id'] if !opts[:'max_war_id'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<Integer>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<Integer>')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: WarsApi#get_wars\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -97,7 +96,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @return [Array<(GetWarsWarIdOk, Fixnum, Hash)>] GetWarsWarIdOk data, response status code and response headers
+    # @return [Array<(GetWarsWarIdOk, Integer, Hash)>] GetWarsWarIdOk data, response status code and response headers
     def get_wars_war_id_with_http_info(war_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: WarsApi.get_wars_war_id ...'
@@ -106,10 +105,6 @@ module ESI
       if @api_client.config.client_side_validation && war_id.nil?
         fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id"
       end
-      if @api_client.config.client_side_validation && war_id < 1
-        fail ArgumentError, 'invalid value for "war_id" when calling WarsApi.get_wars_war_id, must be greater than or equal to 1.'
-      end
-
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
@@ -117,30 +112,32 @@ module ESI
       local_var_path = '/wars/{war_id}/'.sub('{' + 'war_id' + '}', war_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetWarsWarIdOk' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetWarsWarIdOk')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: WarsApi#get_wars_war_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -166,7 +163,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return
-    # @return [Array<(Array<GetWarsWarIdKillmails200Ok>, Fixnum, Hash)>] Array<GetWarsWarIdKillmails200Ok> data, response status code and response headers
+    # @return [Array<(Array<GetWarsWarIdKillmails200Ok>, Integer, Hash)>] Array<GetWarsWarIdKillmails200Ok> data, response status code and response headers
     def get_wars_war_id_killmails_with_http_info(war_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: WarsApi.get_wars_war_id_killmails ...'
@@ -175,46 +172,40 @@ module ESI
       if @api_client.config.client_side_validation && war_id.nil?
         fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id_killmails"
       end
-      if @api_client.config.client_side_validation && war_id < 1
-        fail ArgumentError, 'invalid value for "war_id" when calling WarsApi.get_wars_war_id_killmails, must be greater than or equal to 1.'
-      end
-
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
-      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
-        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling WarsApi.get_wars_war_id_killmails, must be greater than or equal to 1.'
-      end
-
       # resource path
       local_var_path = '/wars/{war_id}/killmails/'.sub('{' + 'war_id' + '}', war_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = []
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetWarsWarIdKillmails200Ok>' 
+
+      auth_names = opts[:auth_names] || []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetWarsWarIdKillmails200Ok>')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: WarsApi#get_wars_war_id_killmails\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end

data/lib/ruby-esi/api_client.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -44,7 +43,7 @@ module ESI
 
     # Call an API with given options.
     #
-    # @return [Array<(Object, Fixnum, Hash)>] an array of 3 elements:
+    # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
@@ -112,8 +111,6 @@ module ESI
         :verbose => @config.debugging
       }
 
-      req_opts.merge!(multipart: true) if header_params['Content-Type'].start_with? "multipart/"
-
       # set custom cert, if provided
       req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
 
@@ -130,6 +127,34 @@ module ESI
       request
     end
 
+    # Builds the HTTP request body
+    #
+    # @param [Hash] header_params Header parameters
+    # @param [Hash] form_params Query parameters
+    # @param [Object] body HTTP body (JSON/XML)
+    # @return [String] HTTP body data in the form of string
+    def build_request_body(header_params, form_params, body)
+      # http form
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+          header_params['Content-Type'] == 'multipart/form-data'
+        data = {}
+        form_params.each do |key, value|
+          case value
+          when ::File, ::Array, nil
+            # let typhoeus handle File, Array and nil parameters
+            data[key] = value
+          else
+            data[key] = value.to_s
+          end
+        end
+      elsif body
+        data = body.is_a?(String) ? body : body.to_json
+      else
+        data = nil
+      end
+      data
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -145,7 +170,7 @@ module ESI
     # Deserialize the response to the given return type.
     #
     # @param [Response] response HTTP response
-    # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
+    # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
     def deserialize(response, return_type)
       body = response.body
 
@@ -189,7 +214,7 @@ module ESI
         data.to_i
       when 'Float'
         data.to_f
-      when 'BOOLEAN'
+      when 'Boolean'
         data == true
       when 'DateTime'
         # parse date time (expecting ISO 8601 format)
@@ -212,9 +237,7 @@ module ESI
         end
       else
         # models, e.g. Pet
-        ESI.const_get(return_type).new.tap do |model|
-          model.build_from_hash data
-        end
+        ESI.const_get(return_type).build_from_hash(data)
       end
     end
 
@@ -246,11 +269,13 @@ module ESI
         tempfile.write(chunk)
       end
       request.on_complete do |response|
-        tempfile.close
-        @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                            "explicitly with `tempfile.delete`"
+        if tempfile
+          tempfile.close
+          @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                              "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                              "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                              "explicitly with `tempfile.delete`"
+        end
       end
     end
 
@@ -266,35 +291,7 @@ module ESI
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
-
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @return [String] HTTP body data in the form of string
-    def build_request_body(header_params, form_params, body)
-      # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
-      end
-      data
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.

data/lib/ruby-esi/api_error.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 module ESI
@@ -34,5 +33,25 @@ module ESI
         super arg
       end
     end
+
+    # Override to_s to display a friendly error message
+    def to_s
+      message
+    end
+
+    def message
+      if @message.nil?
+        msg = "Error message: the server returns an error"
+      else
+        msg = @message
+      end
+
+      msg += "\nHTTP status code: #{code}" if code
+      msg += "\nResponse headers: #{response_headers}" if response_headers
+      msg += "\nResponse body: #{response_body}" if response_body
+
+      msg
+    end
+
   end
 end

data/lib/ruby-esi/configuration.rb

@@ -3,15 +3,12 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
-require 'uri'
-
 module ESI
   class Configuration
     # Defines url scheme
@@ -130,7 +127,7 @@ module ESI
     def initialize
       @scheme = 'https'
       @host = 'esi.evetech.net'
-      @base_path = '/latest'
+      @base_path = 'https://esi.evetech.net/latest'
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0
@@ -174,8 +171,7 @@ module ESI
     end
 
     def base_url
-      url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
     end
 
     # Gets API key (with prefix if set).

data/lib/ruby-esi/models/bad_request.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -26,21 +25,34 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'error' => :'String'
+        :'error' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::BadRequest` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::BadRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'error')
+      if attributes.key?(:'error')
         self.error = attributes[:'error']
       end
     end
@@ -78,17 +90,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [error].hash
     end
 
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
@@ -97,7 +116,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -119,7 +140,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -140,8 +161,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -163,7 +183,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -185,7 +209,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/delete_characters_character_id_mail_labels_label_id_unprocessable_entity.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -26,21 +25,34 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'error' => :'String'
+        :'error' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::DeleteCharactersCharacterIdMailLabelsLabelIdUnprocessableEntity` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::DeleteCharactersCharacterIdMailLabelsLabelIdUnprocessableEntity`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'error')
+      if attributes.key?(:'error')
         self.error = attributes[:'error']
       end
     end
@@ -73,17 +85,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [error].hash
     end
 
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
@@ -92,7 +111,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -114,7 +135,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -135,8 +156,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -158,7 +178,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -180,7 +204,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end