mack-data_mapper 0.8.0.101 → 0.8.1

data/lib/mack-data_mapper.rb

@@ -3,6 +3,8 @@ require 'genosaurus'
 
 configatron.mack.set_default(:disable_transactional_tests, false)
 configatron.mack.data_mapper_session_store.set_default(:expiry_time, 4.hours)
+configatron.mack.data_mapper.set_default(:repository_runner_context, :default)
+configatron.mack.data_mapper.set_default(:use_repository_runner, false)
 
 require 'mack-orm'
 
@@ -12,7 +14,7 @@ fl = File.join(File.dirname(__FILE__), "mack-data_mapper")
 $: << 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"
+  gem "dm-#{g}", "0.9.6"
   require "dm-#{g}" unless g == :types
 end
 
@@ -25,6 +27,8 @@ require File.join(fl, "generators")
 require File.join(fl, "helpers", "orm_helpers")
 require File.join(fl, "resource")
 require File.join(fl, "test_extensions")
+require File.join(fl, "repo_runner_helper")
+require File.join(fl, "paginator")
 
 
 [:helpers, :migration_generator, :model_generator, :scaffold_generator, :dm_patches, :sessions].each do |folder|

data/lib/mack-data_mapper/database.rb

@@ -59,12 +59,12 @@ module Mack
           structure += show.attributes["create table".to_sym]
           structure += ";\n\n"
         end
+        structure.gsub!('MyISAM', 'InnoDB')
         File.open(output_file, "w") {|f| f.puts structure}
       when /Postgres/
         `pg_dump -i -U "#{uri.user}" -s -x -O -n #{ENV["SCHEMA"] ||= "public"} -f #{output_file} #{uri.basename}`
       when /Sqlite3/
-        db_dir = Mack::Paths.db
-        `sqlite3 #{File.join(db_dir, uri.basename)} .schema > #{output_file}`
+        puts `sqlite3 #{uri.path} .schema > #{output_file}`
       else
         raise "Task not supported for '#{repository(repis).adapter.class.name}'"
       end
@@ -97,10 +97,9 @@ module Mack
           repo.adapter.execute "CREATE DATABASE #{uri.basename} ENCODING = 'utf8'"
         end
       when /Sqlite3/
-        db_dir = Mack::Paths.db
-        puts "Creating (SQLite3): #{uri.basename}"
-        FileUtils.mkdir_p(db_dir)
-        FileUtils.touch(File.join(db_dir, uri.basename))
+        puts "Creating (SQLite3): #{uri.path}"
+        FileUtils.mkdir_p(File.dirname(uri.path), :verbose => true)
+        FileUtils.touch(uri.path, :verbose => true)
       else
         raise "Task not supported for '#{repository(repis).adapter.class.name}'"
       end
@@ -117,14 +116,14 @@ module Mack
         end
       when /Postgres/
         setup_temp(uri, "postgres")
+        DataObjects::Postgres::Connection.__pools.each {|k, v| v.dispose}
         repository(:tmp) do |repo|
           puts "Dropping (PostgreSQL): #{uri.basename}"
           repo.adapter.execute "DROP DATABASE IF EXISTS #{uri.basename}"
         end
       when /Sqlite3/
-        puts "Dropping (SQLite3): #{uri.basename}"
-        db_dir = Mack::Paths.db
-        FileUtils.rm_rf(File.join(db_dir.to_s, uri.basename))
+        puts "Dropping (SQLite3): #{uri.path}"
+        FileUtils.rm_rf(uri.path)
       else
         raise "Task not supported for '#{repository(repis).adapter.class.name}'"
       end

data/lib/mack-data_mapper/database_migrations.rb

@@ -6,7 +6,7 @@ module Mack
       
       # Migrates the database to the latest version
       def self.migrate
-        Mack::Database.establish_connection
+        # Mack::Database.establish_connection
         ::DataMapper::MigrationRunner.reset!
         migration_files.each { |mig| load mig }
         ::DataMapper::MigrationRunner.migrate_up!
@@ -29,7 +29,7 @@ module Mack
         end
         ::DataMapper::MigrationRunner.migrations.clear
       end
-            
+      
     end # Migrations
   end # Database
 end # Mack

data/lib/mack-data_mapper/dm_patches/migrations.rb

