* fixtures:
  remove unused methods
  extract database activity out of Fixtures instances
  extract rows that should be inserted to a method
  fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables

* jonleighton/association_fixes:
  Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create.
  Inline ensure_owner_is_persisted! as it is only called from one place
  @target should always be an array
  Rename add_record_to_target_with_callbacks to add_to_target
  Don't pass the block through build_record
  Move create and create! next to build
  Get rid of create_record as it is not only used in one place
  Get rid of AssociationCollection#save_record
  Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db
  Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings

fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables

[#6389 state:resolved]

[#6416 state:resolved]

Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create.

Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings

[#6419 state:committed]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

[#6423 state:committed]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Applied changes to stylesheet_link_tag from javascript_include_tag which corrects issues with ordering and duplicates.

This corrects two issues with javascript_include_tag, the order at which they are expanded, and removing duplicates.

When individual js assets are specified, they will override the order of the same asset specified in an expansion.

[#5938 state:resolved]

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

As per the HTML 4.01 spec:

  Buttons created with the BUTTON element function just like buttons
  created with the INPUT element, but they offer richer rendering
  possibilities: the BUTTON element may have content. For example, a
  BUTTON element that contains an image functions like and may resemble
  an INPUT element whose type is set to "image", but the BUTTON element
  type allows content.

Since rich content is the main purpose of the <button> element, it makes
sense for the button_tag helper to accept a block.

http://www.w3.org/TR/html401/interact/forms.html#edef-BUTTON
http://dev.w3.org/html5/spec/the-button-element.html#the-button-elementSigned-off-by: NSantiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>

"submit" is the default value of the <button> element's type attribute
according to the HTML 4.01 and the HTML5 draft specs, so if button_tag
is going to have a default, type="submit" is a more sensible choice than
type="button".

http://www.w3.org/TR/html401/interact/forms.html#adef-type-BUTTON
http://dev.w3.org/html5/spec/the-button-element.html#attr-button-typeSigned-off-by: NSantiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>