mack-orm 0.8.0.101 → 0.8.1

data/lib/mack-orm.rb

@@ -3,6 +3,7 @@ require 'genosaurus'
 require 'configatron'
 
 configatron.mack.set_default(:disable_transactional_tests, false)
+configatron.mack.database.pagination.set_default(:results_per_page, 10)
 
 base = File.join(File.dirname(__FILE__), "mack-orm")
 require File.join(base, "database")
@@ -11,8 +12,54 @@ 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, "paginator")
 require File.join(base, "scaffold_generator", "scaffold_generator")
 
 Mack::Environment.after_class_method(:load) do
   Mack::Database.establish_connection(Mack.env)
-end
+end
+
+Mack::Portlet::Unpacker.registered_items[:migrations] = Proc.new do |force|
+  local_files = Dir.glob(Mack::Paths.migrations('**/*')).sort
+  num = '001'
+  unless local_files.empty?
+    num = File.basename(local_files.last).match(/(\d+)_.+/).captures.first
+  end
+  files = []
+  Mack.search_path(:db, false).each do |path|
+    files << Dir.glob(File.join(path, 'migrations', '**/*'))
+  end
+  files = files.flatten.compact.uniq.sort
+  files.each do |f|
+    fname = File.basename(f)
+    base = fname.match(/\d+_(.+)/).captures.first
+    if local_files.include?(/\d+_#{base}/) && !force
+      puts "Skipping: #{base}"
+    elsif local_files.include?(/\d+_#{base}/) && force
+      local_files.each do |lf|
+        if lf.match(/\d+_#{base}/)
+          n = lf.match(/(\d+)_#{base}/).captures.first
+          puts "Overwriting: #{base}"
+          src = File.read(f)
+          src.scan(/migration\D+\d+/).each do |line|
+            src.gsub!(line, line.gsub(/\d+/, n))
+          end
+          File.open(lf, 'w') do |w|
+            w.puts src
+          end
+          break
+        end
+      end
+    else
+      puts "Creating: #{"#{num}_#{base}"}"
+      num = num.succ
+      src = File.read(f)
+      src.scan(/migration\D+\d+/).each do |line|
+        src.gsub!(line, line.gsub(/\d+/, num))
+      end
+      File.open(Mack::Paths.migrations("#{num}_#{base}"), 'w') do |w|
+        w.puts src
+      end # File.open
+    end # if
+  end # files.each
+end # Proc

data/lib/mack-orm/database_migrations.rb

@@ -23,7 +23,16 @@ module Mack
       
       # Returns a list of the all migration files.
       def self.migration_files
-        Dir.glob(Mack::Paths.migrations("*.rb"))
+        allmigs = {}
+        Mack.search_path_local_first(:db).each do |path|
+          Dir.glob(File.join(path, 'migrations', '*.rb')).each do |f|
+            base = File.basename(f).match(/\d+_(.+)/).captures.first.downcase
+            unless allmigs[base]
+              allmigs[base] = f
+            end
+          end
+        end
+        allmigs.collect {|k,v| v}.sort
       end
       
     end # Migrations

data/lib/mack-orm/paginator.rb

@@ -0,0 +1,81 @@
+module Mack
+  module Database
+    
+    # Creates a new Mack::Database::Paginator class and calls the paginate method on it.
+    def self.paginate(klass, options = {}, query_options = {})
+      paginator = Mack::Database::Paginator.new(klass, options, query_options)
+      paginator.paginate
+    end
+    
+    # This class provides a clean API for doing database pagination.
+    # The paginate methods needs to be implemented by the ORM developer.
+    class Paginator
+      
+      # The Class that all queries will be called on
+      attr_accessor :klass
+      # Options for the Paginator itself
+      attr_accessor :options
+      # Options for the queries to be run
+      attr_accessor :query_options
+      # The total rows returned by the Paginator
+      attr_accessor :total_results
+      # The total pages available
+      attr_accessor :total_pages
+      # The actual records themselves
+      attr_accessor :results
+      # The current page in the pagination. Default is 1.
+      attr_accessor :current_page
+      # The number of results to be returned per page.
+      attr_accessor :results_per_page
+      
+      # Takes the Class that all queries will be run on, options for the Paginator,
+      # and options for the queries that are going to be run.
+      def initialize(klass, options = {}, query_options = {})
+        self.klass = klass
+        self.options = options
+        self.query_options = query_options
+        self.current_page = (self.options.delete(:current_page) || 1).to_i
+        self.results_per_page = (self.options.delete(:results_per_page) || configatron.mack.database.pagination.results_per_page).to_i
+      end
+      
+      # Implement this method in your ORM package. It should return <tt>self</tt> and set the following
+      # accessors: <tt>total_results</tt>, <tt>total_pages</tt>, <tt>results</tt>.
+      def paginate
+        raise NoMethodError.new('paginate')
+      end
+      
+      # Is there a next page?
+      def has_next?
+        return self.current_page != self.total_pages && self.total_pages > 1
+      end
+      
+      # Is there a previous page?
+      def has_previous?
+        return self.current_page != 1 && self.total_pages > 1
+      end
+      
+      # The starting index for this group of results.
+      # Useful for building things like:
+      #   Displaying 11 - 20 of 56 results.
+      def start_index
+        return 0 if self.total_results == 0
+        si = ((self.current_page - 1) * self.results_per_page)
+        return (si >= 0 ? si + 1 : 0)
+      end
+      
+      # The ending index for this group of results.
+      # Useful for building things like:
+      #   Displaying 11 - 20 of 56 results.
+      def end_index
+        ei = self.current_page * self.results_per_page
+        return (ei < self.total_results ? ei : self.total_results)
+      end
+      
+      def ==(other) # :nodoc:
+        self.results == other.results
+      end
+      
+    end
+    
+  end
+end

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

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

data/lib/mack-orm/tasks/db_create_drop_tasks.rake

@@ -1,6 +1,8 @@
 require 'rake'
 namespace :db do
   
+  task :init => [:recreate, :migrate]
+  
   desc "Drops (if it exists) the database and then creates it for your environment."
   task :recreate => :environment do
     Mack::Database.drop(Mack.env, repis)

data/lib/mack-orm/tasks/test_tasks.rake

@@ -4,7 +4,7 @@ namespace :test do
   desc "Sets up your testing environment"
   task :setup do
     ENV["MACK_ENV"] = "test"
-    # Mack.reset_logger!
+    Mack.reset_logger!
     Rake::Task["db:recreate"].invoke
     Mack::Database.dump_structure("development", :default)
     Mack::Database.load_structure(Mack::Paths.db("development_schema_structure.sql"))
@@ -18,7 +18,7 @@ namespace :test do
       if respond_to?(:run_factories)
         # auto require factories:
         Dir.glob(Mack::Paths.test("factories", "**/*.rb")).each do |f|
-          require f
+          require File.expand_path(f)
         end
         run_factories(:init)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-orm
 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: []
 
@@ -27,6 +27,7 @@ files:
 - lib/mack-orm/generators.rb
 - lib/mack-orm/genosaurus_helpers.rb
 - lib/mack-orm/model_column.rb
+- lib/mack-orm/paginator.rb
 - lib/mack-orm/scaffold_generator/manifest.yml
 - lib/mack-orm/scaffold_generator/scaffold_generator.rb
 - lib/mack-orm/scaffold_generator/templates/app/controllers/controller.rb.template