rest_dsl 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bb98474257dd1c053d322ec536f3aea68100881db224588f9fd7456d44c611
-  data.tar.gz: 63207297bedf1699569e2e36f010e6169f696436548c25b515dfee8ee329aec3
+  metadata.gz: d9cbe8705486df5432dc60a709608903d99e3cd93c1ae95545e055a0c6e5ee02
+  data.tar.gz: 70a579028f4d7e228ec88feab969426e74201010f06833191d8c723389d749a2
 SHA512:
-  metadata.gz: ab7eadd3a565e84ca8747fb347bd265ec2737c1751c5c813cb54979743ff9ee2fbc56304933b7c527f10c46fe76883353cf0c1005b7fd6cea2af6bb555e89d43
-  data.tar.gz: 9cba9233525a7e15e171d3c3b332048b6a27c3cad83b7737ff317ff66d7f9640ad7d97b96dd6b5757e037d1b988f9ebc7c147f2b21ce1ea79e138f581b68589b
+  metadata.gz: be3a4ab3d5fbc03eb10eb99c27ae0af86935a38b12f14ce1186629e9d07d395e5ec615a89f7da7bc5651164aa7cf0426441d40b59c8cfe3d4a56821f2f02218b
+  data.tar.gz: e5309f677355640929f8b955bda644daf3f9a3effbb47189bb15c3a3e0fb558c2647f376f33562f03d259bd4daa43f1bc6614bb023d5c065d21ed1fb6866dd05

data/.gitignore

@@ -1,15 +1,15 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-.idea
-examples.txt
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status
+
+.idea
+examples.txt
 Gemfile.lock

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -1,7 +1,7 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.1
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.6.3
+before_install: gem install bundler -v 2.0.1

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ridgel@grangeinsurance.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at ridgel@grangeinsurance.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in rest_dsl.gemspec
-gemspec
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in rest_dsl.gemspec
+gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Luke Ridge
-
-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.
+The MIT License (MIT)
+
+Copyright (c) 2019 Luke Ridge
+
+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.

data/README.md

@@ -1,41 +1,41 @@
-# RestDsl
-
-A simple dsl for defining rest service consumers in applications.  Mostly intended for test framework use.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'rest_dsl'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rest_dsl
-
-## Usage
-
-[Check Out the Wiki](../../wiki)
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/restDSL/rest_dsl_gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the RestDsl project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/restDSL/rest_dsl/blob/master/CODE_OF_CONDUCT.md).
+# RestDsl
+
+A simple dsl for defining rest service consumers in applications.  Mostly intended for test framework use.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'rest_dsl'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install rest_dsl
+
+## Usage
+
+[Check Out the Wiki](../../wiki)
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/restDSL/rest_dsl_gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the RestDsl project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/restDSL/rest_dsl/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rest_dsl"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "rest_dsl"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/rest_dsl.rb

@@ -1,40 +1,40 @@
-require_relative 'rest_dsl/version'
-require_relative 'rest_dsl/errors'
-require_relative 'rest_dsl/dsl'
-require 'psych'
-require 'json'
-
-module RestDSL
-  class << self
-    attr_reader :config_file_location
-    attr_reader :use_config_file
-    attr_reader :config
-
-    def config_file_location=(arg)
-      @config_file_location = arg
-      load_config
-    end
-
-    def default_configs
-      {}
-    end
-
-    def configuration
-      @config
-    end
-
-    private
-    def load_config
-      @config =
-        if File.exist?("#{config_file_location}/rest_dsl.yml")
-          Psych.load_file("#{config_file_location}/rest_dsl.yml")
-        else
-          default_configs
-        end
-    end
-  end
-
-  @config_file_location = './config'
-  load_config
-
+require_relative 'rest_dsl/version'
+require_relative 'rest_dsl/errors'
+require_relative 'rest_dsl/dsl'
+require 'psych'
+require 'json'
+
+module RestDSL
+  class << self
+    attr_reader :config_file_location
+    attr_reader :use_config_file
+    attr_reader :config
+
+    def config_file_location=(arg)
+      @config_file_location = arg
+      load_config
+    end
+
+    def default_configs
+      {}
+    end
+
+    def configuration
+      @config
+    end
+
+    private
+    def load_config
+      @config =
+        if File.exist?("#{config_file_location}/rest_dsl.yml")
+          Psych.load_file("#{config_file_location}/rest_dsl.yml")
+        else
+          default_configs
+        end
+    end
+  end
+
+  @config_file_location = './config'
+  load_config
+
 end

