Changeset 855

Show
Ignore:
Timestamp:
11/05/07 22:46:02 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

fix bug in use_orm, and update dependencies.rb template

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/config/dependencies.rb

    r853 r855  
    1111 
    1212### Uncomment for DataMapper ORM 
    13 # use_orm "merb_data_mapper" 
     13# use_orm :data_mapper 
    1414 
    1515### Uncomment for ActiveRecord ORM 
    16 # use_orm "merb_active_record" 
     16# use_orm :active_record 
    1717 
    1818### Uncomment for Sequel ORM 
    19 # use_orm "merb_sequel" 
     19# use_orm :sequel 
    2020 
    2121 

  • trunk/lib/merb/core_ext/kernel.rb

    r853 r855  
    3737   
    3838  def use_orm(orm) 
    39     orm = orm.to_s 
    40     orm = "merb_#{orm}" unless orm.match(/^merb_/) 
     39    orm = orm.to_sym 
     40    orm_plugin = orm.to_s.match(/^merb_/) ? orm.to_s : "merb_#{orm}"  
    4141    Merb::GENERATOR_SCOPE.delete(:merb_default) 
    42     Merb::GENERATOR_SCOPE.unshift(orm.to_sym) unless 
    43       Merb::GENERATOR_SCOPE.include?(orm.to_sym) 
    44     Kernel.dependency(orm) 
     42    Merb::GENERATOR_SCOPE.unshift(orm) unless 
     43      Merb::GENERATOR_SCOPE.include?(orm) 
     44    Kernel.dependency(orm_plugin) 
    4545  end 
    4646   

  • trunk/spec/merb/plugins_spec.rb

    r853 r855  
    1515  end 
    1616 
    17   it "should have :merb_active_record in GENERATOR_SCOPE with use_orm(:active_record)" do 
     17  it "should have :active_record in GENERATOR_SCOPE with use_orm(:active_record)" do 
    1818    use_orm(:active_record) 
    19     Merb::GENERATOR_SCOPE.should include(:merb_active_record) 
     19    Merb::GENERATOR_SCOPE.should include(:active_record) 
    2020  end 
    2121 
    22   it "should have :merb_active_record first in GENERATOR_SCOPE with use_orm(:active_record)" do 
     22  it "should have :active_record first in GENERATOR_SCOPE with use_orm(:active_record)" do 
    2323    use_orm(:active_record) 
    24     Merb::GENERATOR_SCOPE.first.should == :merb_active_record 
     24    Merb::GENERATOR_SCOPE.first.should == :active_record 
    2525  end 
    2626   
    …… 
    3434    use_orm(:active_record) 
    3535    use_orm(:active_record) 
    36     Merb::GENERATOR_SCOPE.should == [:merb_active_record, :merb, :rspec] 
     36    Merb::GENERATOR_SCOPE.should == [:active_record, :merb, :rspec] 
    3737  end 
    3838