[DRE-commits] [ruby-factory-girl] 01/03: Merge tag 'upstream/4.4.0'

[Nitesh A Jain]

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

niteshjain-guest pushed a commit to branch master
in repository ruby-factory-girl.

commit 3ee0b3be43ab7b52a24d0096635ffdba92df5023
Merge: cb8e1dc 1fc8943
Author: Nitesh A Jain <niteshjain92 at gmail.com>
Date:   Fri May 30 22:28:39 2014 +0530

    Merge tag 'upstream/4.4.0'
    
    Upstream version 4.4.0

 .travis.yml                                        |   6 +-
 Appraisals                                         |  10 +-
 GETTING_STARTED.md                                 | 368 +++++++++++++--------
 Gemfile                                            |   2 +-
 Gemfile.lock                                       | 104 +++---
 LICENSE                                            |   2 +-
 NEWS                                               |  14 +
 README.md                                          |  23 +-
 Rakefile                                           |   4 +-
 checksums.yaml.gz                                  | Bin 0 -> 268 bytes
 factory_girl.gemspec                               |   1 +
 gemfiles/3.0.gemfile                               |   7 -
 gemfiles/3.0.gemfile.lock                          |  81 -----
 gemfiles/3.1.gemfile                               |   2 +-
 gemfiles/3.1.gemfile.lock                          |  69 ++--
 gemfiles/3.2.gemfile                               |   2 +-
 gemfiles/3.2.gemfile.lock                          |  63 ++--
 gemfiles/4.0.gemfile                               |   2 +-
 gemfiles/4.0.gemfile.lock                          | 101 +++---
 lib/factory_girl.rb                                |  22 +-
 lib/factory_girl/attribute/dynamic.rb              |   2 +-
 lib/factory_girl/attribute_assigner.rb             |   2 +-
 lib/factory_girl/attribute_list.rb                 |   2 +-
 lib/factory_girl/callback.rb                       |   2 +-
 lib/factory_girl/callbacks_observer.rb             |   2 +-
 lib/factory_girl/configuration.rb                  |   5 +-
 lib/factory_girl/declaration_list.rb               |   4 +-
 lib/factory_girl/definition.rb                     |  25 +-
 lib/factory_girl/definition_hierarchy.rb           |   2 +-
 lib/factory_girl/definition_proxy.rb               |  24 +-
 lib/factory_girl/errors.rb                         |   6 +
 lib/factory_girl/factory.rb                        |   6 +-
 lib/factory_girl/find_definitions.rb               |   2 +-
 .../strategy_syntax_method_registrar.rb            |   9 +
 lib/factory_girl/syntax/default.rb                 |   8 +
 lib/factory_girl/version.rb                        |   2 +-
 metadata.yml                                       |  92 +++---
 spec/acceptance/callbacks_spec.rb                  |  84 ++++-
 spec/acceptance/create_pair_spec.rb                |  32 ++
 .../defining_methods_inside_a_factory_spec.rb      |  17 +
 spec/acceptance/definition_camel_string_spec.rb    |  15 +
 spec/acceptance/global_to_create_spec.rb           |   6 +-
 spec/acceptance/initialize_with_spec.rb            |   4 +-
 spec/acceptance/keyed_by_class_spec.rb             |   2 +-
 spec/acceptance/lint_spec.rb                       |  55 +++
 spec/acceptance/modify_factories_spec.rb           |   2 +-
 spec/acceptance/nested_attributes_spec.rb          |   2 +-
 spec/acceptance/parent_spec.rb                     |   2 +-
 spec/acceptance/register_strategies_spec.rb        |   8 +
 spec/acceptance/sequence_context_spec.rb           |   8 +-
 spec/acceptance/sequence_spec.rb                   |   4 +-
 ...yntax_methods_within_dynamic_attributes_spec.rb |  12 +-
 spec/acceptance/traits_spec.rb                     |  24 +-
 spec/acceptance/transient_attributes_spec.rb       |   2 +-
 spec/factory_girl/attribute/dynamic_spec.rb        |   2 +-
 spec/factory_girl/callback_spec.rb                 |   2 +-
 spec/factory_girl/definition_proxy_spec.rb         |   2 +-
 spec/factory_girl/definition_spec.rb               |   8 +-
 spec/factory_girl/sequence_spec.rb                 |   8 +-
 spec/support/matchers/trait.rb                     |   4 +-
 60 files changed, 834 insertions(+), 549 deletions(-)

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