Skip to content
Commits on Feb 24, 2008
  1. @wayneeseguin

    Small bugfix for route_matchers.

    wayneeseguin committed Feb 23, 2008
    Thanks Ben!
  2. @wayneeseguin

    Applied 3 patches from #52 for merb_rspec.

    wayneeseguin committed Feb 23, 2008
    Thanks Ben Burkert!
Commits on Feb 23, 2008
  1. @wayneeseguin

    Applying patches from tickets #50 & #51.

    wayneeseguin committed Feb 23, 2008
    Thanks Ben Burkert.
Commits on Feb 19, 2008
  1. @benburkert

    rakefile update and before_app_loads callback

    benburkert committed with Ezra Zygmuntowicz Feb 19, 2008
    Updated the rake tasks for the database plugins to use
    Merb.start.  Wrapped the database connection calls in
    a before_app_loads callback.
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
  2. @hassox
  3. @hassox
Commits on Feb 18, 2008
  1. @knzconnor

    another tweak to merbtasks for merb_datamapper

    knzconnor committed with Ezra Zygmuntowicz Feb 18, 2008
    It may not be the long term solution you want, but depending on :merb_init is good enough for these tasks (works on blerb).
    
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
  2. @knzconnor

    fixing merbtask rakefile issue in merb_datamapper

    knzconnor committed with Ezra Zygmuntowicz Feb 17, 2008
    Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
Commits on Feb 17, 2008
  1. @benburkert @ivey

    moving plugin rakefiles into a plugin name parent folder

    benburkert committed with ivey Feb 14, 2008
    including the merbtasks.rb plugin file in the root of a plugin caused the files to
    clash when attempting require them in the Rakefile.  For example, both merb_test_unit
    and merb_rspec called:
    
    Merb::Plugins.add_rakefiles "merbtasks"
    
    causing only the last plugin loaded to have it's rakefile included when:
    
    Merb::Plugins.rakefiles.each {|r| require r }
    
    is executed in the Rakefile.  The add_rakefile command is now:
    
    Merb::Plugins.add_rakefiles "merb_rspec" / "merbtasks"
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
  2. @ivey

    helpers has no tasks

    ivey committed Feb 17, 2008
  3. @benburkert @ivey

    documentation and example specs for ControllerMatchers

    benburkert committed with ivey Feb 16, 2008
    Added documentation for the ControllerMatchers, as well as
    some example specs that use the dispatch_to and get helpers
    to verify the ControllerMatchers functionality.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
  4. @ivey

    merb_rspec should depend on merb-test, not merb-more

    Wayne Larsen committed with ivey Feb 16, 2008
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
  5. @ivey
  6. @benburkert @ivey

    rearranging the merbtasks files in all plugins

    benburkert committed with ivey Feb 16, 2008
    Moved all merbtasks.rb files under a plugin-named parent
    folder.  This should prevent possible conflicts between
    loading the plugins rake tasks.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
Commits on Feb 16, 2008
  1. @benburkert @ivey

    Fixed bugs in the failure messages of the ControllerMatchers

    benburkert committed with ivey Feb 15, 2008
    The ControllerMatchers in merb_rspec had faulty negative and
    positive failure messages.  They were fixed along with specs
    to ensure their correctness.  Also, the controller and action
    are included in the failure message if the target is a controller.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
Commits on Feb 15, 2008
  1. @technicalpickles
  2. @technicalpickles
Commits on Feb 14, 2008
  1. @ivey
  2. @ivey
  3. @tdreyno
  4. @tdreyno

    Normalize calls to Merb.start

    tdreyno committed Feb 14, 2008
  5. @abhay
  6. @abhay
Commits on Feb 13, 2008
  1. @benburkert
  2. @benburkert
  3. @ivey

    options_for_select and options_from_collection_for_select no longer r…

    ivey committed Feb 13, 2008
    …ely on returning()
    
    Thanks Robert Evans
  4. @benburkert
  5. @benburkert
  6. @benburkert
  7. @benburkert
  8. @benburkert
  9. @benburkert
  10. @nmeans @ivey

    Fixes NoMethodError: undefined method `gmtime' for 1209600:Fixnum" en…

    nmeans committed with ivey Feb 12, 2008
    …countered when using datamapper session store.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
  11. @nmeans @ivey

    Fixes MySQL session table creation error

    nmeans committed with ivey Feb 12, 2008
    This removes the :serial => true property on the 'sessions'
    table definition, removing the AUTOINCREMENT segment
    of the raw SQL.  Table generation is now functional.
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
  12. @greenpart @ivey

    - added :id attribute generation for radio_group_control and text_are…

    greenpart committed with ivey Feb 13, 2008
    …a_control - labels now can be on any side of field (ruled by :label => {:align => :right}) - right-aligned labels for radios and checkboxes by default
    
    Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com>
Something went wrong with that request. Please try again.