mack-data_mapper 0.6.0.1 → 0.6.1

data/README

@@ -1,9 +1,120 @@
-README
-========================================================================
-mack-data_mapper was developed by: markbates
-
 This gem provides Mack integration with the ORM Framework, DataMapper.
 
 For more information on DataMapper please visit:
 
 http://www.datamapper.org
+
+== Notes
+
+The database.yml file for a DataMapper backed application would look something like this:
+
+  # MySQL:
+  development:
+    default:
+      adapter: mysql
+      database: my_app_development
+      host: localhost
+      username: my_db_user
+      password: password
+    
+  test:
+    default:
+      adapter: mysql
+      database: my_app_test
+      host: localhost
+      username: my_db_user
+      password: password
+
+  production:
+    default:
+      adapter: mysql
+      database: my_app_production
+      host: localhost
+      username: my_db_user
+      password: password
+  
+  # PostgreSQL:
+  development:
+    default:
+      adapter: postgres
+      database: my_app_development
+      host: localhost
+      username: my_db_user
+      password: password
+
+  test:
+    default:
+      adapter: postgres
+      database: my_app_test
+      host: localhost
+      username: my_db_user
+      password: password
+
+  production:
+    default:
+      adapter: postgres
+      database: my_app_production
+      host: localhost
+      username: my_db_user
+      password: password
+
+  # SQLite3:
+  development:
+    default:
+      adapter: sqlite3
+      database: db/my_app_development.db 
+
+  test:
+    default:                           
+      adapter: sqlite3
+      database: db/my_app_test.db 
+
+  production:
+    default:                                 
+      adapter: sqlite3
+      database: db/my_app_production.db 
+
+
+== Testing
+
+Tests are wrapped in a transaction so that any database activities get
+rolled back at the end of the test. This works with both RSpec and
+Test::Unit::TestCase
+
+== Rake tasks
+
+  # Drops (if it exists) the database and then creates it for your environment.
+  rake db:recreate
+  
+  # Creates the database for your environment.
+  rake db:create
+  
+  # Drops the database for your environment.
+  rake db:drop
+  
+  # Creates your test and development databases. Does NOT create your production database!
+  rake db:create:all
+  
+  # Drops your test and development databases. Does NOT create your production database!
+  rake db:drop:all
+  
+  # Drops and creates your test and development databases. Does NOT create your production database!
+  rake db:recreate:all
+  
+  # Migrate the database through scripts in db/migrations.
+  rake db:migrate
+  
+  # Rolls the schema back to the previous version. Specify the number of steps with STEP=n.
+  rake db:rollback
+  
+  # Raises an error if there are pending migrations.
+  rake db:abort_if_pending_migrations
+  
+  # Generates a controller, a model, a migration, and tests for the given resource.
+  rake generate:scaffold
+  
+  # Generates a model, a migration, and a test for the given resource.
+  rake generate:model
+  
+  # Generates a migration for the given columns
+  rake generate:migration

data/lib/mack-data_mapper.rb

@@ -1,16 +1,16 @@
 require 'rubygems'
 require 'genosaurus'
 
