dm-rails 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,29 +5,33 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
+RAILS_VERSION  = '~> 3.1.0'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
-gem 'actionpack',      '~> 3.0.4', :require => 'action_pack'
+# DataMapper dependencies
+gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}"
-gem 'railties',        '~> 3.0.4', :require => 'rails'
+
+# Rails dependencies
+gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
+gem 'railties',   RAILS_VERSION, :require => 'rails'
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/README.rdoc

@@ -169,6 +169,10 @@ An example for setting up a single repository for every environment.
     database: rails3_app_production
     <<: *defaults
 
+An example of setting up a single repository with a URI, which overrides all other configuration for that environment:
+
+  development:
+    uri: mysql://localhost/rails3_app_development?user=mysql
 
 An example for setting up multiple repositories for every environment.
 
@@ -417,7 +421,7 @@ Activating the identity map is achieved by installing a middleware that wraps th
 
   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.
+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. see also next paragraph.
 
 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.
 
@@ -427,7 +431,11 @@ In order to activate the Identity Map in your application, you need to explicitl
     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.
+For a different scope then :default of other repositories replace/add the line with:
+
+    use Rails::DataMapper::Middleware::IdentityMap, :myscope
+
+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 (default) 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'
@@ -479,6 +487,8 @@ or that you want to use your own naming convention, that is implemented in e.g.
     'tbl' + value.camelize(true)
   end
 
+Field names can be customized in the same manner using `Rails::DataMapper.configuration.resource_naming_convention`.
+
 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.
 
 == Mass assignment protection
@@ -535,14 +545,6 @@ Currently dm-rails publishes the same benchmarking information like active_recor
 
   Completed in 9ms (Views: 7.6ms | Models: 0.6ms) with 200
 
