[DRE-commits] [ruby-acts-as-taggable-on] 01/05: Merge tag 'upstream/3.4.2'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-acts-as-taggable-on.

commit 1f1e6f28f5d18dbd7e1ad7a2849a0acb55779e3e
Merge: c865d4d 9fc871d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 21 03:41:32 2014 +0530

    Merge tag 'upstream/3.4.2'
    
    Upstream version 3.4.2
    
    Conflicts:
    	spec/spec_helper.rb

 .gitignore                                         |   2 +-
 .travis.yml                                        |  42 +-
 Appraisals                                         |  23 +-
 CHANGELOG.md                                       | 204 +++++
 CONTRIBUTING.md                                    |  44 +
 Gemfile                                            |   8 +-
 README.md                                          | 211 ++++-
 Rakefile                                           |  12 +-
 UPGRADING.md                                       |  13 +
 acts-as-taggable-on.gemspec                        |  33 +-
 checksums.yaml.gz                                  | Bin 268 -> 0 bytes
 .../migrate/1_acts_as_taggable_on_migration.rb     |   6 +-
 db/migrate/2_add_missing_unique_indices.rb         |  19 +
 db/migrate/3_add_taggings_counter_cache_to_tags.rb |  14 +
 db/migrate/4_add_missing_taggable_index.rb         |   9 +
 gemfiles/activerecord_3.2.gemfile                  |  14 +
 gemfiles/activerecord_4.0.gemfile                  |  14 +
 gemfiles/activerecord_4.1.gemfile                  |  14 +
 gemfiles/activerecord_4.2.gemfile                  |  16 +
 gemfiles/activerecord_edge.gemfile                 |  15 +
 gemfiles/rails_3.gemfile                           |   8 -
 gemfiles/rails_4.gemfile                           |   8 -
 lib/acts-as-taggable-on.rb                         | 121 +--
 lib/acts_as_taggable_on.rb                         |   6 +
 .../acts_as_taggable_on/cache.rb                   |  53 --
 .../acts_as_taggable_on/core.rb                    | 383 ---------
 .../acts_as_taggable_on/ownership.rb               | 135 ---
 .../acts_as_taggable_on/related.rb                 |  84 --
 .../{acts_as_taggable_on => }/compatibility.rb     |  23 +-
 lib/acts_as_taggable_on/default_parser.rb          |  79 ++
 lib/acts_as_taggable_on/engine.rb                  |   5 +
 lib/acts_as_taggable_on/generic_parser.rb          |  19 +
 lib/acts_as_taggable_on/tag.rb                     |  84 +-
 lib/acts_as_taggable_on/tag_list.rb                |  73 +-
 lib/acts_as_taggable_on/tag_list_parser.rb         |  21 +
 lib/acts_as_taggable_on/taggable.rb                |  65 +-
 lib/acts_as_taggable_on/taggable/cache.rb          |  82 ++
 .../collection.rb                                  | 166 ++--
 lib/acts_as_taggable_on/taggable/core.rb           | 459 +++++++++++
 .../{acts_as_taggable_on => taggable}/dirty.rb     |   1 -
 lib/acts_as_taggable_on/taggable/ownership.rb      | 125 +++
 lib/acts_as_taggable_on/taggable/related.rb        |  71 ++
 lib/acts_as_taggable_on/tagger.rb                  |  48 +-
 lib/acts_as_taggable_on/tagging.rb                 |  21 +-
 lib/acts_as_taggable_on/tags_helper.rb             |   8 +-
 lib/acts_as_taggable_on/utils.rb                   |  34 +-
 lib/acts_as_taggable_on/version.rb                 |   2 +-
 .../migration/migration_generator.rb               |  39 -
 metadata.yml                                       | 205 +++--
 .../acts_as_taggable_on_spec.rb                    | 352 ++++----
 spec/acts_as_taggable_on/acts_as_tagger_spec.rb    | 150 ++--
 spec/acts_as_taggable_on/caching_spec.rb           |  77 ++
 spec/acts_as_taggable_on/default_parser_spec.rb    |  47 ++
 spec/acts_as_taggable_on/generic_parser_spec.rb    |  14 +
 spec/acts_as_taggable_on/related_spec.rb           | 173 ++--
 .../single_table_inheritance_spec.rb               | 214 ++---
 spec/acts_as_taggable_on/tag_list_parser_spec.rb   |  46 ++
 spec/acts_as_taggable_on/tag_list_spec.rb          | 162 ++--
 spec/acts_as_taggable_on/tag_spec.rb               | 324 +++++---
 spec/acts_as_taggable_on/taggable/dirty_spec.rb    | 127 +++
 spec/acts_as_taggable_on/taggable_spec.rb          | 907 ++++++++++++---------
 spec/acts_as_taggable_on/tagger_spec.rb            | 172 ++--
 spec/acts_as_taggable_on/tagging_spec.rb           |  65 +-
 spec/acts_as_taggable_on/tags_helper_spec.rb       |  65 +-
 spec/acts_as_taggable_on/utils_spec.rb             |  21 +-
 spec/bm.rb                                         |  52 --
 .../migration/migration_generator_spec.rb          |  22 -
 .../models/altered_inheriting_taggable_model.rb    |   3 +
 spec/internal/app/models/cached_model.rb           |   3 +
 .../internal/app/models/cached_model_with_array.rb |   5 +
 spec/internal/app/models/company.rb                |  15 +
 .../app/models/inheriting_taggable_model.rb        |   2 +
 spec/internal/app/models/market.rb                 |   2 +
 spec/{ => internal/app/models}/models.rb           |  36 +-
 .../app/models/non_standard_id_taggable_model.rb   |   8 +
 spec/internal/app/models/ordered_taggable_model.rb |   4 +
 spec/internal/app/models/other_cached_model.rb     |   3 +
 spec/internal/app/models/other_taggable_model.rb   |   4 +
 spec/internal/app/models/student.rb                |   2 +
 spec/internal/app/models/taggable_model.rb         |  13 +
 spec/internal/app/models/untaggable_model.rb       |   3 +
 spec/internal/app/models/user.rb                   |   3 +
 spec/{ => internal/config}/database.yml.sample     |   4 +-
 spec/internal/db/schema.rb                         |  97 +++
 spec/schema.rb                                     |  61 --
 spec/spec_helper.rb                                |  98 +--
 spec/support/0-helpers.rb                          |  32 +
 spec/support/array.rb                              |   9 +
 spec/support/database.rb                           |  42 +
 spec/support/database_cleaner.rb                   |  21 +
 90 files changed, 4096 insertions(+), 2505 deletions(-)

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