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

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

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

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

    Fixes #227
    steveklabnik committed Jun 27, 2012
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.

    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.
    jimweirich committed with steveklabnik Jun 20, 2012
  4. Let's do eager loading right.

    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
    steveklabnik committed Jun 20, 2012
  5. Merge branch 'cookrn-cookrn_i207_minitest_integration'

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

    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.'
    steveklabnik committed Jun 20, 2012
  7. remove badge.

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

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

    decorate scoped associations #128
    steveklabnik committed Jun 20, 2012
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

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

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

    fix link to commits
    steveklabnik committed Jun 8, 2012
  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

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

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

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

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

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

    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
    carlosantoniodasilva committed May 28, 2012
Commits on May 24, 2012
  1. Merge pull request #211 from patriciomacadden/improve_readme

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

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

    …supporting test libs
    cookrn committed May 18, 2012