[DRE-commits] [ruby-gon] 01/04: Merge tag 'upstream/6.0.1'

[Praveen Arimbrathodiyil]

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

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

commit 304d638498b945ad90af8714670dd15dfc452ed1
Merge: 08ae450 81f73b0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 1 16:05:47 2015 +0530

    Merge tag 'upstream/6.0.1'
    
    Upstream version 6.0.1
    
    # gpg: Signature made Tuesday 01 September 2015 04:05:43 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>"

 .travis.yml                                     |   5 +-
 CHANGELOG.md                                    |  11 ++
 Gemfile                                         |   2 +-
 LICENSE                                         |   2 +-
 README.md                                       |  29 +++--
 Rakefile                                        |   2 -
 gon.gemspec                                     |  14 +--
 lib/gon.rb                                      |  10 +-
 lib/gon/base.rb                                 | 159 +++++++++++-------------
 lib/gon/env_finder.rb                           |  46 +++++++
 lib/gon/escaper.rb                              |   9 +-
 lib/gon/helpers.rb                              |   7 +-
 lib/gon/jbuilder.rb                             | 114 +++--------------
 lib/gon/{jbuilder.rb => jbuilder/parser.rb}     |  86 ++++++-------
 lib/gon/rabl.rb                                 |   6 +-
 lib/gon/spec_helpers.rb                         |   2 +-
 lib/gon/version.rb                              |   2 +-
 lib/gon/watch.rb                                |   4 +-
 metadata.yml                                    |  71 +++++------
 spec/gon/basic_spec.rb                          |  61 ++++-----
 spec/gon/global_spec.rb                         |  40 +++---
 spec/gon/jbuilder_spec.rb                       |  37 +++---
 spec/gon/rabl_with_rabl_rails_spec.rb           |   2 +-
 spec/gon/rabl_with_rabl_spec.rb                 |  14 +--
 spec/gon/templates_spec.rb                      |  12 +-
 spec/gon/thread_spec.rb                         |   2 +-
 spec/gon/watch_spec.rb                          |   6 +-
 spec/spec_helper.rb                             |  11 +-
 spec/test_data/sample_url_helpers.json.jbuilder |   1 +
 29 files changed, 361 insertions(+), 406 deletions(-)

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