@@ -19,6 +19,11 @@ module MerbAutoScaffold extension = case model.new # wanted to use klass.superclass here, but the case statment seems to be checking the # class of klass.superclass instead of an equality check + # + # note: once the internals of Merb stabalize, use Merb's tracking of ORMs + # to perform this test. + # 0.9.3 - Merb.generator_scope.include?(:datamapper) + # 0.9.4 - Merb.orm_generator_scope == :datamapper when ActiveRecord::Base then MerbAutoScaffold::ORMs::ActiveRecord when DataMapper::Base then MerbAutoScaffold::ORMs::DataMapper else raise "Merb AutoScaffold does not currently support the #{ model.class.superclass } ORM" @@ -31,4 +36,9 @@ module MerbAutoScaffold @models end end -end \ No newline at end of file +end + +# These empty class definitions are necessary in order for the above where-clause to not fail when +# one of the ORMs is not present. +module ActiveRecord; class Base; end; end +module DataMapper; class Base; end; end \ No newline at end of file lib/merb_autoscaffold/models.rb e404861f3ef619b5d810678e0ef12e74cf2f221c Aaron Wheeler oldaaronwheeler@aaron-wheelers-macbook-pro-15.local http://github.com/fightinjoe/merb-autoscaffold/commit/f1d82cedbfac327875dbc59d8b9c45740d30d525 f1d82cedbfac327875dbc59d8b9c45740d30d525 2008-06-26T05:11:55-07:00 2008-06-26T05:11:55-07:00 Fixed requirement for both ActiveRecord and DataMapper to be present to use DataMapper as the ORM f63fa1bba795d15d0f80dc64ac2402b64c99e768 Aaron Wheeler oldaaronwheeler@aaron-wheelers-macbook-pro-15.local