Permalink
Commits on Jun 13, 2008
  1. Don't automatically use Facebook signature

    Accidentally put this in, from my benchmarks.  This should go into
    merb_facebooker...which should get merged to facebooker eventually
    ivey committed Jun 13, 2008
Commits on Jun 12, 2008
  1. Merge branch 'master' of git@github.com:wycats/merb-core

    * 'master' of git@github.com:wycats/merb-core:
      make the default rake task 'specs' so running rake in merb-core just runs the specs
      Rename @status to @_status
      Avoid adding nil values in place of missing keys for Hash#only
      Fix issue with null segments
      Fixed session cookie expires value [#366 state:resolved]
      Made HTTP method override proc-based and pluggable. [#364]
    wycats committed Jun 12, 2008
  2. Fixes failing spec.

    wycats committed Jun 12, 2008
  3. make the default rake task 'specs' so running rake in merb-core just …

    …runs the specs
    Ezra Zygmuntowicz committed Jun 12, 2008
Commits on Jun 11, 2008
  1. Rename @status to @_status

    We may want to do the same w/ @request and @headers
    
    [#232 state:resolved]
    ivey committed Jun 11, 2008
  2. Avoid adding nil values in place of missing keys for Hash#only

    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
    Brian Mitchell committed with ivey Jun 6, 2008
  3. Fix issue with null segments

    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
    [#365 state:resolved]
    I was going to change this to use explicit returns, but I think the more
    common case is for segments() to be non-nil so this is better.
    technomage committed with ivey Jun 8, 2008
  4. Fixed session cookie expires value [#366 state:resolved]

    Fixed a bug where setup_session sets the session-key cookie in
    each request, and with no expires value. This bug meant that
    sessions couldn't be set to expire on a certain date -- they
    could only be set to expire when the user closes the browser.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
    mde committed with ivey Jun 10, 2008
  5. Made HTTP method override proc-based and pluggable. [#364]

    Changed the check for specific params to procs that execute
    in the request scope, allowing checks for method overrides to
    be based on params, headers -- or pretty much anything in the
    request. Also changed the name of the array that stores these
    checks from browser_method_workarounds to the more accurate
    and descriptive http_method_overrides.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
     (I changed this to yield the controller to the block, instead of
      using instance_eval, as it seemed cleaner and was significantly
      faster.  See benchmark attachment on ticket #364 --ivey)
    
    [#364 state:resolved]
    mde committed with ivey Jun 9, 2008
  6. Merge branch 'master' of git://github.com/wycats/merb-core

    * 'master' of git://github.com/wycats/merb-core: (192 commits)
      siiiiiigh.
      Revert partial counter and yielding.
      Remove some duplication
      For crying out loud.
      Refactor display. WARNING: This commit might not be stable. I need to add a bunch more specs for display before I feel confident.
      Make the TemplateNotFound error read better. Slight refactor of _get_layout.
      Fix _template_for so it's actually readable
      uhhhhhhhh...
      Added Merb::Router.reset! and Merb::Router.capture
      Speedup Route URL generation
      Start work on fixing contaminated cousins bug.
      Changed controller inheritance of _template_root
      Added the ability to use full/absolute template paths for render, display and partial views
      This cannot be tested this way. It needs to be tested as a public spec (testing it privately here was a cop-out and fails when I fixed up the way dependency works).
      Allows passage of query string via env["QUERY_STRING"] in tests. [#358 state:resolved]
      Handles use of dependency after BootLoading. [#360 state:resolved]
      properly set the session_id_key
      added 2 specs for multipart formdata: (1) for checking request with IO, (2) for testing GET with content_type not erroring on multipart/form-data absence; fixed error with multipart/form-data absence.
      Made Class a lot more sane.
      Fix README for merb-gen app foo
      ...
    David James committed Jun 11, 2008
  7. siiiiiigh.

    wycats committed Jun 11, 2008
  8. Remove some duplication

    wycats committed Jun 11, 2008
  9. For crying out loud.

    wycats committed Jun 11, 2008
  10. Refactor display. WARNING: This commit might not be stable. I need to…

    … add a bunch more specs for display before I feel confident.
    wycats committed Jun 11, 2008
  11. uhhhhhhhh...

    wycats committed Jun 11, 2008
Commits on Jun 9, 2008
Commits on Jun 8, 2008
  1. Speedup Route URL generation

    A lot of time is lost on URL generation calling regexp? on each route.
    This memoizes both the list of ancestors, and the result from regexp?
    
    It also makes Behavior#ancestors public so Route doesn't have to use send()
    to sneak behind the wall.
    ivey committed Jun 8, 2008
  2. Merge branch 'master' of git@github.com:wycats/merb-core

    * 'master' of git@github.com:wycats/merb-core:
      Changed controller inheritance of _template_root
      Added the ability to use full/absolute template paths for render, display and partial views
    wycats committed Jun 8, 2008
  3. Added the ability to use full/absolute template paths for render, dis…

    …play and partial views
    fabien committed Jun 8, 2008
Commits on Jun 6, 2008
  1. This cannot be tested this way. It needs to be tested as a public spe…

    …c (testing it privately here was a cop-out and fails when I fixed up the way dependency works).
    wycats committed Jun 6, 2008
  2. Merge branch 'master' of git@github.com:wycats/merb-core

    * 'master' of git@github.com:wycats/merb-core:
      properly set the session_id_key
      added 2 specs for multipart formdata: (1) for checking request with IO, (2) for testing GET with content_type not erroring on multipart/form-data absence; fixed error with multipart/form-data absence.
    wycats committed Jun 6, 2008
Commits on Jun 5, 2008
  1. properly set the session_id_key

    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    michaeldauria committed with Ezra Zygmuntowicz Jun 4, 2008
  2. added 2 specs for multipart formdata: (1) for checking request with I…

    …O, (2) for testing GET with content_type not erroring on multipart/form-data absence; fixed error with multipart/form-data absence.
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
    Paul Boone committed with Ezra Zygmuntowicz Jun 3, 2008
Commits on Jun 3, 2008
  1. Merge branch 'master' of git@github.com:wycats/merb-core

    * 'master' of git@github.com:wycats/merb-core:
      Fix README for merb-gen app foo
    wycats committed Jun 3, 2008
  2. Made Class a lot more sane.

    wycats committed Jun 3, 2008
  3. Merge branch 'master' of git@github.com:wycats/merb-core

    * 'master' of git@github.com:wycats/merb-core:
      Do not duplicate work Merb::Template.template_extensions does in Templates bootloader.
      Make exception message when Merb cannot find template explain what it was
      Fixed 2 problems with multipart form upload after application is deployed to Tomcat via warble: (1) The @body object in this environment is an IO object, not a StringIO, so doesn't have a size method, and (2) 'tempfile' needs to be explicitly required.
      made only and except uglier and faster
      Preserve order parse query, respect query string override in test request
      Added partial counter and yielding for collections
      Remove occasionly committed *.rbc files.
      Ignore *.rbc created by Rubinius compiler.
      Remove occasionly committed *.rbc files.
      Ignore *.rbc created by Rubinius compiler.
    ivey committed Jun 3, 2008
  4. Fix README for merb-gen app foo

    ivey committed Jun 3, 2008
Commits on Jun 2, 2008