merb_datamapper 0.9.8 → 0.9.9

data/Generators

@@ -0,0 +1,4 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'lib', 'generators/')
+  Merb.add_generators dir + 'data_mapper_migration', dir + 'data_mapper_model', dir + 'data_mapper_resource_controller'
+end

data/Rakefile

@@ -1,58 +1,84 @@
 require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
-require 'pathname'
+require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-ROOT = Pathname(__FILE__).dirname.expand_path
-require ROOT + 'lib/merb_datamapper/version'
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
 
-AUTHOR = "Jason Toy"
-EMAIL  = "jtoy@rubynow.com"
-GEM_NAME = "merb_datamapper"
-GEM_VERSION = DataMapper::MerbDataMapper::VERSION
-GEM_DEPENDENCIES = [["dm-core", ">=0.9.5"], ["dm-migrations", ">=0.9.5"], ["merb-core", ">=0.9.6"], ['templater', ">=0.2.0"]]
-GEM_CLEAN = ["log", "pkg", "coverage"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 
-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"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "DataMapper plugin providing DataMapper support for Merb"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-require ROOT.parent + 'tasks/hoe'
+GEM_AUTHOR = "Jason Toy"
+GEM_EMAIL  = "jtoy@rubynow.com"
 
-task :default => [ :spec ]
+GEM_NAME    = "merb_datamapper"
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = (Merb::VERSION rescue "0.9.9") + PKG_BUILD
 
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
+RELEASE_NAME    = "REL #{GEM_VERSION}"
 
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
+GEM_DEPENDENCIES = [["dm-core", ">=0.9.5"], ["dm-migrations", ">=0.9.5"], ["merb-core", "~> #{GEM_VERSION}"]]
+
+require "extlib/tasks/release"
+
+spec = Gem::Specification.new do |s|
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["LICENSE", 'TODO']
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  GEM_DEPENDENCIES.each do |gem, version|
+    s.add_dependency gem, version
+  end
+  s.require_path = 'lib'
+  s.files = %w(LICENSE Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "Install the gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
 end
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
-
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
   end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/generators/data_mapper_model.rb

@@ -7,6 +7,11 @@ class Merb::Generators::ModelGenerator
     return 'DateTime' if type == 'datetime'
     return type.camel_case
   end
+  
+  def after_generation
+     STDOUT << message("Don't forget to define the model schema in your #{file_name.capitalize} class")
+  end
+  
 end
 
 Merb::Generators::ModelGenerator.template :model_datamapper, :orm => :datamapper do |t|

data/lib/generators/templates/migration.rb

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

data/lib/generators/templates/model.rb

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

data/lib/generators/templates/resource_controller.rb

@@ -7,8 +7,8 @@ class <%= class_name %> < Application
     display @<%= plural_model %>
   end
 
-  def show
-    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+  def show(id)
+    @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
     display @<%= singular_model %>
   end
@@ -16,42 +16,42 @@ class <%= class_name %> < Application
   def new
     only_provides :html
     @<%= singular_model %> = <%= model_class_name %>.new
-    render
+    display <%= model_class_name %>
   end
 
-  def edit
+  def edit(id)
     only_provides :html
-    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+    @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
-    render
+    display @<%= singular_model %>
   end
 
-  def create
+  def create(<%= singular_model %>)
     @<%= 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 %>)
+      redirect resource(@<%= singular_model %>), :message => {:notice => "<%= model_class_name %> was successfully created"}
     else
       render :new
     end
   end
 
-  def update
-    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+  def update(<%= singular_model %>)
+    @<%= singular_model %> = <%= model_class_name %>.get(<%= singular_model %>[:id] )
     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 %>)
+    if @<%= singular_model %>.update_attributes(<%= singular_model %>)
+       redirect resource(@<%= singular_model %>)
     else
-      raise BadRequest
+      display @<%= singular_model %>, :edit
     end
   end
 
-  def destroy
-    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
+  def destroy(id)
+    @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
     if @<%= singular_model %>.destroy
-      redirect url(:<%= (modules.collect{|m| m.downcase} << singular_model).join("_") %>)
+      redirect resource(@<%= plural_model %>)
     else
-      raise BadRequest
+      raise InternalServerError
     end
   end
 

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

