dm-rails 1.0.0.rc3 → 1.0.0

data/Gemfile

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

data/README.rdoc

@@ -8,21 +8,14 @@ Creating new datamapper apps on rails3 from scratch is actually really easy. Lik
 
 It's really easy to go from zero gems to a working rails3 app using datamapper. All you need is the latest {rubygems}[http://docs.rubygems.org/read/chapter/3] release and {rails}[http://github.com/rails/rails]
 
-  gem update —system # you will need rubygems-1.3.6 for the command below to work
+  gem update —system # you will need rubygems ~> 1.3.6 for the command below to work
   gem install rails --pre
 
 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://github.com/snusnu/rails-templates/raw/master/dm_rails_master.rb
-
-Now that was easy! Follow the instructions and point your browser to
-
-  http://localhost:3000/people
-
-Awesome.
-
-In the future, http://github.com/snusnu/rails-templates will host a more comprehensive set of rails application templates. Currently only the above are supported but you can expect some reasonable defaults to follow soon. Things like rspec and jquery support are definitely on the list, maybe also support for {devise}[http://github.com/plataformatec/devise] and {inherited_resources}[http://github.com/josevalim/inherited_resources]. These will of course be on a pluggable basis. Nothing will be forced upon you. We heavily encourage you to build your own customized application templates and maybe send us a note if you think they could be interesting to more people.
+  rails dm_rails3_app -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.
 
 == rspec support
 
@@ -74,10 +67,6 @@ Now that was easy, wasn't it? Whenever you want to update your dependencies beca
 again and {bundler}[http://github.com/carlhuda/bundler] will go ahead and fetch the latest commits from the gems you depend on.
 
 
-== Minimal sample application
-
-Have a look at {datamapper_on_rails3}[http://github.com/snusnu/datamapper_on_rails3] for a very minimal sample application that was built following the previous instructions on how to build a new application from scratch.
-
 == Sample Gemfile
 
 Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an app going with datamapper and rails3. Just use a Gemfile like this, and bundler will pull in everything needed to run your app. Note that you also must add any additional datamapper plugin or any other gem that you'd like to use to the Gemfile. This makes sure that bundler is able to provide a complete environment containing all required dependencies for your app.
@@ -116,21 +105,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.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'
+  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'
 
   # 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.rc3'
+  gem 'dm-rails', '~> 1.0.0'
 
   git 'git://github.com/rspec/rspec.git'
   git 'git://github.com/rspec/rspec-core.git'

data/Rakefile

@@ -15,8 +15,8 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',         '~> 1.0.0.rc3'
-    gem.add_dependency 'dm-active_model', '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-core',         '~> 1.0.0'
+    gem.add_dependency 'dm-active_model', '~> 1.0.0'
     gem.add_dependency 'activesupport',   '~> 3.0.0.beta3'
     gem.add_dependency 'actionpack',      '~> 3.0.0.beta3'
     gem.add_dependency 'railties',        '~> 3.0.0.beta3'

data/VERSION

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

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.0.0.rc3"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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-05-27}
+  s.date = %q{2010-06-08}
   s.description = %q{Integrate DataMapper with Rails 3}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -64,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.rc3"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.0"])
       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.rc3"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.0.0"])
       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.rc3"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.0.0"])
     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

@@ -3,10 +3,6 @@ require 'dm-rails/storage'
 
 namespace :db do
 
-  task :load_models => :environment do
-    FileList["app/models/**/*.rb"].each { |model| load model }
-  end
-
   desc 'Create the database, load the schema, and initialize with the seed data'
   task :setup => [ 'db:create', 'db:automigrate', 'db:seed' ]
 
@@ -46,33 +42,33 @@ namespace :db do
 
 
   desc 'Perform destructive automigration of all repositories in the current Rails.env'
-  task :automigrate => :load_models do
+  task :automigrate => :environment do
     require 'dm-migrations'
     Rails::DataMapper.configuration.repositories[Rails.env].each do |repository, config|
       ::DataMapper.auto_migrate!(repository.to_sym)
-      puts "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
+      ::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)
-        puts "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
+        ::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'
-  task :autoupgrade => :load_models do
+  task :autoupgrade => :environment do
     require 'dm-migrations'
     Rails::DataMapper.configuration.repositories[Rails.env].each do |repository, config|
       ::DataMapper.auto_upgrade!(repository.to_sym)
-      puts "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
+      ::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)
-        puts "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
+        ::DataMapper.logger.info "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
       end
     end
   end
@@ -110,14 +106,16 @@ namespace :db do
     task :create => :environment do
       require 'dm-rails/session_store'
       Rails::DataMapper::SessionStore::Session.auto_migrate!
-      puts "Created '#{Rails::DataMapper.configurations[Rails.env]['database']}.sessions'"
+      database = Rails::DataMapper.configuration.repositories[Rails.env]['database']
+      ::DataMapper.logger.info "Created '#{database}.sessions'"
     end
 
     desc "Clear the sessions table for DataMapperStore"
     task :clear => :environment do
       require 'dm-rails/session_store'
       Rails::DataMapper::SessionStore::Session.destroy!
-      puts "Deleted entries from '#{Rails::DataMapper.configurations[Rails.env]['database']}.sessions'"
+      database = Rails::DataMapper.configuration.repositories[Rails.env]['database']
+      ::DataMapper.logger.info "Deleted entries from '#{database}.sessions'"
     end
   end
 

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

@@ -1,3 +1,28 @@
+require 'active_support/notifications'
+
+# TODO This needs to be fixed upstream in active_support/notifications/instrumenter.rb
+#
+# We need to monkeypatch this for now, because the original implementation hardcodes the
+# duration to the time elapsed between start and end of the event. The current upstream
+# implementation is included here for reference:
+#
+#   def duration
+#     @duration ||= 1000.0 * (@end - @time)
+#   end
+#
+# It should be safe to assume that explicitly provided duration information should be at
+# least as precise as the current generic solution, if not more (as in our specific case).
+#
+module ActiveSupport
+  module Notifications
+    class Event
+      def duration
+        @duration ||= payload[:duration] ? (payload[:duration] / 1000.0) : 1000.0 * (@end - @time)
+      end
+    end
+  end
+end
+
 module LogListener
   def log(message)
     ActiveSupport::Notifications.instrument('sql.data_mapper',
@@ -9,7 +34,6 @@ module LogListener
     )
     super
   rescue Exception => e
-    # TODO proper logging
-    puts "[datamapper - ERROR] #{e.class.name}: #{e.message}: #{message.inspect}}"
+    ::DataMapper.logger.error "[datamapper] #{e.class.name}: #{e.message}: #{message.inspect}}"
   end
 end

data/lib/dm-rails/session_store.rb

@@ -1,4 +1,5 @@
 require 'dm-core'
+require 'active_support/core_ext/class/attribute'
 
 # Implements DataMapper-specific session store.
 
@@ -13,18 +14,22 @@ module Rails
 
         property :id,         Serial
         property :session_id, String,   :required => true, :unique => true
-        property :data,       Object,   :required => true, :default => ActiveSupport::Base64.encode64(Marshal.dump({}))
+        property :data,       Object,   :required => true
         property :updated_at, DateTime,                    :index => true
 
         def self.name
           'session'
         end
 
+        def data
+          attribute_get(:data) || {}
+        end
+
       end
 
       SESSION_RECORD_KEY = 'rack.session.record'.freeze
 
-      cattr_accessor :session_class
+      class_attribute :session_class
       self.session_class = Session
 
       private

data/lib/dm-rails/setup.rb

@@ -8,7 +8,7 @@ module Rails
   module DataMapper
 
     def self.setup(environment)
-      puts "[datamapper] Setting up the #{environment.inspect} environment:"
+      ::DataMapper.logger.info "[datamapper] Setting up the #{environment.inspect} environment:"
       configuration.repositories[environment].each do |name, config|
         setup_with_instrumentation(name.to_sym, config)
       end
@@ -16,7 +16,7 @@ module Rails
     end
 
     def self.setup_with_instrumentation(name, options)
-      puts "[datamapper] Setting up #{name.inspect} repository: '#{options['database']}' on #{options['adapter']}"
+      ::DataMapper.logger.info "[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'])
@@ -29,13 +29,13 @@ module Rails
     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)
+
+      setup_do_driver(driver_name) do |driver|
         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)
+        driver.logger = DataObjects::Logger.new($stdout, :off)
       end
     end
 
@@ -50,5 +50,23 @@ module Rails
       finalize
     end
 
+    class << self
+      private
+
+      if RUBY_VERSION < '1.9'
+        def setup_do_driver(driver_name)
+          if Object.const_defined?('DataObjects') && DataObjects.const_defined?(driver_name)
+            yield DataObjects.const_get(driver_name)
+          end
+        end
+      else
+        def setup_do_driver(driver_name)
+          if Object.const_defined?('DataObjects', false) && DataObjects.const_defined?(driver_name, false)
+            yield DataObjects.const_get(driver_name, false)
+          end
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 977940572
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc3
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,13 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,13 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -170,14 +167,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: datamapper