[DRE-commits] [ruby-stringex] 02/04: Merge tag 'upstream/2.5.2'

[Youhei SASAKI]

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

uwabami-guest pushed a commit to annotated tag debian/2.5.2-1
in repository ruby-stringex.

commit 2a19787dbeac748195a95f2cebd062169e02a619
Merge: b3736e5 fa75d4c
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri May 30 01:01:18 2014 +0900

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2
    
    Conflicts:
    	Gemfile
    	README.rdoc
    	Rakefile
    	VERSION
    	checksums.yaml.gz
    	lib/stringex/configuration/acts_as_url.rb
    	lib/stringex/localization/backend/i18n.rb
    	metadata.yml
    	stringex.gemspec
    	test/acts_as_url/adapter/active_record.rb
    	test/acts_as_url/adapter/data_mapper.rb
    	test/unit/acts_as_url/adapter/active_record.rb
    	test/unit/acts_as_url/adapter/activerecord.rb
    	test/unit/acts_as_url/adapter/data_mapper.rb
    	test/unit/acts_as_url/adapter/datamapper.rb
    	test/unit/localization/da_test.rb
    	test/unit/localization/ru_test.rb
    	test/unit/localization_test.rb

 Gemfile                                            |  64 +++++++----
 MIT-LICENSE                                        |   2 +-
 README.rdoc                                        |  25 ++---
 Rakefile                                           |  30 +----
 VERSION                                            |   2 +-
 checksums.yaml.gz                                  | Bin 419 -> 269 bytes
 lib/stringex/acts_as_url.rb                        |   8 +-
 lib/stringex/acts_as_url/adapter/base.rb           |   7 ++
 lib/stringex/configuration/acts_as_url.rb          |  10 +-
 lib/stringex/localization/backend/i18n.rb          |   8 ++
 lib/stringex/unidecoder.rb                         |  33 +++---
 locales/pl.yml                                     |  88 +++++++++++++++
 locales/sv.yml                                     |  76 +++++++++++++
 metadata.yml                                       | 124 +++++----------------
 stringex.gemspec                                   |  56 ++++------
 .../adapter/{active_record.rb => activerecord.rb}  |   1 -
 .../adapter/{data_mapper.rb => datamapper.rb}      |   1 -
 test/unit/acts_as_url/adapter/mongoid.rb           |   9 +-
 test/unit/acts_as_url_integration_test.rb          |  34 +++++-
 test/unit/localization/da_test.rb                  |   4 +-
 test/unit/localization/pl_test.rb                  | 118 ++++++++++++++++++++
 test/unit/localization/ru_test.rb                  |   2 +-
 test/unit/localization/{da_test.rb => sv_test.rb}  |  90 +++++++--------
 test/unit/localization_test.rb                     |  39 +++++--
 test/unit/unicode_point_suite/basic_latin_test.rb  |   4 +-
 25 files changed, 556 insertions(+), 279 deletions(-)

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