mack-active_record 0.7.1.1 → 0.8.0

data/lib/mack-active_record/model_generator/model_generator.rb

@@ -44,7 +44,7 @@ class ModelGenerator < Genosaurus
   end
   
   def testing_framework # :nodoc:
-    app_config.mack.testing_framework
+    configatron.mack.testing_framework.to_s
   end
   
 end

data/lib/mack-active_record/test_extensions.rb

@@ -8,93 +8,28 @@ if Mack.env == "test"
   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?("AR_TEST_EXTENSIONS")     
+  unless Mack::Testing.const_defined?("AR_TEST_EXTENSIONS")
     
     module Mack
       module Testing
         AR_TEST_EXTENSIONS = 1
-        # module Helpers
-        #   alias_method :mack_rake_task, :rake_task
-        # 
-        #   def rake_task(name, env = {}) # :nodoc:
-        #     DataMapper::MigrationRunner.reset!
-        #     mack_rake_task(name, env, [File.join(File.dirname(__FILE__), "tasks", "db_create_drop_tasks.rake"),
-        #                                File.join(File.dirname(__FILE__), "tasks", "db_migration_tasks.rake")])
-        #   end
-        # end # Helpers
-            
-        module ActiveRecordHelpers
-          def rollback_transaction
-            begin
-              ActiveRecord::Base.transaction do
-                yield if block_given?
-                raise "Rollback!"
-              end
-            rescue => ex
-              # we need to do this so we can throw up actual errors!
-              unless ex.to_s == "Rollback!"
-                raise ex
-              end
+        
+        def rollback_transaction
+          begin
+            ActiveRecord::Base.transaction do
+              yield if block_given?
+              raise "Rollback!"
             end
-          end # rollback_transaction
-        end # ActiveRecordHelpers
-      end # Testing
-    end # Mack
-
-    module Spec # :nodoc:
-      module Example # :nodoc:
-        module ExampleMethods # :nodoc:
-          include Mack::Testing::ActiveRecordHelpers
-
-          alias_method :ar_spec_execute, :execute
-          
-          def before_spec_extension
-          end
-          
-          def after_spec_extension
-          end
-
-          def execute(options, instance_variables)
-            before_spec_extension
-            if !app_config.disable_transactional_tests
-              rollback_transaction do
-                @__res = ar_spec_execute(options, instance_variables)
-              end
-            else
-              @__res = ar_spec_execute(options, instance_variables)
+          rescue => ex
+            # we need to do this so we can throw up actual errors!
+            unless ex.to_s == "Rollback!"
+              raise ex
             end
-            after_spec_extension
-            @__res
           end
+        end # rollback_transaction
 
-        end # ExampleGroup
-      end # Example
-    end # Spec
-  
-    module Test # :nodoc:
-      module Unit # :nodoc:
-        class TestCase # :nodoc:
-          include Mack::Testing::ActiveRecordHelpers
-  
-          # Let's alias the run method in the class above us so we can create a new one here
-          # but still reference it.
-          alias_method :ar_test_case_run, :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:
-            if !app_config.disable_transactional_tests
-              rollback_transaction do
-                ar_test_case_run(result, &progress_block)
-              end
-            else
-              ar_test_case_run(result, &progress_block)
-            end
-          end
-  
-        end # TestCase
-      end # Unit
-    end # Test
+      end # Testing
+    end # Mack
   
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-active_record
 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: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1.1
+        version: 0.8.0
     version: 
 description: "mack-active_record was developed by: markbates"
 email: mark@mackframework.com
@@ -81,7 +81,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: ActiveRecord ORM support for Mack