Permalink
Commits on Aug 31, 2012
  1. Revert "Wrap relation calls and scope calls in decorators"

    This reverts commit e4595d9.
    
    Fixes #267
    
    Conflicts:
    
    	lib/draper/base.rb
    	lib/draper/decorated_enumerable_proxy.rb
    	spec/draper/base_spec.rb
    steveklabnik committed Aug 31, 2012
Commits on Aug 30, 2012
  1. Merge pull request #266 from kuraga/patch-1

    Error in Readme
    steveklabnik committed Aug 30, 2012
  2. Error in Readme

    We have to extend `ApplicationController` but not `Draper::Base`.
    kuraga committed Aug 30, 2012
  3. Merge pull request #265 from stevenbristol/master

    Allowing enumerable proxys to be decorated
    steveklabnik committed Aug 30, 2012
Commits on Aug 29, 2012
  1. Merge pull request #264 from reinh/patch-1

    Separate ViewContext get/create context behavior
    steveklabnik committed Aug 29, 2012
  2. Separate ViewContext get/create context behavior

    Separating these behaviors eliminates and entire class of bugs like forgetting to re-set the thread local, attempting to re-set the block-local conditionally, and so on. It also makes it more obvious that `self.current` is memoizing.
    reinh committed Aug 29, 2012
  3. Remove #tap.

    @reinh points out that this is a bug
    steveklabnik committed Aug 29, 2012
  4. Revert "Break reliance on ActionController."

    This reverts commit b3a2af7.
    
    Basically, we have an issue with ActionMailer::Base. Given this
    code, we end up with
    
    ```
    private method `new' called for ActionMailer::Base:Class
    ```
    
    And That's Bad (tm).
    
    Still that commit should point the way to making it happen somehow.
    steveklabnik committed Aug 29, 2012
  5. relaxing ammeter dependency version

    This means we don't get warnings any more.
    steveklabnik committed Aug 29, 2012
  6. Break reliance on ActionController.

    Originally brought up in #249, I didn't know how to fix this.
    
    But now I do.
    steveklabnik committed Aug 29, 2012
  7. Totally change test integration.

    We no longer need to do specific things before tests run. The
    view_context now loads up appropriate things if they don't exist.
    
    I ended up getting rid of two spec files; one tested things that
    were very simple, but since we're not mocking Rails anymore, they're
    much harder to test. The second was the stuff that I removed. :)
    steveklabnik committed Aug 29, 2012
Commits on Aug 24, 2012
  1. Merge pull request #259 from indrekj/struct-objects

    Decorate struct objects correctly
    steveklabnik committed Aug 24, 2012
  2. Decorate struct objects correctly

    Struct objects implement #each, but they should not be decorated using
    DecoratedEnumerableProxy.
    indrekj committed Aug 24, 2012
Commits on Aug 23, 2012
  1. Merge pull request #257 from jhsu/draper-scope-wrap

    Wrap relation calls and scope calls in decorators
    steveklabnik committed Aug 23, 2012
  2. move fake ActiveRecord::Relation to helper, use #kind_of instead of c…

    …omparing to string
    jhsu committed Aug 23, 2012
Commits on Aug 22, 2012
  1. fix typo with class name

    jhsu committed Aug 22, 2012
  2. Wrap relation calls and scope calls in decorators

    * wrap model in decorator when scope is called on decorator
    * decorate named scope calls on decorators and enumerable proxies
    jhsu committed Aug 22, 2012
Commits on Aug 21, 2012
  1. bump to 0.17.0

    steveklabnik committed Aug 21, 2012
Commits on Aug 18, 2012
  1. Properly proxy to Enumerable or AR::Finder method.

    Decorated associations implement Enumerable, but they also should
    emulate the AR::Finder stuff.
    
        @person = PersonDecorator.find(params[:person_id])
        @pet = @person.pets.find(params[:id])
    
    The problem is, pets delegated to Enumerable always, instead of
    to the finder method. This patch makes it delegate to Enumerable if
    a block is given, and Finder if not.
    
    Fixes #214.
    steveklabnik committed Aug 18, 2012
Commits on Aug 14, 2012
  1. Merge pull request #253 from doublewide/fix_view_context_priming

    Fixed view_context priming. Fixes #244, relates to 057ab4e.
    steveklabnik committed Aug 14, 2012
  2. Fixed view_context priming. Fixes #244, relates to 057ab4e.

    Fix in 057ab4e resulted in a "NameError: undefined local variable or method `view_context' for Draper::ViewContext:Module".
    ihoka committed Aug 14, 2012
  3. Merge pull request #252 from iblue/fixed-changelog

    Fixed changelog
    steveklabnik committed Aug 14, 2012
Commits on Aug 13, 2012
  1. Fix commit sha1 in changelog

    iblue committed Aug 13, 2012
Commits on Aug 12, 2012
  1. Merge pull request #251 from WizardOfOgz/feature-denies-all

    Add denies_all feature
    steveklabnik committed Aug 12, 2012
  2. .denies_all implementation

    Andy Ogzewalla committed Aug 12, 2012
  3. Additional specs for denies_all

    Andy Ogzewalla committed Aug 12, 2012
  4. Add specs for denies_all cases

    Andy Ogzewalla committed Aug 10, 2012