merb_datamapper 1.0.12 → 1.0.13

data/Rakefile

@@ -8,16 +8,20 @@ PROJECT_URL         = "http://merbivore.com"
 PROJECT_SUMMARY     = "DataMapper plugin providing DataMapper support for Merb"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-GEM_AUTHOR = "Jason Toy"
-GEM_EMAIL  = "jtoy@rubynow.com"
+GEM_AUTHOR  = "Jason Toy"
+GEM_EMAIL   = "jtoy@rubynow.com"
 
-GEM_NAME    = "merb_datamapper"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
+GEM_NAME     = "merb_datamapper"
+PKG_BUILD    = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION  = Merb::VERSION + PKG_BUILD
 
-RELEASE_NAME    = "REL #{GEM_VERSION}"
+RELEASE_NAME = "REL #{GEM_VERSION}"
 
-GEM_DEPENDENCIES = [["dm-core", ">=0.9.5"], ["dm-migrations", ">=0.9.5"], ["merb-core", "~> #{GEM_VERSION}"]]
+GEM_DEPENDENCIES = [
+  ["dm-core",       "~> #{Merb::DM_VERSION}"],
+  ["dm-migrations", "~> #{Merb::DM_VERSION}"],
+  ["merb-core",     "~> #{GEM_VERSION}"]
+]
 
 require "extlib/tasks/release"
 

data/lib/generators/data_mapper_model.rb

@@ -7,7 +7,9 @@ class Merb::Generators::ModelGenerator
   end
   
   def after_generation
-     STDOUT << message("Don't forget to define the model schema in your #{ Extlib::Inflection.camelize(file_name) } class")
+    if orm == :datamapper
+      STDOUT << message("Don't forget to define the model schema in your #{ Extlib::Inflection.camelize(file_name) } class")
+    end
   end
   
 end

data/lib/generators/data_mapper_resource_controller.rb

@@ -14,8 +14,7 @@ end
 Merb::Generators::ResourceControllerGenerator.template :controller_datamapper, :orm => :datamapper do |t|
   t.source = File.join(File.dirname(__FILE__), "templates/resource_controller.rb")
   t.destination = File.join("app/controllers", base_path, "#{file_name}.rb")
-  
-  self.add_resource_route(self.plural_model)
+  self.add_resource_route(self.plural_model) unless skip_route_definition?
 end
 
 [:index, :show, :edit, :new].each do |view|

data/lib/generators/templates/resource_controller.rb

@@ -39,7 +39,7 @@ class <%= class_name %> < Application
   def update(id, <%= singular_model %>)
     @<%= singular_model %> = <%= model_class_name %>.get(id)
     raise NotFound unless @<%= singular_model %>
-    if @<%= singular_model %>.update_attributes(<%= singular_model %>)
+    if @<%= singular_model %>.update(<%= singular_model %>)
        redirect resource(@<%= singular_model %>)
     else
       display @<%= singular_model %>, :edit

data/lib/merb/session/data_mapper_session.rb

@@ -1,13 +1,16 @@
 require 'merb-core/dispatch/session'
-require "dm-core"
+
 module Merb
   class DataMapperSessionStore
     include ::DataMapper::Resource
 
-    table_name = Merb::Plugins.config[:merb_datamapper][:session_storage_name] || 'sessions'
-    storage_names[default_repository_name] = table_name
+    def self.default_repository_name
+      Merb::Plugins.config[:merb_datamapper][:session_repository_name]
+    end
+    
+    storage_names[default_repository_name] = Merb::Plugins.config[:merb_datamapper][:session_storage_name]
 
-    property :session_id, String, :size => 32, :nullable => false, :key => true
+    property :session_id, String, :length => 32, :nullable => false, :key => true
     property :data, Object, :default => {}, :lazy => false
     property :created_at, DateTime, :default => Proc.new { |r, p| DateTime.now }
 
@@ -31,7 +34,7 @@ module Merb
     # @param data<Object> The data to be stored in the session. Probably a hash
     def self.store_session(session_id, data)
       if session = get(session_id)
