mack-active_record 0.5.5 → 0.6.0

data/lib/tasks/db_migration_tasks.rake

@@ -2,85 +2,20 @@ require 'rake'
 namespace :db do
   
   desc "Migrate the database through scripts in db/migrations"
-  task :migrate => "db:schema:create" do
-    migration_files.each do |migration|
-      require migration
-      migration = File.basename(migration, ".rb")
-      m_number = migration_number(migration)
-      if m_number > @schema_info.version
-        migration_name(migration).camelcase.constantize.up
-        @schema_info.version += 1
-        @schema_info.save
-      end
-    end # each
+  task :migrate => "mack:environment" do
+    #ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
+    Mack::Database::Migrator.migrate
   end # migrate
   
   desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
-  task :rollback => ["db:schema:create", "db:abort_if_pending_migrations"] do
-    migrations = migration_files.reverse
-    (ENV["STEP"] || 1).to_i.times do |step|
-      migration = migrations[step]
-      require migration
-      migration = File.basename(migration, ".rb")
-      m_number = migration_number(migration)
-      if m_number == @schema_info.version
-        migration_name(migration).camelcase.constantize.down
-        @schema_info.version -= 1
-        @schema_info.save
-      end
-    end
-
+  task :rollback => ["mack:environment"] do
+    Mack::Database::Migrator.rollback
+    #ActiveRecord::Migrator.rollback(File.join(Mack.root, "db", "migrations"), (ENV["STEP"] || 1).to_i)
   end # rollback
-  
-  desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations do
-    migrations = migration_files.reverse
-    return if migrations.empty?
-    migration = migrations.first
-    migration = File.basename(migration, ".rb")
-    m_number = migration_number(migration)
-    if m_number > @schema_info.version
-      raise Mack::Errors::UnrunMigrations.new(m_number - @schema_info.version)
-    end
-  end
-  
+
   desc "Displays the current schema version of your database"
-  task :version => "db:schema:create" do
-    puts "\nYour database is currently at version: #{@schema_info.version}\n"
-  end
-  
-  private
-  namespace :schema do
-    
-    task :create => "mack:environment" do
-      require 'active_record/migration'
-      class CreateSchemaInfo < ActiveRecord::Migration # :nodoc:
-        def self.up
-          create_table :schema_info do |t|
-            t.column :version, :integer, :default => 0
-          end
-        end # up
-      end # CreateSchemaInfo
-      unless SchemaInfo.table_exists?
-        CreateSchemaInfo.up
-        SchemaInfo.create(:version => 0)
-      end
-      @schema_info = SchemaInfo.find(:first)
-    end # create
-    
-  end # schema
-  
-  
-  def migration_files
-    Dir.glob(File.join(Mack::Configuration.root, "db", "migrations", "*.rb"))
-  end
-  
-  def migration_number(migration)
-    migration.match(/(^\d+)/).captures.last.to_i
-  end
-  
-  def migration_name(migration)
-    migration.match(/^\d+_(.+)/).captures.last
+  task :version => "mack:environment" do
+    puts "\nYour database is currently at version: #{Mack::Database::Migrator.version}\n"
   end
   
 end # db

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-active_record
-version: &id001 !ruby/object:Gem::Version 
-  version: 0.5.5
+version: !ruby/object:Gem::Version 
+  version: 0.6.0
 platform: ruby
 authors: 
 - markbates
@@ -9,17 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 -04:00
+date: 2008-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mack-orm_common
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - *id001
-    version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   version_requirement: 
@@ -30,22 +22,26 @@ dependencies:
         version: 2.0.2
     version: 
 description: "mack-active_record was developed by: markbates"
-email: 
+email: mark@mackframework.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
+- lib/database.rb
+- lib/genosaurus_helpers.rb
 - lib/helpers/orm_helpers.rb
 - lib/mack-active_record.rb
 - lib/mack-active_record_tasks.rb
 - lib/migration_generator/migration_generator.rb
 - lib/migration_generator/templates/db/migrations/%=@migration_name%.rb.template
+- lib/model_column.rb
 - lib/model_generator/manifest.yml
 - lib/model_generator/model_generator.rb
 - lib/model_generator/templates/model.rb.template
