merb_datamapper 0.5 → 0.9.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 YOUR NAME
+Copyright (c) 2007 Jason Toy
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_datamapper"
 NAME = "merb_datamapper"
-VERSION = "0.5"
+VERSION = "0.9.2"
 AUTHOR = "Jason Toy"
 EMAIL = "jtoy@rubynow.com"
 HOMEPAGE = "http://merbivore.com"
@@ -20,22 +20,27 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.5')
+  s.add_dependency('merb-core', '>= 0.9.2')
   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}/**/*")
 end
 
+windows = (PLATFORM =~ /win32|cygwin/) rescue nil
+
+SUDO = windows ? "" : "sudo"
+
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-task :install do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+desc "Install merb_datamapper"
+task :install => :package do
+  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
 end
 
+desc 'Release the current version on rubyforge'
 task :release => :package do
   sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
 end

data/datamapper_generators/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'merb'
+# require 'merb'
 class MigrationGenerator < RubiGen::Base
   
   default_options :author => nil

data/datamapper_generators/model/model_generator.rb

@@ -1,17 +1,38 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
+class ModelGenerator < Merb::GeneratorBase
+  attr_reader :model_attributes, :model_class_name, :model_file_name
   
-  def initialize( *args )
-    super( *args )
-    options[:skip_migration] = true
-    @model_template_name = "new_model_template.erb"
-    # @migration_generator_name = "dm_migration"
-    @model_test_generator_name = "merb_model_test"
+  def initialize(args, runtime_args = {})
+    @base =                 File.dirname(__FILE__)
+    super
+    @model_file_name =      args.shift.snake_case
+    @model_class_name =     @model_file_name.to_const_string
+    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
+    @model_file_name =      "#{@model_class_name.snake_case}"
+   
   end
   
-  def self.superclass
-    RubiGen::Base
-  end
+  def manifest
+    record do |m|
+      @m = m
     
+      @assigns = {  :model_file_name  => model_file_name, 
+                    :model_attributes => model_attributes,
+                    :model_class_name => model_class_name
+                  }
+      copy_dirs
+      copy_files
+      
+      m.dependency "merb_model_test", [model_file_name], @assigns
+    end
+  end
+  
+  protected
+  def banner
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a Datamapper Model stub..
+
+      USAGE: #{spec.name}"
+    EOS
+  end
+      
 end

data/datamapper_generators/model/templates/app/models/%model_file_name%.rb

@@ -0,0 +1,5 @@
+class <%= model_class_name %> < DataMapper::Base
+<% model_attributes.each do |attr| -%>
+  <%= "property :#{attr.first}, :#{attr.last}" %>
+<% end -%>
+end

data/datamapper_generators/resource_controller/resource_controller_generator.rb

@@ -1,28 +1,74 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
-
+class ResourceControllerGenerator < Merb::GeneratorBase
+  
+  attr_reader :controller_class_name, 
+              :controller_file_name, 
+              :controller_base_path,
+              :controller_modules,
+              :model_class_name,
+              :full_controller_const,
+              :singular_model,
+              :plural_model
+  
+  def initialize(args, runtime_args = {})
+    @base =             File.dirname(__FILE__)
+    
+    super
+    name = args.shift
+    nfp = name.snake_case.gsub("::", "/")
+    nfp = nfp.split("/")
+    @model_class_name = nfp.pop.singularize.to_const_string
+    @model_class_name = runtime_args[:model_class_name] if runtime_args[:model_class_name]
+    @singular_model         = @model_class_name.snake_case
+    @plural_model           = @singular_model.pluralize
+    
+    nfp << @plural_model
+    
+    @controller_file_name = nfp.join("/")
+    
+    # Need to setup the directories
+    unless @controller_file_name == File.basename(@controller_file_name)
+      @controller_base_path   = controller_file_name.split("/")[0..-2].join("/") 
+    end
+    
+    @controller_modules     = @controller_file_name.to_const_string.split("::")[0..-2]
+    @controller_class_name  = @controller_file_name.to_const_string.split("::").last
 
-  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]
-    runtime_options[:test_stub_generator] = "merb_controller_test"
-    super( [name], runtime_options )
+    @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::")
   end
