dm-rails 1.0.0 → 1.0.1

data/Gemfile

@@ -7,9 +7,9 @@ group :runtime do
 
   git 'git://github.com/rails/rails.git' do
 
-    gem 'activesupport', '~> 3.0.0.beta3', :require => 'active_support'
-    gem 'actionpack',    '~> 3.0.0.beta3', :require => 'action_pack'
-    gem 'railties',      '~> 3.0.0.beta3', :require => 'rails'
+    gem 'activesupport', :require => 'active_support'
+    gem 'actionpack',    :require => 'action_pack'
+    gem 'railties',      :require => 'rails'
 
   end
 

data/README.rdoc

@@ -2,7 +2,7 @@
 
 This gem provides the railtie that allows {datamapper}[http://github.com/datamapper/dm-core] to hook into {rails3}[http://github.com/rails/rails] and thus behave like a rails framework component. Just like activercord does in rails, {dm-rails}[http://github.com/datamapper/dm-rails] uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
 
-Creating new datamapper apps on rails3 from scratch is actually really easy. Like, *really* easy. The following will guide you through the process.
+Creating new datamapper apps on rails3 from scratch is actually really easy. The following will guide you through the process.
 
 == Generating a new application from scratch
 
@@ -13,9 +13,9 @@ It's really easy to go from zero gems to a working rails3 app using datamapper.
 
 Once you have {rails}[http://github.com/rails/rails] and thus {bundler}[http://github.com/carlhuda/bundler] installed, you can bootstrap a rails master branch application with a single command. Yes! A single command. Cool.
 
-  rails dm_rails3_app -m http://datamapper.org/templates/rails.rb
+  rails new project_name -m http://datamapper.org/templates/rails.rb
 
-Now that was easy! When run, the command will print some options on how to proceed with your newly generated application, to the screen.
+When run, the command will print out some options on how to proceed with your newly generated application.
 
 == rspec support
 
@@ -51,16 +51,14 @@ Unfortunately, I haven't yet been able to get rspec to work with the default sql
 
 and you should be good to and use rspec.
 
-
 == Developing dm-rails
 
 Issue the following commands to get a fully functional development environment including datamapper and rails up and running within a minute.
 
   gem install bundler # if this is new for you
   bundle install
-  rake spec
 
-Now that was easy, wasn't it? Whenever you want to update your dependencies because you want to make sure you develop against master branches, just issue
+Whenever you want to update your dependencies because you want to make sure you develop against master branches, just issue
 
   bundle install
 
@@ -73,21 +71,19 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
 
   source 'http://rubygems.org'
 
-  git 'git://github.com/carlhuda/bundler.git'
-
-  gem 'bundler',           '~> 0.9.3'
+  RAILS_VERSION = '~> 3.0.0.beta4'
 
-  git 'git://github.com/rails/rails.git'
+  DM_VERSION    = '~> 1.0.0'
 
-  gem 'activesupport',     '~> 3.0.0.beta1', :require => 'active_support'
-  gem 'actionpack',        '~> 3.0.0.beta1', :require => 'action_pack'
-  gem 'railties',          '~> 3.0.0.beta1', :require => 'rails'
+  RSPEC_VERSION = '~> 2.0.0.beta.11'
 
-  # Uncomment this if you need actionmailer
-  # gem 'actionmailer',      '~> 3.0.0.beta1', :require => 'action_mailer'
+  gem 'activesupport',      RAILS_VERSION, :require => 'active_support'
+  gem 'actionpack',         RAILS_VERSION, :require => 'action_pack'
+  gem 'actionmailer',       RAILS_VERSION, :require => 'action_mailer'
+  gem 'railties',           RAILS_VERSION, :require => 'rails'
 
-  gem 'data_objects',      '~> 0.10.1'
-  gem 'do_sqlite3',        '~> 0.10.1'
+  gem 'dm-rails',               DM_VERSION
+  gem 'dm-#{database}-adapter', DM_VERSION
 
   # You can use any of the other available database adapters.
   # This is only a small excerpt of the list of all available adapters
@@ -98,42 +94,49 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
   #
   # for a rather complete list of available datamapper adapters and plugins
 
-  # gem 'do_mysql',          '~> 0.10.1'
-  # gem 'do_postgres',       '~> 0.10.1'
-  # gem 'do_oracle',         '~> 0.10.1'
+  # gem 'dm-sqlite-adapter',    DM_VERSION
+  # gem 'dm-mysql-adapter',     DM_VERSION
+  # gem 'dm-postgres-adapter',  DM_VERSION
+  # gem 'dm-oracle-adapter',    DM_VERSION
+  # gem 'dm-sqlserver-adapter', DM_VERSION
+
+  gem 'dm-migrations',        DM_VERSION
+  gem 'dm-types',             DM_VERSION
+  gem 'dm-validations',       DM_VERSION
+  gem 'dm-constraints',       DM_VERSION
+  gem 'dm-transactions',      DM_VERSION
+  gem 'dm-aggregates',        DM_VERSION
+  gem 'dm-timestamps',        DM_VERSION
+  gem 'dm-observer',          DM_VERSION
 
-  git 'git://github.com/snusnu/dm-core.git', 'branch' => 'active_support'
-  git "git://github.com/snusnu/dm-more.git", 'branch' => 'active_support'
+  group(:test) do
 
-  gem 'dm-core',           '~> 1.0.0'
-  gem 'dm-types',          '~> 1.0.0'
-  gem 'dm-validations',    '~> 1.0.0'
-  gem 'dm-constraints',    '~> 1.0.0'
-  gem 'dm-aggregates',     '~> 1.0.0'
-  gem 'dm-timestamps',     '~> 1.0.0'
-  gem 'dm-migrations',     '~> 1.0.0'
-  gem 'dm-observer',       '~> 1.0.0'
+    gem 'rspec',              RSPEC_VERSION
+    gem 'rspec-core',         RSPEC_VERSION, :require => 'rspec/core'
+    gem 'rspec-expectations', RSPEC_VERSION, :require => 'rspec/expectations'
+    gem 'rspec-mocks',        RSPEC_VERSION, :require => 'rspec/mocks'
+    gem 'rspec-rails',        RSPEC_VERSION
 
-  # Use this instead of git if you're working on dm-rails
-  # path '/full/path/to/your/local/clone/of/dm-rails'
+  end
 
-  git 'git://github.com/datamapper/dm-rails.git'
+  # ------------------------------------------------------------------------------
 
-  gem 'dm-rails', '~> 1.0.0'
+  # These gems are only listed here in the Gemfile because we want to pin them
+  # to the github repositories for as long as no stable version has been released.
+  # The dm-core gem is a hard dependency for dm-rails so it would get pulled in by
+  # simply adding dm-rails. The dm-do-adapter gem is a hard dependency for any of
+  # the available dm-xxx-adapters. Once we have stable gems available, pinning these
+  # gems to github will be optional.
 
-  git 'git://github.com/rspec/rspec.git'
-  git 'git://github.com/rspec/rspec-core.git'
-  git 'git://github.com/rspec/rspec-expectations.git'
-  git 'git://github.com/rspec/rspec-mocks.git'
-  git 'git://github.com/rspec/rspec-rails.git'
+  gem 'dm-core',              DM_VERSION
+  gem 'dm-do-adapter',        DM_VERSION
+  gem 'dm-active_model',      DM_VERSION
+
+
+  # Uncomment this line if you want to see application specific metric data
+
+  # gem 'rails_metrics', '~> 0.1', :git => 'git://github.com/engineyard/rails_metrics'
 
-  group(:test) do
-    gem 'rspec',              '2.0.0.a8'
-    gem 'rspec-core',         '2.0.0.a8', :require => 'rspec/core'
-    gem 'rspec-expectations', '2.0.0.a8', :require => 'rspec/expectations'
-    gem 'rspec-mocks',        '2.0.0.a8', :require => 'rspec/mocks'
-    gem 'rspec-rails',        '2.0.0.a9'
-  end
 
 
 == Sample database.yml files
@@ -217,52 +220,54 @@ Once you have defined your database.yml file, dm-rails's rake tasks will be able
 
 == Available generators
 
-Due to the awesomeness of rails3 generators we get some cool generators almost for free. Since the new generators provide hooks that allow the dm-rails gem to provide generators that hook into parts like model, scaffolds or test generation, everything just works like it would with active_record.
+Since the new generators provide hooks that allow the dm-rails gem to provide generators that hook into parts like model, scaffolds or test generation, everything just works like it does with active_record.
 
 The following generators are available to help you get started with the typical components of any rails application.
 
-  vendor/bin/rails generate controller
-  vendor/bin/rails generate generator
-  vendor/bin/rails generate helper
-  vendor/bin/rails generate integration_test
-  vendor/bin/rails generate mailer
-  vendor/bin/rails generate metal
-  vendor/bin/rails generate migration
-  vendor/bin/rails generate model
-  vendor/bin/rails generate model_subclass
-  vendor/bin/rails generate observer
-  vendor/bin/rails generate performance_test
-  vendor/bin/rails generate plugin
-  vendor/bin/rails generate resource
-  vendor/bin/rails generate scaffold
-  vendor/bin/rails generate scaffold_controller
-  vendor/bin/rails generate session_migration
-  vendor/bin/rails generate stylesheets
+  ...
+  rails generate controller
+  rails generate generator
+  rails generate helper
+  rails generate integration_test
+  rails generate migration
+  rails generate model
+  rails generate observer
+  rails generate performance_test
+  rails generate plugin
+  rails generate resource
+  rails generate scaffold
+  rails generate scaffold_controller
+  rails generate session_migration
+  rails generate stylesheets
+  ...
+
+For a complete list run the following in your project's directory
+
+  rails generate
 
 
 == Available datamapper specific rake tasks
 
 To get a list of all available rake tasks in your rails3 app, issue the usual
 
-  vendor/bin/rake -T
+  rake -T
 
 Once you do that, you will see the following rake tasks among others. These are the ones that dm-rails added for us.
 
   ...
-  vendor/bin/rake db:automigrate           # Perform destructive automigration
-  vendor/bin/rake db:autoupgrade           # Perform non destructive automigration
-  vendor/bin/rake db:create                # Create the database(s) defined in config/database.yml for the current Rails.env - also creates the test database(s) if Rails.env.development?
-  vendor/bin/rake db:create:all            # Create all the local databases defined in config/database.yml
-  vendor/bin/rake db:drop                  # Drops the database(s) for the current Rails.env - also drops the test database(s) if Rails.env.development?
-  vendor/bin/rake db:drop:all              # Drop all the local databases defined in config/database.yml
-  vendor/bin/rake db:migrate               # Migrate the database to the latest version
-  vendor/bin/rake db:migrate:down[version] # Migrate down using migrations
-  vendor/bin/rake db:migrate:up[version]   # Migrate up using migrations
-  vendor/bin/rake db:seed                  # Load the seed data from db/seeds.rb
-  vendor/bin/rake db:sessions:clear        # Clear the sessions table for DataMapperStore
-  vendor/bin/rake db:sessions:create       # Creates the sessions table for DataMapperStore
-  vendor/bin/rake db:setup                 # Create the database, load the schema, and initialize with the seed data
-
+  rake db:automigrate            # Perform destructive automigration of all repositories in the current Rails.env
+  rake db:autoupgrade            # Perform non destructive automigration of all repositories in the current Rails.env
+  rake db:create                 # Create the database(s) defined in config/database.yml for the current Rails.env - also creates the test database(s) if Rails.env.development?
+  rake db:create:all             # Create all the local databases defined in config/database.yml
+  rake db:drop                   # Drops the database(s) for the current Rails.env - also drops the test database(s) if Rails.env.development?
+  rake db:drop:all               # Drop all the local databases defined in config/database.yml
+  rake db:migrate                # Migrate the database to the latest version
+  rake db:migrate:down[version]  # Migrate down using migrations
+  rake db:migrate:up[version]    # Migrate up using migrations
+  rake db:seed                   # Load the seed data from db/seeds.rb
+  rake db:sessions:clear         # Clear the sessions table for DataMapperStore
+  rake db:sessions:create        # Creates the sessions table for DataMapperStore
+  rake db:setup                  # Create the database, load the schema, and initialize with the seed data
   ...
 
 
@@ -277,34 +282,27 @@ Rails3 makes it easy to expose framework component specific configuration to app
   Rails::DataMapper::Configuration#raw
   Rails::DataMapper::Configuration#environments
   Rails::DataMapper::Configuration#repositories
-  Rails::DataMapper::Configuration#identity_map=(value)
-  Rails::DataMapper::Configuration#identity_map
-  Rails::DataMapper::Configuration#adapter_cascade
-
 
 
 As promised, you can easily inspect the configuration from your running rails application. Let's start a rails console and have a look what's configured for our app.
 
-  ree-1.8.7-2010.01 mungo:datamapper_on_rails3 snusnu$ vendor/bin/rails console
-  Loading development environment (Rails 3.0.0.beta)
+  ree-1.8.7-2010.01 mungo:alfred snusnu$ rails console
+  Loading development environment (Rails 3.0.0.beta4)
   ruby-1.8.7-p248 > require 'pp'
    => ["PP"]
   ruby-1.8.7-p248 > pp Rails::DataMapper.configuration
-  #<Rails::DataMapper::Configuration:0x1025bbc58
-   @adapter_cascade=Rails::DataMapper::Adapters::Cascade,
-   @identity_map=true,
-   @plugins=["dm-validations", "dm-timestamps", "dm-observer", "dm-migrations"],
+  #<Rails::DataMapper::Configuration:0x103b46460
    @raw=
     {"production"=>
       {"adapter"=>"mysql",
        "username"=>"root",
-       "database"=>"rails3_app_production",
+       "database"=>"alfred_production",
        "host"=>"localhost",
        "password"=>nil},
      "development"=>
       {"adapter"=>"mysql",
        "username"=>"root",
-       "database"=>"rails3_app_development",
+       "database"=>"alfred_development",
        "host"=>"localhost",
        "password"=>nil},
      "defaults"=>
@@ -315,7 +313,7 @@ As promised, you can easily inspect the configuration from your running rails ap
      "test"=>
       {"adapter"=>"mysql",
        "username"=>"root",
-       "database"=>"rails3_app_test",
+       "database"=>"alfred_test",
        "host"=>"localhost",
        "password"=>nil}},
    @repositories=
@@ -323,28 +321,30 @@ As promised, you can easily inspect the configuration from your running rails ap
       {"default"=>
         {"adapter"=>"mysql",
          "username"=>"root",
-         "database"=>"rails3_app_production",
+         "database"=>"alfred_production",
          "host"=>"localhost",
          "password"=>nil}},
      "development"=>
       {"default"=>
         {"adapter"=>"mysql",
          "username"=>"root",
-         "database"=>"rails3_app_development",
+         "database"=>"alfred_development",
          "host"=>"localhost",
          "password"=>nil}},
      "test"=>
       {"default"=>
         {"adapter"=>"mysql",
          "username"=>"root",
-         "database"=>"rails3_app_test",
+         "database"=>"alfred_test",
          "host"=>"localhost",
-         "password"=>nil}}}>
+         "password"=>nil}}},
+   @root=#<Pathname:/Users/snusnu/projects/github/mine/alfred>>
+
    => nil
 
 Additionally, you can reach the configuration object via the standard way that rails provides to expose configuration for framework components and plugins.
 
-  Rails.application.config.data_mapper.configuration
+  Rails.application.config.data_mapper
 
 This will give you the exact same object we inspected in the previous pretty print output from rails console.
 
@@ -355,15 +355,9 @@ It's easy to extend or adapt dm-rails to meet your specific needs. Thanks to the
 
 To give you an idea of what you get when inheriting from Rails::DataMapper::Railtie have a look at the list of methods provided by that object.
 
-  Rails::DataMapper::Railtie.setup_data_mapper(app)
-  Rails::DataMapper::Railtie.preload_lib(app)
-  Rails::DataMapper::Railtie.preload_models(app)
-
-  Rails::DataMapper::Railtie#configure_data_mapper(app)
-  Rails::DataMapper::Railtie#setup_adapter_cascade(app)
-  Rails::DataMapper::Railtie#setup_routing_support(app)
+  Rails::DataMapper::Railtie.configure_data_mapper(app)
+  Rails::DataMapper::Railtie.setup_i18n_support(app)
   Rails::DataMapper::Railtie#setup_controller_runtime(app)
-  Rails::DataMapper::Railtie#setup_identity_map(app)
   Rails::DataMapper::Railtie#setup_logger(app)
 
 
@@ -377,12 +371,8 @@ To complete the picture of dm-rails's initialization process, here's an overview
     setup_logger(app, Rails.logger)
   end
 
-  initializer 'data_mapper.adapter_cascade' do |app|
-    setup_adapter_cascade(app)
-  end
-
-  initializer 'data_mapper.routing_support' do |app|
-    setup_routing_support(app)
+  initializer 'data_mapper.i18n_support' do |app|
+    setup_i18n_support(app)
   end
 
   # Expose database runtime to controller for logging.
@@ -390,17 +380,20 @@ To complete the picture of dm-rails's initialization process, here's an overview
     setup_controller_runtime(app)
   end
 
-  initializer 'data_mapper.setup_identity_map' do |app|
-    setup_identity_map(app)
+  # Preload all models once in production mode,
+  # and before every request in development mode
+  initializer "datamapper.add_to_prepare" do |app|
+    config.to_prepare { Rails::DataMapper.preload_models(app) }
   end
 
-  # Run setup code after_initialize to make sure all config/initializers
-  # are in effect once we setup the connection. This is especially necessary
-  # for the cascaded adapter wrappers that need to be declared before setup.
-  # Note that setup_datamapper (and needed methods are defined in class scope)
-
+  # Run setup code once in after_initialize to make sure all initializers
+  # are in effect once we setup the connection. Also, this will make sure
+  # that the connection gets set up after all models have been loaded,
+  # because #after_initialize is guaranteed to run after #to_prepare.
+  # Both production and development environment will execute the setup
+  # code only once.
   config.after_initialize do |app|
-    setup_data_mapper(app)
+    Rails::DataMapper.setup(Rails.env)
   end
 
 If you want to add additional rake tasks in your extension, you can do so by adding the following to your railtie.
@@ -412,16 +405,74 @@ If you want to add additional rake tasks in your extension, you can do so by add
 
 == Identity Map support
 
-By default, dm-rails enables the use of the {identity map}[http://datamapper.org/why.html]. If for any reason you want to turn that off, just add the following line to your config/application.rb or your config/environments/*.rb file.
-
-    config.data_mapper.identity_map = false
-
-Activating the identity map is achieved by installing a middleware that wraps the whole request inside
+Activating the identity map is achieved by installing a middleware that wraps the whole request inside a block
 
   DataMapper.repository { ... }
 
 Note that this scopes every call to datamapper to the :default repository specified in your database.yml file. If you need to access a different repository from within your actions, just wrap the calls in another DataMapper.repository block. DataMapper stacks the repositories it uses and the innermost will always win.
 
+In order to activate the Identity Map in your application, you need to explicitly use the provided middleware (or in fact any other middleware that does the job to your liking) in any of your controllers. For example, if you want to enable the Identity Map for all controllers, you would declare to use the middleware in your ApplicationController.
+
+  require 'dm-rails/middleware/identity_map'
+  class ApplicationController < ActionController::Base
+    use Rails::DataMapper::Middleware::IdentityMap
+    protect_from_forgery
+  end
+
+If you've created your application using the official templates at http://datamapper.org/templates/rails.rb this has already been added for you. If for some reason you don't want to enable the Identity Map globally for all controllers, you can either just use the middleware in a few selected controllers (in case you don't have too many controllers needing it), or you can create a controller class that uses the middleware, and inherit from that controller in cases where you need Identity Map support.
+
+  # app/controllers/identity_map_controller.rb
+  require 'dm-rails/middleware/identity_map'
+  class IdentityMapController < ApplicationController
+    use Rails::DataMapper::Middleware::IdentityMap
+  end
+
+  # app/controllers/people_controller.rb
+  class PeopleController < IdentityMapController
+    # ...
+  end
+
+== Cucumber testing framework support
+
+dm-rails ist working fine with the cucumber testing framework out of the box. In order to have transaction support in cucumber, so that the data generated by the different scenarios doesn't cause problems, create a file "RAILS_APP/features/support/datamapper.rb" with the following contents:
+
+  Before do
+    repository(:default) do |repository|
+      transaction = DataMapper::Transaction.new(repository)
+      transaction.begin
+      repository.adapter.push_transaction(transaction)
+    end
+  end
+
+  After do
+    repository(:default).adapter.pop_transaction.rollback
+  end
+
+This simply wraps each scenario in a transaction which is rolled back.
+
+If your underlying database doesn't support transactions, you can instead use this code to clean/ truncate the whole database after each scenario (not dm-rails specific):
+
+  require 'database_cleaner'
+  require 'database_cleaner/cucumber'
+  DatabaseCleaner.strategy = :truncation
+
+== Using adapter specific Resource naming conventions
+
+Say you want to namespace your models and don't want your storage names to reflect your module nesting. DataMapper provides easy ways to use just the naming conventions you like. Basically, all you need to do is tell dm-rails and thus DataMapper that you either want to use a predefined naming convention
+
+  # in some config/initializers/file.rb
+  convention = DataMapper::NamingConventions::Resource::UnderscoredAndPluralizedWithoutModule
+  Rails::DataMapper.configuration.resource_naming_convention[:default] = convention
+
+or that you want to use your own naming convention, that is implemented in e.g. a lambda
+
+  # in some config/initializers/file.rb
+  Rails::DataMapper.configuration.resource_naming_convention[:default] = lambda do |value|
+    'tbl' + value.camelize(true)
+  end
+
+For more detailed documentation about DataMapper naming conventions and the ones that are available by default, have a look at http://rdoc.info/projects/datamapper/dm-core and search for _NamingConventions_ in the Class List.
+
 
 == Using additional datamapper plugins
 
@@ -440,8 +491,6 @@ Currently dm-rails publishes the same benchmarking information like active_recor
 
   Completed in 9ms (Views: 7.6ms | Models: 0.6ms) with 200
 
-While the SQL issued by DO adapters is already being logged properly, it is not yet published to possible rails subscribers. This is basically the only thing we're still missing in terms of datamapper rails3 notifications integration, compared with active_record. Of course we're not tied to only publishing these messages. If anyone can think of other useful information to publish, it's easy to hook into rails' notification system.
-
 
 == Current Issues
 
@@ -455,11 +504,6 @@ While the SQL issued by DO adapters is already being logged properly, it is not
 * Think about a release strategy supporting both beta releases and master branch
 * Further README updates
 * More work on migrations
-* Check if the {session store}[http://github.com/datamapper/dm-rails/blob/master/lib/dm-rails/session_store.rb] support works
-* Provide a rails template for generating tailored apps for datamapper
-* Publish SQL issued by DO (and eventually every adapter) to rails subscribers
-* Think about integrating with {dana}[http://github.com/snusnu/dm-accepts_nested_attributes]
-* Think about integrating {dm-serializer}[http://github.com/datamapper/dm-more/tree/master/dm-serializer/]
 
 == Credits
 
@@ -481,14 +525,16 @@ Big thanks to everyone working on {datamapper}[http://github.com/datamapper/dm-c
 
 Thx to all contributors, every patch, big or small is very much appreciated!
 
-* Martin Gamsjaeger (snusnu)
-* Dan Kubb (dkubb)
-* Alex Coles (myabc)
-* Alex Mankuta
-* Foy Savas
+* Martin Gamsjaeger ({snusnu}[http://github.com/snusnu])
+* Dan Kubb ({dkubb}[http://github.com/dkubb])
+* Alex Coles ({myabc}[http://github.com/myabc])
+* Alex Mankuta ({cheba}[http://github.com/cheba])
+* Foy Savas ({foysavas}[http://github.com/foysavas])
 * Randall Brewer
-* Josh Huckabee
-* Patrik Sundberg
+* Josh Huckabee {jhuckabee}[http://github.com/jhuckabee]
+* Patrik Sundberg ({sundbp}[http://github.com/sundbp])
+* Corin Langosch ({gucki}[http://github.com/gucki])
+* Jared Morgan ({jm81}[http://github.com/jm81])
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-08-11}
   s.description = %q{Integrate DataMapper with Rails 3}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
      "lib/dm-rails/configuration.rb",
      "lib/dm-rails/middleware/identity_map.rb",
      "lib/dm-rails/railtie.rb",
-     "lib/dm-rails/railties/benchmarking_mixin.rb",
      "lib/dm-rails/railties/controller_runtime.rb",
      "lib/dm-rails/railties/database.rake",
      "lib/dm-rails/railties/i18n_support.rb",

data/lib/dm-rails/configuration.rb

@@ -15,7 +15,7 @@ module Rails
       attr_reader :root, :raw
 
       def environments
-        config.keys
+        raw.keys
       end
 
       def repositories
@@ -30,16 +30,10 @@ module Rails
         end
       end
 
-
-      def identity_map=(value)
-        @identity_map = value
-      end
-
-      def identity_map
-        @identity_map ||= true
+      def resource_naming_convention
+        @resource_naming_convention ||= {}
       end
 
-
     private
 
       def initialize(root, database_yml_hash)

data/lib/dm-rails/railtie.rb

@@ -22,8 +22,6 @@ module Rails
 
     class Railtie < Rails::Railtie
 
-      log_subscriber :data_mapper, ::DataMapper::Railties::LogSubscriber.new
-
       config.generators.orm :data_mapper, :migration => true
 
 
@@ -41,13 +39,8 @@ module Rails
 
       def setup_controller_runtime(app)
         require "dm-rails/railties/controller_runtime"
-        ActionController::Base.send :include, Rails::DataMapper::Railties::ControllerRuntime
-      end
-
-      def setup_identity_map(app)
-        if app.config.data_mapper.identity_map
-          require 'dm-rails/middleware/identity_map'
-          app.config.middleware.use Rails::DataMapper::Middleware::IdentityMap
+        ActiveSupport.on_load(:action_controller) do
+          include Rails::DataMapper::Railties::ControllerRuntime
         end
       end
 
@@ -73,10 +66,6 @@ module Rails
         setup_controller_runtime(app)
       end
 
-      initializer 'data_mapper.setup_identity_map' do |app|
-        setup_identity_map(app)
-      end
-
       # Preload all models once in production mode,
       # and before every request in development mode
       initializer "datamapper.add_to_prepare" do |app|

data/lib/dm-rails/railties/controller_runtime.rb

@@ -15,9 +15,9 @@ module Rails
         def cleanup_view_runtime
           # TODO add checks if DataMapper is connected to a repository.
           # If it is, do this, if it isn't, just delegate to super
-          db_rt_before_render = ::DataMapper.repository.adapter.reset_runtime
+          db_rt_before_render = ::DataMapper::Railties::LogSubscriber.reset_runtime
           runtime = super
-          db_rt_after_render = ::DataMapper.repository.adapter.reset_runtime
+          db_rt_after_render = ::DataMapper::Railties::LogSubscriber.reset_runtime
           self.db_runtime = db_rt_before_render + db_rt_after_render
           runtime - db_rt_after_render
         end
@@ -32,7 +32,7 @@ module Rails
 
           def log_process_action(payload)
             messages, db_runtime = super, payload[:db_runtime]
-            messages << ("Models: %.1fms" % db_runtime.to_f) if db_runtime
+            messages << ("Models: %.3fms" % db_runtime.to_f) if db_runtime
             messages
           end
 
@@ -43,3 +43,4 @@ module Rails
     end
   end
 end
+

data/lib/dm-rails/railties/database.rake

@@ -35,9 +35,6 @@ namespace :db do
   desc "Drops the database(s) for the current Rails.env - also drops the test database(s) if Rails.env.development?"
   task :drop => :environment do
     Rails::DataMapper.storage.drop_environment(Rails::DataMapper.configuration.repositories[Rails.env])
-    if Rails.env.development? && Rails::DataMapper.configuration.repositories['test']
-      Rails::DataMapper.storage.drop_environment(Rails::DataMapper.configuration.repositories['test'])
-    end
   end
 
 
@@ -48,13 +45,6 @@ namespace :db do
       ::DataMapper.auto_migrate!(repository.to_sym)
       ::DataMapper.logger.info "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
     end
-    if Rails.env.development? && Rails::DataMapper.configuration.repositories['test']
-      Rails::DataMapper.setup('test')
-      Rails::DataMapper.configuration.repositories['test'].each do |repository, config|
-        ::DataMapper.auto_migrate!(repository.to_sym)
-        ::DataMapper.logger.info "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
-      end
-    end
   end
 
   desc 'Perform non destructive automigration of all repositories in the current Rails.env'
@@ -64,13 +54,6 @@ namespace :db do
       ::DataMapper.auto_upgrade!(repository.to_sym)
       ::DataMapper.logger.info "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
     end
-    if Rails.env.development? && Rails::DataMapper.configuration.repositories['test']
-      Rails::DataMapper.setup('test')
-      Rails::DataMapper.configuration.repositories['test'].each do |repository, config|
-        ::DataMapper.auto_upgrade!(repository.to_sym)
-        ::DataMapper.logger.info "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
-      end
-    end
   end
 
   desc 'Load the seed data from db/seeds.rb'

data/lib/dm-rails/railties/log_listener.rb

@@ -17,7 +17,7 @@ module ActiveSupport
   module Notifications
     class Event
       def duration
-        @duration ||= payload[:duration] ? (payload[:duration] / 1000.0) : 1000.0 * (@end - @time)
+        payload[:duration] ? (payload[:duration] / 1000.0) : 1000.0 * (self.end - self.time)
       end
     end
   end

data/lib/dm-rails/railties/log_subscriber.rb

@@ -1,7 +1,20 @@
 module DataMapper
   module Railties
 
-    class LogSubscriber < Rails::LogSubscriber
+    class LogSubscriber < ActiveSupport::LogSubscriber
+
+      def self.runtime=(value)
+        Thread.current["data_mapper_sql_runtime"] = value
+      end
+
+      def self.runtime
+        Thread.current["data_mapper_sql_runtime"] ||= 0
+      end
+
+      def self.reset_runtime
+        rt, self.runtime = runtime, 0
+        rt
+      end
 
       def initialize
         super
@@ -9,14 +22,17 @@ module DataMapper
       end
 
       def sql(event)
-        name = '%s (%.1fms)' % [event.payload[:name], event.duration]
+        self.class.runtime += event.duration
+        return unless logger.debug?
+
+        name = '%s (%.3fms)' % [event.payload[:name], event.duration]
         sql  = event.payload[:sql].squeeze(' ')
 
         if odd?
-          name = color(name, :cyan, true)
+          name = color(name, CYAN, true)
           sql  = color(sql, nil, true)
         else
-          name = color(name, :magenta, true)
+          name = color(name, MAGENTA, true)
         end
 
         debug "  #{name}  #{sql}"
@@ -34,3 +50,6 @@ module DataMapper
 
   end
 end
+
+DataMapper::Railties::LogSubscriber.attach_to :data_mapper
+

data/lib/dm-rails/setup.rb

@@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except'
 
 require 'dm-rails/configuration'
 require 'dm-rails/railties/log_listener'
-require 'dm-rails/railties/benchmarking_mixin'
 
 module Rails
   module DataMapper
@@ -18,7 +17,9 @@ module Rails
     def self.setup_with_instrumentation(name, options)
       ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{options['database']}' on #{options['adapter']}"
       adapter = ::DataMapper.setup(name, options)
-      adapter.extend ::DataMapper::Adapters::Benchmarking
+      if convention = configuration.resource_naming_convention[name]
+        adapter.resource_naming_convention = convention
+      end
       setup_log_listener(options['adapter'])
     end
 

data/lib/dm-rails/storage.rb

@@ -47,7 +47,7 @@ module Rails
         end
 
         def lookup_class(adapter)
-          klass_name = adapter.camelize.to_sym
+          klass_name = normalized_adapter_name(adapter).camelize.to_sym
 
           unless Storage.const_defined?(klass_name)
             raise "Adapter #{adapter} not supported (#{klass_name.inspect})"
@@ -56,6 +56,10 @@ module Rails
           const_get(klass_name)
         end
 
+        def normalized_adapter_name(adapter_name)
+          adapter_name.to_s == 'sqlite3' ? 'sqlite' : adapter_name
+        end
+
       end
 
       def initialize(name, config)
@@ -88,7 +92,7 @@ module Rails
         @charset ||= config['charset'] || ENV['CHARSET'] || 'utf8'
       end
 
-      class Sqlite3 < Storage
+      class Sqlite < Storage
         def _create
           return if in_memory?
           ::DataMapper.setup(name, config.merge('database' => path))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253627
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253627
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -93,7 +93,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253627
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -124,7 +124,6 @@ files:
 - lib/dm-rails/configuration.rb
 - lib/dm-rails/middleware/identity_map.rb
 - lib/dm-rails/railtie.rb
-- lib/dm-rails/railties/benchmarking_mixin.rb
 - lib/dm-rails/railties/controller_runtime.rb
 - lib/dm-rails/railties/database.rake
 - lib/dm-rails/railties/i18n_support.rb

data/lib/dm-rails/railties/benchmarking_mixin.rb

@@ -1,23 +0,0 @@
-module DataMapper
-  module Adapters
-    module Benchmarking
-
-      %w[ create read update delete ].each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__
-          def #{method}(*args, &block)
-            result = nil
-            @runtime ||= 0
-            @runtime += Benchmark.ms { result = super(*args, &block) }
-            result
-          end
-        RUBY
-      end
-
-      def reset_runtime
-        rt, @runtime = @runtime, 0
-        rt.to_f
-      end
-
-    end
-  end
-end