Permalink
Commits on Jul 14, 2012
  1. bumping version

    steveklabnik committed Jul 14, 2012
Commits on Jun 28, 2012
  1. Merge pull request #232 from infbio/ammeter_version

    steveklabnik committed Jun 28, 2012
    Ammeter v0.2.6 breaks Draper's specs.
  2. Ammeter v0.2.6 breaks Draper's specs.

    leshill committed Jun 28, 2012
    Specify a known good version until ammeter is fixed
Commits on Jun 27, 2012
  1. update comment in generator.

    steveklabnik committed Jun 27, 2012
    You'd get an infinite loop with the current one
  2. use infect! in rspec integration.

    steveklabnik committed Jun 27, 2012
    Fixes #227
Commits on Jun 20, 2012
  1. updating CHANGELOG

    steveklabnik committed Jun 20, 2012
  2. Bumping to RC1

    steveklabnik committed Jun 20, 2012
  3. Fixing tests with shared state.

    jimweirich committed with steveklabnik Jun 20, 2012
    Originally, these two tests clashed when run in different orders.
    If the second test ran first, then we'd get a fail on the first
    test, since we'd already defined a method after the proxy.
  4. Let's do eager loading right.

    steveklabnik committed Jun 20, 2012
    This code was left over from before the railties redux. Adding the
    decorators dir to eager_load_paths should properly let things load,
    and so we don't need to also require them at boot time.
    
    Fixes #222
    Fixes #209
    Fixes #201
  5. Merge branch 'cookrn-cookrn_i207_minitest_integration'

    steveklabnik committed Jun 20, 2012
    Conflicts:
    	lib/draper/rspec_integration.rb
  6. Fix odd build order stuff.

    steveklabnik committed Jun 20, 2012
    These two tests test the same thing, and it's really hard to tear down the global state of 'added a method dynamically to a class.'
  7. remove badge.

    steveklabnik committed Jun 20, 2012
    Apparently this never updates, so...
  8. Fix the build

    steveklabnik committed Jun 20, 2012
  9. Merge pull request #223 from rboyd/decorates_association_scope

    steveklabnik committed Jun 20, 2012
    decorate scoped associations #128
Commits on Jun 15, 2012
  1. decorate scoped associations #128

    Robert Boyd committed Jun 15, 2012
Commits on Jun 9, 2012
  1. Merge pull request #221 from nashby/spec-order

    steveklabnik committed Jun 9, 2012
    make specs order independed
Commits on Jun 8, 2012
  1. make specs order independed

    nashby committed Jun 8, 2012
  2. Merge pull request #220 from billywatson/fix_readme

    steveklabnik committed Jun 8, 2012
    fix link to commits
  3. fix link to commits

    William Watson committed Jun 8, 2012
Commits on Jun 7, 2012
  1. Merge pull request #218 from nashby/jruby-minitest

    steveklabnik committed Jun 7, 2012
    add minitest to gem dependency for jruby
  2. Merge pull request #217 from sickill/master

    steveklabnik committed Jun 7, 2012
    Rename duplicated "block" variable to make rubinius happy
Commits on Jun 5, 2012
  1. Merge pull request #216 from nashby/rspec-integration

    steveklabnik committed Jun 5, 2012
    set current view context in view tests
  2. set current view context in view tests

    nashby committed Jun 5, 2012
    use before filter in Rspec instead of around
Commits on May 28, 2012
  1. Merge pull request #213 from carlosantoniodasilva/railtie-extension-load

    steveklabnik committed May 28, 2012
    Include view and helper extensions in current context
  2. Include view and helper extensions in current context

    carlosantoniodasilva committed May 28, 2012
    Instead of including extensions in hardcoded ActionController::Base, use
    the current context from AS on_load hook, which in most cases should be
    ActionController::Base, but may change in scenarios such as
    ActionController::API (using the rails-api gem).
    
    See rails-api/rails-api#28 for more info.
    
    Closes #212
Commits on May 24, 2012
  1. Merge pull request #211 from patriciomacadden/improve_readme

    steveklabnik committed May 24, 2012
    Change a few things in the readme
  2. changed a generator call (`rails generate decorator` instead of `rail…

    patriciomacadden committed May 24, 2012
    …s generate draper:decorator`) and a few other changes.
Commits on May 18, 2012
  1. add some clarity to `lib/draper.rb` regarding which requires are for …

    cookrn committed May 18, 2012
    …supporting test libs