-
-  def self.superclass
-    RubiGen::Base
+  
+  def manifest
+    record do |m|
+      @m = m
+      
+      # Create the controller directory
+      m.directory File.join("app/controllers", controller_base_path) if controller_base_path
+      
+      # Create the helpers directory
+      m.directory File.join("app/helpers", controller_base_path) if controller_base_path
+      
+      @assigns =  {
+                    :controller_modules         => controller_modules,
+                    :controller_class_name      => controller_class_name,
+                    :controller_file_name       => controller_file_name,
+                    :controller_base_path       => controller_base_path,
+                    :full_controller_const      => full_controller_const,
+                    :model_class_name           => model_class_name,
+                    :singular_model             => singular_model,
+                    :plural_model               => plural_model
+                  }      
+      copy_dirs
+      copy_files
+      
+      m.dependency "merb_resource_controller_test", [@controller_class_name], @assigns
+    end
   end
   
   protected
   def banner
-        <<-EOS
-  Creates a Merb controller, views and specs using Datamapper Models
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a basic Merb resource controller.
 
-  USAGE: #{$0} #{spec.name} resource_name"
-  EOS
+      USAGE: #{spec.name} my_resource
+    EOS
   end
-  
 end

data/datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb

@@ -0,0 +1,68 @@
+<% counter = 0 -%>
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>class <%= controller_class_name %> < Application
+<%= "  " * counter %>  # provides :xml, :yaml, :js
+
+<%= "  " * counter %>  def index
+<%= "  " * counter %>    @<%= plural_model %> = <%= model_class_name %>.all
+<%= "  " * counter %>    display @<%= plural_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def show
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    display @<%= singular_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def new
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def edit
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def create
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+<%= "  " * counter %>    if @<%= singular_model %>.save
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      render :new
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def update
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>])
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def destroy
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.destroy!
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>

data/datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb

@@ -0,0 +1,16 @@
+<% counter = 1 -%>
+module Merb
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>module <%= controller_class_name %>Helper
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>
+end

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, edit action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, new action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, show action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>

data/lib/merb/orms/data_mapper/base.rb

@@ -0,0 +1,6 @@
+module Merb::Orms::DataMapper::Base
+  def to_param
+    key
+  end
+end
+DataMapper::Base.send(:include, Merb::Orms::DataMapper::Base)

data/lib/merb/orms/data_mapper/connection.rb

@@ -6,8 +6,8 @@ module Merb
     module DataMapper
       class << self
         def config_file() Merb.root / "config" / "database.yml" end
-        def sample_dest() Merb.root / "config" / "database.sample.yml" end
-        def sample_source() File.dirname(__FILE__) / "database.sample.yml" end
+        def sample_dest() Merb.root / "config" / "database.yml.sample" end
+        def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
       
         def copy_sample_config
           FileUtils.cp sample_source, sample_dest unless File.exists?(sample_dest)
@@ -19,7 +19,13 @@ module Merb
               # Convert string keys to symbols
               full_config = Erubis.load_yaml_file(config_file)
               config = (Merb::Plugins.config[:merb_datamapper] = {})
-              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each { |k, v| config[k.to_sym] = v }
+              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each do |k, v| 
+                if k == 'port'
+                  config[k.to_sym] = v.to_i
+                else
+                  config[k.to_sym] = v
+                end
+              end
               config
             end
         end
@@ -27,12 +33,12 @@ module Merb
         # Database connects as soon as the gem is loaded
         def connect
           if File.exists?(config_file)
-            puts "Connecting to database..."
+            Merb.logger.info!("Connecting to database...")
             ::DataMapper::Database.setup(config)
           else
             copy_sample_config
-            puts "No database.yml file found in #{Merb.root}/config."
-            puts "A sample file was created called database.sample.yml for you to copy and edit."
+            Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
+            Merb.logger.error! "A sample file was created called database.sample.yml for you to copy and edit."
             exit(1)
           end
         end
@@ -40,9 +46,9 @@ module Merb
         # Registering this ORM lets the user choose DataMapper as a session store
         # in merb.yml's session_store: option.
         def register_session_type
-          Merb::BootLoader.register_session_type("datamapper",
-            "merb/session/data_mapper_session",
-            "Using DataMapper database sessions")
+          Merb.register_session_type("datamapper",
+          "merb/session/data_mapper_session",
+          "Using DataMapper database sessions")
         end
       end
     end

data/lib/merb/session/data_mapper_session.rb

@@ -3,17 +3,19 @@ require 'base64'
 module Merb
   module SessionMixin
     def setup_session
