RubyGems - mack-data_mapper - Versions diffs - 0.6.1.2 → 0.7.0 - Mend

mack-data_mapper 0.6.1.2 → 0.7.0

Files changed (53) hide show

data/doc/files/lib/mack-data_mapper/{model_column_rb.html → generators_rb.html} RENAMED

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>File: model_column.rb</title>
+  <title>File: generators.rb</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
@@ -47,16 +47,16 @@
   <div id="fileHeader">
-    <h1>model_column.rb</h1>
+    <h1>generators.rb</h1>
     <table class="header-table">
     <tr class="top-aligned-row">
       <td><strong>Path:</strong></td>
-      <td>lib/mack-data_mapper/model_column.rb
+      <td>lib/mack-data_mapper/generators.rb
       </td>
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-data_mapper/helpers/orm_helpers_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-data_mapper/migration_generator/migration_generator_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-data_mapper/model_generator/model_generator_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/mack-data_mapper_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>
@@ -75,6 +75,7 @@
       <div class="name-list">
       rubygems&nbsp;&nbsp;
       genosaurus&nbsp;&nbsp;
+      mack-orm&nbsp;&nbsp;
       </div>
     </div>

data/doc/files/lib/mack-data_mapper_tasks_rb.html CHANGED

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 29 11:14:25 -0400 2008</td>
+      <td>Mon Aug 25 10:11:28 -0400 2008</td>
     </tr>
     </table>
   </div>
@@ -69,6 +69,13 @@
   <div id="contextContent">
+    <div id="requires-list">
+      <h3 class="section-bar">Required files</h3>
+      <div class="name-list">
+      mack-orm_tasks&nbsp;&nbsp;
+      </div>
+    </div>
    </div>

data/doc/fr_class_index.html CHANGED

@@ -21,15 +21,15 @@
   <h1 class="section-bar">Classes</h1>
   <div id="index-entries">
     <a href="classes/DataMapper/Resource.html">DataMapper::Resource</a><br />
-    <a href="classes/DataMapper/Timestamp.html">DataMapper::Timestamp</a><br />
     <a href="classes/Mack.html">Mack</a><br />
     <a href="classes/Mack/Database.html">Mack::Database</a><br />
+    <a href="classes/Mack/Database/Generators.html">Mack::Database::Generators</a><br />
+    <a href="classes/Mack/Database/Migrations.html">Mack::Database::Migrations</a><br />
     <a href="classes/Mack/Testing/DataMapperHelpers.html">Mack::Testing::DataMapperHelpers</a><br />
     <a href="classes/Mack/Testing/Helpers.html">Mack::Testing::Helpers</a><br />
     <a href="classes/Mack/ViewHelpers/DataMapperHelpers.html">Mack::ViewHelpers::DataMapperHelpers</a><br />
     <a href="classes/MigrationGenerator.html">MigrationGenerator</a><br />
     <a href="classes/ModelGenerator.html">ModelGenerator</a><br />
-    <a href="classes/ScaffoldGenerator.html">ScaffoldGenerator</a><br />
   </div>
 </div>
 </body>

data/doc/fr_file_index.html CHANGED

@@ -23,16 +23,18 @@
     <a href="files/README.html">README</a><br />
     <a href="files/lib/mack-data_mapper_rb.html">lib/mack-data_mapper.rb</a><br />
     <a href="files/lib/mack-data_mapper/database_rb.html">lib/mack-data_mapper/database.rb</a><br />
+    <a href="files/lib/mack-data_mapper/database_migrations_rb.html">lib/mack-data_mapper/database_migrations.rb</a><br />
     <a href="files/lib/mack-data_mapper/dm_patches/dm-timestamps_rb.html">lib/mack-data_mapper/dm_patches/dm-timestamps.rb</a><br />
     <a href="files/lib/mack-data_mapper/dm_patches/migrations_rb.html">lib/mack-data_mapper/dm_patches/migrations.rb</a><br />
-    <a href="files/lib/mack-data_mapper/genosaurus_helpers_rb.html">lib/mack-data_mapper/genosaurus_helpers.rb</a><br />
+    <a href="files/lib/mack-data_mapper/dm_patches/model_rb.html">lib/mack-data_mapper/dm_patches/model.rb</a><br />
+    <a href="files/lib/mack-data_mapper/dm_patches/property_set_rb.html">lib/mack-data_mapper/dm_patches/property_set.rb</a><br />
+    <a href="files/lib/mack-data_mapper/dm_patches/validations_rb.html">lib/mack-data_mapper/dm_patches/validations.rb</a><br />
+    <a href="files/lib/mack-data_mapper/generators_rb.html">lib/mack-data_mapper/generators.rb</a><br />
     <a href="files/lib/mack-data_mapper/helpers/orm_helpers_rb.html">lib/mack-data_mapper/helpers/orm_helpers.rb</a><br />
     <a href="files/lib/mack-data_mapper/migration_generator/migration_generator_rb.html">lib/mack-data_mapper/migration_generator/migration_generator.rb</a><br />
-    <a href="files/lib/mack-data_mapper/model_column_rb.html">lib/mack-data_mapper/model_column.rb</a><br />
     <a href="files/lib/mack-data_mapper/model_generator/model_generator_rb.html">lib/mack-data_mapper/model_generator/model_generator.rb</a><br />
     <a href="files/lib/mack-data_mapper/resource_rb.html">lib/mack-data_mapper/resource.rb</a><br />
     <a href="files/lib/mack-data_mapper/runner_rb.html">lib/mack-data_mapper/runner.rb</a><br />
-    <a href="files/lib/mack-data_mapper/scaffold_generator/scaffold_generator_rb.html">lib/mack-data_mapper/scaffold_generator/scaffold_generator.rb</a><br />
     <a href="files/lib/mack-data_mapper/test_extensions_rb.html">lib/mack-data_mapper/test_extensions.rb</a><br />
     <a href="files/lib/mack-data_mapper_tasks_rb.html">lib/mack-data_mapper_tasks.rb</a><br />
   </div>

data/doc/fr_method_index.html CHANGED

@@ -20,14 +20,17 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Mack/Database.html#M000007">create (Mack::Database)</a><br />
-    <a href="classes/Mack/Database.html#M000008">drop (Mack::Database)</a><br />
+    <a href="classes/Mack/Database/Migrations.html#M000011">abort_if_pending_migrations (Mack::Database::Migrations)</a><br />
+    <a href="classes/Mack/Database/Generators.html#M000008">controller_template_location (Mack::Database::Generators)</a><br />
+    <a href="classes/Mack/Database.html#M000004">create (Mack::Database)</a><br />
+    <a href="classes/Mack/Database.html#M000005">drop (Mack::Database)</a><br />
+    <a href="classes/Mack/Database.html#M000007">dump_structure (Mack::Database)</a><br />
     <a href="classes/Mack/ViewHelpers/DataMapperHelpers.html#M000002">error_messages_for (Mack::ViewHelpers::DataMapperHelpers)</a><br />
-    <a href="classes/Mack/Database.html#M000006">establish_connection (Mack::Database)</a><br />
-    <a href="classes/Mack/ViewHelpers/DataMapperHelpers.html#M000004">model_password_field (Mack::ViewHelpers::DataMapperHelpers)</a><br />
-    <a href="classes/Mack/ViewHelpers/DataMapperHelpers.html#M000003">model_text_field (Mack::ViewHelpers::DataMapperHelpers)</a><br />
-    <a href="classes/Mack/ViewHelpers/DataMapperHelpers.html#M000005">model_textarea (Mack::ViewHelpers::DataMapperHelpers)</a><br />
-    <a href="classes/Mack/Testing/DataMapperHelpers.html#M000009">rollback_transaction (Mack::Testing::DataMapperHelpers)</a><br />
+    <a href="classes/Mack/Database.html#M000003">establish_connection (Mack::Database)</a><br />
+    <a href="classes/Mack/Database.html#M000006">load_structure (Mack::Database)</a><br />
+    <a href="classes/Mack/Database/Migrations.html#M000009">migrate (Mack::Database::Migrations)</a><br />
+    <a href="classes/Mack/Database/Migrations.html#M000010">rollback (Mack::Database::Migrations)</a><br />
+    <a href="classes/Mack/Testing/DataMapperHelpers.html#M000012">rollback_transaction (Mack::Testing::DataMapperHelpers)</a><br />
     <a href="classes/DataMapper/Resource.html#M000001">to_param (DataMapper::Resource)</a><br />
   </div>
 </div>

data/lib/mack-data_mapper.rb CHANGED

@@ -1,25 +1,24 @@
 require 'rubygems'
 require 'genosaurus'
+require 'mack-orm'
 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.3"
+  gem "dm-#{g}", "0.9.4"
   require "dm-#{g}"
 end
 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")
-require File.join(fl, "model_column")
-require File.join(fl, "genosaurus_helpers")
 [:helpers, :migration_generator, :model_generator, :scaffold_generator, :dm_patches].each do |folder|
   Dir.glob(File.join(fl, folder.to_s, "**/*.rb")).each {|f| require f}

data/lib/mack-data_mapper/database.rb CHANGED

@@ -28,6 +28,48 @@ module Mack
       drop_database(repis)
     end
+    # Loads the structure of the given file into the database
+    def self.load_structure(file, env = Mack.env, repis = :default)
+      Mack::Database.establish_connection(env)
+      adapter = repository(repis).adapter
+      sql = File.read(file)
+      case adapter.class.name
+      when /Mysql/
+        sql.split(";").each do |s|
+          s.strip!
+          adapter.execute(s) unless s.blank?
+        end
+      else
+        adapter.execute(sql) unless sql.blank?
+      end
+    end
+    # Dumps the structure of the database to a file.
+    def self.dump_structure(env = Mack.env, repis = :default)
+      Mack::Database.establish_connection(env)
+      adapter = repository(repis).adapter
+      uri = adapter.uri
+      structure = ""
+      output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql")
+      case adapter.class.name
+      when /Mysql/
+        sql = "SHOW TABLES"
+        adapter.query(sql).each do |res|
+          show = adapter.query("SHOW CREATE TABLE #{res}").first
+          structure += show.attributes["create table".to_sym]
+          structure += ";\n\n"
+        end
+        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 = File.join(Mack.root, "db")
+        `sqlite3 #{File.join(db_dir, uri.basename)} .schema > #{output_file}`
+      else
+        raise "Task not supported for '#{repository(repis).adapter.class.name}'"
+      end
+    end
     private
     def self.setup_temp(uri, adapter)
       DataMapper.setup(:tmp, {
@@ -42,50 +84,49 @@ module Mack
     def self.create_database(repis = :default)
       uri = repository(repis).adapter.uri
       case repository(repis).adapter.class.name
-        when /Mysql/
-          setup_temp(uri, "mysql")
-          repository(:tmp) do |repo|
-            puts "Creating (MySQL): #{uri.basename}"
-            repo.adapter.execute "CREATE DATABASE `#{uri.basename}` DEFAULT CHARACTER SET `utf8`"
-          end
-        when /Postgres/
-          setup_temp(uri, "postgres")
-          repository(:tmp) do |repo|
-            puts "Creating (PostgreSQL): #{uri.basename}"
-            repo.adapter.execute "CREATE DATABASE #{uri.basename} ENCODING = 'utf8'"
-          end
-        when /Sqlite3/
-          db_dir = File.join(Mack.root, "db")
-          puts "Creating (SQLite3): #{uri.basename}"
-          FileUtils.mkdir_p(db_dir)
-          FileUtils.touch(File.join(db_dir, uri.basename))
-        else
-          raise "Task not supported for '#{repository(repis).adapter.class.name}'"
+      when /Mysql/
+        setup_temp(uri, "mysql")
+        repository(:tmp) do |repo|
+          puts "Creating (MySQL): #{uri.basename}"
+          repo.adapter.execute "CREATE DATABASE `#{uri.basename}` DEFAULT CHARACTER SET `utf8`"
+        end
+      when /Postgres/
+        setup_temp(uri, "postgres")
+        repository(:tmp) do |repo|
+          puts "Creating (PostgreSQL): #{uri.basename}"
+          repo.adapter.execute "CREATE DATABASE #{uri.basename} ENCODING = 'utf8'"
+        end
+      when /Sqlite3/
+        db_dir = File.join(Mack.root, "db")
+        puts "Creating (SQLite3): #{uri.basename}"
+        FileUtils.mkdir_p(db_dir)
+        FileUtils.touch(File.join(db_dir, uri.basename))
+      else
+        raise "Task not supported for '#{repository(repis).adapter.class.name}'"
       end
     end
     def self.drop_database(repis = :default)
       uri = repository(repis).adapter.uri
       case repository(repis).adapter.class.name
-        when /Mysql/
-          setup_temp(uri, "mysql")
-          repository(:tmp) do |repo|
-            puts "Dropping (MySQL): #{uri.basename}"
-            repo.adapter.execute "DROP DATABASE IF EXISTS `#{uri.basename}`"
-          end
-        when /Postgres/
-          setup_temp(uri, "postgres")
-          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 = File.join(Mack.root, "db")
-          FileUtils.rm_rf(File.join(db_dir.to_s, uri.basename))
-        else
-          raise "Task not supported for '#{repository(repis).adapter.class.name}'"
+      when /Mysql/
+        setup_temp(uri, "mysql")
+        repository(:tmp) do |repo|
+          puts "Dropping (MySQL): #{uri.basename}"
+          repo.adapter.execute "DROP DATABASE IF EXISTS `#{uri.basename}`"
+        end
+      when /Postgres/
+        setup_temp(uri, "postgres")
+        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 = File.join(Mack.root, "db")
+        FileUtils.rm_rf(File.join(db_dir.to_s, uri.basename))
+      else
+        raise "Task not supported for '#{repository(repis).adapter.class.name}'"
       end
     end

data/lib/mack-data_mapper/database_migrations.rb ADDED

@@ -0,0 +1,35 @@
+require 'migration_runner'
+include DataMapper::Types
+module Mack
+  module Database
+    module Migrations
+      # Migrates the database to the latest version
+      def self.migrate
+        Mack::Database.establish_connection
+        DataMapper::MigrationRunner.reset!
+        migration_files.each { |mig| load mig }
+        DataMapper::MigrationRunner.migrate_up!
+      end
+      # Rolls back the database by the specified number of steps. Default is 1
+      def self.rollback(step = 1)
+        DataMapper::MigrationRunner.reset!
+        migration_files.each { |mig| load mig }
+        migrations = DataMapper::MigrationRunner.migrations.sort.reverse
+        step.times do |i|
+          migrations[migrations.size - (i + 1)].perform_down
+        end
+      end
+      def self.abort_if_pending_migrations
+        migration_files.each { |mig| load mig }
+        DataMapper::MigrationRunner.migrations.each do |mig|
+          raise Mack::Errors::UnrunMigrations.new(mig.name) if mig.send("needs_up?")
+        end
+        DataMapper::MigrationRunner.migrations.clear
+      end
+    end # Migrations
+  end # Database
+end # Mack

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

@@ -1,6 +1,6 @@
-module DataMapper
-  module Timestamp
-    TIMESTAMP_PROPERTIES[:created_at] = lambda { |r| r.created_at = DateTime.now if r.new_record? && r.created_at.nil? }
-    TIMESTAMP_PROPERTIES[:created_on] = lambda { |r| r.created_on = DateTime.now if r.new_record? && r.created_on.nil? }
+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/migrations.rb CHANGED

@@ -17,5 +17,27 @@ module SQL # :nodoc:
       statement
     end
-  end
-end
+  end # Sqlite3
+  class TableModifier # :nodoc:
+    def add_column(name, type, opts = {})
+      column = SQL::TableCreator::Column.new(@adapter, name, build_type(name, type), opts)
+      @statements << "ALTER TABLE #{quoted_table_name} ADD COLUMN #{column.to_sql}"
+    end
+    def change_column(name, type, opts = {})
+      # raise NotImplemented for SQLite3
+      @statements << "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(name)} TYPE #{build_type(name, type, opts).gsub(quote_column_name(name), '').gsub('NOT NULL', '')}"
+    end
+    def build_type(name, type_class, options = @opts)
+      schema = {:name => name.to_s, :quote_column_name => quote_column_name(name)}.merge(options)
+      schema[:serial?] ||= schema[:serial]
+      schema[:nullable?] ||= schema[:nullable]
+      schema = @adapter.class.type_map[type_class].merge(schema)
+      @adapter.property_schema_statement(schema)
+    end
+  end # TableModifier
+end # SQL

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

@@ -0,0 +1,48 @@
+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