lib/merb_autoscaffold/orms/activerecord.rb
spec/activerecord/app/controllers/application.rb
spec/activerecord/app/init.rb
spec/activerecord/app/log/merb_test.log
spec/activerecord/app/models/blog.rb
spec/activerecord/app/models/comment.rb
spec/activerecord/log/merb_test.log
spec/activerecord/merb_autoscaffold_spec.rb
spec/activerecord/spec_helper.rb
spec/datamapper/app/controllers/application.rb
spec/datamapper/app/init.rb
spec/datamapper/app/log/merb_test.log
spec/datamapper/app/models/blog.rb
spec/datamapper/app/models/comment.rb
spec/datamapper/merb_autoscaffold_spec.rb
spec/datamapper/spec_helper.rb
@@ -1,3 +1,7 @@
+0.2.0
+ - Controller and View tests
+ - Support for DataMapper 0.3.0 and ActiveRecord
+
0.1.2
- Support added for habtm relationships
- New Merbivore-styled layout
CHANGELOG
@@ -2,7 +2,8 @@ merb_autoscaffold
=================
Merb AutoScaffold is a Merb plugin that provides scaffolding for free
-for all models.
+for all models. Merb AutoScaffold currently works with DataMapper 0.3
+and ActiveRecord.
==== Usage:
@@ -51,6 +52,6 @@ end
==== Caveats
-Currently, autoscaffolds only work with DataMapper 0.3 models.
+Currently, autoscaffolds only work with DataMapper 0.3 and ActiveRecord models.
Autoscaffolds also will not work with flat Merb apps.
\ No newline at end of file
README
@@ -58,7 +58,7 @@ module MerbAutoScaffold
else
def index
@models = Paginator.new( self.class.Model.count, 20) do |offset, per_page|
- self.class.Model.all(:limit => per_page, :offset => offset)
+ find_all( self.class.Model, :limit => per_page, :offset => offset )
end
render
end
@@ -68,7 +68,7 @@ module MerbAutoScaffold
native_actions << 'show'
else
def show
- @model = self.class.Model.first(params[:id])
+ @model = find_first( self.class.Model, params[:id] )
raise NotFound unless @model
display @model
end
@@ -89,7 +89,7 @@ module MerbAutoScaffold
else
def edit
only_provides :html
- @model = self.class.Model.first(params[:id])
+ @model = find_first( self.class.Model, params[:id] )
raise NotFound unless @model
render
end
@@ -100,7 +100,7 @@ module MerbAutoScaffold
native_actions << 'create'
else
def create
- associations = scaf_has_manys.collect { |a|
+ associations = self.class.Model.scaf_has_manys.collect { |a|
[ a, params['model'].delete( a.name ) ]
}
@@ -122,10 +122,10 @@ module MerbAutoScaffold
def update
params[:model].each { |k,v| params[:model][k] = nil if v.blank? }
- @model = self.class.Model.first(params[:id])
+ @model = find_first( self.class.Model, params[:id] )
raise NotFound unless @model
- associations = scaf_has_manys.collect { |a|
+ associations = self.class.Model.scaf_has_manys.collect { |a|
[ a, params['model'].delete( a.name ) ]
}
@@ -142,9 +142,9 @@ module MerbAutoScaffold
native_actions << 'destroy'
else
def destroy
- @model = self.class.Model.first(params[:id])
+ @model = find_first( self.class.Model, params[:id] )
raise NotFound unless @model
- if @model.destroy!
+ if delete( @model )
redirect url( "scaffold_#{self.class.Model.plural_name}" )
else
raise BadRequest
@@ -168,13 +168,44 @@ module MerbAutoScaffold
end
end
+ def find_first( klass, *params )
+ # wanted to use klass.superclass here, but the case statment seems to be checking the
+ # class of klass.superclass instead of an equality check
+ case klass.new
+ when ActiveRecord::Base then return klass.find(:first, *params)
+ when DataMapper::Base then return klass.first( *params )
+ end
+ end
+
+ def find_all( klass, *params )
+ case klass.new
+ when ActiveRecord::Base then return klass.find(:all, *params)
+ when DataMapper::Base then return klass.all( *params )
+ end
+ end
+
+ def delete( obj )
+ case obj
+ when ActiveRecord::Base then return obj.destroy
+ when DataMapper::Base then return obj.destroy!
+ end
+ end
+
+ def clear_association( object, assoc )
+ rel = object.send( assoc.name )
+ case object
+ when ActiveRecord::Base then rel.clear
+ when DataMapper::Base then rel.nullify_association
+ end
+ rel
+ end
+
def update_has_many_association( assoc, model, ids )
- rel = model.send( assoc.name )
# remove all of the associated items
- rel.nullify_association
+ rel = clear_association( model, assoc )
# add all of the objects to the relationship
- for obj in assoc.associated_table.klass.all( :id.in => ids )
+ for obj in find_all( assoc.klass, :conditions => ['id in (?)', ids] )
rel << obj
end
model.save
lib/merb_autoscaffold/controller.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), 'orms', 'datamapper' )
+%w(datamapper activerecord).each { |r| require File.join( File.dirname(__FILE__), 'orms', r ) }
module MerbAutoScaffold
class Models
@@ -16,7 +16,15 @@ module MerbAutoScaffold
def self.singular_name() self.to_s.snake_case.to_sym; end
def self.plural_name() self.to_s.snake_case.pluralize.to_sym; end
}
- model.meta_eval { include MerbAutoScaffold::ORMs::DataMapper }
+ 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
+ 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"
+ end
+
+ model.meta_eval { include extension }
@models << model
end
}
lib/merb_autoscaffold/models.rb
@@ -1,10 +1,13 @@
module MerbAutoScaffold
module ORMs
module DataMapper
- def scaf_table() database.schema[ self ]; end
def scaf_columns() scaf_table.columns; end
def scaf_assocs() scaf_table.associations; end
+ def scaf_serial_columns
+ scaf_columns.select { |c| c.options[:serial] }
+ end
+
def scaf_has_manys
scaf_assocs.select { |a|
a.is_a?(::DataMapper::Associations::HasManyAssociation) ||
@@ -25,6 +28,17 @@ module DataMapper
def scaf_foreign_keys
scaf_belongs_tos.collect(&:foreign_key_name)
end
+
+ def scaf_foreign_key_name( assoc )
+ assoc.foreign_key_name
+ end
+
+ def scaf_find_all_available_items_to_association( assoc )
+ assoc.associated_table.klass.all
+ end
+
+ private
+ def scaf_table() database.schema[ self ]; end
end
end
end
\ No newline at end of file
lib/merb_autoscaffold/orms/datamapper.rb
@@ -6,12 +6,13 @@
#
# association<DataMapper::Associations::BelongsToAssociation> - the association to display
# model<DataMapper::Base> - the model which belongs to the object being selected
+ foreign_key = model.class.scaf_foreign_key_name( association )
%>
-<select name="model[<%= association.foreign_key_name %>]">
- <% selected_value = model.send( association.foreign_key_name ) %>
+<select name="model[<%= foreign_key %>]">
+ <% selected_value = model.send( foreign_key ) %>
<option value=""></option>
- <% for obj in association.constant.all %>
+ <% for obj in find_all( association.klass ) %>
<option value="<%= obj.id %>"<%= ' selected="selected"' if obj.id == selected_value %>>
<%= obj.try(:title) || obj.try(:name) || "#{ obj.class.to_s } ##{ obj.id }" %>
</option>
lib/merb_autoscaffold/views/_belongs_to.html.erb
@@ -1,12 +1,16 @@
<dl>
<% model.class.scaf_columns.each do |column| %>
- <% next if model.class.scaf_foreign_keys.include?( column.name ) %>
+ <%
+ # Do not display a form field for a foreign key. Instead,
+ # display a select option below.
+ next if model.class.scaf_foreign_keys.include?( column.name )
+ %>
<dt><%= column.name %></dt>
<dd>
- <% if column.options[:serial] %>
+ <% if model.class.scaf_serial_columns.include?( column ) %>
<%= model.send( column.name ) || ' ' %>
<% else %>
lib/merb_autoscaffold/views/_form.html.erb
@@ -12,7 +12,7 @@
<dt><%= association.name.to_s.capitalize %></dt>
<dd>
<select name="model[<%= association.name %>][]" multiple="multiple">
- <% for obj in association.associated_table.klass.all %>
+ <% for obj in model.class.scaf_find_all_available_items_to_association( association ) %>
<option value="<%= obj.id %>"<%= ' selected="selected"' if model.send( association.name ).include?( obj ) %>>
<%= scaf_title( obj ) %>
</option>
lib/merb_autoscaffold/views/_has_many_edit.html.erb
@@ -6,7 +6,7 @@
<a href="<%= url( "scaffold_#{self.class.Model.singular_name}", @model ) %>">Cancel</a>
</h2>
- <form action="<%= url( "scaffold_#{self.class.Model.singular_name}", @model ) %>" method="POST">
+ <form action="<%= url( "scaffold_#{self.class.Model.singular_name}", @model.id ) %>" method="POST">
<input type="hidden" name="_method" value="PUT" />
<%= partial( 'form', :model => @model ) %>
<input type="submit" value="Update" />
lib/merb_autoscaffold/views/edit.html.erb
@@ -13,11 +13,11 @@
</h2>
<dl>
- <% @model.class.scaf_table.columns.each do |column| %>
+ <% @model.class.scaf_columns.each do |column| %>
<dt><%= column.name %></dt>
<dd>
<% if association = @model.class.scaf_assoc_hash[column.name] %>
- <% obj = association.constant.get( @model.send( column.name ) ) %>
+ <% obj = find_first( association.klass, @model.send( column.name ) ) %>
<%= scaf_link( obj ) unless obj.blank? %>
<% else %>
<%= @model.send( column.name ) || ' ' %>
lib/merb_autoscaffold/views/show.html.erb
spec/app/controllers/application.rb
spec/app/init.rb
spec/app/log/merb_test.log
spec/app/models/blog.rb
spec/app/models/comment.rb
spec/controllers/controller_spec.rb
spec/merb_autoscaffold_spec.rb
spec/models/models_spec.rb
spec/spec_helper.rb
spec/views/views_spec.rb
996637d92c8a863aac9c0dd80e021bc273b12ce6
Aaron Wheeler
aaronwheeler@aaron-wheelers-macbook-pro-15.local
http://github.com/fightinjoe/merb-autoscaffold/commit/e404861f3ef619b5d810678e0ef12e74cf2f221c
e404861f3ef619b5d810678e0ef12e74cf2f221c
2008-05-21T06:30:22-07:00
2008-05-21T06:02:36-07:00
Added support for ActiveRecord
eb456b63d85a746f964d75850cfbf5c6ad5da72e
Aaron Wheeler
aaronwheeler@aaron-wheelers-macbook-pro-15.local