-      Merb.logger.info("Setting up session")
-      before = cookies[_session_id_key]
+      before_value = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
-      @_new_cookie = cookies[_session_id_key] != before
+      @_new_cookie = cookies[_session_id_key] != before_value
     end
-  
+
     def finalize_session
-      Merb.logger.info("Finalize session")
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
-      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+      set_cookie(_session_id_key, request.session.session_id, Time.now + _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+    end
+
+    def session_store_type
+      "datamapper"
     end
   end
 
@@ -22,8 +24,9 @@ module Merb
   class DataMapperSession < DataMapper::Base
     
     set_table_name "sessions"
-    property :session_id, :text, :lazy => false, :key => true
+    property :session_id, :string, :length => 255, :lazy => false, :key => true
     property :data,       :text, :lazy => false
+    property :updated_at, :datetime
   
     attr_accessor :needs_new_cookie
   

data/lib/merb_datamapper.rb

@@ -1,11 +1,16 @@
-# make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  if Merb::BootLoader.app_loaded?
-    puts "Warning: The merb_datamapper gem must be loaded before the application"
-  else
-    require "merb/orms/data_mapper/connection"
-    Merb::Orms::DataMapper.connect
-    Merb::Orms::DataMapper.register_session_type
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection")
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "base")
+  Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
+  
+  class Merb::Orms::DataMapper::Connect < Merb::BootLoader
+
+    after BeforeAppRuns
+
+    def self.run
+      Merb::Orms::DataMapper.connect
+      Merb::Orms::DataMapper.register_session_type
+    end
+
   end
-  Merb::Plugins.add_rakefiles "merb/orms/data_mapper/tasks/databases"
 end

data/lib/{merb/orms/data_mapper/tasks/databases.rb → merb_datamapper/merbtasks.rb}

@@ -1,24 +1,30 @@
 require 'fileutils'
 
 namespace :dm do
+  
+  task :merb_start do
+    Merb.start :adapter => 'runner',
+               :environment => ENV['MERB_ENV'] || 'development'
+  end
+  
   namespace :db do
     desc "Perform automigration"
-    task :automigrate => :merb_env do
+    task :automigrate => :merb_start do
       DataMapper::Persistence.auto_migrate!
     end
   end
   
   namespace :sessions do
     desc "Creates session migration"
-    task :create => :merb_env do
+    task :create => :merb_start do
       dest = File.join(Merb.root, "schema", "migrations","001_add_sessions_table.rb")
       source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb")
       #FileUtils.cp source, dest unless File.exists?(dest)
     end
     
     desc "Clears sessions"
-    task :clear => :merb_env do
-      table_name = (Merb::Plugins.config[:datamapper][:session_table_name] || "sessions")
+    task :clear => :merb_start do
+      table_name = ((Merb::Plugins.config[:datamapper] || {})[:session_table_name] || "sessions")
       #Merb::Orms::DataMapper.connect.execute("DELETE FROM #{table_name}")
     end
   end

metadata

@@ -1,101 +1,115 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2008-01-09 00:00:00 -08:00
-summary: Merb plugin that provides DataMapper support for Merb
-require_paths: 
-- lib
-email: jtoy@rubynow.com
-homepage: http://merbivore.com
-rubyforge_project: 
-description: Merb plugin that provides DataMapper support for Merb
-autorequire: merb_datamapper
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jason Toy
+autorequire: merb_datamapper
+bindir: bin
+cert_chain: []
+
+date: 2008-03-24 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: datamapper
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+description: Merb plugin that provides DataMapper support for Merb
+email: jtoy@rubynow.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
 - lib/merb
-- lib/merb_datamapper.rb
-- lib/merbtasks.rb
 - lib/merb/orms
-- lib/merb/session
 - lib/merb/orms/data_mapper
+- lib/merb/orms/data_mapper/base.rb
 - lib/merb/orms/data_mapper/connection.rb
-- lib/merb/orms/data_mapper/database.sample.yml
-- lib/merb/orms/data_mapper/tasks
-- lib/merb/orms/data_mapper/tasks/databases.rb
+- lib/merb/orms/data_mapper/database.yml.sample
+- lib/merb/session
 - lib/merb/session/data_mapper_session.rb
+- lib/merb_datamapper
+- lib/merb_datamapper/merbtasks.rb
+- lib/merb_datamapper.rb
 - specs/merb_sequel_spec.rb
 - specs/spec_helper.rb
 - datamapper_generators/migration
