merb_datamapper 0.9.7 → 0.9.8

data/Manifest.txt

@@ -17,7 +17,6 @@ lib/generators/templates/views/new.html.erb
 lib/generators/templates/views/show.html.erb
 lib/merb/orms/data_mapper/connection.rb
 lib/merb/orms/data_mapper/database.yml.sample
-lib/merb/orms/data_mapper/resource.rb
 lib/merb/session/data_mapper_session.rb
 lib/merb_datamapper.rb
 lib/merb_datamapper/merbtasks.rb

data/Rakefile

@@ -45,7 +45,7 @@ end
 desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
 
   begin
     t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true

data/lib/merb/orms/data_mapper/database.yml.sample

@@ -34,3 +34,6 @@ production:
   # repositories:
   #   repo1:
   #     database: sample_development
+
+rake:
+  <<: *defaults

data/lib/merb/session/data_mapper_session.rb

@@ -1,10 +1,3 @@
-begin
-  gem 'dm-core', '=0.9.6'
-  require 'dm-core'
-rescue LoadError => e
-  require 'data_mapper'
-end
-
 require 'merb-core/dispatch/session'
 
 module Merb

data/lib/merb_datamapper.rb

@@ -26,13 +26,31 @@ if defined?(Merb::Plugins)
         require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
       end
 
-      # required to provide 'to_param'
-      require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "resource"
+      # take advantage of the fact #id returns the key of the model, unless #id is a property
+      Merb::Router.root_behavior = Merb::Router.root_behavior.identify(DataMapper::Resource => :id)
 
       Merb.logger.debug "Merb::Orms::DataMapper::Connect complete"
     end
   end
 
+  class Merb::Orms::DataMapper::Associations < Merb::BootLoader
+    after LoadClasses
+
+    def self.run
+      Merb.logger.debug 'Merb::Orms::DataMapper::Associations block.'
+
+      # make sure all relationships are initialized after loading
+      descendants = DataMapper::Resource.descendants.dup
+      descendants.each do |model|
+        descendants.merge(model.descendants) if model.respond_to?(:descendants)
+      end
+      descendants.each do |model|
+        model.relationships.each_value { |r| r.child_key }
+      end
+
+      Merb.logger.debug 'Merb::Orms::DataMapper::Associations complete'
+    end
+  end
 
   generators = File.join(File.dirname(__FILE__), 'generators')
   Merb.add_generators generators / 'data_mapper_model'

data/lib/merb_datamapper/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module MerbDataMapper
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

data/spec/spec_helper.rb

@@ -6,4 +6,3 @@ require 'rubygems'
 gem 'dm-core', '=0.9.6'
 require 'dm-core'
 require 'merb-core'
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +03:00
+date: 2008-10-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ files:
 - lib/generators/templates/views/show.html.erb
 - lib/merb/orms/data_mapper/connection.rb
 - lib/merb/orms/data_mapper/database.yml.sample
-- lib/merb/orms/data_mapper/resource.rb
 - lib/merb/session/data_mapper_session.rb
 - lib/merb_datamapper.rb
 - lib/merb_datamapper/merbtasks.rb

data/lib/merb/orms/data_mapper/resource.rb

@@ -1,12 +0,0 @@
-module Merb
-  module Orms
-    module DataMapper
-      module Resource
-        def to_param
-          key
-        end
-      end
-    end
-  end
-end
-DataMapper::Resource.send(:include, Merb::Orms::DataMapper::Resource)