mack-data_mapper 0.5.1 → 0.5.5

data/lib/configuration.rb

@@ -0,0 +1,22 @@
+module Mack
+  module Configuration
+
+    def self.load_database_configurations(env = Mack::Configuration.env)
+      dbs = Mack::Configuration.database_configurations
+      unless dbs.nil?
+        settings = dbs[env]
+        settings.symbolize_keys!
+        if settings[:default]
+          settings.each do |k,v|
+            DataMapper::Database.setup(k, v.symbolize_keys)
+          end
+        else
+          DataMapper::Database.setup(settings)
+        end
+      end
+    end # load_database_configurations
+
+  end # Configuration
+end # Mack
+
+Mack::Configuration.load_database_configurations

data/lib/helpers/orm_helpers.rb

@@ -26,16 +26,16 @@ module Mack
           end
         end
         app_errors.flatten!
-        File.join(MACK_VIEWS, "application", "_error_messages.html.erb")
+        File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb")
         unless app_errors.empty?
           if view_partial.nil?
-            if File.exist?(File.join(MACK_VIEWS, "application", "_error_messages.html.erb"))
-              render :partial => "application/error_messages", :locals => {:errors => app_errors}
+            if File.exist?(File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb"))
+              render(:partial, "application/error_messages", :locals => {:errors => app_errors})
             else
-              render :text => DEFAULT_PARTIAL, :locals => {:errors => app_errors}
+              render(:text, DEFAULT_PARTIAL, :locals => {:errors => app_errors})
             end
           else        
-            render :partial => view_partial, :locals => {:errors => app_errors}
+            render(:partial, view_partial, :locals => {:errors => app_errors})
           end
         else
           ""

data/lib/mack-data_mapper.rb

@@ -9,24 +9,13 @@ end
 gem("datamapper", "0.3.2")
 require 'data_mapper'
 
-dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
-
-unless dbs.nil?
-  settings = dbs[MACK_ENV]
-  settings.symbolize_keys!
-  if settings[:default]
-    settings.each do |k,v|
-      DataMapper::Database.setup(k, v.symbolize_keys)
-    end
-  else
-    DataMapper::Database.setup(settings)
-  end
-end
-
+fl = File.dirname(__FILE__)
+require File.join(fl, "persistence")
+require File.join(fl, "configuration")
+Mack::Configuration.load_database_configurations
 class SchemaInfo # :nodoc:
   include DataMapper::Persistence
   
-  set_table_name "schema_info"
   property :version, :integer, :default => 0
 end
 

data/lib/persistence.rb

@@ -0,0 +1,9 @@
+module DataMapper
+  module Persistence
+    
+    def to_param
+      self.key
+    end
+    
+  end
+end

data/lib/scaffold_generator/scaffold_generator.rb

@@ -20,7 +20,7 @@ class ScaffoldGenerator < Genosaurus
   
   def update_routes_file
     # update routes.rb
-    routes = File.join(MACK_CONFIG, "routes.rb")
+    routes = File.join(Mack::Configuration.config_directory, "routes.rb")
     rf = File.open(routes).read
     unless rf.match(".resource :#{@name_plural}")
       puts "Updating routes.rb"

data/lib/scaffold_generator/templates/app/controllers/controller.rb.template

@@ -2,12 +2,12 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # GET /<%= @name_plural %>
   def index
-    @<%= @name_plural %> = <%= @name_singular_camel %>.find(:all)
+    @<%= @name_plural %> = <%= @name_singular_camel %>.all
   end
 
   # GET /<%= @name_plural %>/1
   def show
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
   end
 
   # GET /<%= @name_plural %>/new
@@ -17,32 +17,32 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # GET /<%= @name_plural %>/1/edit
   def edit
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
   end
 
   # POST /<%= @name_plural %>
   def create
     @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
     if @<%= @name_singular %>.save
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
     else
-      render(:action => "new")
+      render(:action, "new")
     end
   end
 
   # PUT /<%= @name_plural %>/1
   def update
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
     if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
-      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
     else
-      render(:action => "edit")
+      render(:action, "edit")
     end
   end
 
   # DELETE /<%= @name_plural %>/1
   def delete
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
     @<%= @name_singular %>.destroy!
     redirect_to(<%= @name_plural %>_index_url)
   end

data/lib/scaffold_generator/templates/app/views/edit.html.erb.template

@@ -2,7 +2,7 @@
 
 <%%= error_messages_for :<%= @name_singular %> %>
 
-<%% form(<%= @name_singular %>s_update_url(:id => @<%= @name_singular %>.id), :class => "edit_<%= @name_singular %>", :id => "edit_<%= @name_singular %>", :method => :put) do %>
+<%% form(<%= @name_singular %>s_update_url(:id => @<%= @name_singular %>), :class => "edit_<%= @name_singular %>", :id => "edit_<%= @name_singular %>", :method => :put) do %>
 <% for column in columns -%>
 <% unless column.column_name == "created_at" || column.column_name == "updated_at" -%>
   <p>

data/lib/scaffold_generator/templates/app/views/index.html.erb.template

@@ -29,9 +29,9 @@ else
 -%>
     <td>&nbsp;</td>
 <% end -%>
-    <td><%%= link_to("Show", <%= @name_plural %>_show_url(:id => <%= @name_singular %>.id)) %></td>
-    <td><%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => <%= @name_singular %>.id)) %></td>
-    <td><%%= link_to("Delete", <%= @name_plural %>_delete_url(:id => <%= @name_singular %>.id), :method => :delete, :confirm => "Are you sure?") %></td>
+    <td><%%= link_to("Show", <%= @name_plural %>_show_url(:id => <%= @name_singular %>)) %></td>
+    <td><%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => <%= @name_singular %>)) %></td>
+    <td><%%= link_to("Delete", <%= @name_plural %>_delete_url(:id => <%= @name_singular %>), :method => :delete, :confirm => "Are you sure?") %></td>
   </tr>
 <%% end %>
 </table>

