oauth 0.5.6 → 0.5.7.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd785e08f2a318da373f07b79fe6583ed3e8c26bcc92c5e1513ee615ea0f037
-  data.tar.gz: 3e9f81feb37166f4fec398d20e8b4de882b6e1e2304f893c033b920ab737616a
+  metadata.gz: a88cb9c5d6705a3a9af88054d4b67bd2fdf2686057bedb2022d1998f4e94d12f
+  data.tar.gz: d37b3d22e48c4258f1ce25f154a9c1a0ab4252fb7cb804e79808dd36c0ddcc5f
 SHA512:
-  metadata.gz: 6bc060045ecb7ca1c47263f4bab7fde62c3a173ccf7ea6e1dacc5ac4e814ecea88e4b2f594f6bd2a7d80f9393e1295b1a5cbc85f3eb74c35cbb348da6f32cfe6
-  data.tar.gz: c96c9abd68f71cca8d33db21e3d68f1c7fe98898dba924fd440bf882280d99d39beb7a0751be913bb0f18872875ca8098792733f1717ff8d127156a99a69f039
+  metadata.gz: 9c074fe3a9f43349f37deddbd1405f2d6eb53585d5188c81db30699b4d05b5ab546263d8e8471cad6742a861dcf23b14a94d54f3cede5f8891eeedd3a0e4b21c
+  data.tar.gz: 2ad01843b191714dcc05e9aaed252d5d1edc59e224c3d46e9e0b361c92403a97bf52288c4d84fd530e22b44a7d112aa36adb3f4d62fa3a4a1561681a5e353f93

data/CHANGELOG.md

@@ -0,0 +1,454 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Added
+
+* Setup Rubocop (#205, #208 by @pboling)
+* Added CODE_OF_CONDUCT.md (#217, #218 by @pboling)
+* Added FUNDING.yml (#217, #218 by @pboling)
+* Added Client Certificate Options: :ssl_client_cert and :ssl_client_key (#136, #220 by @pboling)
+* Handle a nested array of hashes in OAuth::Helper.normalize (#80, #221 by @pboling)
+
+### Changed
+
+* Switch from TravisCI to Github Actions (#202, #207, #176 by @pboling)
+* Upgrade webmock to v3.14.0 (#196 by @pboling)
+* Upgrade em-http-request to v1.1.7 (#173 by @pboling)
+* Upgrade mocha to v1.13.0 (#193 by @pboling)
+* HISTORY renamed to CHANGELOG.md, and follows Keep a Changelog (#214, #215 by @pboling)
+* CHANGELOG, LICENSE, and README now ship with packaged gem (#214, #215 by @pboling)
+* README.rdoc renamed to README.md (#217, #218 by @pboling)
+* Require plaintext signature method by default (#135 by @confiks & @pboling)
+
+### Fixed
+
+* Fixed Infinite Redirect in v0.5.5, v0.5.6 (#186, #210 by @pboling)
+* Fixed NoMethodError on missing leading slash in path (#194, #211 by @pboling)
+* Fixed NoMethodError on nil request object (#165, #212 by @pboling)
+* Fixed Unsafe String Comparison (#156, #209 by @pboling and @drosseau)
+* Fixed typos in Gemspec (#204, #203, #208 by @pboling)
+* Copyright Notice in LICENSE - added correct years (#217, #218 by @pboling)
+
+### Removed
+
+* Remove direct development dependency on nokogiri (#299 by @pboling)
+
+## [0.5.6] 2021-04-02
+### Added
+
+* Add metadata to Gemspec file
+* Add support for PUT requests with Action Controller (#181)
+
+### Changed
+
+* Change default timeout to be the same as Net::HTTP default, 60 seconds instead of 30 seconds.
+
+## [0.5.5] 2020-01-19
+### Added
+
+* Add :allow_empty_params option (#155)
+
+### Changed
+
+* Allow redirect to different host but same path
+* Various cleanups
+
+### Fixed
+
+* Fixes ssl-noverify
+* Fixed README example (#158, #159, by @pboling)
+
+## [0.5.4] 2017-12-08
+### Changed
+
+* Various cleanups (charliesome)
+
+### Fixed
+
+* Fixes UnknownRequestType on Rails 5.1 for ActionDispatch::Request (xprazak2)
+
+## [0.5.3] 2017-05-24
+### Fixed
+
+* Fix #145 - broken CLI required loading active_support (James Pinto)
+
+### Changed
+
+* Removing legacy scripts (James Pinto)
+
+## [0.5.2] 2017-05-17
+### Added
+
+* Adding a development dependency that had not been mentioned (James Pinto)
+* Adding CodeClimate (James Pinto)
+* Adding support to Ruby 2.4 and head (James Pinto)
+
+### Changed
+
+* Use assert_nil so as to silence a Minitest 6 deprecation warning (James Pinto)
+* Stop bundling tests files in the gem (Michal Papis)
+* Minor cleanup on tests (James Pinto)
+* TravisCI no longer needs libcurl-dev (James Pinto)
+* Nokogiri 1.7 does not accept Ruby 2.0 (James Pinto)
+* Upgrading to CodeClimate 1.0 (James Pinto)
+* Locking gemspec to Rails 4 so as to allow our next version for Rails 5 (James Pinto)
+* moving development dependency to gemspec (James Pinto)
+* Silencing 'Net::HTTPResponse#header is obsolete' (James Pinto)
+* Silencing some test warnings (James Pinto)
+* Silencing 'loading in progress, circular require considered harmful' (James Pinto)
+* Silence 'URI.escape obsolete' (James Pinto)
+* Refactored CLI (James Pinto)
+* Moving test files into test/units/ (James Pinto)
+* Reimplementing #82 - Debug Output Option (James Pinto)
+
+### Fixed
+
+* Fix #113 adding paths when a full URL has been specified   (James Pinto)
+* Bug Fix, webmock 2.0 has introduced a new bug (James Pinto)
+* Making a test/support dir (James Pinto)
+* Fix #177 - Adjusting to webmock latest recommended implementation for minitest (James Pinto)
+
+## [0.5.1] 2016-02-29
+### Added
+
+* Add license info to the gemspec (Robert Reiz)
+
+### Fixed
+
+* Proper handling for empty query string in RequestToken#build_authorize_url (midchildan,
+  Harald Sitter)
+* Replace calls to String#blank? with its implementation (Sergio Gil Pérez de la Manga)
+
+### Changed
+
+* Loosen some development dependencies. Add libcurl-dev to travis
+* Fixes to travis config. Switch to rubygems for installation and loading
+
+### Removed
+
+* Remove obsolete comment (Arthur Nogueira Neves)
+* Remove jeweler from gemspec
+
+## [0.5.0] 2016-02-20
+### Added
+
+* Add support for HTTP PATCH method (Richard Huang)
+* Allow reading private key from a string (Khaja Minhajuddin)
+* Add rest-client proxy (Khem Veasna)
+* Add byebug. (Kevin Hughes)
+* Allow reading certificate file path from environment variable. Add CentOS cert file path (Danil Vlasov)
+
+### Changed
+
+* Replace jeweler with real spec and bundler tasks
+* Extract version to separate file
+* Use OpenSSL for all digest and hashing. Remove signature methods not defined by OAuth spec. (Kevin Hughes)
+* Change token requests to exclude `oauth_body_hash`. Update doc links in comments. (John Remmen)
+
+### Fixed
+
+* Fix ability to pass in an authorize url with a query string (Roger Smith)
+* Fix bug in signature verification (r-stu31)
+* Use standard key name (`oauth_token_secret`) in Token#to_query (Craig Walker)
+* Fix error in CLI when using `query` without supplying a method (grafikchaos)
+* Compatibility fix for Typhoeus >= 0.5.0 (Chad Feller)
+* Rails 3+ / ActiveSupport::SafeBuffer patch (Clif Reeder)
+* Handle `nil` token gracefully for RequestToken#authorize_url (Brian John)
+* Fix typhoeus compatibility (Vladimir Mikhailov)
+* Fix oauth cli option parser on Ruby 2.2 (Felix Bünemann)
+* Update gemspec for security fixes. Convert to Minitest. Add .travis.yml. (Kevin Hughes)
+* Fix some warnings (amatsuda)
+* Various fixes/updates to README (Evan Arnold, Jonathan Camenisch, Brian John, Ankur Sethi)
+
+## [0.4.7] 2012-09-03
+### Added
+
+* Set a configurable timeout for all requests (Rick Olson)
+
+### Fixed
+
+* Fix merging paths if the path is not empty
+* Fix nested hash params in Consumer#request (Ernie Miller)
+
+## [0.4.6] 2012-04-21
+### Changed
+
+* Make use the path component of the :site parameter (Jonathon M. Abbott)
+
+### Fixed
+
+* Fixed nested attributes in #normalize (Shaliko Usubov)
+* Fixed post body's being dropped in 1.9 (Steven Hammond)
+* Fixed PUT request handling (Anton Panasenko)
+
+## [0.4.5] 2011-06-25
+### Added
+
+* Add explicit require for rsa/sha1 (Juris Galang)
+* Add gemtest support (Adrian Feldman)
+
+### Changed
+* Use webmock to mock all http-requests in tests (Adrian Feldman)
+* Mention Typhoeus require in the README (Kim Ahlström)
+* Use Net::HTTPGenericRequest (Jakub Kuźma)
+
+### Fixed
+
+* Fix POST Requests with Typhoeus proxy (niedhui)
+* Fix incorrect hardcoded port (Ian Taylor)
+
+## [0.4.4] 2010-10-31
+### Added
+
+* Added support for Rails 3 in client/action_controller_request (Pelle)
+
+### Fixed
+
+* Fix LoadError rescue in tests: return can't be used in this context (Hans de Graaff)
+* HTTP headers should be strings. (seancribbs)
+* ensure consumer uri gets set back to original config even if an error occurs (Brian Finney)
+* Yahoo uses & to split records in OAuth headers (Brian Finney)
+
+## [0.4.3] 2010-09-01
+### Fixed
+
+* Fix for em-http proxy (ichverstehe)
+
+## [0.4.2] 2010-08-13
+### Added
+
+* Added Bundler (rc) Gemfile for easier dev/testing
+
+### Fixed
+
+* Fixed compatibility with Ruby 1.9.2 (ecavazos)
+* Fixed the em-http request proxy (Joshua Hull)
+* Fix for oauth proxy string manipulation (Jakub Suder)
+
+## [0.4.1] 2010-06-16
+### Added
+
+* Added support for using OAuth with proxies (Marsh Gardiner)
+
+### Fixed
+
+* Rails 3 Compatibility fixes (Pelle Braendgaard)
+* Fixed load errors on tests for missing (non-required) libraries
+
+## [0.4.0] 2010-04-22
+### Added
+
+* Added computation of oauth_body_hash as per OAuth Request Body Hash 1.0 Draft 4 (Michael Reinsch)
+* Added the optional `oauth_session_handle` parameter for the Yahoo implementation (Will Bailey)
+* Added optional block to OAuth::Consumer.get_*_token (Neill Pearman)
+* Exclude `oauth_callback` with :exclude_callback (Neill Pearman)
+* Support for Ruby 1.9 (Aaron Quint, Corey Donahoe, et al)
+* Support for Typhoeus (Bill Kocik)
+* Support for em-http (EventMachine) (Darcy Laycock)
+* Support for curb (André Luis Leal Cardoso Junior)
+* New website (Aaron Quint)
+
+### Changed
+
+* Better marshalling implementation (Yoan Blanc)
+* Replaced hoe with Jeweler (Aaron Quint)
+
+### Fixed
+
+* Strip extraneous spaces and line breaks from access_token responses (observed in the wild with Yahoo!'s OAuth+OpenID hybrid) (Eric Hartmann)
+* Stop double-escaping PLAINTEXT signatures (Jimmy Zimmerman)
+* OAuth::Client::Helper won't override the specified `oauth_version` (Philip Kromer)
+* Fixed an encoding / multibyte issue (成田 一生)
+
+## [0.3.6] 2009-09-14
+### Added
+
+* Added -B CLI option to use the :body authentication scheme (Seth)
+* Support POST and PUT with raw bodies (Yu-Shan Fung et al)
+* Added :ca_file consumer option to allow consumer specific certificate override. (Pelle)
+
+### Changed
+
+* Test clean-up (Xavier Shay, Hannes Tydén)
+
+### Fixed
+
+* Respect `--method` in `authorize` CLI command (Seth)
+
+## [0.3.5] 2009-06-03
+### Added
+
+* `query` CLI command to access protected resources (Seth)
+* Added -H, -Q CLI options for specifying the authentication scheme (Seth)
+* Added -O CLI option for specifying a file containing options (Seth)
+* Support streamable body contents for large request bodies (Seth Cousins)
+* Support for OAuth 1.0a (Seth)
+* Added proxy support to OAuth::Consumer (Marshall Huss)
+* Added --scope CLI option for Google's 'scope' parameter (Seth)
+
+## [0.3.4] 2009-05-06
+### Changed
+
+* OAuth::Client::Helper uses OAuth::VERSION (chadisfaction)
+
+### Fixed
+
+* Fix OAuth::RequestProxy::ActionControllerRequest's handling of params (Tristan Groléat)
+
+## [0.3.3] 2009-05-04
+### Added
+
+* Support for arguments in OAuth::Consumer#get_access_token (Matt Sanford)
+* Add gem version to user-agent header (Matt Sanford)
+
+### Changed
+
+* Improved error handling for invalid Authorization headers (Matt Sanford)
+* Handle input from aggressive form encoding libraries (Matt Wood)
+
+### Fixed
+
+* Corrected OAuth XMPP namespace (Seth)
+* Fixed signatures for non-ASCII under $KCODE other than 'u' (Matt Sanford)
+* Fixed edge cases in ActionControllerRequestProxy where params were being incorrectly signed (Marcos Wright Kuhns)
+
+## [0.3.2] 2009-03-23
+### Added
+
+* Support applications using the MethodOverride Rack middleware (László Bácsi)
+* `authorize` command for `oauth` CLI (Seth)
+* Initial support for Problem Reporting extension (Seth)
+* Verify SSL certificates if CA certificates are available (Seth)
+* Added help to the 'oauth' CLI (Seth)
+
+### Fixed
+
+* 2xx statuses should be treated as success (Anders Conbere)
+* Fixed ActionController parameter escaping behavior (Thiago Arrais, László Bácsi, Brett Gibson, et al)
+* Fixed signature calculation when both options and a block were provided to OAuth::Signature::Base#initialize (Seth)
+* Fixed a problem when attempting to normalize MockRequest URIs (Seth)
+
+## [0.3.1] 2009-01-26
+### Fixed
+
+* Fixed a problem with relative and absolute token request paths. (Michael
+  Wood)
+
+## [0.3.0] 2009-01-25
+### Added
+
+* Support ActionController::Request from Edge Rails (László Bácsi)
+* Added #normalized_parameters to OAuth::RequestProxy::Base (Pelle)
+* Command-line app for generating signatures. (Seth)
+
+### Changed
+
+* OAuth::Signature.sign and friends now yield the RequestProxy instead of the token when the passed block's arity is 1. (Seth)
+* Improved test-cases and compatibility for encoding issues. (Pelle)
+
+### Fixed
+
+* Correctly handle multi-valued parameters (Seth)
+* Token requests are made to the configured URL rather than generating a potentially incorrect one.  (Kellan Elliott-McCrea)
+
+## 0.2.7 2008-09-10
+The lets fix the last release release
+
+### Fixed
+
+* Fixed plain text signatures (Andrew Arrow)
+* Fixed RSA requests using OAuthTokens. (Philip Lipu Tsai)
+
+## 0.2.6 2008-09-09
+The lets RSA release
+
+### Added
+
+* Improved support for Ruby 1.8.7 (Bill Kocik)
+* Added support for 'private_key_file' option for RSA signatures (Chris Mear)
+
+### Changed
+
+* Improved RSA testing
+* Omit token when signing with RSA
+
+### Fixed
+
+* Fixed RSA verification to support RSA providers now using Ruby and RSA
+* Fixed several edge cases where params were being incorrectly signed (Scott Hill)
+* Fixed RSA signing (choonkeat)
+
+## 0.2.2 2008-02-22
+Lets actually support SSL release
+
+### Fixed
+
+* Use HTTPS when required.
+
+## 0.2 2008-1-19
+All together now release
+
+This is a big release, where we have merged the efforts of various parties into one common library.
+This means there are definitely some API changes you should be aware of. They should be minimal
+but please have a look at the unit tests.
+
+## 0.1.2 2007-12-1
+### Fixed
+
+* Fixed checks for missing OAuth params to improve performance
+* Includes Pat's fix for getting the realm out.
+
+## 0.1.1 2007-11-26
+### Added
+
+* First release as a GEM
+* Moved all non-Rails functionality from the Rails plugin:
+  http://code.google.com/p/oauth-plugin/
+
+[Unreleased]: https://github.com/oauth-xx/oauth-ruby/compare/v0.5.6...HEAD
+
+[0.3.0]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.0
+
+[0.3.1]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.1
+
+[0.3.2]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.2
+
+[0.3.3]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.3
+
+[0.3.4]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.4
+
+[0.3.5]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.5
+
+[0.3.6]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.3.6
+
+[0.4.0]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.0
+
+[0.4.1]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.1
+
+[0.4.2]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.2
+
+[0.4.3]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.3
+
+[0.4.4]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.4
+
+[0.4.5]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.5
+
+[0.4.6]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.6
+
+[0.4.7]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.4.7
+
+[0.5.0]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.0
+
+[0.5.1]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.1
+
+[0.5.2]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.2
+
+[0.5.3]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.3
+
+[0.5.4]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.4
+
+[0.5.6]: https://github.com/oauth-xx/oauth-ruby/releases/tag/v0.5.6

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders 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, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at peter.boling@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/LICENSE

@@ -1,20 +1,21 @@
-Copyright (c) 2007 Blaine Cook, Larry Halff, Pelle Braendgaard
+The MIT License (MIT)
 
-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:
+Copyright (c) 2007-2012, 2016-2017, 2020-2021 Blaine Cook, Larry Halff, Pelle Braendgaard, Peter Boling
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+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 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 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.