mack-data_mapper 0.7.1.1 → 0.8.0

data/lib/mack-data_mapper.rb

@@ -1,12 +1,10 @@
 require 'rubygems'
 require 'genosaurus'
-require 'mack-orm'
 
-config = {
-  "data_mapper_session_store::expiry_time" => 4.hours
-}
+configatron.mack.set_default(:disable_transactional_tests, false)
+configatron.mack.data_mapper_session_store.set_default(:expiry_time, 4.hours)
 
-app_config.load_hash(config.merge(app_config.final_configuration_settings), "mack-data_mapper")
+require 'mack-orm'
 
 
 fl = File.join(File.dirname(__FILE__), "mack-data_mapper")
@@ -15,16 +13,17 @@ $: << File.expand_path(File.join(fl, "dm_patches"))
 
 [:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g|
   gem "dm-#{g}", "0.9.5"
-  require "dm-#{g}"
+  require "dm-#{g}" unless g == :types
 end
 
+autoload :Serial, 'dm-types/serial'
+autoload :Yaml, 'dm-types/yaml'
 
 require File.join(fl, "database")
 require File.join(fl, "database_migrations")
 require File.join(fl, "generators")
 require File.join(fl, "helpers", "orm_helpers")
 require File.join(fl, "resource")
-require File.join(fl, "runner")
 require File.join(fl, "test_extensions")
 
 
@@ -39,15 +38,10 @@ module DataMapper # :nodoc:
   class Logger # :nodoc:
     
     [:debug, :info, :warn, :error, :fatal].each do |m|
-      unless method_defined?("dm_#{m}")
-        eval %{
-          alias_method :dm_#{m}, :#{m}
-    
-          def #{m}(message)
-            Mack.logger.#{m}(message)
-            dm_#{m}(message)
-          end
-        }
+      alias_instance_method m
+      define_method(m) do |message|
+        Mack.logger.send(m, message)
+        self.send("_original_#{m}", message)
       end
     end
     

data/lib/mack-data_mapper/model_generator/manifest.yml

@@ -5,12 +5,12 @@ model_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "model.rb.template") %>
   output_path: <%= File.join("app", "models", "#{param(:name).singular.underscore}.rb") %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test_case.rb.template") %>
   output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "rspec.rb.template") %>

data/lib/mack-data_mapper/sessions/data_mapper_session_store.rb

@@ -1,7 +1,7 @@
 module Mack
   module SessionStore # :nodoc:
     # Stores session information in the database.
-    # To set the expiry time for this session store use the following app_config setting:
+    # To set the expiry time for this session store use the following configatron setting:
     #   data_mapper_session_store::expiry_time: <%= 4.hours %>
     class DataMapper < Mack::SessionStore::Base
 
@@ -13,7 +13,7 @@ module Mack
           create_storage_if_non_existent
           sess = Mack::DataMapper::Session.first(:id => id)
           return nil if sess.nil? 
-          expire_date = DateTime.now.minus_seconds(app_config.data_mapper_session_store.expiry_time)
+          expire_date = DateTime.now.minus_seconds(configatron.mack.data_mapper_session_store.expiry_time)
           if sess.updated_at.to_s < expire_date.to_s
             sess.destroy
             return nil

data/lib/mack-data_mapper/test_extensions.rb

@@ -17,64 +17,23 @@ if Mack.env == "test"
           include DataMapper::Resource
         end
       
-        module DataMapperHelpers
-          def rollback_transaction
-            begin
-              Mack::Testing::DmTestTransactionWrapper.transaction do
-              # DataMapper::Transaction.new.commit 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
+            Mack::Testing::DmTestTransactionWrapper.transaction do
+            # DataMapper::Transaction.new.commit do
+              yield if block_given?
+              raise "Rollback!"
             end
-          end # rollback_transaction
-        end # DataMapperHelpers
-      end # Testing
-    end # Mack
-
-
-    module Spec # :nodoc:
-      module Example # :nodoc:
-        module ExampleMethods # :nodoc:
-          include Mack::Testing::DataMapperHelpers
-
-          alias_method :dm_spec_execute, :execute
-
-          def execute(options, instance_variables)
-            rollback_transaction do
-              @__res = dm_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
-            @__res
           end
+        end # rollback_transaction
 
-        end # ExampleGroup
-      end # Example
-    end # Spec
-  
-    module Test # :nodoc:
-      module Unit # :nodoc:
-        class TestCase # :nodoc:
-          include Mack::Testing::DataMapperHelpers
-  
-          # 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 :dm_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:
-            rollback_transaction do
-              dm_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-data_mapper
 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 
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1.1
+        version: 0.8.0
     version: 
 description: "mack-data_mapper was developed by: markbates"
 email: mark@mackframework.com
@@ -128,7 +128,6 @@ files:
 - lib/mack-data_mapper/model_generator/templates/rspec.rb.template
 - lib/mack-data_mapper/model_generator/templates/test_case.rb.template
 - lib/mack-data_mapper/resource.rb
-- lib/mack-data_mapper/runner.rb
 - lib/mack-data_mapper/scaffold_generator/templates/app/controllers/controller.rb.template
 - lib/mack-data_mapper/sessions/data_mapper_session_store.rb
 - lib/mack-data_mapper/sessions/session.rb
@@ -159,7 +158,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: DataMapper ORM support for Mack

data/lib/mack-data_mapper/runner.rb

@@ -1,17 +0,0 @@
-#--
-# module Mack
-#   class Runner
-#     
-#     alias_method :data_mapper_custom_dispatch_wrapper, :custom_dispatch_wrapper# if self.respond_to? :custom_dispatch_wrapper
-#     
-#     # Wrap all requests in a 'default' DataMapper repository block.
-#     def custom_dispatch_wrapper(&block)
-#       repo = (app_config.mack.default_respository_name || "default").to_sym
-#       repository(repo) do
-#         data_mapper_custom_dispatch_wrapper(&block)
-#       end
-#     end
-#     
-#   end # Runner
-# end # Mack
-#++