mack-orm 0.7.1.1 → 0.8.0

data/lib/mack-orm.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'genosaurus'
+require 'configatron'
+
+configatron.mack.set_default(:disable_transactional_tests, false)
 
 base = File.join(File.dirname(__FILE__), "mack-orm")
 require File.join(base, "database")
@@ -7,6 +10,7 @@ require File.join(base, "database_migrations")
 require File.join(base, "generators")
 require File.join(base, "genosaurus_helpers")
 require File.join(base, "model_column")
+require File.join(base, "test_extensions")
 require File.join(base, "scaffold_generator", "scaffold_generator")
 
 Mack::Environment.after_class_method(:load) do

data/lib/mack-orm/scaffold_generator/manifest.yml

@@ -18,12 +18,12 @@ show_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "views", "show.html.erb.template") %>
   output_path: <%= File.join("app", "views", @name_plural, "show.html.erb") %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 functional_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "controllers", "test_case.rb.template") %>
   output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 functional_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "controllers", "rspec.rb.template") %>

data/lib/mack-orm/scaffold_generator/scaffold_generator.rb

@@ -11,7 +11,7 @@ class ScaffoldGenerator < Genosaurus
     @name_plural = param(:name).plural.underscore
     @name_singular_camel = @name_singular.camelcase
     @name_plural_camel = @name_plural.camelcase
-    @test_framework = app_config.mack.testing_framework
+    @test_framework = configatron.mack.testing_framework
   end
   
   def after_generate # :nodoc:

data/lib/mack-orm/test_extensions.rb

@@ -0,0 +1,80 @@
+require "test/unit"
+require 'spec'
+
+if Mack.env == "test"
+  module Mack
+    module Testing # :nodoc: 
+    end
+  end
+
+  # Wrap it so we don't accidentally alias the run method n times and run out of db connections!
+  unless Mack::Testing.const_defined?("LOADED")
+    
+    LOADED = true
+    module Mack
+      module Testing
+        
+        # Implement this method to give transactional test support
+        # to both RSpec and Test::Unit::TestCase for your ORM.
+        def rollback_transaction
+          yield
+        end # rollback_transaction
+
+      end # Testing
+    end # Mack
+
+
+    module Spec # :nodoc:
+      module Example # :nodoc:
+        module ExampleMethods # :nodoc:
+          include Mack::Testing
+
+          alias_instance_method :execute, :mack_spec_execute
+          
+          def before_spec_extension
+          end
+          
+          def after_spec_extension
+          end
+
+          def execute(options, instance_variables)
+            before_spec_extension
+            unless configatron.mack.disable_transactional_tests
+              rollback_transaction do
+                @__res = mack_spec_execute(options, instance_variables)
+              end
+            else
+              @__res = mack_spec_execute(options, instance_variables)
+            end
+            after_spec_extension
+            return @__res
+          end
+
+        end # ExampleGroup
+      end # Example
+    end # Spec
+  
+    module Test # :nodoc:
+      module Unit # :nodoc:
+        class TestCase # :nodoc:
+          include Mack::Testing
+  
+          # Let's alias the run method in the class above us so we can create a new one here
+          # but still reference it.
+          alias_instance_method :run, :mack_test_case_run # :nodoc:
+  
+          # We need to wrap the run method so we can do things like
+          # run a cleanup method if it exists
+          def run(result, &progress_block) # :nodoc:
+            rollback_transaction do
+              mack_test_case_run(result, &progress_block)
+            end
+          end
+  
+        end # TestCase
+      end # Unit
+    end # Test
+  
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-orm
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -04:00
+date: 2008-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/mack-orm/tasks/db_create_drop_tasks.rake
 - lib/mack-orm/tasks/db_migration_tasks.rake
 - lib/mack-orm/tasks/test_tasks.rake
+- lib/mack-orm/test_extensions.rb
 - lib/mack-orm.rb
 - lib/mack-orm_tasks.rb
 - README
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Common ORM support for Mack