merb_datamapper 1.0.8.1 → 1.0.9

data/lib/merb_datamapper.rb

@@ -5,6 +5,21 @@ if defined?(Merb::Plugins)
   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.
+  # This is most relevent for :use_repository_block, which is used later in this file.
+  unless Merb::Plugins.config[:merb_datamapper].has_key?(:use_repository_block)
+    Merb::Plugins.config[:merb_datamapper][:use_repository_block] = true
+  end
+
+  unless Merb::Plugins.config[:merb_datamapper].has_key?(:session_storage_name)
+    Merb::Plugins.config[:merb_datamapper][:session_storage_name] = 'sessions'
+  end
+
+  unless Merb::Plugins.config[:merb_datamapper].has_key?(:session_repository_name)
+    Merb::Plugins.config[:merb_datamapper][:session_repository_name] = :default
+  end
+
+
   class Merb::Orms::DataMapper::Connect < Merb::BootLoader
     after BeforeAppLoads
 
@@ -53,13 +68,15 @@ if defined?(Merb::Plugins)
     end
   end
 
-  # wrap action in repository block to enable identity map
-  class Application < Merb::Controller
-    override! :_call_action
-    def _call_action(*)
-      repository do |r|
-        Merb.logger.debug "In repository block #{r.name}"
-        super
+  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(*)
+        repository do |r|
+          Merb.logger.debug "In repository block #{r.name}"
+          super
+        end
       end
     end
   end
@@ -68,22 +85,5 @@ if defined?(Merb::Plugins)
   Merb.add_generators generators / 'data_mapper_model'
   Merb.add_generators generators / 'data_mapper_resource_controller'
   Merb.add_generators generators / 'data_mapper_migration'
-  
-  # Override bug in DM::Timestamps
-  Merb::BootLoader.after_app_loads do
-    module DataMapper
-      module Timestamp
-        private
-        
-        def set_timestamps
-          return unless dirty? || new_record?
-          TIMESTAMP_PROPERTIES.each do |name,(_type,proc)|
-            if model.properties.has_property?(name)
-              model.properties[name].set(self, proc.call(self, model.properties[name])) unless attribute_dirty?(name)
-            end
-          end
-        end
-      end
-    end
-  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.8.1
+  version: 1.0.9
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.8.1
+        version: 1.0.9
     version: 
 description: DataMapper plugin providing DataMapper support for Merb
 email: jtoy@rubynow.com