data/lib/rest_dsl/client.rb

@@ -1,63 +1,64 @@
-require 'rest-client'
-require 'psych'
-require 'json'
-
-module RestDSL
-  class Client
-
-    class << self
-      attr_accessor :methods_without_payloads, :config_dir
-
-      def environments
-        RestDSL.configuration[:environments]
-      end
-
-    end
-
-    attr_accessor :base_url
-
-    @methods_without_payloads = %i[get delete head options]
-
-    def initialize(environment = nil, base_url: nil)
-      if base_url
-        @base_url = base_url
-      else
-        environment = environment.to_sym
-        environmental_info = environments.fetch(environment) do
-          raise RestDSL::UndefinedEnvironmentError.new(environment, environments)
-        end
-        @base_url = "#{environmental_info[:url]}"
-      end
-    end
-
-    def execute(method, endpoint, headers, payload: nil, **hash_args, &block)
-      url = "#{@base_url}/#{endpoint}"
-      args = { method: method.to_sym, url: url, headers: headers }
-      args.merge!(payload: payload) if payload && method_has_payload?(method)
-      args.merge!(hash_args)
-
-      response =
-        begin
-          RestClient::Request.new(args).execute(&block)
-        rescue RestClient::ExceptionWithResponse => e
-          e.response
-        end
-      { response: response, parsed: JSON.parse(response, symbolize_names: true) }
-    rescue JSON::ParserError => e
-      { response: response, parsed: "Failed to parse, see response for more information, code was: #{response.code}, message was: #{response.body}" }
-    end
-
-    def method_has_payload?(method)
-      !self.class.methods_without_payloads.include?(method)
-    end
-
-    def environments
-      self.class.environments
-    end
-
-    def self.default_headers
-      { accept: 'application/json' }
-    end
-
-  end
+require 'rest-client'
+require 'psych'
+require 'json'
+require 'addressable'
+
+module RestDSL
+  class Client
+
+    class << self
+      attr_accessor :methods_without_payloads, :config_dir
+
+      def environments
+        RestDSL.configuration[:environments]
+      end
+
+    end
+
+    attr_accessor :base_url
+
+    @methods_without_payloads = %i[get delete head options]
+
+    def initialize(environment = nil, base_url: nil)
+      if base_url
+        @base_url = base_url
+      else
+        environment = environment.to_sym
+        environmental_info = environments.fetch(environment) do
+          raise RestDSL::UndefinedEnvironmentError.new(environment, environments)
+        end
+        @base_url = "#{environmental_info[:url]}"
+      end
+    end
+
+    def execute(method, endpoint, headers, payload: nil, **hash_args, &block)
+      url = "#{@base_url}/#{endpoint}"
+      args = { method: method.to_sym, url: Addressable::URI.escape(url), headers: headers }
+      args.merge!(payload: payload) if payload && method_has_payload?(method)
+      args.merge!(hash_args)
+
+      response =
+        begin
+          RestClient::Request.new(args).execute(&block)
+        rescue RestClient::ExceptionWithResponse => e
+          e.response
+        end
+      { response: response, parsed: JSON.parse(response.to_s, symbolize_names: true) }
+    rescue JSON::ParserError => e
+      { response: response, parsed: "Failed to parse, see response for more information, code was: #{response.code}, message was: #{response.body}" }
+    end
+
+    def method_has_payload?(method)
+      !self.class.methods_without_payloads.include?(method)
+    end
+
+    def environments
+      self.class.environments
+    end
+
+    def self.default_headers
+      { accept: 'application/json' }
+    end
+
+  end
 end

