merb_datamapper 0.9.9 → 0.9.10

data/Rakefile

@@ -20,7 +20,7 @@ GEM_EMAIL  = "jtoy@rubynow.com"
 
 GEM_NAME    = "merb_datamapper"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::VERSION rescue "0.9.9") + PKG_BUILD
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/lib/generators/data_mapper_resource_controller.rb

@@ -14,6 +14,8 @@ end
 Merb::Generators::ResourceControllerGenerator.template :controller_datamapper, :orm => :datamapper do |t|
   t.source = File.join(File.dirname(__FILE__), "templates/resource_controller.rb")
   t.destination = File.join("app/controllers", base_path, "#{file_name}.rb")
+  
+  self.add_resource_route(self.plural_model)
 end
 
 [:index, :show, :edit, :new].each do |view|

data/lib/generators/templates/model.rb

@@ -3,7 +3,7 @@ class <%= class_name %>
   include DataMapper::Resource
   
   property :id, Serial
-<% attributes.each do |name, type| -%>
+<% attributes.each do |name, type| %>
   property :<%= name -%>, <%= datamapper_type(type) -%>
 <% end %>
 

data/lib/generators/templates/resource_controller.rb

@@ -16,7 +16,7 @@ class <%= class_name %> < Application
   def new
     only_provides :html
     @<%= singular_model %> = <%= model_class_name %>.new
-    display <%= model_class_name %>
+    display @<%= singular_model %>
   end
 
   def edit(id)
@@ -27,16 +27,17 @@ class <%= class_name %> < Application
   end
 
   def create(<%= singular_model %>)
-    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+    @<%= singular_model %> = <%= model_class_name %>.new(<%= singular_model %>)
     if @<%= singular_model %>.save
       redirect resource(@<%= singular_model %>), :message => {:notice => "<%= model_class_name %> was successfully created"}
     else
+      message[:error] = "<%= model_class_name %> failed to be created"
       render :new
     end
   end
 
-  def update(<%= singular_model %>)
-    @<%= singular_model %> = <%= model_class_name %>.get(<%= singular_model %>[:id] )
+  def update(id, <%= singular_model %>)
+    @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
     if @<%= singular_model %>.update_attributes(<%= singular_model %>)
        redirect resource(@<%= singular_model %>)
@@ -49,7 +50,7 @@ class <%= class_name %> < Application
     @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
     if @<%= singular_model %>.destroy
-      redirect resource(@<%= plural_model %>)
+      redirect resource(:<%= plural_model %>)
     else
       raise InternalServerError
     end

data/lib/generators/templates/views/edit.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, edit action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/views/index.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, index action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/views/new.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, new action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/views/show.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, show action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/merb_datamapper/merbtasks.rb

@@ -9,22 +9,22 @@ namespace :db do
   end
   
   desc "Create a sample database.yml file"
-  task :database_yaml => :merb_start do
+  task :database_yaml => :merb_env do
     sample_location = File.join(File.dirname(__FILE__), "..", "merb", "orms", "data_mapper", "database.yml.sample")
     target_location = Merb.dir_for(:config)
     FileUtils.cp sample_location, target_location
   end
   desc "Perform automigration"
-  task :automigrate => :merb_start do
+  task :automigrate => :merb_env do
     ::DataMapper::AutoMigrator.auto_migrate
   end
   desc "Perform non destructive automigration"
-  task :autoupgrade => :merb_start do
+  task :autoupgrade => :merb_env do
     ::DataMapper::AutoMigrator.auto_upgrade
   end
 
   namespace :migrate do
-    task :load => :merb_start do
+    task :load => :merb_env do
       gem 'dm-migrations'
       require 'migration_runner'
       FileList["schema/migrations/*.rb"].each do |migration|
@@ -81,12 +81,12 @@ end
 
 namespace :sessions do
   desc "Perform automigration for sessions"
-  task :create => :merb_start do
+  task :create => :merb_env do
     Merb::DataMapperSessionStore.auto_migrate!
   end
 
   desc "Clears sessions"
-  task :clear => :merb_start do
+  task :clear => :merb_env do
     Merb::DataMapperSessionStore.all.destroy!
   end
 end

data/lib/merb_datamapper/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module MerbDataMapper
-    VERSION = "0.9.9"
+    VERSION = "0.9.10"
   end
 end

data/lib/merb_datamapper.rb

@@ -2,6 +2,7 @@ if defined?(Merb::Plugins)
   dependency 'dm-core'
 
   require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection"
+  require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
   Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
 
   class Merb::Orms::DataMapper::Connect < Merb::BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 +03:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: DataMapper plugin providing DataMapper support for Merb
 email: jtoy@rubynow.com
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin providing DataMapper support for Merb