[DRE-commits] [ruby-recaptcha] 01/05: Merge tag 'upstream/3.2.0'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-recaptcha.

commit 25628b508dcb59b83345bf8e04d611a808677d58
Merge: 9ad7701 84ebde6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jun 16 15:25:13 2016 +0530

    Merge tag 'upstream/3.2.0'
    
    Upstream version 3.2.0
    
    # gpg: Signature made Thursday 16 June 2016 03:25:08 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .rubocop.yml                                       | 154 +++++++++++++
 .travis.yml                                        |   8 +-
 CHANGELOG                                          |  41 ----
 CHANGELOG.md                                       |  91 ++++++++
 Gemfile.lock                                       |  65 ++++--
 README.md                                          | 163 ++++++++++++++
 README.rdoc                                        | 151 -------------
 Rakefile                                           |   9 +-
 demo/rails/.env                                    |   3 +
 demo/rails/.gitignore                              |  17 ++
 demo/rails/Gemfile                                 |   6 +
 demo/rails/Gemfile.lock                            | 115 ++++++++++
 demo/rails/Rakefile                                |   6 +
 demo/rails/app/assets/javascripts/application.js   |  13 ++
 demo/rails/app/assets/stylesheets/application.css  |  15 ++
 .../app/controllers/application_controller.rb      |   5 +
 demo/rails/app/controllers/captcha_controller.rb   |  12 +
 demo/rails/app/controllers/concerns/.keep          |   0
 demo/rails/app/controllers/users_controller.rb     |  18 ++
 demo/rails/app/helpers/application_helper.rb       |   2 +
 demo/rails/app/mailers/.keep                       |   0
 demo/rails/app/models/.keep                        |   0
 demo/rails/app/models/user.rb                      |   2 +
 demo/rails/app/views/captcha/index.html.erb        |  46 ++++
 demo/rails/app/views/layouts/application.html.erb  |  18 ++
 demo/rails/app/views/users/edit.html.erb           |   5 +
 demo/rails/app/views/users/index.html.erb          |   5 +
 demo/rails/bin/bundle                              |   3 +
 demo/rails/bin/rails                               |   9 +
 demo/rails/bin/rake                                |   9 +
 demo/rails/bin/setup                               |  29 +++
 demo/rails/bin/spring                              |  15 ++
 demo/rails/config.ru                               |   4 +
 demo/rails/config/application.rb                   |  26 +++
 demo/rails/config/boot.rb                          |   3 +
 demo/rails/config/database.yml                     |  25 +++
 demo/rails/config/environment.rb                   |   5 +
 demo/rails/config/environments/development.rb      |  41 ++++
 demo/rails/config/initializers/assets.rb           |  11 +
 .../config/initializers/backtrace_silencers.rb     |   7 +
 .../config/initializers/cookies_serializer.rb      |   3 +
 .../initializers/filter_parameter_logging.rb       |   4 +
 demo/rails/config/initializers/inflections.rb      |  16 ++
 demo/rails/config/initializers/mime_types.rb       |   4 +
 demo/rails/config/initializers/session_store.rb    |   3 +
 demo/rails/config/initializers/wrap_parameters.rb  |  14 ++
 demo/rails/config/locales/en.yml                   |  23 ++
 demo/rails/config/routes.rb                        |   5 +
 demo/rails/config/secrets.yml                      |  22 ++
 demo/rails/db/migrate/20151226015155_add_user.rb   |   7 +
 demo/rails/db/schema.rb                            |  20 ++
 demo/rails/db/seeds.rb                             |   1 +
 demo/rails/public/favicon.ico                      | Bin 0 -> 28974 bytes
 demo/sinatra/Gemfile                               |   4 +
 demo/sinatra/Gemfile.lock                          |  28 +++
 demo/sinatra/server.rb                             |  29 +++
 init.rb                                            |   5 -
 lib/recaptcha.rb                                   |  57 +++--
 lib/recaptcha/client_helper.rb                     | 151 ++++---------
 lib/recaptcha/configuration.rb                     |  37 +--
 lib/recaptcha/merb.rb                              |   4 -
 lib/recaptcha/rails.rb                             |  11 +-
 lib/recaptcha/railtie.rb                           |  15 --
 lib/recaptcha/verify.rb                            | 163 +++++++-------
 lib/recaptcha/version.rb                           |   2 +-
 recaptcha.gemspec                                  |  21 +-
 test/client_helper_test.rb                         |  35 +++
 test/configuration_test.rb                         |  33 +++
 test/helper.rb                                     |  22 ++
 test/recaptcha_configuration_test.rb               |  44 ----
 test/recaptcha_test.rb                             |  54 -----
 test/recaptcha_v1_test.rb                          |  35 ---
 test/verify_recaptcha_test.rb                      | 191 ----------------
 test/verify_test.rb                                | 250 +++++++++++++++++++++
 74 files changed, 1650 insertions(+), 820 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-recaptcha.git