0
@@ -168,6 +168,10 @@ module Merb
0
           opts.on("-i", "--irb-console", "This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.") do |console|
0
             options[:adapter] = 'irb'
0
           end
0
+          
0
+          opts.on("-S", "--sandbox", "This flag will enable a sandboxed irb console. If your ORM supports transactions, all edits will be rolled back on exit.") do |sandbox|
0
+            options[:sandbox] = true
0
+          end
0
 
0
           opts.on("-l", "--log-level LEVEL", "Log levels can be set to any of these options: debug < info < warn < error < fatal") do |log_level|
0
             options[:log_level] = log_level.to_sym

0
@@ -35,6 +35,38 @@ module Merb
0
         end
0
         nil
0
       end
0
+      
0
+      # Starts a sandboxed session (delegates to any Merb::Orms::* modules).
0
+      #
0
+      # An ORM should implement Merb::Orms::MyOrm#open_sandbox! to support this.
0
+      # Usually this involves starting a transaction.
0
+      def open_sandbox!
0
+        puts "Loading #{Merb.environment} environment in sandbox (Merb #{Merb::VERSION})"
0
+        puts "Any modifications you make will be rolled back on exit"
0
+        orm_modules.each { |orm| orm.open_sandbox! if orm.respond_to?(:open_sandbox!) }
0
+      end
0
+      
0
+      # Ends a sandboxed session (delegates to any Merb::Orms::* modules).
0
+      #
0
+      # An ORM should implement Merb::Orms::MyOrm#close_sandbox! to support this.
0
+      # Usually this involves rolling back a transaction.
0
+      def close_sandbox!
0
+        orm_modules.each { |orm| orm.close_sandbox! if orm.respond_to?(:close_sandbox!) }
0
+        puts "Modifications have been rolled back"
0
+      end
0
+      
0
+      private
0
+      
0
+      # ==== Returns
0
+      # Array:: All Merb::Orms::* modules.
0
+      def orm_modules
0
+        if Merb.const_defined?('Orms')
0
+          Merb::Orms.constants.map { |c| Merb::Orms::const_get(c) }
0
+        else
0
+          []
0
+        end
0
+      end
0
+      
0
     end
0
 
0
     class Irb
0
@@ -49,14 +81,22 @@ module Merb
0
         m = Merb::Rack::Console.new
0
         Object.send(:define_method, :merb) { m }  
0
         ARGV.clear # Avoid passing args to IRB 
0
+        m.open_sandbox! if sandboxed?
0
         require 'irb' 
0
         require 'irb/completion' 
0
         if File.exists? ".irbrc"
0
           ENV['IRBRC'] = ".irbrc"
0
         end
0
         IRB.start
0
+        at_exit do merb.close_sandbox! if sandboxed? end
0
         exit
0
       end
0
+      
0
+      private
0
+      
0
+      def self.sandboxed?
0
+        Merb::Config[:sandbox]
0
+      end      
0
     end
0
   end
0
 end
0
\ No newline at end of file