merb_datamapper 0.9.3 → 0.9.4

data/Manifest.txt

@@ -4,23 +4,17 @@ Manifest.txt
 README.txt
 Rakefile
 TODO
-datamapper_generators/migration/USAGE
-datamapper_generators/migration/migration_generator.rb
-datamapper_generators/migration/templates/new_migration.erb
-datamapper_generators/model/USAGE
-datamapper_generators/model/model_generator.rb
-datamapper_generators/model/templates/app/models/%model_file_name%.rb
-datamapper_generators/resource_controller/USAGE
-datamapper_generators/resource_controller/resource_controller_generator.rb
-datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
-datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
-datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
-datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
-datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
-datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
-datamapper_generators/resource_migration/USAGE
-datamapper_generators/resource_migration/resource_migration_generator.rb
-datamapper_generators/resource_migration/templates/class_migration.erb
+lib/generators/data_mapper_migration.rb
+lib/generators/data_mapper_model.rb
+lib/generators/data_mapper_resource_controller.rb
+lib/generators/templates/migration.rb
+lib/generators/templates/model.rb
+lib/generators/templates/model_migration.rb
+lib/generators/templates/resource_controller.rb
+lib/generators/templates/views/edit.html.erb
+lib/generators/templates/views/index.html.erb
+lib/generators/templates/views/new.html.erb
+lib/generators/templates/views/show.html.erb
 lib/merb/orms/data_mapper/connection.rb
 lib/merb/orms/data_mapper/database.yml.sample
 lib/merb/orms/data_mapper/resource.rb
@@ -29,5 +23,9 @@ lib/merb_datamapper.rb
 lib/merb_datamapper/merbtasks.rb
 lib/merb_datamapper/version.rb
 spec/connection_spec.rb
+spec/generators/data_mapper_migration_spec.rb
+spec/generators/data_mapper_model_spec.rb
+spec/generators/data_mapper_resource_controller_spec.rb
+spec/generators/spec_helper.rb
 spec/spec.opts
 spec/spec_helper.rb

data/Rakefile

@@ -10,11 +10,11 @@ AUTHOR = "Jason Toy"
 EMAIL  = "jtoy@rubynow.com"
 GEM_NAME = "merb_datamapper"
 GEM_VERSION = DataMapper::MerbDataMapper::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-migrations", GEM_VERSION], ["merb-core", ">=0.9.3"]]
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-migrations", GEM_VERSION], ["merb-core", ">=0.9.4"], ['templater', ">=0.1.5"]]
 GEM_CLEAN = ["log", "pkg", "coverage"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 
-PROJECT_NAME = "datamapper"
+PROJECT_NAME = "merb"
 PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/merb_datamapper"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin providing DataMapper support for Merb"
 

data/TODO

@@ -1,10 +1,10 @@
 TODO
 ====
 
-* Add proper migration support as soon as its released
 * Fix session support
-* Finish rake tasks
-
+* Add in model migration generation
+* Tidy up Resource Controller generator
+* Add property interpolation for views
 ---
 TODO tickets may also be found in the DataMapper Issue Tracker:
 http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/lib/generators/data_mapper_migration.rb

@@ -0,0 +1,4 @@
+Merb::Generators::MigrationGenerator.template :migration_datamapper, :orm => :datamapper do
+  source(File.dirname(__FILE__), 'templates/migration.rb')
+  destination("#{destination_directory}/#{file_name}.rb")
+end

data/lib/generators/data_mapper_model.rb

@@ -0,0 +1,15 @@
+Merb::Generators::ModelGenerator.option :migration, :as => :boolean, :desc => 'Also generate a dm-migration for the model'
+
+class Merb::Generators::ModelGenerator
+  ##
+  # Corrects case of common datamapper arguments.
+  def datamapper_type(type)
+    return 'DateTime' if type == 'datetime'
+    return type.camel_case
+  end
+end
+
+Merb::Generators::ModelGenerator.template :model_datamapper, :orm => :datamapper do
+  source(File.dirname(__FILE__), "templates", "model.rb")
+  destination("app/models", base_path, "#{file_name}.rb")
+end

data/lib/generators/data_mapper_resource_controller.rb

@@ -0,0 +1,25 @@
+class Merb::Generators::ResourceControllerGenerator
+  # TODO: fix this for Datamapper, so that it returns the primary keys for the model
+  def params_for_get
+    "params[:id]"
+  end
+
+  # TODO: implement this for Datamapper so that we get the model properties
+  def properties
+    []
+  end
+end
+
+
+Merb::Generators::ResourceControllerGenerator.template :controller_datamapper, :orm => :datamapper do
+  source(File.dirname(__FILE__), "templates/resource_controller.rb")
+  destination("app/controllers", base_path, "#{file_name}.rb")
+end
+
+[:index, :show, :edit, :new].each do |view|
+  Merb::Generators::ResourceControllerGenerator.template "view_#{view}_datamapper".to_sym,
+      :orm => :datamapper, :template_engine => :erb do
+    source(File.dirname(__FILE__), "templates/views/#{view}.html.erb")
+    destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+  end
+end

data/lib/generators/templates/migration.rb

@@ -0,0 +1,7 @@
+migration <%= current_migration_nr + 1 %>, :<%= migration_name %>  do
+  up do
+  end
+
+  down do
+  end
+end

data/lib/generators/templates/model.rb

@@ -0,0 +1,9 @@
+<% with_modules(modules) do -%>
+class <%= class_name %>
+  include DataMapper::Resource
+<% attributes.each do |name, type| %>
+  property :<%= name -%>, <%= datamapper_type(type) -%>
+<% end %>
+
+end
+<% end -%>

data/lib/generators/templates/model_migration.rb

@@ -0,0 +1,15 @@
+migration <%= current_migration_nr + 1 %>, :<%= migration_name %>  do
+  up do
+<% unless properties.empty? -%>
+    create_table :<%= table_name %> do
+  <% properties.each do |p| -%>
+    column :<%= p.name -%>, <%= p.type %>
+  <% end -%>
+  end
+<% end -%>
+  end
+
+  down do
+    drop_table :<%= table_name %>
+  end
+end

data/lib/generators/templates/resource_controller.rb

@@ -0,0 +1,59 @@
+<% with_modules(modules) do -%>
+class <%= class_name %> < Application
+  # provides :xml, :yaml, :js
+
+  def index
+    @<%= plural_model %> = <%= model_class_name %>.all
+    display @<%= plural_model %>
+  end
+
+  def show
+    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+    raise NotFound unless @<%= singular_model %>
+    display @<%= singular_model %>
+  end
+
+  def new
+    only_provides :html
+    @<%= singular_model %> = <%= model_class_name %>.new
+    render
+  end
+
+  def edit
+    only_provides :html
+    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+    raise NotFound unless @<%= singular_model %>
+    render
+  end
+
+  def create
+    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+    if @<%= singular_model %>.save
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+    else
+      render :new
+    end
+  end
+
+  def update
+    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+    raise NotFound unless @<%= singular_model %>
+    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>]) || !@<%= singular_model %>.dirty?
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+    else
+      raise BadRequest
+    end
+  end
+
+  def destroy
+    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+    raise NotFound unless @<%= singular_model %>
+    if @<%= singular_model %>.destroy
+      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>)
+    else
+      raise BadRequest
+    end
+  end
+
+end # <%= class_name %>
+<% end -%>