-
-== Migrations
-
-The latest released version of {dm-migrations}[http://github.com/datamapper/dm-migrations] suffers from a {bug}[http://datamapper.lighthouseapp.com/projects/20609/tickets/1214]
-that prevents any migration to be run at all when invoked via the standard `rake db:migrate` command. Currently, there are two ways to workaround that.
-
-You can either point {dm-migrations}[http://github.com/datamapper/dm-migrations] to :git in your application's Gemfile, or you can patch the generated Rakefile as shown at the bottom of the related {bug report}[http://datamapper.lighthouseapp.com/projects/20609/tickets/1214].
-
 == TODO (not necessarily in that order)
 
 * SPECS !!!
@@ -586,6 +588,7 @@ Thx to all contributors, every patch, big or small is very much appreciated!
 * Xavier Shay ({xaviershay}[http://github.com/xaviershay])
 * Nico Rieck ({gix}[http://github.com/gix])
 * Piotr Solnica ({solnic}[http://github.com/solnic])
+* Corin Lawson ({maxsum-corin}[http://github.com/maxsum-corin])
 
 == Copyright
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1,2 +1 @@
-1.1.0
-
+1.2.0.rc1

data/dm-rails.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-rails}
-  s.version = "1.1.0"
+  s.name = "dm-rails"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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{2011-03-16}
-  s.description = %q{Integrate DataMapper with Rails 3}
-  s.email = %q{gamsnjaga@gmail.com}
+  s.date = "2011-09-09"
+  s.description = "Integrate DataMapper with Rails 3"
+  s.email = "gamsnjaga@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -55,47 +55,40 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-rails}
+  s.homepage = "http://github.com/datamapper/dm-rails"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Use DataMapper with Rails 3}
-  s.test_files = [
-    "spec/models/fake.rb",
-    "spec/models/topic.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/mass_assignment_security_spec.rb",
-    "spec/unit/multiparameter_attributes_spec.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Use DataMapper with Rails 3"
 
   if s.respond_to? :specification_version then
     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.1.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<railties>, ["~> 3.0.4"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<railties>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.1.0"])
-      s.add_dependency(%q<railties>, ["~> 3.0.4"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
+      s.add_dependency(%q<railties>, ["~> 3.1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.1.0"])
-    s.add_dependency(%q<railties>, ["~> 3.0.4"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
+    s.add_dependency(%q<railties>, ["~> 3.1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/lib/dm-rails/configuration.rb

@@ -35,6 +35,10 @@ module Rails
         @resource_naming_convention ||= {}
       end
 
+      def field_naming_convention
+        @field_naming_convention ||= {}
+      end
+
     private
 
       def normalize_repository_config(hash)

data/lib/dm-rails/middleware/identity_map.rb

@@ -3,12 +3,13 @@ module Rails
     module Middleware
 
       class IdentityMap
-        def initialize(app)
+        def initialize(app, name = :default)
           @app = app
+          @name = name.to_sym
         end
 
         def call(env)
-          ::DataMapper.repository do
+          ::DataMapper.repository(@name) do
             @app.call(env)
           end
         end

data/lib/dm-rails/railtie.rb

@@ -29,7 +29,7 @@ module Rails
 
       config.data_mapper = Rails::DataMapper::Configuration.create
 
-      config.generators.orm :data_mapper, :migration => true
+      config.app_generators.orm :data_mapper, :migration => true
 
 
       # Support overwriting crucial steps in subclasses

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

@@ -64,18 +64,26 @@ namespace :db do
     end
 
     desc 'Migrate up using migrations'
-    task :up, :version, :needs => :load do |t, args|
+    task :up, [:version] => [:load] do |t, args|
       ::DataMapper::MigrationRunner.migrate_up!(args[:version])
     end
 
     desc 'Migrate down using migrations'
-    task :down, :version, :needs => :load do |t, args|
+    task :down, [:version] => [:load] do |t, args|
       ::DataMapper::MigrationRunner.migrate_down!(args[:version])
     end
   end
 
   desc 'Migrate the database to the latest version'
-  task :migrate => 'db:migrate:up'
+  task :migrate do
+    migrate_task = if Dir['db/migrate/*.rb'].empty?
+                     'db:autoupgrade'
+                   else
+                     'db:migrate:up'
+                   end
+
+    Rake::Task[migrate_task].invoke
+  end
 
   namespace :sessions do
     desc "Creates the sessions table for DataMapperStore"

data/lib/dm-rails/session_store.rb

@@ -44,7 +44,7 @@ module Rails
       def set_session(env, sid, session_data)
         session            = get_session_resource(env, sid)
         session.data       = session_data
-        session.updated_at = Time.now if session.dirty?
+        session.updated_at = DateTime.now if session.dirty?
         session.save ? sid : false
       end
 

data/lib/dm-rails/setup.rb

@@ -15,12 +15,23 @@ module Rails
     end
 
     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 = if options['uri']
+                  database_uri = ::Addressable::URI.parse(options['uri'])
+                  ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{database_uri.path}' on #{database_uri.scheme}"
+                  ::DataMapper.setup(name, database_uri)
+                else
+                  ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{options['database']}' on #{options['adapter']}"
+                 ::DataMapper.setup(name, options)
+                end
+
       if convention = configuration.resource_naming_convention[name]
         adapter.resource_naming_convention = convention
       end
-      setup_log_listener(options['adapter'])
+      if convention = configuration.field_naming_convention[name]
+        adapter.field_naming_convention = convention
+      end
+      setup_log_listener(adapter.options['adapter'])
     end
 
     def self.setup_logger(logger)
@@ -45,8 +56,8 @@ module Rails
     end
 
     def self.preload_models(app)
-      app.config.paths.app.models.each do |path|
-        Dir.glob("#{path}/**/*.rb").sort.each { |file| require_dependency file }
+      app.config.paths['app/models'].each do |path|
+        Dir.glob("#{path}/**/*.rb").sort.each { |file| require_dependency file[path.length..-1] }
       end
       finalize
     end

data/lib/dm-rails/storage.rb

@@ -98,19 +98,39 @@ module Rails
         "[datamapper] Dropped database '#{database}'"
       end
 
+      # Create the configured database
+      #
+      # This is a noop so that calling this method
+      # won't explode on people who use adapters that
+      # don't support creating a storage recepticle
+      def _create
+        true
+      end
+
+      # Drop the configured database
+      #
+      # This is a noop so that calling this method
+      # won't explode on people who use adapters that
+      # don't support dropping a storage recepticle
+      def _drop
+        true
+      end
+
       class Sqlite < Storage
-        def _create
-          # This is a noop for sqlite
-          #
-          # Both auto_migrate!/auto_upgrade! will create the actual database
-          # if the connection has been setup properly and there actually
-          # are statements to execute (i.e. at least one model is declared)
-          #
-          # DataMapper.setup alone won't create the actual database so there
-          # really is no API to simply create an empty database for sqlite3.
-          #
-          # we return true to indicate success nevertheless
 
+        # This is a noop for sqlite
+        #
+        # Overwritten solely for documentation purposes
+        #
+        # Both auto_migrate!/auto_upgrade! will create the actual database
+        # if the connection has been setup properly and there actually
+        # are statements to execute (i.e. at least one model is declared)
+        #
+        # DataMapper.setup alone won't create the actual database so there
+        # really is no API to simply create an empty database for sqlite3.
+        #
+        # we return true to indicate success nevertheless
+        def _create
           true
         end
 

data/spec/unit/multiparameter_attributes_spec.rb

@@ -7,6 +7,7 @@ describe Rails::DataMapper::MultiparameterAttributes do
   before :all do
     load Pathname(__FILE__).dirname.parent.join('models/topic.rb').expand_path
     load Pathname(__FILE__).dirname.parent.join('models/fake.rb').expand_path
+    DataMapper.finalize
     model = ::Rails::DataMapper::Models::Topic
     model.auto_migrate! if model.respond_to?(:auto_migrate!)
   end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -11,86 +18,124 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.4
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   name: dm-active_model
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: actionpack
 - !ruby/object:Gem::Dependency 
-  name: railties
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.4
-  type: :runtime
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: railties
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id005
+  requirement: *id005
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id006
+  requirement: *id006
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id007
+  requirement: *id007
+  name: rspec
 description: Integrate DataMapper with Rails 3
 email: gamsnjaga@gmail.com
 executables: []
@@ -138,7 +183,6 @@ files:
 - tasks/clean.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-rails
 licenses: []
 
@@ -152,23 +196,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use DataMapper with Rails 3
-test_files: 
-- spec/models/fake.rb
-- spec/models/topic.rb
-- spec/spec_helper.rb
-- spec/unit/mass_assignment_security_spec.rb
-- spec/unit/multiparameter_attributes_spec.rb
+test_files: []
+