rest_dsl 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d92b0df1a0fa25c1ba529abcd1c6fac552fe4eeb07086c83419536f429a6977
-  data.tar.gz: 7ab9ade7fd5c1695b9606b023388a6a0fd525f691b42ab1fc10fa240de6ba492
+  metadata.gz: 00bb98474257dd1c053d322ec536f3aea68100881db224588f9fd7456d44c611
+  data.tar.gz: 63207297bedf1699569e2e36f010e6169f696436548c25b515dfee8ee329aec3
 SHA512:
-  metadata.gz: 37915ab7d017ead39e40f16b950936dfc2aec8231a10141f9b133e8b0c3df04a6b5d084c76a1b6f034555034ba4abffe062cc36314c713976e74db35566efc65
-  data.tar.gz: 259caa0ed9ca8257a8f8b6f65f3d0643aa43370123c37eeacf0c42ec76f94ee7be311a36ed0eac605ba4ff6ca8ad4446f5a1ff6ad6d9a24c4ef82b34da0c8287
+  metadata.gz: ab7eadd3a565e84ca8747fb347bd265ec2737c1751c5c813cb54979743ff9ee2fbc56304933b7c527f10c46fe76883353cf0c1005b7fd6cea2af6bb555e89d43
+  data.tar.gz: 9cba9233525a7e15e171d3c3b332048b6a27c3cad83b7737ff317ff66d7f9640ad7d97b96dd6b5757e037d1b988f9ebc7c147f2b21ce1ea79e138f581b68589b

data/README.md

@@ -20,38 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-Create a service class
-```ruby
-# some_dir/postman_echo.rb
-class PostmanEcho < RestDSL::ServiceBase
-  self.service_name = '' # Postman echo has no service name in its url
-
-  rest_call(:get, :echo, 'get')
-  rest_call(:post, :echo, 'post')
-  rest_call(:get, :auth, 'basic-auth')
-end
-```
-and an associated yaml file
-Note: Uses symbolized keys
-```yml
-# some_dir/postman_echo.yml
-:postman_echo_prod: # The name of my environment
-  :credentials:
-    :user: 'some_user_name'
-    :password: 'some_password'
-  :headers:
-    :some_header: 'foo' 
-```
-
-Make calls to your hearts content
-```ruby
-PostmanEcho.environment = :postman_echo_prod
-PostmanEcho.get_echo(params: {word: 'cow'})
-```
-
-All services are defined as singletons, if you truly need more than one instance for any reason, 
-you can always just dup it into a new constant.  See the specs for more advanced use until I get a chance to write up
-more documentation.
+[Check Out the Wiki](../../wiki)
 
 ## Development
 
@@ -61,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/castone22/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.
+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
 
@@ -69,4 +38,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## 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/[USERNAME]/rest_dsl/blob/master/CODE_OF_CONDUCT.md).
+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/lib/rest_dsl/client.rb

@@ -33,7 +33,7 @@ module RestDSL
     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.to_json) if payload && method_has_payload?(method)
+      args.merge!(payload: payload) if payload && method_has_payload?(method)
       args.merge!(hash_args)
 
       response =

data/lib/rest_dsl/dsl.rb

@@ -25,13 +25,13 @@ module RestDSL
       end
 
       def from_file(file_name)
-        parser = file_parsers.find{|key, _| key.any? {|file_type| file_name.include? file_type}}[1]
+        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)
-                 else # Most non-yaml parsers in ruby work like the json one so lets make it be the default.
+                 elsif parser.eql?(JSON)
                    parser.parse(File.read(file_name))
                  end
-        result ||= File.read(file_name)
+        result ||= File.new(file_name)
         result
       rescue Errno::ENOENT => e
         e.message << " relative to directory #{Dir.pwd}"

data/lib/rest_dsl/service_base.rb

@@ -18,7 +18,7 @@ module RestDSL
 
     class << self
       attr_reader :environment, :file_name, :client, :config_file, :last_response
-      attr_writer :headers, :authentication
+      attr_writer :headers, :authentication, :service_name
 
       # Initializes the singleton
       def environment=(environment)
@@ -27,10 +27,6 @@ module RestDSL
         self
       end
 
-      def service_name=(name)
-        @service_name = name
-      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)
@@ -39,12 +35,13 @@ module RestDSL
 
       # 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, **hash_args, &block)
+      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) if payload
+        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)

data/lib/rest_dsl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Luke Ridge
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler