mack-data_mapper 0.5.5 → 0.6.0

data/lib/scaffold_generator/templates/app/helpers/controllers/helper.rb.template

@@ -0,0 +1,7 @@
+module Mack
+  module ControllerHelpers
+    module <%= @name_plural_camel %>Controller
+      # methods here will automatically be included as protected methods into <%= @name_plural_camel %>Controller
+    end
+  end
+end

data/lib/scaffold_generator/templates/app/views/edit.html.erb.template

@@ -12,7 +12,7 @@
 <% end -%>
 <% end -%>
   <p>
-    <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Update" />
+    <%%= submit_tag("Update") %>
   </p>
 <%% end %>
 

data/lib/scaffold_generator/templates/app/views/new.html.erb.template

@@ -12,7 +12,7 @@
 <% end -%>
 <% end -%>
   <p>
-    <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
+    <%%= submit_tag("Create") %>
   </p>
 <%% end %>
 

data/lib/scaffold_generator/templates/test/functional/rspec.rb.template

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe <%= @name_plural_camel %>Controller do
+  
+  describe "index" do
+    
+    it "should list <%= @name_plural %>"
+    
+  end
+  
+  describe "show" do
+    
+    it "should show a <%= @name_singular %>"
+    
+  end
+  
+  describe "new" do
+    
+    it "should show a form to create a new <%= @name_singular %>"
+    
+  end
+  
+  describe "edit" do
+    
+    it "should edit a <%= @name_singular %>"
+    
+  end
+  
+  describe "create" do
+    
+    it "should create a <%= @name_singular %>"
+    
+  end
+  
+  describe "update" do
+    
+    it "should update a <%= @name_singular %>"
+    
+  end
+  
+  describe "delete" do
+    
+    it "should delete a <%= @name_singular %>"
+    
+  end
+  
+end

data/lib/tasks/db_create_drop_tasks.rake

@@ -1,76 +1,57 @@
 require 'rake'
 namespace :db do
   
-  desc "Create the database for your environment."
+  desc "Drops (if it exists) the database and then creates it for your environment."
+  task :recreate => :environment do
+    Mack::Database.drop(Mack.env, repis)
+    Mack::Database.create(Mack.env, repis)
+  end
+  
+  desc "Creates the database for your environment."
   task :create => :environment do
-    Mack::Configuration.load_database_configurations(Mack::Configuration.env)
-    database(:default) do
-      drop_create_database
-    end
+    Mack::Database.create(Mack.env, repis)
+  end
+  
+  desc "Drops the database for your environment."
+  task :drop => :environment do
+    Mack::Database.drop(Mack.env, repis)
   end
   
   namespace :create do
     
-    desc "Creates your Full environment. Does NOT create your production database!"
+    desc "Creates your test and development databases. Does NOT create your production database!"
     task :all => :environment do
-      Mack::Configuration.load_database_configurations("test")
-      database(:default) do
-        drop_create_database
-      end
-      Mack::Configuration.load_database_configurations("development")
-      database(:default) do
-        drop_create_database
-      end
-      Rake::Task["db:migrate"].invoke
+      Mack::Database.create("test", repis)
+      Mack::Database.create("development", repis)
     end
     
   end
-
-end
-
-private
-def drop_create_database
-  configuration = database.adapter.instance_variable_get('@configuration')
-  case database.adapter.class.name
-    when "DataMapper::Adapters::MysqlAdapter"
-      DataMapper::Database.setup(:tmp, {
-        :adapter => "mysql",
-        :host => "localhost",
-        :database => "mysql",
-        :username => ENV["DB_USERNAME"] || "root",
-        :password => ENV["DB_PASSWORD"] || ""
-      })
-      database(:tmp) do
-        puts "Dropping (MySQL): #{configuration.database}"
-        database.execute "DROP DATABASE IF EXISTS `#{configuration.database}`"
-        puts "Creating (MySQL): #{configuration.database}"
-        database.execute "CREATE DATABASE `#{configuration.database}` DEFAULT CHARACTER SET `utf8`"
-        begin
-          database.adapter.flush_connections!
-        rescue Exception => e
-        end
-      end
-    when "DataMapper::Adapters::PostgresqlAdapter"
-      ENV['PGHOST']     = configuration.host if configuration.host
-      ENV['PGPORT']     = configuration.port.to_s if configuration.port
-      ENV['PGPASSWORD'] = configuration.password.to_s if configuration.password
-
-      database.adapter.flush_connections!
-      begin
-        puts "Dropping (PostgreSQL): #{configuration.database}"
-        `dropdb -U "#{configuration.username}" #{configuration.database}`
-      rescue Exception => e
-      end
-      
-      begin
-        puts "Creating (PostgreSQL): #{configuration.database}"
-        `createdb -U "#{configuration.username}" #{configuration.database}`
-      rescue Exception => e
-      end
-    when 'DataMapper::Adapters::Sqlite3Adapter'
-      puts "Dropping (SQLite3): #{configuration.database}"
-      FileUtils.rm_rf(configuration.database)
-    else
-      raise "Task not supported for '#{database.adapter}'"
+  
+  namespace :drop do
+    
+    desc "Drops your test and development databases. Does NOT create your production database!"
+    task :all => :environment do
+      Mack::Database.drop("test", repis)
+      Mack::Database.drop("development", repis)
+    end
+    
   end
+  
+  namespace :recreate do
+    
+    desc "Drops and creates your test and development databases. Does NOT create your production database!"
+    task :all => :environment do
+      Mack::Database.drop("test", repis)
+      Mack::Database.create("test", repis)
+      Mack::Database.drop("development", repis)
+      Mack::Database.create("development", repis)
+    end
+    
+  end
+  
+  private
+  def repis
+    (ENV["REPO"] ||= "default").to_sym
+  end
+
 end

data/lib/tasks/db_migration_tasks.rake

@@ -1,83 +1,46 @@
 require 'rake'
 namespace :db do
   
+
+  
   desc "Migrate the database through scripts in db/migrations"
-  task :migrate => "db:schema:create" do
-    migration_files.each do |migration|
-      require migration
-      migration = File.basename(migration, ".rb")
-      m_number = migration_number(migration)
-      if m_number > @schema_info.version
-        migration_name(migration).camelcase.constantize.up
-        @schema_info.version += 1
-        @schema_info.save
-      end
-    end # each
+  task :migrate => "mack:environment" do
+    require 'migration_runner'
+    include DataMapper::Types
+    DataMapper::MigrationRunner.reset!
+    migration_files.each { |mig| load mig }
+    DataMapper::MigrationRunner.migrate_up!
   end # migrate
   
   desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
-  task :rollback => ["db:schema:create", "db:abort_if_pending_migrations"] do
-    migrations = migration_files.reverse
-    (ENV["STEP"] || 1).to_i.times do |step|
-      migration = migrations[step]
-      require migration
-      migration = File.basename(migration, ".rb")
-      m_number = migration_number(migration)
-      if m_number == @schema_info.version
-        migration_name(migration).camelcase.constantize.down
-        @schema_info.version -= 1
-        @schema_info.save
-      end
+  task :rollback => ["mack:environment", "db:abort_if_pending_migrations"] do
+    require 'dm-core/types'
+    require 'migration_runner'
+    include DataMapper::Types
+    DataMapper::MigrationRunner.reset!
+    migration_files.each { |mig| load mig }
+    step = (ENV["STEP"] || 1).to_i
+    migrations = DataMapper::MigrationRunner.migrations.sort.reverse
+    step.times do |i|
+      migrations[migrations.size - (i + 1)].perform_down
     end
-
   end # rollback
   
   desc "Raises an error if there are pending migrations"
   task :abort_if_pending_migrations do
-    migrations = migration_files.reverse
-    return if migrations.empty?
-    migration = migrations.first
-    migration = File.basename(migration, ".rb")
-    m_number = migration_number(migration)
-    if m_number > @schema_info.version
-      raise Mack::Errors::UnrunMigrations.new(m_number - @schema_info.version)
+    require 'dm-core/types'
+    require 'migration_runner'
+    migration_files.each { |mig| load mig }
+    DataMapper::MigrationRunner.migrations.each do |mig|
+      raise Mack::Errors::UnrunMigrations.new(mig.name) if mig.send("needs_up?")
     end