data/lib/rest_dsl/dsl.rb

@@ -1,42 +1,42 @@
-require 'json'
-require 'psych'
-
-module RestDSL
-
-  ##
-  # A collection of DSL extensions for use with various worlds to allow the use of some simpler
-  # dsl language in them.
-  #
-  # For rspec, in spec helper add config.extend RestDSL::DSLExtensions::<<extension>>
-  # In cucumber World(RestDSL::DSLExtensions::<<extension>>)
-  # Each extension can also be extended onto a class like normal to use it in that class
-  module DSLExtensions
-
-    ##
-    # Adds a DSL method for parsing information from a file, parser list can be overridden by redefining file_parsers
-    # If no parser is designed, for the file extension, loads the file as plain text
-    module FromFile
-
-      def file_parsers
-        {
-          %w[.json] => JSON,
-          %w[.yml .yaml] => Psych
-        }
-      end
-
-      def from_file(file_name)
-        parser = file_parsers.find{|key, _| key.any? {|file_type| file_name.include? file_type}}&.[](1)
-        result = if parser.eql?(Psych)
-                   parser.load_file(file_name)
-                 elsif parser.eql?(JSON)
-                   parser.parse(File.read(file_name))
-                 end
-        result ||= File.new(file_name)
-        result
-      rescue Errno::ENOENT => e
-        e.message << " relative to directory #{Dir.pwd}"
-        raise e
-      end
-    end
-  end
+require 'json'
+require 'psych'
+
+module RestDSL
+
+  ##
+  # A collection of DSL extensions for use with various worlds to allow the use of some simpler
+  # dsl language in them.
+  #
+  # For rspec, in spec helper add config.extend RestDSL::DSLExtensions::<<extension>>
+  # In cucumber World(RestDSL::DSLExtensions::<<extension>>)
+  # Each extension can also be extended onto a class like normal to use it in that class
+  module DSLExtensions
+
+    ##
+    # Adds a DSL method for parsing information from a file, parser list can be overridden by redefining file_parsers
+    # If no parser is designed, for the file extension, loads the file as plain text
+    module FromFile
+
+      def file_parsers
+        {
+          %w[.json] => JSON,
+          %w[.yml .yaml] => Psych
+        }
+      end
+
+      def from_file(file_name)
+        parser = file_parsers.find{|key, _| key.any? {|file_type| file_name.include? file_type}}&.[](1)
+        result = if parser.eql?(Psych)
+                   parser.load_file(file_name)
+                 elsif parser.eql?(JSON)
+                   parser.parse(File.read(file_name))
+                 end
+        result ||= File.new(file_name)
+        result
+      rescue Errno::ENOENT => e
+        e.message << " relative to directory #{Dir.pwd}"
+        raise e
+      end
+    end
+  end
 end

data/lib/rest_dsl/errors.rb

@@ -1,14 +1,14 @@
-module RestDSL
-  class ErrorBase < StandardError
-    def initialize(message)
-      message = "[RestDSL] #{message}"
-      super(message)
-    end
-  end
-  class UndefinedEnvironmentError < ErrorBase
-    def initialize(environment, available_envs)
-      message = "Undefined environment, #{environment}, known environments: #{available_envs.keys.join(', ')}"
-      super(message)
-    end
-  end
+module RestDSL
+  class ErrorBase < StandardError
+    def initialize(message)
+      message = "[RestDSL] #{message}"
+      super(message)
+    end
+  end
+  class UndefinedEnvironmentError < ErrorBase
+    def initialize(environment, available_envs)
+      message = "Undefined environment, #{environment}, known environments: #{available_envs.keys.join(', ')}"
+      super(message)
+    end
+  end
 end

data/lib/rest_dsl/service_base.rb

