Merge branch 'master' into add-test-files-exist

Matt Bernier · web-flow · commit 6639ece2fadb · 2017-10-31T21:58:04.000-06:00
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,5 +1,5 @@
 ---
-engines:
+plugins:
   duplication:
     enabled: false
     config:
@@ -14,7 +14,3 @@ engines:
   rubocop:
     enabled: true
     channel: rubocop-0-48
-ratings:
-  paths:
-    - "**.rb"
-exclude_paths:
diff --git a/.env_sample b/.env_sample
@@ -0,0 +1 @@
+export SENDGRID_API_KEY=''
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,24 @@
+<!--
+We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.
+
+
+Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
+e.g. 
+Fixes #1
+Closes #2
+-->
+# Fixes # 
+
+### Checklist
+- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
+- [ ] I have read the [Contribution Guide] and my PR follows them.
+- [ ] I updated my branch with the master branch.
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have added necessary documentation about the functionality in the appropriate .md file
+- [ ] I have added in line documentation to the code I modified
+
+### Short description of what this PR does:
+- 
+- 
+
+If you have questions, please send an email to [Sendgrid](mailto:dx@sendgrid.com), or file a Github Issue in this repository.
diff --git a/CHANGELOG.md b/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.3.0] - 2017-10-30
+## Added
+- #11 fix: Allow for multiple values for a parameter
+- Thanks to [xiaoboa](https://github.com/xiaoboa) for the pull request!
+
 ## [3.2.0] - 2017-09-01
 ### Added
 - #12 Add a helper returns the response body as a hash
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 SendGrid, Inc.
+Copyright (c) 2016-2017 SendGrid, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,25 @@
+<!--
+(Thanks for sending a pull request! Please make sure you click the link above to view the contribution guidelines, then fill out the blanks below.)
+-->
+<!-- Add the issue number that is fixed by this PR (In the form Fixes #123) -->
+
+Fixes #<!--Enter Issue number you have referenced(please refer only one issue at once)-->
+
+#### Checklist
+<!-- Please Star this repository and follow this template for your PR to be considered-->
+- [ ] I have read the SendGrid Contributor License Agreement (CLA)
+- [ ] I have read the [Contribution Guide] and my PR follows them.
+- [ ] My branch is up-to-date with the master branch.
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have added necessary documentation (if appropriate)
+<!-- If an existing function does not have a docstring, please add one -->
+- [ ] All the functions created/modified in this PR contain relevant docstrings.
+
+#### Short description of what this resolves:
+
+
+#### Changes proposed in this pull request:
+<!--Fill These Bullet Points-->
+
+
+ If you have questions, please send an email [Sendgrid](mailto:dx@sendgrid.com), or file a Github Issue in this repository.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![BuildStatus](https://travis-ci.org/sendgrid/ruby-http-client.svg?branch=master)](https://travis-ci.org/sendgrid/ruby-http-client)
 [![Email Notifications Badge](https://dx.sendgrid.com/badge/ruby)](https://dx.sendgrid.com/newsletter/ruby)
+[![Gem Version](https://badge.fury.io/rb/sendgrid-ruby.svg)](https://badge.fury.io/rb/sendgrid-ruby)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)
 [![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)
 [![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/ruby-http-client.svg)](https://github.com/sendgrid/ruby-http-client/graphs/contributors)
@@ -30,6 +31,18 @@ All updates to this library is documented in our [CHANGELOG](https://github.com/
 
 - Ruby version 2.2+
 
+## Setup Environment Variables
+
+### Environment Variable
+
+Update the development environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys), for example:
+
+```bash
+echo "export SENDGRID_API_KEY='YOUR_API_KEY'" > sendgrid.env
+echo "sendgrid.env" >> .gitignore
+source ./sendgrid.env
+```
+
 ## Install Package
 
 ```bash
@@ -98,4 +111,4 @@ ruby-http-client is guided and supported by the SendGrid [Developer Experience T
 ruby-http-client is maintained and funded by SendGrid, Inc. The names and logos for ruby-http-client are trademarks of SendGrid, Inc.
 
 # License
-[The MIT License (MIT)](LICENSE.txt)
+[The MIT License (MIT)](LICENSE.txt)
diff --git a/lib/ruby_http_client.rb b/lib/ruby_http_client.rb
@@ -90,7 +90,7 @@ def add_version(url = nil)
     #   - The url string with the query parameters appended
     #
     def build_query_params(url, query_params)
-      params = query_params.map { |key, value| "#{key}=#{value}" }.join('&')
+      params = URI.encode_www_form(query_params)
       url.concat("?#{params}")
     end
 
diff --git a/ruby_http_client.gemspec b/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.2.0'
+  spec.version     = '3.3.0'
   spec.authors     = ['Elmer Thomas']
   spec.email       = 'dx@sendgrid.com'
   spec.summary     = 'A simple REST client'
diff --git a/test/test_ruby_http_client.rb b/test/test_ruby_http_client.rb
@@ -61,9 +61,9 @@ def test_add_version
 
   def test_build_query_params
     url = ''
-    query_params = { 'limit' => 100, 'offset' => 0 }
+    query_params = { 'limit' => 100, 'offset' => 0, 'categories' => ['category1', 'category2'] }
     url = @client.build_query_params(url, query_params)
-    assert_equal('?limit=100&offset=0', url)
+    assert_equal('?limit=100&offset=0&categories=category1&categories=category2', url)
   end
 
   def test_build_url
@@ -234,5 +234,12 @@ def test_usage_exists
 
   def test_use_cases_exists
     assert(File.file?('./USE_CASES.md'))
-  end
+  end 
+  
+  def test_license_date_is_updated
+    license_end_year = IO.read('LICENSE.txt').match(/Copyright \(c\) 2016-(\d{4}) SendGrid/)[1].to_i
+    current_year = Time.new.year
+    assert_equal(current_year, license_end_year)
+  end
+  
 end

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def add_version(url = nil)`
`90`	`90`	`# - The url string with the query parameters appended`
`91`	`91`	`#`
`92`	`92`	`def build_query_params(url, query_params)`
`93`		`- params = query_params.map { \|key, value\| "#{key}=#{value}" }.join('&')`
	`93`	`+ params = URI.encode_www_form(query_params)`
`94`	`94`	`url.concat("?#{params}")`
`95`	`95`	`end`
`96`	`96`