-  end
-  
-  desc "Displays the current schema version of your database"
-  task :version => "db:schema:create" do
-    puts "\nYour database is currently at version: #{@schema_info.version}\n"
+    DataMapper::MigrationRunner.migrations.clear
   end
   
   private
-  namespace :schema do
-    
-    task :create => "mack:environment" do
-      require 'data_mapper/migration'
-      unless SchemaInfo.table.exists?
-        class SchemaInfo
-          include DataMapper::Persistence
-          property :version, :integer
-        end
-        SchemaInfo.auto_migrate!
-        SchemaInfo.create(:version => 0, :id => 1)
-      end
-      @schema_info = SchemaInfo.first
-    end # create
-    
-  end # schema
-  
   
   def migration_files
-    Dir.glob(File.join(Mack::Configuration.root, "db", "migrations", "*.rb"))
-  end
-  
-  def migration_number(migration)
-    migration.match(/(^\d+)/).captures.last.to_i
-  end
-  
-  def migration_name(migration)
-    migration.match(/^\d+_(.+)/).captures.last
+    Dir.glob(File.join(Mack.root, "db", "migrations", "*.rb"))
   end
   
 end # db

data/lib/tasks/test_tasks.rake

@@ -0,0 +1,12 @@
+namespace :test do
+  
+  task :setup do
+    unless ENV["MACK_TEST_ENV_SETUP?"] == "true"
+      ENV["MACK_ENV"] = "test"
+      Rake::Task["db:recreate"].invoke
+      Rake::Task["db:migrate"].invoke
+      ENV["MACK_TEST_ENV_SETUP?"] = "true"
+    end
+  end
+  
+end

data/lib/test_extensions.rb

@@ -0,0 +1,90 @@
+require "test/unit"
+require 'spec'
+
+if Mack.env == "test"
+  module Mack
+    module Testing # :nodoc: 
+    end
+  end
+
+  # Wrap it so we don't accidentally alias the run method n times and run out of db connections!
+  unless Mack::Testing.const_defined?("DmTestTransactionWrapper")
+  
+    module Mack
+      module Testing
+        module Helpers
+          alias_method :mack_rake_task, :rake_task
+        
+          def rake_task(name, env = {})
+            DataMapper::MigrationRunner.reset!
+            mack_rake_task(name, env, [File.join(File.dirname(__FILE__), "..", "lib", "tasks", "db_create_drop_tasks.rake"),
+                                       File.join(File.dirname(__FILE__), "..", "lib", "tasks", "db_migration_tasks.rake")])
+          end
+        end # Helpers
+      
+        class DmTestTransactionWrapper # :nodoc:
+          include DataMapper::Resource
+        end
+      
+        module DataMapperHelpers
+          def rollback_transaction
+            begin
+              Mack::Testing::DmTestTransactionWrapper.transaction do
+              # DataMapper::Transaction.new.commit do
+                yield if block_given?
+                raise "Rollback!"
+              end
+            rescue => ex
+              # we need to do this so we can throw up actual errors!
+              unless ex.to_s == "Rollback!"
+                raise ex
+              end
+            end
+          end # rollback_transaction
+        end # DataMapperHelpers
+      end # Testing
+    end # Mack
+
+
+    module Spec # :nodoc:
+      module Example # :nodoc:
+        module ExampleMethods # :nodoc:
+          include Mack::Testing::DataMapperHelpers
+
+          alias_method :dm_spec_execute, :execute
+
+          def execute(options, instance_variables)
+            rollback_transaction do
+              @__res = dm_spec_execute(options, instance_variables)
+            end
+            @__res
+          end
+
+        end # ExampleGroup
+      end # Example
+    end # Spec
+  
+    module Test # :nodoc:
+      module Unit # :nodoc:
+        class TestCase # :nodoc:
+          include Mack::Testing::DataMapperHelpers
+  
+          # Let's alias the run method in the class above us so we can create a new one here
+          # but still reference it.
+          alias_method :dm_test_case_run, :run # :nodoc:
+  
+          # We need to wrap the run method so we can do things like
+          # run a cleanup method if it exists
+          def run(result, &progress_block) # :nodoc:
+            rollback_transaction do
+              dm_test_case_run(result, &progress_block)
+            end
+          end
+  
+        end # TestCase
+      end # Unit
+    end # Test
+  
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
-version: &id001 !ruby/object:Gem::Version 
-  version: 0.5.5
+version: !ruby/object:Gem::Version 
+  version: 0.6.0
 platform: ruby
 authors: 
 - markbates