+- lib/model_generator/templates/rspec.rb.template
 - lib/model_generator/templates/test.rb.template
 - lib/scaffold_generator/manifest.yml
 - lib/scaffold_generator/scaffold_generator.rb
@@ -54,12 +50,13 @@ files:
 - lib/scaffold_generator/templates/app/views/index.html.erb.template
 - lib/scaffold_generator/templates/app/views/new.html.erb.template
 - lib/scaffold_generator/templates/app/views/show.html.erb.template
+- lib/scaffold_generator/templates/spec.rb.template
 - lib/scaffold_generator/templates/test.rb.template
 - lib/tasks/db_create_drop_tasks.rake
 - lib/tasks/db_migration_tasks.rake
 - README
 has_rdoc: true
-homepage: 
+homepage: http://www.mackframework.com
 post_install_message: 
 rdoc_options: []
 
@@ -70,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -85,32 +82,5 @@ rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: ActiveRecord ORM support for Mack
-test_files: 
-- test/database.yml
-- test/fixtures
-- test/fixtures/add_users_migration.rb.fixture
-- test/fixtures/album.rb.fixture
-- test/fixtures/album_unit_test.rb.fixture
-- test/fixtures/create_users_migration.rb.fixture
-- test/fixtures/routes.rb.fixture
-- test/fixtures/zoo.rb.fixture
-- test/fixtures/zoo_no_cols
-- test/fixtures/zoo_no_cols/edit.html.erb.fixture
-- test/fixtures/zoo_no_cols/index.html.erb.fixture
-- test/fixtures/zoo_no_cols/new.html.erb.fixture
-- test/fixtures/zoo_no_cols/show.html.erb.fixture
-- test/fixtures/zoo_with_cols
-- test/fixtures/zoo_with_cols/edit.html.erb.fixture
-- test/fixtures/zoo_with_cols/index.html.erb.fixture
-- test/fixtures/zoo_with_cols/new.html.erb.fixture
-- test/fixtures/zoo_with_cols/show.html.erb.fixture
-- test/fixtures/zoo_with_cols/zoos_controller.rb.fixture
-- test/generators
-- test/generators/migration_generator_test.rb
-- test/generators/model_generator_test.rb
-- test/generators/scaffold_generator_test.rb
-- test/lib
-- test/lib/user.rb
-- test/tasks
-- test/tasks/db_migration_tasks_test.rb
-- test/test_helper.rb
+test_files: []
+

data/test/database.yml

@@ -1,3 +0,0 @@
-test:
-  adapter: sqlite3
-  database: <%= File.join(Mack::Configuration.root, "mack-active_record_test.db") %>

data/test/fixtures/add_users_migration.rb.fixture

@@ -1,9 +0,0 @@
-class AddUsers < ActiveRecord::Migration
-  def self.up
-    User.create(:username => "markbates", :email => "mark@mackframework.com")
-  end
-
-  def self.down
-    User.delete_all
-  end
-end

data/test/fixtures/album.rb.fixture

@@ -1,3 +0,0 @@
-class Album < ActiveRecord::Base
-
-end

data/test/fixtures/album_unit_test.rb.fixture

@@ -1,9 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
-
-class AlbumTest < Test::Unit::TestCase
-  
-  def test_truth
-    assert true
-  end
-  
-end

data/test/fixtures/create_users_migration.rb.fixture

@@ -1,12 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
-      t.column :username, :string
-      t.column :email, :string
-    end
-  end
-
-  def self.down
-    drop_table :users
-  end
-end

data/test/fixtures/routes.rb.fixture

@@ -1,3 +0,0 @@
-Mack::Routes.build do |r|
-  
-end

data/test/fixtures/zoo.rb.fixture

@@ -1,3 +0,0 @@
-class Zoo < ActiveRecord::Base
-
-end

data/test/fixtures/zoo_no_cols/edit.html.erb.fixture

@@ -1,11 +0,0 @@
-<h1>Edit Zoo</h1>
-
-<%= error_messages_for :zoo %>
-
-<% form(zoos_update_url(:id => @zoo.id), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %>
-  <p>
-    <input id="zoo_submit" name="commit" type="submit" value="Update" />
-  </p>
-<% end %>
-
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_no_cols/index.html.erb.fixture

@@ -1,20 +0,0 @@
-<h1>Listing Zoos</h1>
-
-<table>
-  <tr>
-    <th>&nbsp;</th>
-  </tr>
-
-<% for zoo in @zoos %>
-  <tr>
-    <td>&nbsp;</td>
-    <td><%= link_to("Show", zoos_show_url(:id => zoo.id)) %></td>
-    <td><%= link_to("Edit", zoos_edit_url(:id => zoo.id)) %></td>
-    <td><%= link_to("Delete", zoos_delete_url(:id => zoo.id), :method => :delete, :confirm => "Are you sure?") %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to("New Zoo", zoos_new_url) %>

data/test/fixtures/zoo_no_cols/new.html.erb.fixture

@@ -1,11 +0,0 @@
-<h1>New Zoo</h1>
-
-<%= error_messages_for :zoo %>
-
-<% form(zoos_create_url, :class => "new_zoo", :id => "new_zoo") do %>
-  <p>
-    <input id="zoo_submit" name="commit" type="submit" value="Create" />
-  </p>
-<% end %>
-
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_no_cols/show.html.erb.fixture

@@ -1,6 +0,0 @@
-<p>
-  <h1>Zoo</h1>
-</p>
-
-<%= link_to("Edit", zoos_edit_url(:id => @zoo.id)) %> |
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_with_cols/edit.html.erb.fixture

@@ -1,19 +0,0 @@
-<h1>Edit Zoo</h1>
-
-<%= error_messages_for :zoo %>
-
-<% form(zoos_update_url(:id => @zoo.id), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %>
-  <p>
-    <b>Name</b><br />
-    <input type="text" name="zoo[name]" id="zoo_name" size="30" value="<%= @zoo.name %>" />
-  </p>
-  <p>
-    <b>Description</b><br />
-    <textarea name="zoo[description]" id="zoo_description" cols="60" rows="20"><%= @zoo.description %></textarea>
-  </p>
-  <p>
-    <input id="zoo_submit" name="commit" type="submit" value="Update" />
-  </p>
-<% end %>
-
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_with_cols/index.html.erb.fixture

@@ -1,26 +0,0 @@
-<h1>Listing Zoos</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Description</th>
-    <th>CreatedAt</th>
-    <th>UpdatedAt</th>
-  </tr>
-
-<% for zoo in @zoos %>
-  <tr>
-    <td><%= zoo.name %></td>
-    <td><%= zoo.description %></td>
-    <td><%= zoo.created_at %></td>
-    <td><%= zoo.updated_at %></td>
-    <td><%= link_to("Show", zoos_show_url(:id => zoo.id)) %></td>
-    <td><%= link_to("Edit", zoos_edit_url(:id => zoo.id)) %></td>
-    <td><%= link_to("Delete", zoos_delete_url(:id => zoo.id), :method => :delete, :confirm => "Are you sure?") %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to("New Zoo", zoos_new_url) %>

data/test/fixtures/zoo_with_cols/new.html.erb.fixture

@@ -1,19 +0,0 @@
-<h1>New Zoo</h1>
-
-<%= error_messages_for :zoo %>
-
-<% form(zoos_create_url, :class => "new_zoo", :id => "new_zoo") do %>
-  <p>
-    <b>Name</b><br />
-    <input type="text" name="zoo[name]" id="zoo_name" size="30" value="<%= @zoo.name %>" />
-  </p>
-  <p>
-    <b>Description</b><br />
-    <textarea name="zoo[description]" id="zoo_description" cols="60" rows="20"><%= @zoo.description %></textarea>
-  </p>
-  <p>
-    <input id="zoo_submit" name="commit" type="submit" value="Create" />
-  </p>
-<% end %>
-
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_with_cols/show.html.erb.fixture

@@ -1,22 +0,0 @@
-<p>
-  <h1>Zoo</h1>
-</p>
-<p>
-  <b>Name</b><br />
-  <%= @zoo.name %>
-</p>
-<p>
-  <b>Description</b><br />
-  <%= @zoo.description %>
-</p>
-<p>
-  <b>CreatedAt</b><br />
-  <%= @zoo.created_at %>
-</p>
-<p>
-  <b>UpdatedAt</b><br />
-  <%= @zoo.updated_at %>
-</p>
-
-<%= link_to("Edit", zoos_edit_url(:id => @zoo.id)) %> |
-<%= link_to("Back", zoos_index_url) %>

data/test/fixtures/zoo_with_cols/zoos_controller.rb.fixture

@@ -1,50 +0,0 @@
-class ZoosController < Mack::Controller::Base
-
-  # GET /zoos
-  def index
-    @zoos = Zoo.find(:all)
-  end
-
-  # GET /zoos/1
-  def show
-    @zoo = Zoo.find(params(:id))
-  end
-
-  # GET /zoos/new
-  def new
-    @zoo = Zoo.new
-  end
-
-  # GET /zoos/1/edit
-  def edit
-    @zoo = Zoo.find(params(:id))
-  end
-
-  # POST /zoos
-  def create
-    @zoo = Zoo.new(params(:zoo))
-    if @zoo.save
-      redirect_to(zoos_show_url(:id => @zoo.id))
-    else
-      render(:action, "new")
-    end
-  end
-
-  # PUT /zoos/1
-  def update
-    @zoo = Zoo.find(params(:id))
-    if @zoo.update_attributes(params(:zoo))
-      redirect_to(zoos_show_url(:id => @zoo.id))
-    else
-      render(:action, "edit")
-    end
-  end
-
-  # DELETE /zoos/1
-  def delete
-    @zoo = Zoo.find(params(:id))
-    @zoo.destroy
-    redirect_to(zoos_index_url)
-  end
-
-end

data/test/generators/migration_generator_test.rb

@@ -1,71 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
-
-class MigrationGeneratorTest < Test::Unit::TestCase
-  
-  def test_next_migration_number
-    mg = MigrationGenerator.new("NAME" => "foo")
-    assert_equal "001", mg.next_migration_number
-    FileUtils.mkdir_p(migrations_directory)
-    assert File.exists?(migrations_directory)
-    File.open(File.join(migrations_directory, "001_foo.rb"), "w") {|f| f.puts ""}
-    assert_equal "002", mg.next_migration_number
-  end
-  
-  def test_generate_data_mapper
-    generate_common
-    mig = <<-MIG
-class FooBar < ActiveRecord::Migration
-
-  def self.up
-  end
-
-  def self.down
-  end
-
-end
-MIG
-    assert_equal mig, @file_body
-  end
-
-  def test_generate_data_mapper_with_columns
-    generate_common({"NAME" => "create_users", "cols" => "username:string,email_address:string,created_at:datetime,updated_at:datetime"})
-    mig = <<-MIG
-class CreateUsers < ActiveRecord::Migration
-
-  def self.up
-    create_table :users do |t|
-      t.column :username, :string
-      t.column :email_address, :string
-      t.column :created_at, :datetime
-      t.column :updated_at, :datetime
-    end
-  end
-
-  def self.down
-    drop_table :users
-  end
-
-end
-MIG
-    assert_equal mig, @file_body
-  end
-  
-  def generate_common(opts = {})
-    5.times do |i|
-      options = {"NAME" => "foo_bar"}.merge(opts)
-      mg = MigrationGenerator.run(options)
-      assert File.exists?(migrations_directory)
-      assert File.exists?(File.join(migrations_directory, "00#{i+1}_#{options["NAME"]}.rb"))
-      File.open(File.join(migrations_directory, "00#{i+1}_#{options["NAME"]}.rb"), "r") do |file|
-        @file_body = file.read
-      end
-    end
-  end
-  
-  def test_required_params
-    assert_raise(ArgumentError) { MigrationGenerator.new }
-    mg = MigrationGenerator.new("NAME" => "foo")
-    assert_not_nil mg
-  end
-  
-end

data/test/generators/model_generator_test.rb

@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
-
-class ModelGeneratorTest < Test::Unit::TestCase
-  
-  def test_generate_data_mapper
-    ModelGenerator.new("name" => "album").generate
-    assert File.exists?(model_loc)
-    assert_equal fixture("album.rb"), File.open(model_loc).read
-    assert File.exists?(migration_loc)
-  end
-  
-  def test_generate_data_mapper_with_columns
-    ModelGenerator.new("name" => "albums", "cols" => "title:string,artist_id:integer,description:text").generate
-    assert File.exists?(model_loc)
-    assert_equal fixture("album.rb"), File.open(model_loc).read
-    assert File.exists?(migration_loc)
-  end
-  
-  def test_unit_test_created
-    ModelGenerator.new("name" => "album").generate
-    assert File.exists?(unit_test_loc)
-    assert_equal fixture("album_unit_test.rb"), File.open(unit_test_loc).read
-  end
-  
-  def unit_test_loc
-    File.join(test_directory, "unit", "album_test.rb")
-  end
-  
-  def model_loc
-    File.join(models_directory, "album.rb")
-  end
-  
-  def migration_loc
-    File.join(migrations_directory, "001_create_albums.rb")
-  end
-  
-end

data/test/generators/scaffold_generator_test.rb

@@ -1,61 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
-
-class ScaffoldGeneratorTest < Test::Unit::TestCase
-  
-  def test_generate_data_mapper
-    sg = ScaffoldGenerator.run("name" => "zoo")
-    File.open(File.join(Mack::Configuration.config_directory, "routes.rb")) do |f|
-      assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read
-    end
-    
-    assert File.exists?(views_directory)
-    assert_equal fixture("zoo_no_cols", "edit.html.erb"), File.open(File.join(views_directory, "edit.html.erb")).read
-    assert_equal fixture("zoo_no_cols", "index.html.erb"), File.open(File.join(views_directory, "index.html.erb")).read
-    assert_equal fixture("zoo_no_cols", "new.html.erb"), File.open(File.join(views_directory, "new.html.erb")).read
-    assert_equal fixture("zoo_no_cols", "show.html.erb"), File.open(File.join(views_directory, "show.html.erb")).read
-    
-    assert File.exists?(model_file)
-    assert File.exists?(controller_file)
-    assert File.exists?(migration_file)
-    assert File.exists?(functional_test_file)
-    assert_equal fixture("zoo_with_cols", "zoos_controller.rb"), File.open(controller_file).read
-    assert_equal fixture("zoo.rb"), File.open(model_file).read
-  end
-  
-  def test_generate_data_mapper_with_columns
-    sg = ScaffoldGenerator.run("name" => "zoo", "cols" => "name:string,description:text,created_at:datetime,updated_at:datetime")
-    File.open(File.join(Mack::Configuration.config_directory, "routes.rb")) do |f|
-      assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read
-    end
-    assert File.exists?(views_directory)
-    assert_equal fixture("zoo_with_cols", "edit.html.erb"), File.open(File.join(views_directory, "edit.html.erb")).read
-    assert_equal fixture("zoo_with_cols", "index.html.erb"), File.open(File.join(views_directory, "index.html.erb")).read
-    assert_equal fixture("zoo_with_cols", "new.html.erb"), File.open(File.join(views_directory, "new.html.erb")).read
-    assert_equal fixture("zoo_with_cols", "show.html.erb"), File.open(File.join(views_directory, "show.html.erb")).read
-
-    assert File.exists?(model_file)
-    assert File.exists?(controller_file)
-    assert File.exists?(migration_file)
-  end
-  
-  def functional_test_file
-    File.join(test_directory, "functional", "zoos_controller_test.rb")
-  end
-  
-  def views_directory
-    File.join(Mack::Configuration.views_directory, "zoos")
-  end
-  
-  def model_file
-    File.join(Mack::Configuration.app_directory, "models", "zoo.rb")
-  end
-  
-  def controller_file
-    File.join(Mack::Configuration.app_directory, "controllers", "zoos_controller.rb")
-  end
-  
-  def migration_file
-    File.join(migrations_directory, "001_create_zoos.rb")
-  end
-  
-end

data/test/lib/user.rb

@@ -1,3 +0,0 @@
-class User < ActiveRecord::Base
-
-end