@@ -1,18 +1,3 @@
 <h1><%= class_name %> controller, edit action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
-
-<%%= form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
-<% for property in properties.select{|p| !p.key?} -%>
-  <p>
-    <%%= text_field :<%= property %>, :label => "<%= Extlib::Inflection.humanize(property) %>"  %>
-  </p>
-
-<% end -%>
-  <p>
-    <%%= submit "Update" %>
-  </p>
-<%% end =%>
-
-<%%= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>) %> |
-<%%= link_to 'Back', url(:<%= plural_model %>) %>
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>

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

@@ -1,23 +1,3 @@
 <h1><%= class_name %> controller, index action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
-
-<table>
-  <tr>
-<% for property in properties.reject{|p| p.lazy?} -%>
-    <th><%= Extlib::Inflection.humanize(property.field) %></th>
-<% end -%>
-  </tr>
-
-<%% for <%= singular_model %> in @<%= plural_model %> %>
-  <tr>
-<% for property in properties.reject{|p| p.lazy?} -%>
-    <td><%%=h <%= singular_model %>.<%= property.getter %> %></td>
-<% end -%>
-    <td><%%= link_to 'Show', url(:<%= singular_model %>, <%= singular_model %>) %></td>
-    <td><%%= link_to 'Edit', url(:edit_<%= singular_model %>,  <%= singular_model %>) %></td>
-  </tr>
-<%% end %>
-</table>
-
-<%%= link_to 'New', url(:new_<%= singular_model %>) %>
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>

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

@@ -1,17 +1,3 @@
 <h1><%= class_name %> controller, new action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
-
-<%%= form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do %>
-<% for property in properties.select{|p| !p.key?} -%>
-  <p>
-    <%%= text_field :<%= property %>, :label => "<%= Extlib::Inflection.humanize(property) %>"  %>
-  </p>
-
-<% end -%>
-  <p>
-    <%%= submit "Create" %>
-  </p>
-<%% end =%>
-
-<%%= link_to 'Back', url(:<%= plural_model %>) %>
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>

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

@@ -1,14 +1,3 @@
 <h1><%= class_name %> controller, show action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
-
-<% for property in properties -%>
-<p>
-  <b><%= Extlib::Inflection.humanize(property.field) %>:</b>
-  <%%=h @<%= singular_model %>.<%= property.getter %> %>
-</p>
-
-<% end -%>
-
-<%%= link_to 'Edit',  url(:edit_<%= singular_model %>,  @<%= singular_model %>) %> |
-<%%= link_to 'Back', url(:<%= plural_model %>) %>
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>

data/lib/merb_datamapper/merbtasks.rb

@@ -1,94 +1,93 @@
 require 'fileutils'
 require 'merb/orms/data_mapper/connection'
 
-namespace :dm do
-
+namespace :db do
+  
   task :merb_start do
     Merb.start_environment :adapter => 'runner',
-                           :environment => ENV['MERB_ENV'] || 'development'
+    :environment => ENV['MERB_ENV'] || 'development'
+  end
+  
+  desc "Create a sample database.yml file"
+  task :database_yaml => :merb_start 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
+    ::DataMapper::AutoMigrator.auto_migrate
+  end
+  desc "Perform non destructive automigration"
+  task :autoupgrade => :merb_start do
+    ::DataMapper::AutoMigrator.auto_upgrade
   end
 
-  namespace :db do
-    desc "Create a sample database.yml file"
-    task :database_yaml => :merb_start 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
+  namespace :migrate do
+    task :load => :merb_start do
+      gem 'dm-migrations'
+      require 'migration_runner'
+      FileList["schema/migrations/*.rb"].each do |migration|
+        load migration
+      end
     end
-    desc "Perform automigration"
-    task :automigrate => :merb_start do
-      ::DataMapper::AutoMigrator.auto_migrate
+
+    desc "Migrate up using migrations"
+    task :up, :version, :needs => :load do |t, args|
+      version = args[:version] || ENV['VERSION']
+      migrate_up!(version)
     end
-    desc "Perform non destructive automigration"
-    task :autoupgrade => :merb_start do
-      ::DataMapper::AutoMigrator.auto_upgrade
+    desc "Migrate down using migrations"
+    task :down, :version, :needs => :load do |t, args|
+      version = args[:version] || ENV['VERSION']
+      migrate_down!(version)
     end