@@ -9,59 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 -04:00
+date: 2008-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mack-orm_common
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - *id001
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: data_mapper
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.9.2
     version: 
 description: "mack-data_mapper was developed by: markbates"
-email: 
+email: mark@mackframework.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
-- lib/configuration.rb
+- lib/database.rb
+- lib/dm_patches/confirmation_validation.rb
+- lib/dm_patches/dm-cli.rb
+- lib/dm_patches/migrations.rb
+- lib/dm_patches/pooling.rb
+- lib/genosaurus_helpers.rb
 - lib/helpers/orm_helpers.rb
 - lib/mack-data_mapper.rb
 - lib/mack-data_mapper_tasks.rb
 - lib/migration_generator/migration_generator.rb
 - lib/migration_generator/templates/db/migrations/%=@migration_name%.rb.template
+- lib/model_column.rb
 - lib/model_generator/manifest.yml
 - lib/model_generator/model_generator.rb
 - lib/model_generator/templates/model.rb.template
-- lib/model_generator/templates/test.rb.template
-- lib/persistence.rb
+- lib/model_generator/templates/rspec.rb.template
+- lib/model_generator/templates/test_case.rb.template
+- lib/resource.rb
+- lib/runner.rb
 - lib/scaffold_generator/manifest.yml
 - lib/scaffold_generator/scaffold_generator.rb
 - lib/scaffold_generator/templates/app/controllers/controller.rb.template
+- lib/scaffold_generator/templates/app/helpers/controllers/helper.rb.template
 - lib/scaffold_generator/templates/app/views/edit.html.erb.template
 - lib/scaffold_generator/templates/app/views/index.html.erb.template
 - lib/scaffold_generator/templates/app/views/new.html.erb.template
 - lib/scaffold_generator/templates/app/views/show.html.erb.template
-- lib/scaffold_generator/templates/test.rb.template
+- lib/scaffold_generator/templates/test/functional/rspec.rb.template
+- lib/scaffold_generator/templates/test/functional/test_case.rb.template
 - lib/tasks/db_create_drop_tasks.rake
 - lib/tasks/db_migration_tasks.rake
+- lib/tasks/test_tasks.rake
+- lib/test_extensions.rb
 - README
 has_rdoc: true
-homepage: 
+homepage: http://www.mackframework.com
 post_install_message: 
 rdoc_options: []
 
@@ -72,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -87,33 +91,5 @@ rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: DataMapper ORM support for Mack
-test_files: 
-- test/database.yml
-- test/fixtures
-- test/fixtures/add_users_migration.rb.fixture
-- test/fixtures/album.rb.fixture
-- test/fixtures/album_unit_test.rb.fixture
-- test/fixtures/album_with_cols.rb.fixture
-- test/fixtures/create_users_migration.rb.fixture
-- test/fixtures/routes.rb.fixture
-- test/fixtures/zoo_no_cols
-- test/fixtures/zoo_no_cols/edit.html.erb.fixture
-- test/fixtures/zoo_no_cols/index.html.erb.fixture
-- test/fixtures/zoo_no_cols/new.html.erb.fixture
-- test/fixtures/zoo_no_cols/show.html.erb.fixture
-- test/fixtures/zoo_with_cols
-- test/fixtures/zoo_with_cols/edit.html.erb.fixture
-- test/fixtures/zoo_with_cols/index.html.erb.fixture
-- test/fixtures/zoo_with_cols/new.html.erb.fixture
-- test/fixtures/zoo_with_cols/show.html.erb.fixture
-- test/fixtures/zoo_with_cols/zoo.rb.fixture
-- test/fixtures/zoo_with_cols/zoos_controller.rb.fixture
-- test/generators
-- test/generators/migration_generator_test.rb
-- test/generators/model_generator_test.rb
-- test/generators/scaffold_generator_test.rb
-- test/lib
-- test/lib/user.rb
-- test/tasks
-- test/tasks/db_migration_tasks_test.rb
-- test/test_helper.rb
+test_files: []
+