-# gem 'dm-core', '0.9.2'
-# require 'dm-core'
-# gem 'dm-validations', '0.9.2'
-# require 'dm-validations'
-# gem 'dm-migrations', '0.9.2'
-# require 'dm-migrations'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "dm_patches"))
-require 'data_mapper'
-
-fl = File.dirname(__FILE__)
+fl = File.join(File.dirname(__FILE__), "mack-data_mapper")
+
+$: << File.expand_path(File.join(fl, "dm_patches"))
+
+[:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g|
+  gem "dm-#{g}", "0.9.3"
+  require "dm-#{g}"
+end
+
+
 require File.join(fl, "database")
 require File.join(fl, "helpers", "orm_helpers")
 require File.join(fl, "resource")
@@ -22,7 +22,7 @@ require File.join(fl, "genosaurus_helpers")
 
 
 [:helpers, :migration_generator, :model_generator, :scaffold_generator, :dm_patches].each do |folder|
-  Dir.glob(File.join(File.dirname(__FILE__), folder.to_s, "**/*.rb")).each {|f| require f}
+  Dir.glob(File.join(fl, folder.to_s, "**/*.rb")).each {|f| require f}
 end
 
 English::Inflect.word 'email_address'
@@ -49,4 +49,6 @@ end
 
 DataMapper.logger = DataMapper::Logger.new(StringIO.new, 0)
 
-Mack::Database.establish_connection(Mack.env)
+Mack::Database.establish_connection(Mack.env)
+
+require File.join(File.dirname(__FILE__), 'mack-data_mapper_tasks')

data/lib/mack-data_mapper/dm_patches/dm-timestamps.rb

@@ -0,0 +1,6 @@
+module DataMapper
+  module Timestamp
+    TIMESTAMP_PROPERTIES[:created_at] = lambda { |r| r.created_at = DateTime.now if r.new_record? && r.created_at.nil? }
+    TIMESTAMP_PROPERTIES[:created_on] = lambda { |r| r.created_on = DateTime.now if r.new_record? && r.created_on.nil? }
+  end
+end

data/lib/mack-data_mapper/dm_patches/migrations.rb

@@ -0,0 +1,9 @@
+module DataMapper # :nodoc:
+  module MigrationRunner # :nodoc:
+    
+    def self.reset!
+      @@migrations = []
+    end
+    
+  end
+end

data/lib/{genosaurus_helpers.rb → mack-data_mapper/genosaurus_helpers.rb}

@@ -1,7 +1,7 @@
 module Mack
   module Genosaurus # :nodoc:
     module DataMapper # :nodoc:
-      module Helpers
+      module Helpers # :nodoc:
       
         def columns(name = param(:name))
           ivar_cache("form_columns") do

data/lib/{helpers → mack-data_mapper/helpers}/orm_helpers.rb

@@ -28,8 +28,10 @@ module Mack
         object_names.each do |name|
           object = instance_variable_get("@#{name}")
           if object
-            if object.is_a?(DataMapper::Resource)
-              app_errors << object.errors.full_messages.uniq
+            if object.respond_to?(:errors)
+              if object.errors.respond_to?(:full_messages)
+                app_errors << object.errors.full_messages.uniq
+              end
             end
           end
         end

data/lib/{model_column.rb → mack-data_mapper/model_column.rb}

@@ -1,8 +1,8 @@
 module Mack
-  module Genosaurus
-    module DataMapper
+  module Genosaurus # :nodoc:
+    module DataMapper # :nodoc:
       # Used to represent a 'column' from the param cols or columns for generators.
-      class ModelColumn
+      class ModelColumn # :nodoc:
       
         # The name of the column.
         attr_accessor :column_name

data/lib/{tasks → mack-data_mapper/tasks}/db_migration_tasks.rake

@@ -3,7 +3,7 @@ namespace :db do
   
 
   
-  desc "Migrate the database through scripts in db/migrations"
+  desc "Migrate the database through scripts in db/migrations."
   task :migrate => "mack:environment" do
     require 'migration_runner'
     include DataMapper::Types
@@ -12,7 +12,7 @@ namespace :db do
     DataMapper::MigrationRunner.migrate_up!
   end # migrate
   
-  desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
+  desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n."
   task :rollback => ["mack:environment", "db:abort_if_pending_migrations"] do
     require 'dm-core/types'
     require 'migration_runner'
@@ -26,7 +26,7 @@ namespace :db do
     end
   end # rollback
   
-  desc "Raises an error if there are pending migrations"
+  desc "Raises an error if there are pending migrations."
   task :abort_if_pending_migrations do
     require 'dm-core/types'
     require 'migration_runner'

data/lib/{test_extensions.rb → mack-data_mapper/test_extensions.rb}

@@ -15,10 +15,10 @@ if Mack.env == "test"
         module Helpers
           alias_method :mack_rake_task, :rake_task
         
-          def rake_task(name, env = {})
+          def rake_task(name, env = {}) # :nodoc:
             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")])
+            mack_rake_task(name, env, [File.join(File.dirname(__FILE__), "tasks", "db_create_drop_tasks.rake"),
+                                       File.join(File.dirname(__FILE__), "tasks", "db_migration_tasks.rake")])
           end
         end # Helpers
       

data/lib/mack-data_mapper_tasks.rb

@@ -1,3 +1,3 @@
-Dir.glob(File.join(File.dirname(__FILE__), "tasks", "*.rake")).each do |f|
+Dir.glob(File.join(File.dirname(__FILE__), "mack-data_mapper", "tasks", "*.rake")).each do |f|
   load(f)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.0.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - markbates
@@ -9,18 +9,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-18 00:00:00 -04:00
+date: 2008-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: data_mapper
+  name: dm-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: dm-aggregates
+  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: dm-serializer
+  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-timestamps
+  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-validations
+  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-observer
+  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-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.3
     version: 
 description: "mack-data_mapper was developed by: markbates"
 email: mark@mackframework.com
@@ -31,74 +101,38 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- 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/database.rb
+- lib/mack-data_mapper/dm_patches/dm-timestamps.rb
+- lib/mack-data_mapper/dm_patches/migrations.rb
+- lib/mack-data_mapper/genosaurus_helpers.rb
+- lib/mack-data_mapper/helpers/orm_helpers.rb
+- lib/mack-data_mapper/migration_generator/migration_generator.rb
+- lib/mack-data_mapper/migration_generator/templates/db/migrations/%=@migration_name%.rb.template
+- lib/mack-data_mapper/model_column.rb
+- lib/mack-data_mapper/model_generator/manifest.yml
+- lib/mack-data_mapper/model_generator/model_generator.rb
+- lib/mack-data_mapper/model_generator/templates/model.rb.template
+- lib/mack-data_mapper/model_generator/templates/rspec.rb.template
+- lib/mack-data_mapper/model_generator/templates/test_case.rb.template
+- lib/mack-data_mapper/resource.rb
+- lib/mack-data_mapper/runner.rb
+- lib/mack-data_mapper/scaffold_generator/manifest.yml
+- lib/mack-data_mapper/scaffold_generator/scaffold_generator.rb
+- lib/mack-data_mapper/scaffold_generator/templates/app/controllers/controller.rb.template
+- lib/mack-data_mapper/scaffold_generator/templates/app/helpers/controllers/helper.rb.template
+- lib/mack-data_mapper/scaffold_generator/templates/app/views/edit.html.erb.template
+- lib/mack-data_mapper/scaffold_generator/templates/app/views/index.html.erb.template
+- lib/mack-data_mapper/scaffold_generator/templates/app/views/new.html.erb.template
+- lib/mack-data_mapper/scaffold_generator/templates/app/views/show.html.erb.template
+- lib/mack-data_mapper/scaffold_generator/templates/test/functional/rspec.rb.template
+- lib/mack-data_mapper/scaffold_generator/templates/test/functional/test_case.rb.template
+- lib/mack-data_mapper/tasks/db_create_drop_tasks.rake
+- lib/mack-data_mapper/tasks/db_migration_tasks.rake
+- lib/mack-data_mapper/tasks/test_tasks.rake
+- lib/mack-data_mapper/test_extensions.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/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/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
-- doc/classes/DataMapper/Resource.html
-- doc/classes/Mack/Database.html
-- doc/classes/Mack/Genosaurus/DataMapper/Helpers.html
-- doc/classes/Mack/Genosaurus/DataMapper/ModelColumn.html
-- doc/classes/Mack/Testing/DataMapperHelpers.html
-- doc/classes/Mack/Testing/Helpers.html
-- doc/classes/Mack/ViewHelpers/DataMapperHelpers.html
-- doc/classes/Mack.html
-- doc/classes/MigrationGenerator.html
-- doc/classes/ModelGenerator.html
-- doc/classes/ScaffoldGenerator.html
-- doc/created.rid
-- doc/files/lib/database_rb.html
-- doc/files/lib/dm_patches/confirmation_validation_rb.html
-- doc/files/lib/dm_patches/dm-cli_rb.html
-- doc/files/lib/dm_patches/migrations_rb.html
-- doc/files/lib/dm_patches/pooling_rb.html
-- doc/files/lib/genosaurus_helpers_rb.html
-- doc/files/lib/helpers/orm_helpers_rb.html
-- doc/files/lib/mack-data_mapper_rb.html
-- doc/files/lib/mack-data_mapper_tasks_rb.html
-- doc/files/lib/migration_generator/migration_generator_rb.html
-- doc/files/lib/model_column_rb.html
-- doc/files/lib/model_generator/model_generator_rb.html
-- doc/files/lib/resource_rb.html
-- doc/files/lib/runner_rb.html
-- doc/files/lib/scaffold_generator/scaffold_generator_rb.html
-- doc/files/lib/test_extensions_rb.html
-- doc/files/README.html
-- doc/fr_class_index.html
-- doc/fr_file_index.html
-- doc/fr_method_index.html
-- doc/index.html
-- doc/rdoc-style.css
 has_rdoc: true
 homepage: http://www.mackframework.com
 post_install_message: