dm-rails 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 The dm-rails team
+Copyright (c) 2010-2010 The dm-rails team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -116,21 +116,21 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
   git 'git://github.com/snusnu/dm-core.git', 'branch' => 'active_support'
   git "git://github.com/snusnu/dm-more.git", 'branch' => 'active_support'
 
-  gem 'dm-core',           '~> 1.0.0.rc2'
-  gem 'dm-types',          '~> 1.0.0.rc2'
-  gem 'dm-validations',    '~> 1.0.0.rc2'
-  gem 'dm-constraints',    '~> 1.0.0.rc2'
-  gem 'dm-aggregates',     '~> 1.0.0.rc2'
-  gem 'dm-timestamps',     '~> 1.0.0.rc2'
-  gem 'dm-migrations',     '~> 1.0.0.rc2'
-  gem 'dm-observer',       '~> 1.0.0.rc2'
+  gem 'dm-core',           '~> 1.0.0.rc3'
+  gem 'dm-types',          '~> 1.0.0.rc3'
+  gem 'dm-validations',    '~> 1.0.0.rc3'
+  gem 'dm-constraints',    '~> 1.0.0.rc3'
+  gem 'dm-aggregates',     '~> 1.0.0.rc3'
+  gem 'dm-timestamps',     '~> 1.0.0.rc3'
+  gem 'dm-migrations',     '~> 1.0.0.rc3'
+  gem 'dm-observer',       '~> 1.0.0.rc3'
 
   # Use this instead of git if you're working on dm-rails
   # path '/full/path/to/your/local/clone/of/dm-rails'
 
   git 'git://github.com/datamapper/dm-rails.git'
 
-  gem 'dm-rails', '~> 1.0.0.rc2'
+  gem 'dm-rails', '~> 1.0.0.rc3'
 
   git 'git://github.com/rspec/rspec.git'
   git 'git://github.com/rspec/rspec-core.git'
@@ -503,4 +503,4 @@ Thx to all contributors, every patch, big or small is very much appreciated!
 
 == Copyright
 
-Copyright (c) 2009-2010 The dm-rails team. See {LICENSE}[http://github.com/datamapper/dm-rails/blob/master/LICENSE] for details.
+Copyright (c) 2010-2010 The dm-rails team. See {LICENSE}[http://github.com/datamapper/dm-rails/blob/master/LICENSE] for details.

data/Rakefile

@@ -2,30 +2,29 @@ require 'rubygems'
 require 'rake'
 
 begin
-
+  gem 'jeweler', '~> 1.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
-
     gem.name        = 'dm-rails'
     gem.summary     = 'Use DataMapper with Rails 3'
     gem.description = 'Integrate DataMapper with Rails 3'
     gem.email       = 'gamsnjaga@gmail.com'
-    gem.homepage    = 'http://github.com/datamapper/dm-rails'
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
 
-    gem.add_dependency 'dm-core',           '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-active_model',   '~> 1.0.0.rc2'
+    gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'activesupport',     '~> 3.0.0.beta3'
-    gem.add_dependency 'actionpack',        '~> 3.0.0.beta3'
-    gem.add_dependency 'railties',          '~> 3.0.0.beta3'
+    gem.add_dependency 'dm-core',         '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-active_model', '~> 1.0.0.rc3'
+    gem.add_dependency 'activesupport',   '~> 3.0.0.beta3'
+    gem.add_dependency 'actionpack',      '~> 3.0.0.beta3'
+    gem.add_dependency 'railties',        '~> 3.0.0.beta3'
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
-
 rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{Integrate DataMapper with Rails 3}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/dm-rails/railties/controller_runtime.rb",
      "lib/dm-rails/railties/database.rake",
      "lib/dm-rails/railties/i18n_support.rb",
+     "lib/dm-rails/railties/log_listener.rb",
      "lib/dm-rails/railties/log_subscriber.rb",
      "lib/dm-rails/session_store.rb",
      "lib/dm-rails/setup.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Use DataMapper with Rails 3}
 
@@ -62,21 +64,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0.beta3"])
       s.add_runtime_dependency(%q<railties>, ["~> 3.0.0.beta3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
       s.add_dependency(%q<actionpack>, ["~> 3.0.0.beta3"])
       s.add_dependency(%q<railties>, ["~> 3.0.0.beta3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
     s.add_dependency(%q<actionpack>, ["~> 3.0.0.beta3"])
     s.add_dependency(%q<railties>, ["~> 3.0.0.beta3"])

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

@@ -116,7 +116,7 @@ namespace :db do
     desc "Clear the sessions table for DataMapperStore"
     task :clear => :environment do
       require 'dm-rails/session_store'
-      Rails::DataMapper::SessionStore::Session.all.destroy!
+      Rails::DataMapper::SessionStore::Session.destroy!
       puts "Deleted entries from '#{Rails::DataMapper.configurations[Rails.env]['database']}.sessions'"
     end
   end

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

@@ -0,0 +1,15 @@
+module LogListener
+  def log(message)
+    ActiveSupport::Notifications.instrument('sql.data_mapper',
+      :name          => 'SQL',
+      :sql           => message.query, # TODO think about changing the key to :query
+      :start         => message.start,
+      :duration      => message.duration,
+      :connection_id => self.object_id
+    )
+    super
+  rescue Exception => e
+    # TODO proper logging
+    puts "[datamapper - ERROR] #{e.class.name}: #{e.message}: #{message.inspect}}"
+  end
+end

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

@@ -3,6 +3,11 @@ module DataMapper
 
     class LogSubscriber < Rails::LogSubscriber
 
+      def initialize
+        super
+        @odd_or_even = false
+      end
+
       def sql(event)
         name = '%s (%.1fms)' % [event.payload[:name], event.duration]
         sql  = event.payload[:sql].squeeze(' ')

data/lib/dm-rails/session_store.rb

@@ -12,9 +12,9 @@ module Rails
         include ::DataMapper::Resource
 
         property :id,         Serial
-        property :session_id, String,   :required => true, :unique => true, :unique_index => true
+        property :session_id, String,   :required => true, :unique => true
         property :data,       Object,   :required => true, :default => ActiveSupport::Base64.encode64(Marshal.dump({}))
-        property :updated_at, DateTime, :required => false, :index => true
+        property :updated_at, DateTime,                    :index => true
 
         def self.name
           'session'

data/lib/dm-rails/setup.rb

@@ -1,6 +1,7 @@
 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
@@ -11,30 +12,42 @@ module Rails
       configuration.repositories[environment].each do |name, config|
         setup_with_instrumentation(name.to_sym, config)
       end
-      initialize_foreign_keys
-    end
-
-    def self.setup_logger(logger)
-      ::DataMapper.logger = logger
+      finalize
     end
 
     def self.setup_with_instrumentation(name, options)
       puts "[datamapper] Setting up #{name.inspect} repository: '#{options['database']}' on #{options['adapter']}"
       adapter = ::DataMapper.setup(name, options)
       adapter.extend ::DataMapper::Adapters::Benchmarking
+      setup_log_listener(options['adapter'])
+    end
+
+    def self.setup_logger(logger)
+      ::DataMapper.logger = logger
     end
 
-    def self.initialize_foreign_keys
-      ::DataMapper::Model.descendants.each do |model|
-        model.relationships.each_value { |r| r.child_key }
+    def self.setup_log_listener(adapter_name)
+      adapter_name = 'sqlite3' if adapter_name == 'sqlite'
+      driver_name  = ActiveSupport::Inflector.camelize(adapter_name)
+      if Object.const_defined?('DataObjects') && DataObjects.const_defined?(driver_name)
+        DataObjects::Connection.send(:include, LogListener)
+        # FIXME Setting DataMapper::Logger.new($stdout, :off) alone won't work because the #log
+        # method is currently only available in DO and needs an explicit DO Logger instantiated.
+        # We turn the logger :off because ActiveSupport::Notifications handles displaying log messages
+        do_driver = DataObjects.const_get(driver_name)
+        do_driver.logger = DataObjects::Logger.new($stdout, :off)
       end
     end
 
+    def self.finalize
+      ::DataMapper.finalize
+    end
+
     def self.preload_models(app)
       app.config.paths.app.models.each do |path|
         Dir.glob("#{path}/**/*.rb").sort.each { |file| require_dependency file }
       end
-      initialize_foreign_keys
+      finalize
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,13 +28,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,13 +45,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,7 @@ files:
 - lib/dm-rails/railties/controller_runtime.rb
 - lib/dm-rails/railties/database.rake
 - lib/dm-rails/railties/i18n_support.rb
+- lib/dm-rails/railties/log_listener.rb
 - lib/dm-rails/railties/log_subscriber.rb
 - lib/dm-rails/session_store.rb
 - lib/dm-rails/setup.rb
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: datamapper
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3