ruby_http_client 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63c2713199b58782f416e3e227fc6b5b3d461fb
-  data.tar.gz: c3eaace81c3ac9824eb2ebf2b7d176ed4ea4d8e3
+  metadata.gz: 915aca3c1ef2db0465b051e7a30aa8af13918469
+  data.tar.gz: 3a296aa133c66dd033b7be2b4483b0a3e085c242
 SHA512:
-  metadata.gz: 4dfaa2f5ac354e5db31fa29c96ead42d96a3c6ffd4a3fe951f4c57cb7de7e2a18b1e40df3dbf4ffc4856912b87bce03f67d6d6f2662ac97638b2f8413600c133
-  data.tar.gz: 8df6524cf7066f7a0db19f36356577484663e1cb1662be59b9012ef0f6a6276f0eccf33db32424c5e02d0a5e1bcbaa63d6418ecd36dca1e90075284d3a18b831
+  metadata.gz: e8e6f3b4c8c1c32d56fd0ed8dc7f845d5bb6ddd232305b532642a6340fe6fce102ddfa11687af5ac1cb8541ecb1ef0d6954e7583143b5dbaf39571dba68d0c74
+  data.tar.gz: 67b7f3b7d8db5bc929e566c0296e8f9297a9d8f921cdc916f0e755b5fe22eaaf9987d48b5618ccb6054d7f58c28e419328604db8fc5a65bd92575f3b163cd0e3

data/CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.2] - 2016-04-10
+### Update
+- #8 Internal refactor
+- Thanks to [ciamiz](https://github.com/ciamiz) for the pull request!
+
 ## [3.0.1] - 2016-01-25
 ### Fix
 - [Pull Request #7](https://github.com/sendgrid/ruby-http-client/pull/7)

data/CONTRIBUTING.md

@@ -16,13 +16,13 @@ We use [Milestones](https://github.com/sendgrid/ruby-http-client/milestones) to
 <a name="cla"></a>
 ## CLAs and CCLAs
 
-Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) or a SendGrid Company Contributor Licensing Agreement (CCLA) be filled out by every contributor to a SendGrid open source project.
+Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) be filled out by every contributor to a SendGrid open source project.
 
-Our goal with the CLA and CCLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions.  The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution.  In this way the CLA and CCLA encourage broad participation by our open source community and help us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
+Our goal with the CLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions.  The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution.  In this way the CLA encourages broad participation by our open source community and helps us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
 
-SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA (or CCLA). Copies of the CLA and CCLA are available [here](https://drive.google.com/a/sendgrid.com/file/d/0B0PlcM9qA91LN2VEUTJWU2RIVXc/view).
+SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA. Copies of the CLA are available [here](https://gist.github.com/SendGridDX/98b42c0a5d500058357b80278fde3be8#file-sendgrid_cla).
 
-You may submit your completed [CLA or CCLA](https://drive.google.com/a/sendgrid.com/file/d/0B0PlcM9qA91LN2VEUTJWU2RIVXc/view) to SendGrid at [dx@sendgrid.com](mailto:dx@sendgrid.com).  SendGrid will then confirm you are ready to begin making contributions.
+When you create a Pull Request, after a few seconds, a comment will appear with a link to the CLA. Click the link and fill out the brief form and then click the "I agree" button and you are all set. You will not be asked to re-sign the CLA unless we make a change.
 
 There are a few ways to contribute, which we'll enumerate below:
 
@@ -191,4 +191,4 @@ Please run your code through:
 7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
     with a clear title and description against the `master` branch. All tests must be passing before we will review the PR.
 
-If you have any additional questions, please feel free to [email](mailto:dx@sendgrid.com) us or create an issue in this repo.
+If you have any additional questions, please feel free to [email](mailto:dx@sendgrid.com) us or create an issue in this repo.

data/lib/ruby_http_client.rb

@@ -32,9 +32,9 @@ module SendGrid
     #
     def initialize(host: nil, request_headers: nil, version: nil, url_path: nil)
       @host = host
-      @request_headers = request_headers ? request_headers : {}
+      @request_headers = request_headers || {}
       @version = version
-      @url_path = url_path ? url_path : []
+      @url_path = url_path || []
       @methods = %w(delete get patch post put)
       @query_params = nil
       @request_body = nil
@@ -46,7 +46,7 @@ module SendGrid
     #   - +request_headers+ -> Hash of request header key/values
     #
     def update_headers(request_headers)
-      @request_headers = @request_headers.merge(request_headers)
+      @request_headers.merge!(request_headers)
     end
 
     # Build the final request headers
@@ -70,9 +70,9 @@ module SendGrid
     # * *Returns* :
     #   - The url string with the version pre-pended
     #
-    def add_version(url)
-      url.concat("/#{@version}")
-      url
+    def add_version(url = nil)
+      path = @version ? "/#{@version}" : ''
+      url.concat(path)
     end
 
     # Add query parameters to the url
@@ -84,14 +84,8 @@ module SendGrid
     #   - The url string with the query parameters appended
     #
     def build_query_params(url, query_params)
-      url.concat('?')
-      count = 0
-      query_params.each do |key, value|
-        url.concat('&') if count > 0
-        url.concat("#{key}=#{value}")
-        count += 1
-      end
-      url
+      params = query_params.map { |key, value| "#{key}=#{value}" }.join('&')
+      url.concat("?#{params}")
     end
 
     # Set the query params, request headers and request body
@@ -122,11 +116,7 @@ module SendGrid
     #   - The final url string
     #
     def build_url(query_params: nil)
-      url = ''
-      url = add_version(url) if @version
-      @url_path.each do |x|
-        url.concat("/#{x}")
-      end
+      url = [add_version(''), *@url_path].join('/')
       url = build_query_params(url, query_params) if query_params
       URI.parse("#{@host}#{url}")
     end
@@ -178,8 +168,7 @@ module SendGrid
     #   - HTTP::NET object
     #
     def add_ssl(http)
-      protocol = host.split(':')[0]
-      if protocol == 'https'
+      if host.start_with?('https')
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end

data/ruby_http_client.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'ruby_http_client'
-  spec.version     = '3.0.1'
+  spec.version     = '3.0.2'
   spec.authors     = ['Elmer Thomas']
   spec.email       = 'dx@sendgrid.com'
   spec.summary     = 'A simple REST client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_http_client
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Elmer Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A simple REST client