merb_datamapper 0.4.2 → 0.4.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_datamapper"
 NAME = "merb_datamapper"
-VERSION = "0.4.2"
+VERSION = "0.4.3"
 AUTHOR = "Jason Toy"
 EMAIL = "jtoy@rubynow.com"
 HOMEPAGE = "http://merbivore.com"
@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.add_dependency('merb', '>= 0.4.0')
-  s.add_dependency('datamapper')
+  s.add_dependency('datamapper', '>= 0.2.3')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,datamapper_generators}/**/*")

data/datamapper_generators/resource_controller/resource_controller_generator.rb

@@ -4,6 +4,7 @@ class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorB
 
 
   def initialize(*args)
+    puts args.inspect
     runtime_options = args.last.is_a?(Hash) ? args.pop : {}
     name, *actions = args.flatten
     runtime_options[:actions] = %w[index show new edit]

data/datamapper_generators/resource_controller/templates/controller.rb

@@ -4,23 +4,24 @@ class <%= class_name %> < Application
   provides :xml, :js, :yaml
   
   def index
-    @<%= ivar %>s = <%= klass %>.all
-    render @<%= ivar %>s
+    @<%= ivar.pluralize %> = <%= klass %>.all
+    render @<%= ivar.pluralize %>
   end
   
   def show(id)
     @<%= ivar %> = <%= klass %>[id]
+    raise BadRequest unless @<%= ivar %>
     render @<%= ivar %>
   end
   
-  def new(<%= ivar %>)
+  def new
     only_provides :html
-    @<%= ivar %> = <%= klass %>.new(<%= ivar %>)
+    @<%= ivar %> = <%= klass %>.new
     render @<%= ivar %>
   end
   
   def create(<%= ivar %>)
-    @<%= ivar %> = <%= klass %>.new()
+    @<%= ivar %> = <%= klass %>.new(<%= ivar %>)
     if @<%= ivar %>.save
       redirect url(:<%= ivar %>, @<%= ivar %>)
     else
@@ -28,14 +29,16 @@ class <%= class_name %> < Application
     end
   end
   
-  def edit
+  def edit(id)
     only_provides :html
-    @<%= ivar %> = <%= klass %>.find(params[:id])
+    @<%= ivar %> = <%= klass %>[id]
+    raise BadRequest unless @<%= ivar %>
     render
   end
   
   def update(id, <%= ivar %>)
     @<%= ivar %> = <%= klass %>[id]
+    raise BadRequest unless @<%= ivar %>
     if @<%= ivar %>.update_attributes(<%= ivar %>)
       redirect url(:<%= ivar %>, @<%= ivar %>)
     else
@@ -45,8 +48,9 @@ class <%= class_name %> < Application
   
   def destroy(id)
     @<%= ivar %> = <%= klass %>[id]
+    raise BadRequest unless @<%= ivar %>
     if @<%= ivar %>.destroy!
-      redirect url(:<%= ivar %>s)
+      redirect url(:<%= ivar.pluralize %>)
     else
       raise BadRequest
     end

data/datamapper_generators/resource_controller/templates/helper.rb

@@ -1,5 +1,5 @@
 module Merb
-module <%= class_name %>Helper
+module <%= class_name.pluralize %>Helper
   
   end
 end

data/lib/merb/orms/data_mapper/tasks/databases.rb

@@ -2,9 +2,9 @@ require 'fileutils'
 
 namespace :dm do
   namespace :db do
-    desc "Perform migration using migrations in schema/migrations"
-    task :migrate => :merb_env do
-      #Sequel::Migrator.apply(Merb::Orms::Sequel.connect, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    desc "Perform automigration"
+    task :automigrate => :merb_env do
+      DataMapper::Base.auto_migrate!
     end
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2007-11-06 00:00:00 -06:00
+  version: 0.4.3
+date: 2007-11-08 00:00:00 -06:00
 summary: Merb plugin that provides DataMapper support for Merb
 require_paths: 
 - lib
@@ -95,7 +95,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 0.2.3
     version: