rails_datamapper 0.9.11 → 0.10.0

data/History.rdoc

@@ -0,0 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
+=== 0.9.11 / 2009-03-29
+
+  * Made a gem

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 datamapper.rake
@@ -10,15 +10,11 @@ generators/dm_install/templates/datamapper.rake
 generators/dm_migration/dm_migration_generator.rb
 generators/dm_migration/templates/migration.rb
 generators/dm_model/dm_model_generator.rb
-generators/dm_model/templates/migration.rb
 generators/dm_model/templates/model.rb
 generators/dm_model/templates/unit_test.rb
 generators/rspec_dm_model/rspec_dm_model_generator.rb
-generators/rspec_dm_model/templates/model.rb
 generators/rspec_dm_model/templates/model_spec.rb
-init.rb
 lib/rails_datamapper.rb
-lib/rails_datamapper/rails_datamapper.rb
-lib/rails_datamapper/validations.rb
+lib/rails_datamapper/session_store.rb
 lib/rails_datamapper/version.rb
 tasks/install.rb

data/{README.txt → README.rdoc}

@@ -12,12 +12,13 @@ This will install the datamapper rake tasks:
 
 script/generate dm_install
 
-Two generators are added by default
+Three generators are added by default
 
 script/generate dm_model
 script/generate rspec_dm_model
+script/generate dm_migration
 
-These by default add an active record migrations but you can call
+The first two add a migration but you can call
 
 script/generate dm_model --skip-migration
 script/generate rspec_dm_model --skip-migration
@@ -26,5 +27,14 @@ To avoid any dependency on active record add this to your projects environment.r
 
 config.frameworks -= [ :active_record ]
 
-== Future
-I really should sort out migrations but with rails3 round the corner don't hold your breath
+== Session Store
+
+Change config/initializers/session_store.rb to something like the following:
+
+ActionController::Base.session_store = :data_mapper_store
+ActionController::Base.session = {
+    :expires_after => 7.days,
+    :key           => '_session_id',
+}
+
+Then create the sessions table with: rake db:sessions:create

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -8,27 +7,18 @@ SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
 require ROOT + 'lib/rails_datamapper/version'
 
-AUTHOR           = 'Tom Malone'
-EMAIL            = 'tomjmalone [a] gmail [d] com'
-GEM_NAME         = 'rails_datamapper'
-GEM_VERSION      = DataMapper::RailsDatamapper::VERSION
-GEM_DEPENDENCIES = [
-  [ 'dm-core',        GEM_VERSION ],
-  [ 'dm-aggregates',  GEM_VERSION ],
-  [ 'dm-migrations',  GEM_VERSION ],
-  [ 'dm-serializer',  GEM_VERSION ],
-  [ 'dm-timestamps',  GEM_VERSION ],
-  [ 'dm-validations', GEM_VERSION ],
-  [ 'dm-types',       GEM_VERSION ],
-]
-
-GEM_CLEAN  = %w[ pkg ]
-GEM_EXTRAS = { :has_rdoc => false, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+AUTHOR = 'Tom Malone'
+EMAIL  = 'tomjmalone [a] gmail [d] com'
+GEM_NAME = 'rails_datamapper'
+GEM_VERSION = Rails::DataMapper::VERSION
+GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
+GEM_CLEAN = %w[ pkg ]
+GEM_EXTRAS = { :has_rdoc => false, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
 PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'Rails Plugin for datamapper'
 
 [ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).sort.each { |filename| require filename }
 end

data/datamapper.rake

@@ -1,36 +1,80 @@
+
+# Monkey patch to allow overriding defined rake tasks (instead of
+# adding to them, which is the default behaviour when specifying tasks
+# >1 times).
+
+Rake::TaskManager.class_eval do
+  def remove_task(task_name)
+    @tasks.delete(task_name.to_s)
+  end
+end
+
+def remove_task(task_name)
+  returning Rake.application do |app|
+    app.remove_task(app[task_name].name)
+  end
+end
+
+# Until AR/DM co-existence becomes practically possible, presume
+# mutual exclusivity between the two.  Thus we wipe all pre-existing
+# db tasks which we assume to be ActiveRecord-based and thus won't
+# work).
+
+Rake.application.tasks.select do |t|
+  t.class == Rake::Task && t.name.starts_with?("db")
+end.each { |t| remove_task(t.name) }
+
 namespace :db do
 
-  desc "Perform automigration"
+  desc 'Perform automigration'
   task :automigrate => :environment do
+    FileList["app/models/**/*.rb"].each do |model|
+      load model
+    end
     ::DataMapper.auto_migrate!
   end
 
-  desc "Perform non destructive automigration"
+  desc 'Perform non destructive automigration'
   task :autoupgrade => :environment do
+    FileList["app/models/**/*.rb"].each do |model|
+      load model
+    end
     ::DataMapper.auto_upgrade!
   end
 
   namespace :migrate do
     task :load => :environment do
       gem 'dm-migrations'
-      FileList["db/migrations/*.rb"].each do |migration|
+      FileList['db/migrations/*.rb'].each do |migration|
         load migration
       end
     end
 
-    desc "Migrate up using migrations"
+    desc 'Migrate up using migrations'
     task :up, :version, :needs => :load do |t, args|
       version = args[:version]
       migrate_up!(version)
     end
 
-    desc "Migrate down using migrations"
+    desc 'Migrate down using migrations'
     task :down, :version, :needs => :load do |t, args|
       version = args[:version]
       migrate_down!(version)
     end
   end
 
-  desc "Migrate the database to the latest version"
+  desc 'Migrate the database to the latest version'
   task :migrate => 'db:migrate:up'
+
+  namespace :sessions do
+    desc "Creates the sessions table for DataMapperStore"
+    task :create => :environment do
+      ::DataMapperStore::Session.auto_migrate!
+    end
+
+    desc "Clear the sessions table for DataMapperStore"
+    task :clear => :environment do
+      ::DataMapperStore::Session.all.destroy!
+    end
+  end
 end

data/generators/dm_install/dm_install_generator.rb

@@ -4,8 +4,8 @@ class DmInstallGenerator < Rails::Generator::Base
 
   def manifest
     record do |m|
-      m.directory "lib/tasks"
-      m.template "datamapper.rake",      "lib/tasks/datamapper.rake"
+      m.directory 'lib/tasks'
+      m.template 'datamapper.rake', 'lib/tasks/datamapper.rake'
     end
   end
 

data/generators/dm_install/templates/datamapper.rake

@@ -1,16 +1,16 @@
 namespace :db do
 
-  desc "Perform automigration"
+  desc 'Perform automigration'
   task :automigrate => :environment do
-    FileList["app/models/**/*.rb"].each do |model|
+    FileList['app/models/**/*.rb'].each do |model|
       load model
     end
     ::DataMapper.auto_migrate!
   end
 
-  desc "Perform non destructive automigration"
+  desc 'Perform non destructive automigration'
   task :autoupgrade => :environment do
-    FileList["app/models/**/*.rb"].each do |model|
+    FileList['app/models/**/*.rb'].each do |model|
       load model
     end
     ::DataMapper.auto_upgrade!
@@ -19,24 +19,24 @@ namespace :db do
   namespace :migrate do
     task :load => :environment do
       gem 'dm-migrations'
-      FileList["db/migrations/*.rb"].each do |migration|
+      FileList['db/migrations/*.rb'].each do |migration|
         load migration
       end
     end
 
-    desc "Migrate up using migrations"
+    desc 'Migrate up using migrations'
     task :up, :version, :needs => :load do |t, args|
       version = args[:version]
       migrate_up!(version)
     end
 
-    desc "Migrate down using migrations"
+    desc 'Migrate down using migrations'
     task :down, :version, :needs => :load do |t, args|
       version = args[:version]
       migrate_down!(version)
     end
   end
 
-  desc "Migrate the database to the latest version"
+  desc 'Migrate the database to the latest version'
   task :migrate => 'db:migrate:up'
 end

data/generators/dm_migration/dm_migration_generator.rb

@@ -1,10 +1,11 @@
 require 'rails_generator/generators/components/migration/migration_generator'
+require 'active_record'
 
 class DmMigrationGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      m.migration_template "migration.rb", "db/migrate"
+      m.migration_template 'migration.rb', 'db/migrate'
     end
   end
 end

data/generators/dm_migration/templates/migration.rb

@@ -1,7 +1,17 @@
-migration <%= # TODO %>, :<%= class_name.underscore %>  do
+migration 1, :<%= class_name.underscore %> do
   up do
+    create_table :<%= table_name %> do
+<% Array(attributes).each do |attribute| -%>
+      column :<%= attribute.name if attribute %>, <%= attribute.type.to_s.capitalize %>, :nullable? => false
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+      column :created_at, DateTime, :nullable? => false
+      column :updated_at, DateTime, :nullable? => false
+<% end -%>
+    end
   end
 
   down do
+    drop_table :<%= table_name %>
   end
 end

data/generators/dm_model/dm_model_generator.rb

@@ -1,23 +1,24 @@
 require 'rails_generator/generators/components/model/model_generator'
 require 'active_record'
 
-class DmModelGenerator <ModelGenerator
+class DmModelGenerator < ModelGenerator
 
   def manifest
     record do |m|
+
       # Check for class naming collisions.
       m.class_collisions class_path, class_name, "#{class_name}Test"
 
       # Model, test, and fixture directories.
       m.directory File.join('app/models', class_path)
-      m.directory File.join('test/unit', class_path)
+      m.directory File.join('test/unit',  class_path)
 
       # Model class, unit test, and fixtures.
       m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
+      m.template 'unit_test.rb',  File.join('test/unit',  class_path, "#{file_name}_test.rb")
 
       unless options[:skip_migration]
-        m.migration_template 'migration.rb', 'db/migrate', :assigns => {
+        m.migration_template 'dm_migration:migration.rb', 'db/migrate', :assigns => {
           :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
       end

data/generators/dm_model/templates/model.rb

@@ -1,14 +1,13 @@
 class <%= class_name %>
   include DataMapper::Resource
-  property :id, Serial
 
-<% for attribute in attributes -%>
+  property :id, Serial
+<% Array(attributes).each do |attribute| -%>
   property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false
-
 <% end -%>
-<% unless options[:skip_timestamps] %>
+<% unless options[:skip_timestamps] -%>
   property :created_at, DateTime, :nullable => false
   property :updated_at, DateTime, :nullable => false
-
 <% end -%>
+
 end

data/generators/rspec_dm_model/rspec_dm_model_generator.rb

@@ -10,21 +10,19 @@ class RspecDmModelGenerator <ModelGenerator
       m.class_collisions class_path, class_name
 
       # Model, spec, and fixture directories.
-      m.directory File.join('app/models', class_path)
+      m.directory File.join('app/models',  class_path)
       m.directory File.join('spec/models', class_path)
 
       # Model class, spec and fixtures.
-      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'model_spec.rb',       File.join('spec/models', class_path, "#{file_name}_spec.rb")
+      m.template 'dm_model:model.rb', File.join('app/models',  class_path, "#{file_name}.rb")
+      m.template 'model_spec.rb',     File.join('spec/models', class_path, "#{file_name}_spec.rb")
 
       unless options[:skip_migration]
-        m.migration_template 'model:migration.rb', 'db/migrate', :assigns => {
+        m.migration_template 'dm_migration:migration.rb', 'db/migrate', :assigns => {
           :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
       end
-
     end
-
   end
 
 end

data/generators/rspec_dm_model/templates/model_spec.rb

@@ -1,10 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), <%= ([ "'..'" ] * class_nesting_depth).join(', ') %>, '..', 'spec_helper')
 
 describe <%= class_name %> do
   before(:each) do
     @<%= file_name %> = <%= class_name %>.new
   end
 
-  it "should be valid" do
-  end
+  it 'should be awesome'
 end

data/lib/rails_datamapper/session_store.rb

@@ -0,0 +1,63 @@
+require 'dm-core'
+
+# Implements DataMapper-specific session store.
+
+module ActionController
+  module Session
+    class DataMapperStore < AbstractStore
+
+      # Options passed in here are specified at:
+      # config/initializers/session_store.rb
+
+      def initialize(app, options = {})
+        options.symbolize_keys!
+        options[:expire_after] = options[:expires] || nil
+
+        super
+
+        unless (self.class.class_variable_defined? :@@session_class and @@session_class)
+          @@session_class = options.delete(:session_class) || ::DataMapperStore::Session
+        end
+      end
+
+      private
+      def get_session(env, sid)
+        sid     ||= generate_sid
+        session   = @@session_class.first(:session_id => sid)
+        [sid, session.nil? ? {} : session.data]
+      end
+
+      def set_session(env, sid, session_data)
+        session            = @@session_class.first(:session_id => sid) ||
+                             @@session_class.new(:session_id => sid)
+        session.data       = session_data || {}
+        session.updated_at = Time.now if session.dirty?
+
+        session.save
+      end
+    end
+  end
+end
+
+module DataMapperStore
+  class Session
+    include ::DataMapper::Resource
+
+    def self.name
+      "session"
+    end
+
+    property :id,         Serial
+    property :session_id, String,   :unique_index => true
+    property :data,       Text,     :nullable => false, :default => ::Base64.encode64(Marshal.dump({}))
+    property :updated_at, DateTime, :nullable => true, :index => true
+
+    def data=(data)
+      attribute_set(:data, ::Base64.encode64(Marshal.dump(data)))
+    end
+
+    def data
+      Marshal.load(::Base64.decode64(attribute_get(:data)))
+    end
+  end
+end

data/lib/rails_datamapper/version.rb

@@ -1,5 +1,5 @@
-module DataMapper
-  module RailsDatamapper
-    VERSION = '0.9.11'
+module Rails
+  module DataMapper
+    VERSION = '0.10.0'.freeze
   end
 end

data/lib/rails_datamapper.rb

@@ -1,15 +1,61 @@
 require 'pathname'
-require 'dm-core'
-require 'dm-aggregates'
-require 'dm-migrations'
-require 'dm-serializer'
-require 'dm-timestamps'
-require 'dm-validations'
-require 'dm-types'
+require 'extlib/pathname'
 
-dir = Pathname(__FILE__).dirname.expand_path / 'rails_datamapper'
+require 'rails_datamapper/session_store'
 
-require dir / 'rails_datamapper'
-require dir / 'validations'
+module Rails
+  module DataMapper
+    class << self
+      extend ActiveSupport::Memoizable
 
-create_connection()
+      def create_connection
+        # TODO: handle Rails and Merb style database.yml files
+        conf = config.dup
+        repositories = conf.delete(:repositories)
+        ::DataMapper.setup(:default, conf) unless conf.empty?
+      end
+
+    private
+
+      def config_file
+        Rails.root / 'config' / 'database.yml'
+      end
+
+      def full_config
+        YAML::load(ERB.new(config_file.read).result)
+      end
+
+      memoize :full_config
+
+      def config
+        if hash = full_config[Rails.env] || full_config[Rails.env.to_sym]
+          normalize_config(hash)
+        else
+          raise ArgumentError, "missing environment '#{Rails.env}' in config file #{config_file}"
+        end
+      end
+
+      memoize :config
+
+      def normalize_config(hash)
+        config = {}
+
+        hash.symbolize_keys.each do |key, value|
+          config[key] = if value.kind_of?(Hash)
+            normalize_config(value)
+          elsif key == :port
+            value.to_i
+          elsif key == :adapter && value == 'postgresql'
+            'postgres'
+          else
+            value
+          end
+        end
+
+        config
+      end
+    end
+  end
+end
+
+Rails::DataMapper.create_connection

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Tom Malone
@@ -9,79 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-serializer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-timestamps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: Rails Plugin for datamapper
 email: 
 - tomjmalone [a] gmail [d] com
@@ -90,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - datamapper.rake
@@ -107,26 +38,22 @@ files:
 - generators/dm_migration/dm_migration_generator.rb
 - generators/dm_migration/templates/migration.rb
 - generators/dm_model/dm_model_generator.rb
-- generators/dm_model/templates/migration.rb
 - generators/dm_model/templates/model.rb
 - generators/dm_model/templates/unit_test.rb
 - generators/rspec_dm_model/rspec_dm_model_generator.rb
-- generators/rspec_dm_model/templates/model.rb
 - generators/rspec_dm_model/templates/model_spec.rb
-- init.rb
 - lib/rails_datamapper.rb
-- lib/rails_datamapper/rails_datamapper.rb
-- lib/rails_datamapper/validations.rb
+- lib/rails_datamapper/session_store.rb
 - lib/rails_datamapper/version.rb
 - tasks/install.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/datamapper/dm-more/tree/master/rails_datamapper
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -144,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails Plugin for datamapper

data/History.txt

@@ -1,5 +0,0 @@
-=== 0.9.11 / 2009-03-29
-
-* 1 minor enhancement:
-
-  * Added migration tasks

data/generators/dm_model/templates/migration.rb

@@ -1,16 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name %> do |t|
-<% for attribute in attributes -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end -%>
-<% unless options[:skip_timestamps] %>
-      t.timestamps
-<% end -%>
-    end
-  end
-
-  def self.down
-    drop_table :<%= table_name %>
-  end
-end

data/generators/rspec_dm_model/templates/model.rb

@@ -1,14 +0,0 @@
-class <%= class_name %>
-  include DataMapper::Resource
-  property :id, Serial
-
-<% for attribute in attributes -%>
-  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false
-
-<% end -%>
-<% unless options[:skip_timestamps] %>
-  property :created_at, DateTime, :nullable => false
-  property :updated_at, DateTime, :nullable => false
-
-<% end -%>
-end

data/init.rb

@@ -1,2 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path / 'lib/rails_datamapper'

data/lib/rails_datamapper/rails_datamapper.rb

@@ -1,45 +0,0 @@
-def config_file()
-  RAILS_ROOT + "/config/database.yml"
-end
-
-def create_connection()
-  conf = config.dup
-  repositories = conf.delete(:repositories)
-  ::DataMapper.setup(:default, conf) unless conf.empty?
-end
-
-def get_config_for_environment
-  if hash = full_config[RAILS_ENV]
-    symbolize_keys(hash)
-  elsif hash = full_config[RAILS_ENV.to_sym]
-    hash
-  else
-    raise ArgumentError, "missing environment '#{RAILS_ENV}' in config file #{config_file}"
-  end
-end
-
-def full_config
-  @full_config ||= YAML::load(ERB.new(IO.read(config_file)).result)
-end
-
-def config
-  @config ||= get_config_for_environment
-end
-
-def symbolize_keys(h)
-  config = {}
-
-  h.each do |k, v|
-    if k == 'port'
-      config[k.to_sym] = v.to_i
-    elsif k == 'adapter' && v == 'postgresql'
-      config[k.to_sym] = 'postgres'
-    elsif v.is_a?(Hash)
-      config[k.to_sym] = symbolize_keys(v)
-    else
-      config[k.to_sym] = v
-    end
-  end
-
-  config
-end

data/lib/rails_datamapper/validations.rb

@@ -1,9 +0,0 @@
-module DataMapper
-  module Validate
-    class ValidationErrors
-      def count
-        size
-      end
-    end
-  end
-end