@@ -40,4 +40,40 @@ module SQL # :nodoc:
     end
 
   end # TableModifier  
-end # SQL
+end # SQL
+
+module DataMapper # :nodoc:
+
+  class Migration # :nodoc:
+    include SQL
+
+    # perform the migration by running the code in the #up block
+    def perform_up
+      result = nil
+      if needs_up?
+        # database.transaction.commit do
+          say_with_time "== Performing Up Migration ##{position}: #{name}", 0 do
+            result = @up_action.call
+          end
+          update_migration_info(:up)
+        # end
+      end
+      result
+    end
+
+    # un-do the migration by running the code in the #down block
+    def perform_down
+      result = nil
+      if needs_down?
+        # database.transaction.commit do
+          say_with_time "== Performing Down Migration ##{position}: #{name}", 0 do
+            result = @down_action.call
+          end
+          update_migration_info(:down)
+        # end
+      end
+      result
+    end
+
+  end # Migration
+end # DataMapper

data/lib/mack-data_mapper/dm_patches/uri.rb

@@ -0,0 +1,9 @@
+module DataObjects # :nodoc:
+  class URI # :nodoc:
+    
+    def basename
+      self.path[1..self.path.length]
+    end
+    
+  end # URI
+end # DataObjects

data/lib/mack-data_mapper/paginator.rb

@@ -0,0 +1,52 @@
+module Mack
+  module Database
+    
+    class Paginator
+      
+      # Implements the paginate method from the Mack::Database::Paginator spec in mack-orm.
+      def paginate
+        order_clause = [self.query_options.delete(:order)].flatten.compact
+          
+        self.total_results = self.klass.count(self.query_options)
+        self.total_pages = (self.total_results.to_f / self.results_per_page).ceil
+        
+        self.current_page = self.total_pages if self.current_page > self.total_pages
+        
+        if order_clause.empty?
+          self.klass.key.each do |k| 
+            order_clause << k.name.to_sym.asc
+          end
+        end
+
+        self.query_options.reverse_merge!({
+          :order => order_clause
+        })
+        
+        offset = (self.current_page - 1) * self.results_per_page
+        offset = 0 if offset < 0
+        
+        self.query_options.merge!({
+          :limit => self.results_per_page, 
+          :offset => offset
+        })
+        
+        self.results = self.klass.all(self.query_options)
+        self
+      end # paginate
+      
+    end # Paginator
+  end # Database
+end # Mack
+
+module DataMapper # :nodoc:
+  module Resource # :nodoc:
+    module ClassMethods # :nodoc:
+      
+      def paginate(options = {}, query_options = {})
+        paginator = Mack::Database::Paginator.new(self, options, query_options)
+        paginator.paginate
+      end
+      
+    end # ClassMethods
+  end # Resource
+end # DataMapper

data/lib/mack-data_mapper/repo_runner_helper.rb

@@ -0,0 +1,22 @@
+module Mack
+  module DataMapper # :nodoc:
+    # This runner helper will wrap a request with a DataMapper::Repository.
+    # To turn on this runner set the following configuration value equal to true:
+    #   configatron.mack.data_mapper.use_repository_runner = true
+    # To set the context in which the runner helper runs, set this configuration value:
+    #   configatron.mack.data_mapper.repository_runner_context = :default
+    class RepositoryRunnerHelper < Mack::RunnerHelpers::Base
+      
+      def start(request, response, cookies)
+        ::DataMapper::Repository.context << ::DataMapper::Repository.new(configatron.mack.data_mapper.repository_runner_context)
+      end
+      
+      def complete(request, response, cookies)
+        ::DataMapper::Repository.context.pop
+      end
+      
+    end
+  end
+end
+
+Mack::RunnerHelpers::Registry.add(Mack::DataMapper::RepositoryRunnerHelper) if configatron.mack.data_mapper.use_repository_runner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.101
+  version: 0.8.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-observer
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-types
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: mack-orm
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0.101
+        version: 0.8.1
     version: 
 description: "mack-data_mapper was developed by: markbates"
 email: mark@mackframework.com
@@ -113,11 +113,8 @@ extra_rdoc_files:
 files: 
 - lib/mack-data_mapper/database.rb
 - lib/mack-data_mapper/database_migrations.rb
-- lib/mack-data_mapper/dm_patches/dm-timestamps.rb
 - lib/mack-data_mapper/dm_patches/migrations.rb
-- lib/mack-data_mapper/dm_patches/model.rb
-- lib/mack-data_mapper/dm_patches/property_set.rb
-- lib/mack-data_mapper/dm_patches/validations.rb
+- lib/mack-data_mapper/dm_patches/uri.rb
 - lib/mack-data_mapper/generators.rb
 - lib/mack-data_mapper/helpers/orm_helpers.rb
 - lib/mack-data_mapper/migration_generator/migration_generator.rb
@@ -127,6 +124,8 @@ files:
 - lib/mack-data_mapper/model_generator/templates/model.rb.template
 - 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/paginator.rb
+- lib/mack-data_mapper/repo_runner_helper.rb
 - lib/mack-data_mapper/resource.rb
 - lib/mack-data_mapper/scaffold_generator/templates/app/controllers/controller.rb.template
 - lib/mack-data_mapper/sessions/data_mapper_session_store.rb

data/lib/mack-data_mapper/dm_patches/dm-timestamps.rb

@@ -1,6 +0,0 @@
-# module DataMapper # :nodoc:
-#   module Timestamp # :nodoc:
-#     TIMESTAMP_PROPERTIES[:created_at] = lambda { |r| r.created_at = DateTime.now if r.new_record? && r.created_at.nil? } # :nodoc:
-#     TIMESTAMP_PROPERTIES[:created_on] = lambda { |r| r.created_on = DateTime.now if r.new_record? && r.created_on.nil? } # :nodoc:
-#   end
-# end

data/lib/mack-data_mapper/dm_patches/model.rb

@@ -1,48 +0,0 @@
-# module DataMapper # :nodoc:
-#   module Model # :nodoc:
-# 
-#     def property(name, type, options = {})
-#       property = Property.new(self, name, type, options)
-# 
-#       create_property_getter(property)
-#       create_property_setter(property)
-# 
-#       @properties[repository_name][property.name] = property
-# 
-#       # Add property to the other mappings as well if this is for the default
-#       # repository.
-#       if repository_name == default_repository_name
-#         @properties.each_pair do |repository_name, properties|
-#           next if repository_name == default_repository_name
-#           properties << property
-#         end
-#       end
-# 
-#       # Add the property to the lazy_loads set for this resources repository
-#       # only.
-#       # TODO Is this right or should we add the lazy contexts to all
-#       # repositories?
-#       if property.lazy?
-#         context = options.fetch(:lazy, :default)
-#         context = :default if context == true
-# 
-#         Array(context).each do |item|
-#           @properties[repository_name].lazy_context(item) << name
-#         end
-#       end
-# 
-#       # add the property to the child classes only if the property was
-#       # added after the child classes' properties have been copied from
-#       # the parent
-#       if respond_to?(:descendants)
-#         descendants.each do |model|
-#           next if model.properties(repository_name).has_property?(name)
-#           model.property(name, type, options)
-#         end
-#       end
-# 
-#       property
-#     end
-#     
-#   end # module Model
-# end # module DataMapper

data/lib/mack-data_mapper/dm_patches/property_set.rb

@@ -1,15 +0,0 @@
-# module DataMapper # :nodoc:
-#   class PropertySet # :nodoc:
-#     
-#     def []=(name, property)
-#       if existing_property = detect { |p| p.name == name }
-#         property.hash
-#         @entries[@entries.index(existing_property)] = property
-#       else
-#         add(property)
-#       end
-#       property
-#     end
-#     
-#   end # class PropertySet
-# end # module DataMapper

data/lib/mack-data_mapper/dm_patches/validations.rb

@@ -1,15 +0,0 @@
-# module DataMapper # :nodoc:
-#   module Validate # :nodoc:
-#     class GenericValidator # :nodoc:
-# 
-#       def ==(other)
-#         self.field_name == other.field_name &&
-#         self.if_clause == other.if_clause &&
-#         self.class == other.class &&
-#         self.unless_clause == other.unless_clause &&
-#         self.instance_variable_get(:@options) == other.instance_variable_get(:@options)
-#       end
-# 
-#     end # class GenericValidator
-#   end # module Validate
-# end # module DataMapper