dm-rails 1.0.1 → 1.0.2

data/README.rdoc

@@ -6,9 +6,10 @@ Creating new datamapper apps on rails3 from scratch is actually really easy. The
 
 == Generating a new application from scratch
 
-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]
+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, {bundler}[http://gembundler.com] and {rails}[http://github.com/rails/rails]
 
   gem update —system # you will need rubygems ~> 1.3.6 for the command below to work
+  gem install bundler --pre (optional, rails will likely pull in a current version)
   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.
@@ -19,37 +20,61 @@ When run, the command will print out some options on how to proceed with your ne
 
 == rspec support
 
-Unfortunately, I haven't yet been able to get rspec to work with the default sqlite3 database.yml setup. In order to get rspec working you would need to change to another database for now, like mysql. Edit your database.yml file to look something like this:
+I haven't yet tested rspec support extensively, but the basics are working after a few modifications to the spec/spec_helper.rb file that the necessary
 
-  defaults: &defaults
-    adapter: mysql
-    username: root
-    password:
-    host: localhost
+  rails generate rspec:install
 
-  development:
-    database: dm_rails3_app_development
-    <<: *defaults
+gives us. First you need to uncomment/remove a seemingly invalid rspec configuration option that gets set by default, and you also should turn off transactional_fixtures at least for now. It's pretty common to run `DataMapper.auto_migrate!` before all specs too. My spec_helper.rb file currently looks like the following, and model specs run fine.
 
-    # Add more repositories
-    # repositories:
-    #   repo1:
-    #     adapter:  postgresql
-    #     database: sample_development
-    #     username: the_user
-    #     password: secrets
-    #     host:     localhost
-    #   repo2:
-    #     ...
+  # This file is copied to ~/spec when you run 'ruby script/generate rspec'
+  # from the project root directory.
+  ENV["RAILS_ENV"] ||= 'test'
+  require File.expand_path("../../config/environment", __FILE__)
+  require 'rspec/rails'
 
-  test:
-    database: dm_rails3_app_test
-    <<: *defaults
-  production:
-    database: dm_rails3_app_production
-    <<: *defaults
+  # Requires supporting files with custom matchers and macros, etc,
+  # in ./support/ and its subdirectories.
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+  RSpec.configure do |config|
+    # == Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    # config.mock_with :rr
+    config.mock_with :rspec
+
+    config.before(:all) { DataMapper.auto_migrate! }
 
-and you should be good to and use rspec.
+    # I can't find that option when looking at current rspec-core source
+    # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+    # If you're not using ActiveRecord, or you'd prefer not to run each of your
+    # examples within a transaction, comment the following line or assign false
+    # instead of true.
+    # config.use_transactional_fixtures = true
+  end
+
+With this in place, running
+
+  ./bin/rake spec
+  ./bin/rake spec:models
+  ...
+
+should work fine. In order to have ./bin/rake available, the bundle needs to be installed with
+
+  bundle install --binstubs
+
+If you haven't done so for whatever reason, use
+
+  bundle exec rake spec
+  bundle exec rake spec:models
+
+instead.
+
+You may have noticed that rspec is included into both the `:development` and `:test` groups in the Gemfile the application template generated. I couldn't find another way to make it so that the above mentioned way of running the specs work. If rspec is not included into the `:development` group, rails must be informed explicitly about the environment it should run in, by prefixing the above rake commands with `RAILS_ENV=test`. 
 
 == Developing dm-rails
 
@@ -71,19 +96,17 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
 
   source 'http://rubygems.org'
 
-  RAILS_VERSION = '~> 3.0.0.beta4'
-
+  RAILS_VERSION = '~> 3.0.0.rc'
   DM_VERSION    = '~> 1.0.0'
-
-  RSPEC_VERSION = '~> 2.0.0.beta.11'
+  RSPEC_VERSION = '~> 2.0.0.beta.19'
 
   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 'dm-rails',               DM_VERSION
-  gem 'dm-#{database}-adapter', DM_VERSION
+  gem 'dm-rails',          DM_VERSION # !NOTE! 1.0.2 will be released soon
+  gem 'dm-sqlite-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
@@ -111,32 +134,23 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
 
   group(:test) do
 
-    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
 
-  end
-
-  # ------------------------------------------------------------------------------
-
-  # 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.
+    # To get a detailed overview about what queries get issued and how long they take
+    # have a look at rails_metrics. Once you bundled it, you can run
+    #
+    #   rails g rails_metrics Metric
+    #   rake db:automigrate
+    #
+    # to generate a model that stores the metrics. You can access them by visiting
+    #
+    #   /rails_metrics
+    #
+    # in your rails application.
 
-  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'
+    # gem 'rails_metrics', '~> 0.1', :git => 'git://github.com/engineyard/rails_metrics'
 
+  end
 
 
 == Sample database.yml files

data/VERSION

@@ -1 +1,2 @@
-1.0.1
+1.0.2
+

data/dm-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]

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

@@ -42,8 +42,9 @@ namespace :db do
   task :automigrate => :environment do
     require 'dm-migrations'
     Rails::DataMapper.configuration.repositories[Rails.env].each do |repository, config|
+      ::DataMapper.setup(repository.to_sym, config)
       ::DataMapper.auto_migrate!(repository.to_sym)
-      ::DataMapper.logger.info "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
+      puts "[datamapper] Finished auto_migrate! for :#{repository} repository '#{config['database']}'"
     end
   end
 
@@ -51,8 +52,9 @@ namespace :db do
   task :autoupgrade => :environment do
     require 'dm-migrations'
     Rails::DataMapper.configuration.repositories[Rails.env].each do |repository, config|
+      ::DataMapper.setup(repository.to_sym, config)
       ::DataMapper.auto_upgrade!(repository.to_sym)
-      ::DataMapper.logger.info "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
+      puts "[datamapper] Finished auto_upgrade! for :#{repository} repository '#{config['database']}'"
     end
   end
 
@@ -90,7 +92,7 @@ namespace :db do
       require 'dm-rails/session_store'
       Rails::DataMapper::SessionStore::Session.auto_migrate!
       database = Rails::DataMapper.configuration.repositories[Rails.env]['database']
-      ::DataMapper.logger.info "Created '#{database}.sessions'"
+      puts "Created '#{database}.sessions'"
     end
 
     desc "Clear the sessions table for DataMapperStore"
@@ -98,7 +100,7 @@ namespace :db do
       require 'dm-rails/session_store'
       Rails::DataMapper::SessionStore::Session.destroy!
       database = Rails::DataMapper.configuration.repositories[Rails.env]['database']
-      ::DataMapper.logger.info "Deleted entries from '#{database}.sessions'"
+      puts "Deleted entries from '#{database}.sessions'"
     end
   end
 

data/lib/dm-rails/storage.rb

@@ -95,7 +95,8 @@ module Rails
       class Sqlite < Storage
         def _create
           return if in_memory?
-          ::DataMapper.setup(name, config.merge('database' => path))
+          # TODO don't to_s the path once a do_sqlite3 gem supports it
+          ::DataMapper.setup(name, config.merge('database' => path.to_s))
         end
 
         def _drop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)