data/lib/scaffold_generator/templates/app/views/show.html.erb.template

@@ -8,5 +8,5 @@
 </p>
 <% end -%>
 
-<%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => @<%= @name_singular %>.id)) %> |
+<%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => @<%= @name_singular %>)) %> |
 <%%= link_to("Back", <%= @name_plural %>_index_url) %>

data/lib/tasks/db_create_drop_tasks.rake

@@ -0,0 +1,76 @@
+require 'rake'
+namespace :db do
+  
+  desc "Create the database for your environment."
+  task :create => :environment do
+    Mack::Configuration.load_database_configurations(Mack::Configuration.env)
+    database(:default) do
+      drop_create_database
+    end
+  end
+  
+  namespace :create do
+    
+    desc "Creates your Full environment. Does NOT create your production database!"
+    task :all => :environment do
+      Mack::Configuration.load_database_configurations("test")
+      database(:default) do
+        drop_create_database
+      end
+      Mack::Configuration.load_database_configurations("development")
+      database(:default) do
+        drop_create_database
+      end
+      Rake::Task["db:migrate"].invoke
+    end
+    
+  end
+
+end
+
+private
+def drop_create_database
+  configuration = database.adapter.instance_variable_get('@configuration')
+  case database.adapter.class.name
+    when "DataMapper::Adapters::MysqlAdapter"
+      DataMapper::Database.setup(:tmp, {
+        :adapter => "mysql",
+        :host => "localhost",
+        :database => "mysql",
+        :username => ENV["DB_USERNAME"] || "root",
+        :password => ENV["DB_PASSWORD"] || ""
+      })
+      database(:tmp) do
+        puts "Dropping (MySQL): #{configuration.database}"
+        database.execute "DROP DATABASE IF EXISTS `#{configuration.database}`"
+        puts "Creating (MySQL): #{configuration.database}"
+        database.execute "CREATE DATABASE `#{configuration.database}` DEFAULT CHARACTER SET `utf8`"
+        begin
+          database.adapter.flush_connections!
+        rescue Exception => e
+        end
+      end
+    when "DataMapper::Adapters::PostgresqlAdapter"
+      ENV['PGHOST']     = configuration.host if configuration.host
+      ENV['PGPORT']     = configuration.port.to_s if configuration.port
+      ENV['PGPASSWORD'] = configuration.password.to_s if configuration.password
+
+      database.adapter.flush_connections!
+      begin
+        puts "Dropping (PostgreSQL): #{configuration.database}"
+        `dropdb -U "#{configuration.username}" #{configuration.database}`
+      rescue Exception => e
+      end
+      
+      begin
+        puts "Creating (PostgreSQL): #{configuration.database}"
+        `createdb -U "#{configuration.username}" #{configuration.database}`
+      rescue Exception => e
+      end
+    when 'DataMapper::Adapters::Sqlite3Adapter'
+      puts "Dropping (SQLite3): #{configuration.database}"
+      FileUtils.rm_rf(configuration.database)
+    else
+      raise "Task not supported for '#{database.adapter}'"
+  end
+end

data/lib/tasks/{db_tasks.rake → db_migration_tasks.rake}

@@ -1,3 +1,4 @@
+require 'rake'
 namespace :db do
   
   desc "Migrate the database through scripts in db/migrations"
@@ -54,8 +55,12 @@ namespace :db do
     task :create => "mack:environment" do
       require 'data_mapper/migration'
       unless SchemaInfo.table.exists?
-        SchemaInfo.table.create!
-        SchemaInfo.create(:version => 0)
+        class SchemaInfo
+          include DataMapper::Persistence
+          property :version, :integer
+        end
+        SchemaInfo.auto_migrate!
+        SchemaInfo.create(:version => 0, :id => 1)
       end
       @schema_info = SchemaInfo.first
     end # create
@@ -64,7 +69,7 @@ namespace :db do
   
   
   def migration_files
-    Dir.glob(File.join(MACK_ROOT, "db", "migrations", "*.rb"))
+    Dir.glob(File.join(Mack::Configuration.root, "db", "migrations", "*.rb"))
   end
   
   def migration_number(migration)

data/test/database.yml

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

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

@@ -2,7 +2,7 @@
 
 <%= error_messages_for :zoo %>
 
-<% form(zoos_update_url(:id => @zoo.id), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %>
+<% form(zoos_update_url(:id => @zoo), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %>
   <p>
     <input id="zoo_submit" name="commit" type="submit" value="Update" />
   </p>

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

@@ -8,9 +8,9 @@
 <% 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>
+    <td><%= link_to("Show", zoos_show_url(:id => zoo)) %></td>
+    <td><%= link_to("Edit", zoos_edit_url(:id => zoo)) %></td>
+    <td><%= link_to("Delete", zoos_delete_url(:id => zoo), :method => :delete, :confirm => "Are you sure?") %></td>
   </tr>
 <% end %>
 </table>

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

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

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

@@ -2,7 +2,7 @@
 
 <%= error_messages_for :zoo %>
 
-<% form(zoos_update_url(:id => @zoo.id), :class => "edit_zoo", :id => "edit_zoo", :method => :put) do %>
+<% form(zoos_update_url(:id => @zoo), :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 %>" />

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

@@ -14,9 +14,9 @@
     <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>
+    <td><%= link_to("Show", zoos_show_url(:id => zoo)) %></td>
+    <td><%= link_to("Edit", zoos_edit_url(:id => zoo)) %></td>
+    <td><%= link_to("Delete", zoos_delete_url(:id => zoo), :method => :delete, :confirm => "Are you sure?") %></td>
   </tr>
 <% end %>
 </table>

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

@@ -18,5 +18,5 @@
   <%= @zoo.updated_at %>
 </p>
 
-<%= link_to("Edit", zoos_edit_url(:id => @zoo.id)) %> |
+<%= link_to("Edit", zoos_edit_url(:id => @zoo)) %> |
 <%= link_to("Back", zoos_index_url) %>

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

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

data/test/generators/scaffold_generator_test.rb

@@ -4,7 +4,7 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   
   def test_generate_data_mapper
     sg = ScaffoldGenerator.run("name" => "zoo")
-    File.open(File.join(MACK_CONFIG, "routes.rb")) do |f|
+    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
     
@@ -24,7 +24,7 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   
   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_CONFIG, "routes.rb")) do |f|
+    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)
@@ -43,15 +43,15 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   end
   
   def views_directory
-    File.join(MACK_VIEWS, "zoos")
+    File.join(Mack::Configuration.views_directory, "zoos")
   end
   
   def model_file
-    File.join(MACK_APP, "models", "zoo.rb")
+    File.join(Mack::Configuration.app_directory, "models", "zoo.rb")
   end
   
   def controller_file
-    File.join(MACK_APP, "controllers", "zoos_controller.rb")
+    File.join(Mack::Configuration.app_directory, "controllers", "zoos_controller.rb")
   end
   
   def migration_file

data/test/tasks/{db_tasks_test.rb → db_migration_tasks_test.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class DbTasksTest < Test::Unit::TestCase
+class DbMigrationTasksTest < Test::Unit::TestCase
   
-  $current_rake_task = File.join(File.dirname(__FILE__), "..", "..", "lib", "tasks", "db_tasks.rake")
+  $current_rake_task = File.join(File.dirname(__FILE__), "..", "..", "lib", "tasks", "db_migration_tasks.rake")
   
   def test_db_rollback
     test_db_migrate

data/test/test_helper.rb

@@ -1,17 +1,30 @@
 require "test/unit"
 require File.join(File.dirname(__FILE__), "..", "..", "test_helpers")
+require 'rubygems'
+require 'genosaurus'
+module Mack
+  module Configuration
+    def self.method_missing(sym, *args)
+      ev = "_mack_#{sym}".downcase
+      return ENV[ev]
+    end
+    
+    def self.set(name, value)
+      ENV["_mack_#{name.to_s.downcase}"] = value
+    end
+  end
+end
 
 $genosaurus_output_directory = File.join(File.dirname(__FILE__), "..", "tmp")
 
-Object::MACK_CONFIG = File.dirname(__FILE__) unless Object.const_defined?("MACK_CONFIG")
-Object::MACK_ROOT = $genosaurus_output_directory unless Object.const_defined?("MACK_ROOT")
-Object::MACK_APP = File.join($genosaurus_output_directory, "app") unless Object.const_defined?("MACK_APP")
-Object::MACK_ENV = "test" unless Object.const_defined?("MACK_ENV")
-Object::MACK_VIEWS = File.join(MACK_APP, "views") unless Object.const_defined?("MACK_VIEWS")
+ENV["_mack_config_directory"] = File.dirname(__FILE__)
+ENV["_mack_root"] = $genosaurus_output_directory
+ENV["_mack_app_directory"] = File.join($genosaurus_output_directory, "app")
+ENV["_mack_env"] = "test"
+ENV["_mack_views_directory"] = File.join(ENV["_mack_app_directory"], "views")
 
-require File.join(File.dirname(__FILE__), "..", "lib", "mack-data_mapper")
 require File.join(File.dirname(__FILE__), "..", "..", "mack-orm_common", "lib", "mack-orm_common")
-
+require File.join(File.dirname(__FILE__), "..", "lib", "mack-data_mapper")
 
 load File.join(File.dirname(__FILE__), "lib", "user.rb")
 
@@ -23,7 +36,7 @@ class Test::Unit::TestCase
   def cleanup
     database.adapter.flush_connections!
     FileUtils.rm_rf($genosaurus_output_directory)
-    FileUtils.rm_rf(File.join(MACK_CONFIG, "routes.rb"))
+    FileUtils.rm_rf(File.join(Mack::Configuration.config_directory, "routes.rb"))
   end
   
   def teardown
@@ -35,7 +48,7 @@ class Test::Unit::TestCase
     [$genosaurus_output_directory, migrations_directory, models_directory].each do |d|
       FileUtils.mkdir_p(d)
     end
-    FileUtils.cp(fixture_path("routes.rb"), File.join(MACK_CONFIG, "routes.rb"))
+    FileUtils.cp(fixture_path("routes.rb"), File.join(Mack::Configuration.config_directory, "routes.rb"))
   end
   
   def migrations_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: &id001 !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -04:00
+date: 2008-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/configuration.rb
 - lib/helpers/orm_helpers.rb
 - lib/mack-data_mapper.rb
 - lib/mack-data_mapper_tasks.rb
@@ -47,6 +48,7 @@ files:
 - lib/model_generator/model_generator.rb
 - lib/model_generator/templates/model.rb.template
 - lib/model_generator/templates/test.rb.template
+- lib/persistence.rb
 - lib/scaffold_generator/manifest.yml
 - lib/scaffold_generator/scaffold_generator.rb
 - lib/scaffold_generator/templates/app/controllers/controller.rb.template
@@ -55,7 +57,8 @@ files:
 - lib/scaffold_generator/templates/app/views/new.html.erb.template
 - lib/scaffold_generator/templates/app/views/show.html.erb.template
 - lib/scaffold_generator/templates/test.rb.template
-- lib/tasks/db_tasks.rake
+- lib/tasks/db_create_drop_tasks.rake
+- lib/tasks/db_migration_tasks.rake
 - README
 has_rdoc: true
 homepage: 
@@ -112,5 +115,5 @@ test_files:
 - test/lib
 - test/lib/user.rb
 - test/tasks
-- test/tasks/db_tasks_test.rb
+- test/tasks/db_migration_tasks_test.rb
 - test/test_helper.rb