-        session.update_attributes(:data => data)
+        session.update(:data => data)
       else
         create(:session_id => session_id, :data => data)
       end
@@ -44,10 +47,6 @@ module Merb
     def self.delete_session(session_id)
       all(:session_id => session_id).destroy!
     end
-
-    def self.default_repository_name
-      Merb::Plugins.config[:merb_datamapper][:session_repository_name] || :default
-    end
   end
 
   class DataMapperSession < SessionStoreContainer

data/lib/merb_datamapper.rb

@@ -1,8 +1,7 @@
 if defined?(Merb::Plugins)
-  dependency 'dm-core'
+  require 'dm-core'
 
   require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection"
-  require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
   Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
 
   # conditionally assign things, so as not to override previously set options.
@@ -37,7 +36,7 @@ if defined?(Merb::Plugins)
 
       # if we use a datamapper session store, require it.
       Merb.logger.verbose! "Checking if we need to use DataMapper sessions"
-      if Merb::Config.session_stores.include?(:datamapper)
+      if Merb::Config.session_store == 'datamapper'
         Merb.logger.verbose! "Using DataMapper sessions"
         require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
       end
@@ -53,32 +52,36 @@ if defined?(Merb::Plugins)
     after LoadClasses
 
     def self.run
-      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations block'
-
-      # make sure all relationships are initialized after loading
-      descendants = DataMapper::Resource.descendants.dup
-      descendants.dup.each do |model|
-        descendants.merge(model.descendants) if model.respond_to?(:descendants)
-      end
-      descendants.each do |model|
+      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations - defining lazy relationship properties'
+      
+      DataMapper::Model.descendants.each do |model|
         model.relationships.each_value { |r| r.child_key }
       end
 
-      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations complete'
+      Merb.logger.verbose! 'Merb::Orms::DataMapper::Associations - complete'
+      
     end
   end
 
   if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
-    # wrap action in repository block to enable identity map
-    class Application < Merb::Controller
-      override! :_call_action
-      def _call_action(*)
-        DataMapper.repository do |r|
-          Merb.logger.debug "In repository block #{r.name}"
-          super
+
+    class Merb::Orms::DataMapper::IdentityMapSupport < Merb::BootLoader
+
+      after RackUpApplication
+
+      def self.run
+
+        app = Merb::Config[:app]
+        def app.call(env)
+          DataMapper.repository do |r|
+            Merb.logger.debug "In repository block #{r.name}"
+            super
+          end
         end
+
       end
     end
+
   end
 
   generators = File.join(File.dirname(__FILE__), 'generators')

data/lib/merb_datamapper/merbtasks.rb

@@ -16,17 +16,16 @@ namespace :db do
   end
   desc "Perform automigration"
   task :automigrate => :merb_env do
-    ::DataMapper::AutoMigrator.auto_migrate
+    ::DataMapper.auto_migrate!
   end
   desc "Perform non destructive automigration"
   task :autoupgrade => :merb_env do
-    ::DataMapper::AutoMigrator.auto_upgrade
+    ::DataMapper.auto_upgrade!
   end
 
   namespace :migrate do
     task :load => :merb_env do
-      gem 'dm-migrations'
-      require 'migration_runner'
+      require 'dm-migrations/migration_runner'
       FileList["schema/migrations/*.rb"].each do |migration|
         load migration
       end
@@ -66,7 +65,7 @@ namespace :db do
   desc "Drop the database (postgres only)"
   task :drop do
     config = Merb::Orms::DataMapper.config
-    puts "Droping database '#{config[:database]}'"
+    puts "Dropping database '#{config[:database]}'"
     case config[:adapter]
     when 'postgres'
       `dropdb -U #{config[:username]} #{config[:database]}`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: "0.10"
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: "0.10"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.0.13
     version: 
 description: DataMapper plugin providing DataMapper support for Merb
 email: jtoy@rubynow.com
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing DataMapper support for Merb