merb_datamapper 0.9.2 → 0.9.3

data/lib/merb_datamapper.rb

@@ -1,16 +1,20 @@
 if defined?(Merb::Plugins)
-  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
+  require 'rubygems'
+  require 'merb_datamapper/version'
 
-    after BeforeAppRuns
+  gem 'dm-core', DataMapper::MerbDataMapper::VERSION
+  require 'dm-core'
 
-    def self.run
-      Merb::Orms::DataMapper.connect
-      Merb::Orms::DataMapper.register_session_type
-    end
+  if File.file?(Merb.dir_for(:config) / "database.yml")
+    require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection")
 
+    Merb::Orms::DataMapper.connect
+    Merb::Orms::DataMapper.register_session_type
+  else
+    Merb.logger.info "No database.yml file found in #{Merb.dir_for(:config)}, assuming database connection(s) established in the environment file in #{Merb.dir_for(:config)}/environments"
   end
-end
+
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "resource")
+
+  Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
+end

data/lib/merb_datamapper/merbtasks.rb

@@ -1,31 +1,60 @@
 require 'fileutils'
 
 namespace :dm do
-  
+
   task :merb_start do
-    Merb.start :adapter => 'runner',
-               :environment => ENV['MERB_ENV'] || 'development'
+    Merb.start_environment :adapter => 'runner',
+                           :environment => ENV['MERB_ENV'] || 'development'
   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
+    end
     desc "Perform automigration"
     task :automigrate => :merb_start do
-      DataMapper::Persistence.auto_migrate!
+      ::DataMapper::AutoMigrator.auto_migrate
+    end
+    desc "Perform non destructive automigration"
+    task :autoupgrade => :merb_start do
+      ::DataMapper::AutoMigrator.auto_upgrade
+    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 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
     end
   end
-  
+
   namespace :sessions do
-    desc "Creates session migration"
+    desc "Perform automigration for sessions"
     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)
+      Merb::DataMapperSession.auto_migrate!
     end
-    
+
     desc "Clears 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}")
+      ::DataMapper.repository.adapter.execute("DELETE FROM #{table_name}")
     end
   end
-end
+end

data/lib/merb_datamapper/version.rb

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

data/spec/connection_spec.rb

@@ -0,0 +1,67 @@
+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/spec.opts

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

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+$TESTING=true
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rubygems'
+
+gem 'dm-core', '=0.9.3'
+require 'dm-core'
+
+module Merb
+  module Plugins
+    def self.config
+      @config ||= {}
+    end
+  end
+end

metadata

@@ -1,95 +1,108 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Jason Toy
-autorequire: merb_datamapper
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-07-29 00:00:00 -05: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.3
+    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.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: 1.6.0
     version: 
-description: Merb plugin that provides DataMapper support for Merb
-email: jtoy@rubynow.com
+description: DataMapper plugin providing DataMapper support for Merb
+email: 
+- jtoy@rubynow.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.txt
 - LICENSE
 - TODO
 files: 
+- History.txt
 - LICENSE
-- README
+- Manifest.txt
+- README.txt
 - Rakefile
 - TODO
-- lib/merb
-- lib/merb/orms
-- 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.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/migration/USAGE
 - datamapper_generators/migration/migration_generator.rb
-- datamapper_generators/migration/templates
 - datamapper_generators/migration/templates/new_migration.erb
-- datamapper_generators/migration/USAGE
-- datamapper_generators/model
+- datamapper_generators/model/USAGE
 - 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/resource_controller
+- datamapper_generators/resource_controller/USAGE
 - 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_migration/USAGE
+- datamapper_generators/resource_migration/resource_migration_generator.rb
+- datamapper_generators/resource_migration/templates/class_migration.erb
+- lib/merb/orms/data_mapper/connection.rb
+- lib/merb/orms/data_mapper/database.yml.sample
+- lib/merb/orms/data_mapper/resource.rb
+- 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/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://github.com/sam/dm-more/tree/master/merb_datamapper
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -106,10 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Merb plugin that provides DataMapper support for Merb
+summary: DataMapper plugin providing DataMapper support for Merb
 test_files: []
 

data/README

@@ -1,10 +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 merb.yml:
-    :session_store: datamapper
-2. add the dependency in dependencies.rb:
-    use_orm :datamapper

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

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

data/specs/spec_helper.rb

@@ -1,2 +0,0 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')