+  end
 
-    namespace :migrate do
-      task :load => :merb_start do
-        gem 'dm-migrations'
-        require 'migration_runner'
-        FileList["schema/migrations/*.rb"].each do |migration|
-          load migration
-        end
-      end
+  desc "Migrate the database to the latest version"
+  task :migrate => 'db:migrate:up'
 
-      desc "Migrate up using migrations"
-      task :up, :version, :needs => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
-        migrate_up!(version)
-      end
-      desc "Migrate down using migrations"
-      task :down, :version, :needs => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
-        migrate_down!(version)
-      end
+  desc "Create the database"
+  task :create do
+    config = Merb::Orms::DataMapper.config
+    puts "Creating database '#{config[:database]}'"
+    case config[:adapter]
+    when 'postgres'
+      `createdb -U #{config[:username]} #{config[:database]}`
+    when 'mysql'
+      `mysqladmin -u #{config[:username]} #{config[:password] ? "-p'#{config[:password]}'" : ''} create #{config[:database]}`
+    when 'sqlite3'
+      Rake::Task['rake:db:automigrate'].invoke
+    else
+      raise "Adapter #{config[:adapter]} not supported for creating databases yet."
     end
+  end
 
-    desc "Migrate the database to the latest version"
-    task :migrate => 'dm:db:migrate:up'
-
-    desc "Create the database"
-    task :create do
-      config = Merb::Orms::DataMapper.config
-      puts "Creating database '#{config[:database]}'"
-      case config[:adapter]
-      when 'postgres'
-        `createdb -U #{config[:username]} #{config[:database]}`
-      when 'mysql'
-        `mysqladmin -u #{config[:username]} #{config[:password] ? "-p'#{config[:password]}'" : ''} create #{config[:database]}`
-      when 'sqlite3'
-        Rake::Task['rake:dm:db:automigrate'].invoke
-      else
-        raise "Adapter #{config[:adapter]} not supported for creating databases yet."
-      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 for dropping databases yet.\ntry db:automigrate"
     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 for dropping databases yet.\ntry dm:db:automigrate"
-      end
-    end
+  desc "Drop the database, and migrate from scratch"
+  task :reset => [:drop, :create, :migrate]
+end
 
-    desc "Drop the database, and migrate from scratch"
-    task :reset => [:drop, :create, :migrate]
+namespace :sessions do
+  desc "Perform automigration for sessions"
+  task :create => :merb_start do
+    Merb::DataMapperSessionStore.auto_migrate!
   end
 
-  namespace :sessions do
-    desc "Perform automigration for sessions"
-    task :create => :merb_start do
-      Merb::DataMapperSessionStore.auto_migrate!
-    end
-
-    desc "Clears sessions"
-    task :clear => :merb_start do
-      Merb::DataMapperSessionStore.all.destroy!
-    end
+  desc "Clears sessions"
+  task :clear => :merb_start do
+    Merb::DataMapperSessionStore.all.destroy!
   end
 end
+

data/lib/merb_datamapper/version.rb

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

data/lib/merb_datamapper.rb

@@ -8,7 +8,7 @@ if defined?(Merb::Plugins)
     after BeforeAppLoads
 
     def self.run
-      Merb.logger.debug "Merb::Orms::DataMapper::Connect block."
+      Merb.logger.verbose! "Merb::Orms::DataMapper::Connect block."
 
       # check for the presence of database.yml
       if File.file?(Merb.dir_for(:config) / "database.yml")
@@ -20,16 +20,16 @@ if defined?(Merb::Plugins)
       end
 
       # if we use a datamapper session store, require it.
-      Merb.logger.debug "Checking if we need to use DataMapper sessions"
+      Merb.logger.verbose! "Checking if we need to use DataMapper sessions"
       if Merb::Config.session_stores.include?(:datamapper)
-        Merb.logger.debug "Using DataMapper sessions"
+        Merb.logger.verbose! "Using DataMapper sessions"
         require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
       end
 
       # take advantage of the fact #id returns the key of the model, unless #id is a property
       Merb::Router.root_behavior = Merb::Router.root_behavior.identify(DataMapper::Resource => :id)
 
-      Merb.logger.debug "Merb::Orms::DataMapper::Connect complete"
+      Merb.logger.verbose! "Merb::Orms::DataMapper::Connect complete"
     end
   end
 
@@ -37,7 +37,7 @@ if defined?(Merb::Plugins)
     after LoadClasses
 
     def self.run
-      Merb.logger.debug 'Merb::Orms::DataMapper::Associations block.'
+      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations block'
 
       # make sure all relationships are initialized after loading
       descendants = DataMapper::Resource.descendants.dup
@@ -48,7 +48,7 @@ if defined?(Merb::Plugins)
         model.relationships.each_value { |r| r.child_key }
       end
 
-      Merb.logger.debug 'Merb::Orms::DataMapper::Associations complete'
+      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations complete'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 +03:00
+date: 2008-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,79 +38,54 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: templater
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 0.9.9
     version: 
 description: DataMapper plugin providing DataMapper support for Merb
-email: 
-- jtoy@rubynow.com
+email: jtoy@rubynow.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
 - LICENSE
 - TODO
 files: 
-- History.txt
 - LICENSE
-- Manifest.txt
-- README.txt
 - Rakefile
 - TODO
+- Generators
+- lib/generators
 - lib/generators/data_mapper_migration.rb
 - lib/generators/data_mapper_model.rb
 - lib/generators/data_mapper_resource_controller.rb
+- lib/generators/templates
 - 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
 - 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
+- lib/merb/orms
+- lib/merb/orms/data_mapper
 - lib/merb/orms/data_mapper/connection.rb
 - lib/merb/orms/data_mapper/database.yml.sample
+- lib/merb/session
 - lib/merb/session/data_mapper_session.rb
-- lib/merb_datamapper.rb
+- lib/merb_datamapper
 - lib/merb_datamapper/merbtasks.rb
 - lib/merb_datamapper/version.rb
-- spec/connection_spec.rb
-- spec/session_store_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
+- lib/merb_datamapper.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/merb_datamapper
+homepage: http://merbivore.com
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/History.txt

@@ -1 +0,0 @@
-

data/Manifest.txt

@@ -1,31 +0,0 @@
-History.txt
-LICENSE
-Manifest.txt
-README.txt
-Rakefile
-TODO
-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/session/data_mapper_session.rb
-lib/merb_datamapper.rb
-lib/merb_datamapper/merbtasks.rb
-lib/merb_datamapper/version.rb
-spec/connection_spec.rb
-spec/session_store_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/README.txt

@@ -1,13 +0,0 @@
-= merb_datamapper
-
-A plugin for the Merb framework that provides DataMapper access
-
-To use sessions:
-
-1. set the session store to datamapper in init.rb:
-    Merb::Config.use { |c|
-      c[:session_store] = 'datamapper'
-    }
-
-2. add the dependency in init.rb:
-    use_orm :datamapper

data/spec/connection_spec.rb

@@ -1,67 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'merb', 'orms', 'data_mapper', 'connection')
-
-describe 'Merb datamapper' do
-  it "should read the configuration file" do
-
-  end
-
-  it 'should return an option hash with symbol keys' do
-    Merb.should_receive(:environment).once.and_return('development')
-
-    config = {
-      'development' => {
-        'adapter'      => 'myadapter',
-        'more_stuff'   => 'more_stuff',
-        'repositories' => {
-          'repo1' => {
-            'adapter' => 'mysql',
-          },
-        },
-      },
-    }
-
-    Merb::Orms::DataMapper.should_receive(:full_config).once.and_return(config)
-    Merb::Orms::DataMapper.config.should have_key(:adapter)
-    Merb::Orms::DataMapper.config[:adapter].should == 'myadapter'
-    Merb::Orms::DataMapper.config.should have_key(:repositories)
-    Merb::Orms::DataMapper.config[:repositories].should have_key(:repo1)
-    Merb::Orms::DataMapper.config[:repositories][:repo1].should have_key(:adapter)
-    Merb::Orms::DataMapper.config[:repositories][:repo1][:adapter].should == 'mysql'
-  end
-
-  it "should create a default repository" do
-    config = {
-      :adapter => 'mysql',
-      :database => 'mydb'
-    }
-
-    Merb::Orms::DataMapper.should_receive(:config).and_return(config)
-    DataMapper.should_receive(:setup).with(:default, config)
-
-    Merb::Orms::DataMapper.setup_connections
-  end
-
-  it "should create additional repositories" do
-    conf_mysql = {
-      :adapter => "mysql",
-      :database => "db"
-    }
-    conf_postgres = {
-      :adapter => "postgres",
-      :database => "dbp"
-    }
-    config = {
-      :repositories => {
-        :repo1 => conf_mysql,
-        :repo2 => conf_postgres
-      }
-    }
-
-    Merb::Orms::DataMapper.should_receive(:config).and_return(config)
-    DataMapper.should_receive(:setup).with(:repo1, conf_mysql)
-    DataMapper.should_receive(:setup).with(:repo2, conf_postgres)
-
-    Merb::Orms::DataMapper.setup_connections
-  end
-end

data/spec/generators/data_mapper_migration_spec.rb

@@ -1,31 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

data/spec/generators/spec_helper.rb

@@ -1,280 +0,0 @@
-# require our other spec helpers
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-
-# require merb-gen and the spec helpers
-require 'merb-gen'
-require 'templater/spec/helpers'
-
-
-# require the generators
-require 'generators/data_mapper_migration'
-require 'generators/data_mapper_model'
-require 'generators/data_mapper_resource_controller'
-
-# include the helpers
-Spec::Runner.configure do |config|
-  config.include Templater::Spec::Helpers
-end
-
-# copied from merb-more/merb-gen/spec/spec_helpers.rb
-# 07/08/2008
-
-shared_examples_for "named generator" do
-
-  describe '#file_name' do
-
-    it "should convert the name to snake case" do
-      @generator.name = 'SomeMoreStuff'
-      @generator.file_name.should == 'some_more_stuff'
-    end
-
-    it "should preserve dashes" do
-      @generator.name = "project-pictures"
-      @generator.file_name.should == "project-pictures"
-    end
-
-  end
-
-  describe '#base_name' do
-
-    it "should convert the name to snake case" do
-      @generator.name = 'SomeMoreStuff'
-      @generator.base_name.should == 'some_more_stuff'
-    end
-
-    it "should preserve dashes" do
-      @generator.name = "project-pictures"
-      @generator.base_name.should == "project-pictures"
-    end
-
-  end
-
-  describe "#symbol_name" do
-
-    it "should snakify the name" do
-      @generator.name = "ProjectPictures"
-      @generator.symbol_name.should == "project_pictures"
-    end
-
-    it "should replace dashes with underscores" do
-      @generator.name = "project-pictures"
-      @generator.symbol_name.should == "project_pictures"
-    end
-
-  end
-
-  describe '#class_name' do
-
-    it "should convert the name to camel case" do
-      @generator.name = 'some_more_stuff'
-      @generator.class_name.should == 'SomeMoreStuff'
-    end
-
-    it "should convert a name with dashes to camel case" do
-      @generator.name = 'some-more-stuff'
-      @generator.class_name.should == 'SomeMoreStuff'
-    end
-
-  end
-
-  describe '#module_name' do
-
-    it "should convert the name to camel case" do
-      @generator.name = 'some_more_stuff'
-      @generator.module_name.should == 'SomeMoreStuff'
-    end
-
-    it "should convert a name with dashes to camel case" do
-      @generator.name = 'some-more-stuff'
-      @generator.module_name.should == 'SomeMoreStuff'
-    end
-
-  end
-
-  describe '#test_class_name' do
-
-    it "should convert the name to camel case and append 'test'" do
-      @generator.name = 'some_more_stuff'
-      @generator.test_class_name.should == 'SomeMoreStuffTest'
-    end
-
-  end
-
-end
-
-shared_examples_for "namespaced generator" do
-
-  describe "#class_name" do
-    it "should camelize the name" do
-      @generator.name = "project_pictures"
-      @generator.class_name.should == "ProjectPictures"
-    end
-
-    it "should split off the last double colon separated chunk" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.class_name.should == "ProjectPictures"
-    end
-
-    it "should split off the last slash separated chunk" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.class_name.should == "ProjectPictures"
-    end
-
-    it "should convert a name with dashes to camel case" do
-      @generator.name = 'some-more-stuff'
-      @generator.class_name.should == 'SomeMoreStuff'
-    end
-  end
-
-  describe "#module_name" do
-    it "should camelize the name" do
-      @generator.name = "project_pictures"
-      @generator.module_name.should == "ProjectPictures"
-    end
-
-    it "should split off the last double colon separated chunk" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.module_name.should == "ProjectPictures"
-    end
-
-    it "should split off the last slash separated chunk" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.module_name.should == "ProjectPictures"
-    end
-
-    it "should convert a name with dashes to camel case" do
-      @generator.name = 'some-more-stuff'
-      @generator.module_name.should == 'SomeMoreStuff'
-    end
-  end
-
-  describe "#modules" do
-    it "should be empty if no modules are passed to the name" do
-      @generator.name = "project_pictures"
-      @generator.modules.should == []
-    end
-
-    it "should split off all but the last double colon separated chunks" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.modules.should == ["Test", "Monkey"]
-    end
-
-    it "should split off all but the last slash separated chunk" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.modules.should == ["Test", "Monkey"]
-    end
-  end
-
-  describe "#file_name" do
-    it "should snakify the name" do
-      @generator.name = "ProjectPictures"
-      @generator.file_name.should == "project_pictures"
-    end
-
-    it "should preserve dashes" do
-      @generator.name = "project-pictures"
-      @generator.file_name.should == "project-pictures"
-    end
-
-    it "should split off the last double colon separated chunk and snakify it" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.file_name.should == "project_pictures"
-    end
-
-    it "should split off the last slash separated chunk and snakify it" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.file_name.should == "project_pictures"
-    end
-  end
-
-  describe "#base_name" do
-    it "should snakify the name" do
-      @generator.name = "ProjectPictures"
-      @generator.base_name.should == "project_pictures"
-    end
-
-    it "should preserve dashes" do
-      @generator.name = "project-pictures"
-      @generator.base_name.should == "project-pictures"
-    end
-
-    it "should split off the last double colon separated chunk and snakify it" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.base_name.should == "project_pictures"
-    end
-
-    it "should split off the last slash separated chunk and snakify it" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.base_name.should == "project_pictures"
-    end
-  end
-
-  describe "#symbol_name" do
-    it "should snakify the name and replace dashes with underscores" do
-      @generator.name = "project-pictures"
-      @generator.symbol_name.should == "project_pictures"
-    end
-
-    it "should split off the last slash separated chunk, snakify it and replace dashes with underscores" do
-      @generator.name = "test/monkey/project-pictures"
-      @generator.symbol_name.should == "project_pictures"
-    end
-  end
-
-  describe "#test_class_name" do
-    it "should camelize the name and append 'Test'" do
-      @generator.name = "project_pictures"
-      @generator.test_class_name.should == "ProjectPicturesTest"
-    end
-
-    it "should split off the last double colon separated chunk" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.test_class_name.should == "ProjectPicturesTest"
-    end
-
-    it "should split off the last slash separated chunk" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.test_class_name.should == "ProjectPicturesTest"
-    end
-  end
-
-  describe "#full_class_name" do
-    it "should camelize the name" do
-      @generator.name = "project_pictures"
-      @generator.full_class_name.should == "ProjectPictures"
-    end
-
-    it "should camelize a name with dashes" do
-      @generator.name = "project-pictures"
-      @generator.full_class_name.should == "ProjectPictures"
-    end
-
-    it "should leave double colon separated chunks" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.full_class_name.should == "Test::Monkey::ProjectPictures"
-    end
-
-    it "should convert slashes to double colons and camel case" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.full_class_name.should == "Test::Monkey::ProjectPictures"
-    end
-  end
-
-  describe "#base_path" do
-    it "should be blank for no namespaces" do
-      @generator.name = "project_pictures"
-      @generator.base_path.should == ""
-    end
-
-    it "should snakify and join namespace for double colon separated chunk" do
-      @generator.name = "Test::Monkey::ProjectPictures"
-      @generator.base_path.should == "test/monkey"
-    end
-
-    it "should leave slashes but only use the namespace part" do
-      @generator.name = "test/monkey/project_pictures"
-      @generator.base_path.should == "test/monkey"
-    end
-  end
-
-end

data/spec/session_store_spec.rb

@@ -1,125 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-require 'merb/session/data_mapper_session'
-describe Merb::DataMapperSessionStore do
-  before(:all) do
-    DataMapper.setup(:default, "sqlite3::memory:")
-  end
-
-  before(:each) do
-    Merb::Plugins.config[:merb_datamapper] = {}
-    @session_container = Merb::DataMapperSessionStore
-    @session_container.auto_migrate!
-    @sess_id = 'a'*32
-  end
-
-
-  describe "#retrieve_session" do
-    it "responds to retrieve_session" do
-      @session_container.should respond_to(:retrieve_session)
-    end
-    it "returns the data when given an existing session id" do
-      @session_container.create(:session_id => @sess_id, :data => {:foo => 'bar'})
-      session_data = @session_container.retrieve_session(@sess_id)
-      session_data.should_not be_nil
-      session_data[:foo].should == 'bar'
-    end
-    it "returns nil when a non-existent session_id is used" do
-      @session_container.retrieve_session(@sess_id).should be_nil
-    end
-  end
-
-
-  describe "#store_session" do
-    it "responds to store_session" do
-      @session_container.should respond_to(:store_session)
-    end
-
-    describe "when a session_id doesn't exist" do
-      it "creates a new record" do
-      @session_container.all.should be_empty
-      @session_container.store_session(@sess_id, {:foo => 'bar'})
-      @session_container.all.should_not be_empty
-      end
-
-      it "saves the data" do
-        @session_container.store_session(@sess_id, {:foo => 'bar'})
-        session_data = @session_container.retrieve_session(@sess_id)
-        session_data.should_not be_nil
-        session_data[:foo].should == 'bar'
-      end
-    end
-
-    describe "when a session_id does exist" do
-      before(:each) do
-        @session_container.store_session(@sess_id, {:foo => 'bar'})
-      end
-
-      it "doesn't create a new session" do
-        @session_container.all.size.should == 1
-        @session_container.store_session(@sess_id, {:foo => 'FOOOO'})
-        @session_container.all.size.should == 1
-      end
-
-      it "saves the data" do
-        @session_container.store_session(@sess_id, {:foo => 'FOOOO'})
-        session_data = @session_container.retrieve_session(@sess_id)
-        session_data.should_not be_nil
-        session_data[:foo].should == 'FOOOO'
-      end
-    end
-  end
-
-
-  describe "#delete_session" do
-    before(:each) do
-      @session_container.store_session(@sess_id, {:foo => 'bar'})
-    end
-
-    it "responds to #delete_session" do
-      @session_container.should respond_to(:delete_session)
-    end
-
-    it "destroys an existing session" do
-      @session_container.all.size.should == 1
-      @session_container.delete_session(@sess_id)
-      @session_container.all.size.should == 0
-    end
-
-    it "doesn't destroy a session when the key doesn't match" do
-      @session_container.all.size.should == 1
-      @session_container.delete_session('b'*32)
-      @session_container.all.size.should == 1
-    end
-  end
-end
-describe "configuration options" do
-  before(:each) do
-    @session_container = Merb::DataMapperSessionStore
-  end
-  after(:each) do
-    Merb::Plugins.config[:merb_datamapper].clear
-  end
-
-  describe "repository" do
-    it "uses the :default repository when no options are set" do
-      @session_container.default_repository_name.should == :default
-    end
-    it "uses the set name when provided" do
-      Merb::Plugins.config[:merb_datamapper][:session_repository_name] = :other
-      @session_container.default_repository_name.should == :other
-    end
-  end
-
-
-  describe "table name" do
-    it "uses the 'sessions'  when no options are set" do
-      @session_container.storage_names[:default].should == 'sessions'
-    end
-    it "uses the set table name when it is set" do
-      pending "this should work but doesn't"
-      Merb::Plugins.config[:merb_datamapper][:session_storage_name] = 'foos'
-      @session_container.storage_names[:default].should == 'foos'
-    end
-  end
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---format specdoc
---colour

data/spec/spec_helper.rb

@@ -1,8 +0,0 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'rubygems'
-
-gem 'dm-core', '=0.9.6'
-require 'dm-core'
-require 'merb-core'