@@ -1,93 +1,93 @@
-require 'psych'
-require_relative 'client'
-
-module RestDSL
-
-  ##
-  # Base Class for defining a rest service DSL Object.
-  # Will look in a config file contained in the same directory as the service defining its headers and/or creds
-  # by environment.  This file should be named such that it matches the service file name with a .yml ending.
-  class ServiceBase
-
-    def self.inherited(clazz)
-      clazz.class_eval do
-        @file_name = caller_locations[2].path
-        @config_file = @file_name.gsub('.rb', '.yml')
-      end
-    end
-
-    class << self
-      attr_reader :environment, :file_name, :client, :config_file, :last_response
-      attr_writer :headers, :authentication, :service_name
-
-      # Initializes the singleton
-      def environment=(environment)
-        @environment = environment
-        @client = Client.new(environment)
-        self
-      end
-
-      def rest_call(method, name, url_schema)
-        self.class.define_method("#{method}_#{name}") do |*args, headers: nil, payload: nil, params: nil, url_args: nil, **hash_args|
-          execute_request(method, url_schema.dup, *args, **hash_args, headers: headers, payload: payload, params: params, url_args: url_args)
-        end
-      end
-
-      # The method wrapped by the methods generated by rest_call, these methods all follow this blueprint
-      # Can by wrapped manually to create more complicated logic than what's supported by the default generators
-      def execute_request(method, rest_method_call, *args, headers: nil, payload: nil, params: nil, url_args: nil, form_data: nil, **hash_args, &block)
-        headers ||= self.headers
-        url_args ||= {}
-        service_name = "#{@service_name}/" unless @service_name&.empty?
-        hash_args.merge!(auth)
-        hash_args.merge!(payload: payload.to_json) if payload
-        hash_args.merge!(payload: form_data) if form_data
-        sub_url_args!(url_args, rest_method_call)
-        arg_list = [method, "#{service_name}#{rest_method_call}#{build_params(params)}", headers]
-        response = @client.execute(*arg_list, *args, **hash_args, &block)
-        @last_response = response[:response]
-        response[:parsed]
-      end
-
-      def build_params(params)
-        params ||= {}
-        return "" if params.empty?
-        "?#{params.map{|key,value| "#{key}=#{value}"}.join('&')}" unless params.empty?
-      end
-
-      def sub_url_args!(arg_list, rest_method_call)
-        # Given the protocol is handled by the client and not service_base, this should be a safe enough pattern in most cases
-        arg_list.each{ |arg_name, value| rest_method_call.gsub!(":#{arg_name}", value) }
-      end
-
-      def config
-        @config || reload_config
-      end
-
-      def config_file=(file_name)
-        @config_file = file_name
-        reload_config
-      end
-
-      def reload_config
-        @config = Psych.load_file(@config_file)[@environment] if File.exist?(@config_file)
-        @config = {} unless File.exist?(@config_file)
-        @config
-      end
-
-      def auth
-        @authentication || config&.[](:credentials) || {}
-      end
-
-      def headers
-        @headers ||= config&.[](:headers) || {}
-      end
-    end
-
-    def service_name
-      self.class.instance_variable_get(:@service_name)
-    end
-  end
-
-end
-
+require 'psych'
+require_relative 'client'
+
+module RestDSL
+
+  ##
+  # Base Class for defining a rest service DSL Object.
+  # Will look in a config file contained in the same directory as the service defining its headers and/or creds
+  # by environment.  This file should be named such that it matches the service file name with a .yml ending.
+  class ServiceBase
+
+    def self.inherited(clazz)
+      clazz.class_eval do
+        @file_name = caller_locations[2].path
+        @config_file = @file_name.gsub('.rb', '.yml')
+      end
+    end
+
+    class << self
+      attr_reader :environment, :file_name, :client, :config_file, :last_response
+      attr_writer :headers, :authentication, :service_name
+
+      # Initializes the singleton
+      def environment=(environment)
+        @environment = environment
+        @client = Client.new(environment)
+        self
+      end
+
+      def rest_call(method, name, url_schema)
+        self.class.define_method("#{method}_#{name}") do |*args, headers: nil, payload: nil, params: nil, url_args: nil, **hash_args|
+          execute_request(method, url_schema.dup, *args, **hash_args, headers: headers, payload: payload, params: params, url_args: url_args)
+        end
+      end
+
+      # The method wrapped by the methods generated by rest_call, these methods all follow this blueprint
+      # Can by wrapped manually to create more complicated logic than what's supported by the default generators
+      def execute_request(method, rest_method_call, *args, headers: nil, payload: nil, params: nil, url_args: nil, form_data: nil, **hash_args, &block)
+        headers ||= self.headers
+        url_args ||= {}
+        service_name = "#{@service_name}/" unless @service_name&.empty?
+        hash_args.merge!(auth)
+        hash_args.merge!(payload: payload.to_json) if payload
+        hash_args.merge!(payload: form_data) if form_data
+        sub_url_args!(url_args, rest_method_call)
+        arg_list = [method, "#{service_name}#{rest_method_call}#{build_params(params)}", headers]
+        response = @client.execute(*arg_list, *args, **hash_args, &block)
+        @last_response = response[:response]
+        response[:parsed]
+      end
+
+      def build_params(params)
+        params ||= {}
+        return "" if params.empty?
+        "?#{params.map{|key,value| "#{key}=#{value}"}.join('&')}" unless params.empty?
+      end
+
+      def sub_url_args!(arg_list, rest_method_call)
+        # Given the protocol is handled by the client and not service_base, this should be a safe enough pattern in most cases
+        arg_list.each{ |arg_name, value| rest_method_call.gsub!(":#{arg_name}", value) }
+      end
+
+      def config
+        @config || reload_config
+      end
+
+      def config_file=(file_name)
+        @config_file = file_name
+        reload_config
+      end
+
+      def reload_config
+        @config = Psych.load_file(@config_file)[@environment] if File.exist?(@config_file)
+        @config = {} unless File.exist?(@config_file)
+        @config
+      end
+
+      def auth
+        @authentication || config&.[](:credentials) || {}
+      end
+
+      def headers
+        @headers ||= config&.[](:headers) || {}
+      end
+    end
+
+    def service_name
+      self.class.instance_variable_get(:@service_name)
+    end
+  end
+
+end
+