data/{datamapper_generators/resource_controller/templates/app/views/%controller_file_name% → lib/generators/templates/views}/edit.html.erb

@@ -1,14 +1,13 @@
-<h1><%= full_controller_const %> controller, edit action</h1>
+<h1><%= class_name %> controller, edit action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
 
 <%%= error_messages_for :<%= singular_model %> %>
 
 <%% form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
 <% for property in properties.select{|p| !p.key?} -%>
   <p>
-    <b><%= Extlib::Inflection.humanize(property.field) %></b><br />
-    <%%= <%= field_from_type(property.type) %> :<%= property.getter %> %>
+    <%%= text_control :<%= property.getter %>, :label => "<%= Extlib::Inflection.humanize(property.field) %>"  %>
   </p>
 
 <% end -%>

data/{datamapper_generators/resource_controller/templates/app/views/%controller_file_name% → lib/generators/templates/views}/index.html.erb

@@ -1,6 +1,6 @@
-<h1><%= full_controller_const %> controller, index action</h1>
+<h1><%= class_name %> controller, index action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
 
 <table>
   <tr>

data/{datamapper_generators/resource_controller/templates/app/views/%controller_file_name% → lib/generators/templates/views}/new.html.erb

@@ -1,14 +1,13 @@
-<h1><%= full_controller_const %> controller, new action</h1>
+<h1><%= class_name %> controller, new action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
 
 <%%= error_messages_for :<%= singular_model %> %>
 
 <%% form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do |f| %>
 <% for property in properties.select{|p| !p.key?} -%>
   <p>
-    <b><%= Extlib::Inflection.humanize(property.field) %></b><br />
-    <%%= <%= field_from_type(property.type) %> :<%= property.getter %> %>
+    <%%= text_control :<%= property.getter %>, :label => "<%= Extlib::Inflection.humanize(property.field) %>"  %>
   </p>
 
 <% end -%>

data/{datamapper_generators/resource_controller/templates/app/views/%controller_file_name% → lib/generators/templates/views}/show.html.erb

@@ -1,6 +1,6 @@
-<h1><%= full_controller_const %> controller, show action</h1>
+<h1><%= class_name %> controller, show action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
 
 <% for property in properties -%>
 <p>

data/lib/merb/session/data_mapper_session.rb

@@ -1,5 +1,5 @@
 begin
-  gem 'dm-core', '=0.9.3'
+  gem 'dm-core', '=0.9.4'
   require 'dm-core'
 rescue LoadError => e
   require 'data_mapper'

data/lib/merb_datamapper.rb

@@ -17,4 +17,8 @@ if defined?(Merb::Plugins)
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "resource")
 
   Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
+
+  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_model')
+  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_resource_controller')
+  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_migration')
 end

data/lib/merb_datamapper/merbtasks.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'merb/orms/data_mapper/connection'
 
 namespace :dm do
 
@@ -43,6 +44,36 @@ namespace :dm do
         migrate_down!(version)
       end
     end
+
+    desc "Migrate the database to the latest version"
+    task :migrate => 'dm:db:migrate:up'
+
+    desc "Create the database (postgres only)"
+    task :create do
+      config = Merb::Orms::DataMapper.config
+      puts "Creating database '#{config[:database]}'"
+      case config[:adapter]
+      when 'postgres'
+        `createdb -U #{config[:username]} #{config[:database]}`
+      else
+        raise "Adapter #{config[:adapter]} not supported yet."
+      end
+    end
+
+    desc "Drop the database (postgres only)"
+    task :drop do
+      config = Merb::Orms::DataMapper.config
+      puts "Droping database '#{config[:database]}'"
+      case config[:adapter]
+      when 'postgres'
+        `dropdb -U #{config[:username]} #{config[:database]}`
+      else
+        raise "Adapter #{config[:adapter]} not supported yet."
+      end
+    end
+
+    desc "Drop the database, and migrate from scratch"
+    task :reset => [:drop, :create, :migrate]
   end
 
   namespace :sessions do

data/lib/merb_datamapper/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module MerbDataMapper
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
-end
+end

data/spec/generators/data_mapper_migration_spec.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+# many specs copied from merb-gen master branch
+describe "Merb::Generators::MigrationGenerator for DataMapper" do
+  it "should complain if no name is specified" do
+    lambda {
+      @generator = Merb::Generators::MigrationGenerator.new('/tmp', {:orm => :datamapper})
+    }.should raise_error(::Templater::TooFewArgumentsError)
+  end
+
+
+  describe "with no options" do
+    before(:each) do
+      @base_dir = "/tmp/migrations"
+      FileUtils.mkdir_p @base_dir
+      @generator = Merb::Generators::MigrationGenerator.new(@base_dir, {:orm => :datamapper}, 'SomeMoreStuff')
+    end
+
+    after(:each) do
+      FileUtils.rm_r @base_dir
+    end
+
+    it "should render successfully" do
+      lambda { @generator.render! }.should_not raise_error
+    end
+
+    it "creates the file correctly" do
+      @generator.should create('/tmp/migrations/schema/migrations/001_some_more_stuff_migration.rb')
+    end
+
+  end
+end

data/spec/generators/data_mapper_model_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+describe "Merb::Generators::ModelGenerator for DataMapper" do
+  it "complains if no name is specified" do
+    lambda {
+      @generator = Merb::Generators::ModelGenerator.new('/tmp', {:orm => :datamapper})
+    }.should raise_error(::Templater::TooFewArgumentsError)
+  end
+
+
+  before do
+    @generator = Merb::Generators::ModelGenerator.new('/tmp',{:orm => :datamapper}, 'Stuff')
+  end
+
+  it_should_behave_like "namespaced generator"
+
+  it "should create a model" do
+    @generator.should create('/tmp/app/models/stuff.rb')
+  end
+
+  it "should render successfully" do
+    lambda { @generator.render! }.should_not raise_error
+  end
+
+  it "generates a resource" do
+    model_file = @generator.render!.detect { |file| file =~ /class/ }
+    model_file.should match(/include DataMapper::Resource/)
+  end
+  it "generates a resource with appropriate properties" do
+    @generator = Merb::Generators::ModelGenerator.new('/tmp',{:orm => :datamapper}, 'Stuff', 'id' => 'serial')
+    model_file = @generator.template(:model_datamapper).render
+    model_file.should match(/property :id, Serial/)
+  end
+  it "generates a resource with DateTime properties in the correct case when called with the common argument of datetime" do
+    @generator = Merb::Generators::ModelGenerator.new('/tmp',{:orm => :datamapper}, 'Stuff', 'created_at' => 'datetime')
+    model_file = @generator.template(:model_datamapper).render
+    model_file.should match(/property :created_at, DateTime/)
+  end
+end

data/spec/generators/data_mapper_resource_controller_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+describe "Merb::Generators::ResourceControllerGenerator for DataMapper" do
+  it "complains if no name is specified" do
+    lambda {
+      @generator = Merb::Generators::ResourceControllerGenerator.new('/tmp', {:orm => :datamapper })
+    }.should raise_error(::Templater::TooFewArgumentsError)
+  end
+
+
+  before do
+    @generator = Merb::Generators::ResourceControllerGenerator.new('/tmp', { :orm => :datamapper }, 'Stuff')
+  end
+
+  it_should_behave_like "namespaced generator"
+
+  it "should create a model" do
+    @generator.should create('/tmp/app/controllers/stuff.rb')
+  end
+
+  it "should render successfully" do
+    lambda { @generator.render! }.should_not raise_error
+  end
+
+end