-- datamapper_generators/model
-- datamapper_generators/resource_controller
 - datamapper_generators/migration/migration_generator.rb
 - datamapper_generators/migration/templates
-- datamapper_generators/migration/USAGE
 - datamapper_generators/migration/templates/new_migration.erb
+- datamapper_generators/migration/USAGE
+- datamapper_generators/model
 - datamapper_generators/model/model_generator.rb
 - datamapper_generators/model/templates
+- datamapper_generators/model/templates/app
+- datamapper_generators/model/templates/app/models
+- datamapper_generators/model/templates/app/models/%model_file_name%.rb
 - datamapper_generators/model/USAGE
-- datamapper_generators/model/templates/new_model_template.erb
+- datamapper_generators/resource_controller
 - datamapper_generators/resource_controller/resource_controller_generator.rb
 - datamapper_generators/resource_controller/templates
+- datamapper_generators/resource_controller/templates/app
+- datamapper_generators/resource_controller/templates/app/controllers
+- datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
+- datamapper_generators/resource_controller/templates/app/helpers
+- datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
+- datamapper_generators/resource_controller/templates/app/views
+- datamapper_generators/resource_controller/templates/app/views/%controller_file_name%
+- 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_controller/USAGE
-- datamapper_generators/resource_controller/templates/controller.rb
-- datamapper_generators/resource_controller/templates/edit.html.erb
-- datamapper_generators/resource_controller/templates/helper.rb
-- datamapper_generators/resource_controller/templates/index.html.erb
-- datamapper_generators/resource_controller/templates/new.html.erb
-- datamapper_generators/resource_controller/templates/show.html.erb
-test_files: []
-
+has_rdoc: true
+homepage: http://merbivore.com
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: datamapper
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.3
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Merb plugin that provides DataMapper support for Merb
+test_files: []
+

data/datamapper_generators/model/templates/new_model_template.erb

@@ -1,6 +0,0 @@
-class <%= class_name %> < DataMapper::Base
-<% table_attributes.each do |attr| -%>
-  <%= "property :#{attr.name}, :#{attr.type}" %>
-<% end -%>
-end
-

data/datamapper_generators/resource_controller/templates/controller.rb

@@ -1,58 +0,0 @@
-<% klass = class_name.singularize -%>
-<% ivar = class_name.snake_case.singularize -%>
-class <%= class_name %> < Application
-  provides :xml, :js, :yaml
-  
-  def index
-    @<%= ivar.pluralize %> = <%= klass %>.all
-    render @<%= ivar.pluralize %>
-  end
-  
-  def show(id)
-    @<%= ivar %> = <%= klass %>[id]
-    raise NotFound unless @<%= ivar %>
-    render @<%= ivar %>
-  end
-  
-  def new
-    only_provides :html
-    @<%= ivar %> = <%= klass %>.new
-    render @<%= ivar %>
-  end
-  
-  def create(<%= ivar %>)
-    @<%= ivar %> = <%= klass %>.new(<%= ivar %>)
-    if @<%= ivar %>.save
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      render :action => :new
-    end
-  end
-  
-  def edit(id)
-    only_provides :html
-    @<%= ivar %> = <%= klass %>[id]
-    raise NotFound unless @<%= ivar %>
-    render
-  end
-  
-  def update(id, <%= ivar %>)
-    @<%= ivar %> = <%= klass %>[id]
-    raise NotFound unless @<%= ivar %>
-    if @<%= ivar %>.update_attributes(<%= ivar %>)
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      raise BadRequest
-    end
-  end
-  
-  def destroy(id)
-    @<%= ivar %> = <%= klass %>[id]
-    raise NotFound unless @<%= ivar %>
-    if @<%= ivar %>.destroy!
-      redirect url(:<%= ivar.pluralize %>)
-    else
-      raise BadRequest
-    end
-  end
-end

data/datamapper_generators/resource_controller/templates/edit.html.erb

@@ -1 +0,0 @@
-Edit for <%= class_name %>

data/datamapper_generators/resource_controller/templates/helper.rb

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

data/datamapper_generators/resource_controller/templates/index.html.erb

@@ -1 +0,0 @@
-Index for <%= class_name %>

data/datamapper_generators/resource_controller/templates/new.html.erb

@@ -1 +0,0 @@
-New for <%= class_name %>

data/datamapper_generators/resource_controller/templates/show.html.erb

@@ -1 +0,0 @@
-Show for <%= class_name %>