data/lib/rest_dsl/version.rb

@@ -1,3 +1,3 @@
-module RestDSL
-  VERSION = '0.1.7'.freeze
-end
+module RestDSL
+  VERSION = '0.1.8'.freeze
+end

data/rest_dsl.gemspec

@@ -1,40 +1,41 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rest_dsl/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'rest_dsl'
-  spec.version       = RestDSL::VERSION
-  spec.authors       = ['Luke Ridge']
-  spec.email         = ['ridgel@grangeinsurance.com']
-
-  spec.summary       = %q{A Simple DSL for writing rest services}
-  spec.homepage      = "https://github.com/castone22/rest_dsl_gem"
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = "https://github.com/castone22/rest_dsl_gem"
-    spec.metadata['changelog_uri'] = "https://github.com/castone22/rest_dsl_gem"
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
-  end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rest-client'
-
-end
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rest_dsl/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'rest_dsl'
+  spec.version       = RestDSL::VERSION
+  spec.authors       = ['Luke Ridge']
+  spec.email         = ['ridgel@grangeinsurance.com']
+
+  spec.summary       = %q{A Simple DSL for writing rest services}
+  spec.homepage      = "https://github.com/castone22/rest_dsl_gem"
+  spec.license       = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['homepage_uri'] = spec.homepage
+    spec.metadata['source_code_uri'] = "https://github.com/castone22/rest_dsl_gem"
+    spec.metadata['changelog_uri'] = "https://github.com/castone22/rest_dsl_gem"
+  else
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
+  end
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_dependency 'rest-client', '~> 2 '
+  spec.add_dependency 'addressable', '~> 2'
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Luke Ridge
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: 
 email:
 - ridgel@grangeinsurance.com
@@ -112,7 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A Simple DSL for writing rest services