mack-active_record 0.5.5 → 0.6.0

data/lib/database.rb

@@ -0,0 +1,118 @@
+#
+# AR db create/drop.
+# Currently it supports 3 adapters: sqlite3, postgresql, and mysql
+#
+# ds - July 2008
+#
+
+module Mack
+  module Database
+    
+    module Migrator
+      def self.version
+        ActiveRecord::Migrator.current_version
+      end
+      
+      def self.migrate
+        ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
+      end
+      
+      def self.rollback(step = 1)
+        step = (ENV["STEP"] || step).to_i
+        cur_version = version.to_i
+        target_version = cur_version - step 
+        target_version = 0 if target_version < 0
+        
+        ActiveRecord::Migrator.down(File.join(Mack.root, "db", "migrations"), target_version)
+      end
+      
+    end
+        
+    def self.db_settings(env)
+      dbs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
+      dbs = dbs[env]
+      dbs.symbolize_keys!
+      return dbs
+    end
+    
+    def self.establish_connection(env)
+      dbs = db_settings(env)
+      ActiveRecord::Base.establish_connection(dbs)
+    end
+    
+    # Perform db create or drop
+    # 
+    # By default the mode is drop then create, but caller will be able to 
+    # call this routine with a specific action (:drop, :create, or :drop_and_create)
+    # 
+    def self.drop_or_create_database(env, mode = :drop_and_create)
+      dbs = db_settings(env)
+      case dbs[:adapter]
+        when "mysql"
+          establish_mysql_connection
+          drop_mysql_db(env, dbs) if mode == :drop or mode == :drop_and_create
+          create_mysql_db(env, dbs) if mode == :create or mode == :drop_and_create
+          
+        when "postgresql"
+          ENV['PGHOST']     = dbs[:host] if dbs[:host]
+          ENV['PGPORT']     = dbs[:port].to_s if dbs[:port]
+          ENV['PGPASSWORD'] = dbs[:password].to_s if dbs[:password]
+          
+          ActiveRecord::Base.clear_active_connections!
+          drop_postgresql_db(env, dbs) if mode == :drop or mode == :drop_and_create
+          create_postgresql_db(env, dbs) if mode == :create or mode == :drop_and_create
+          
+        when "sqlite3"
+          ActiveRecord::Base.clear_active_connections!
+          FileUtils.rm_rf(dbs[:database]) if mode == :drop or mode == :drop_and_create
+      end
+    end
+            
+    private
+    
+    def self.drop_postgresql_db(env, dbs)
+      begin
+        puts "Dropping (PostgreSQL): #{dbs[:database]}"
+        `dropdb -U "#{dbs[:username]}" #{dbs[:database]}`
+      rescue Exception => e
+        puts e
+      end
+    end
+    
+    def self.create_postgresql_db(env, dbs)
+      begin
+        enc_option = "-E #{dbs[:encoding]}" if dbs[:encoding]
+        puts "Creating (PostgreSQL): #{dbs[:database]}"
+        `createdb #{enc_option} -U "#{dbs[:username]}" #{dbs[:database]}`
+      rescue Exception => e
+        puts e
+      end
+    end
+    
+    def self.establish_mysql_connection
+      # connect to mysql meta database
+      ActiveRecord::Base.establish_connection(
+        :adapter => "mysql",
+        :host => "localhost",
+        :database => "mysql",
+        :username => ENV["DB_USERNAME"] || "root",
+        :password => ENV["DB_PASSWORD"] || ""
+      )
+    end
+    
+    def self.create_mysql_db(env, dbs)
+      if dbs[:collation]
+        puts "Dropping (MySQL): #{dbs[:database]}"
+        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{dbs[:database]}` DEFAULT CHARACTER SET `#{dbs[:charset] || 'utf8'}` COLLATE `#{dbs[:collation]}`"
+      else
+        puts "Creating (MySQL): #{dbs[:database]}"
+        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{dbs[:database]}` DEFAULT CHARACTER SET `#{dbs[:charset] || 'utf8'}`"
+      end
+    end
+    
+    def self.drop_mysql_db(env, dbs)
+      puts "Dropping (MySQL): #{dbs[:database]}"
+      ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS `#{dbs[:database]}`"
+    end
+  end
+end

data/lib/genosaurus_helpers.rb

@@ -0,0 +1,40 @@
+module Mack
+  module Genosaurus # :nodoc:
+    module ActiveRecord # :nodoc:
+      module Helpers
+      
+        def columns(name = param(:name))
+          ivar_cache("form_columns") do
+            cs = []
+            cols = (param(:cols) || param(:columns))
+            if cols
+              cols.split(",").each do |x|
+                cs << Mack::Genosaurus::ActiveRecord::ModelColumn.new(name, x)
+              end
+            end
+            cs
+          end
+        end
+
+        def db_directory
+          File.join(Mack.root, "db")
+        end
+      
+        def migrations_directory
+          File.join(db_directory, "migrations")
+        end
+      
+        def next_migration_number
+          last = Dir.glob(File.join(migrations_directory, "*.rb")).last
+          if last
+            return File.basename(last).match(/^\d+/).to_s.succ
+          end
+          return "001"
+        end
+      
+        ::Genosaurus.send(:include, self)
+      
+      end # Helpers
+    end # ActiveRecord
+  end # Genosaurus
+end # Mack

data/lib/helpers/orm_helpers.rb

@@ -6,25 +6,25 @@ end
 
 module Mack
   module ViewHelpers
-    module OrmHelpers
+    module ActiveRecordHelpers
       DEFAULT_PARTIAL = %{
-        <div>
-          <div class="errorExplanation" id="errorExplanation">
-            <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
-            <ul>
-              <% for error in errors %>
-                <li><%= error %></li>
-              <% end %>  
-            </ul>
-          </div>
-        </div>
+<div>
+  <div class="errorExplanation" id="errorExplanation">
+    <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
+    <ul>
+      <% for error in errors %>
+        <li><%= error %></li>
+      <% end %>
+    </ul>
+  </div>
+</div>
       }
   
       def error_messages_for(object_names = [], view_partial = nil)
         object_names = [object_names]
         object_names.flatten!
         app_errors = []
-        object_names.each do |name| 
+        object_names.each do |name|
           object = instance_variable_get("@#{name}")
           if object
             object.errors.each do |key, value|
@@ -55,13 +55,13 @@ module Mack
             end
           end
         end
-        File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb")
         unless app_errors.empty?
+          app_errors.uniq!
           if view_partial.nil?
-            if File.exist?(File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb"))
+            if File.exist?(File.join(Mack.root, "app", "views", "application", "_error_messages.html.erb"))
               render(:partial, "application/error_messages", :locals => {:errors => app_errors})
             else
-              render(:text, DEFAULT_PARTIAL, :locals => {:errors => app_errors})
+              render(:inline, DEFAULT_PARTIAL, :locals => {:errors => app_errors})
             end
           else        
             render(:partial, view_partial, :locals => {:errors => app_errors})

data/lib/mack-active_record.rb

@@ -1,23 +1,25 @@
 require 'rubygems'
 require 'genosaurus'
-require 'erubis'
-begin
-  require 'mack-orm_common'
-rescue Exception => e
-  puts e
-end
 
 require 'activerecord'
 
-dbs = Mack::Configuration.database_configurations
-
-unless dbs.nil?
-  ActiveRecord::Base.establish_connection(dbs[Mack::Configuration.env])
-  class SchemaInfo < ActiveRecord::Base # :nodoc:
-    set_table_name 'schema_info'
-  end
+module ActiveRecord # :nodoc:
 end
+
+fl = File.join(File.dirname(__FILE__))
+
+require File.join(fl, "database")
+require File.join(fl, "helpers", "orm_helpers")
+require File.join(fl, "model_column")
+require File.join(fl, "genosaurus_helpers")
+
+# [:migration, :model, :scaffold].each do |gen|
+#   require File.join(fl, "#{gen}_generator", "#{gen}_generator")
+# end
 [:helpers, :migration_generator, :model_generator, :scaffold_generator].each do |folder|
   Dir.glob(File.join(File.dirname(__FILE__), folder.to_s, "**/*.rb")).each {|f| require f}
 end
-# Dir.glob(File.join(File.dirname(__FILE__), "tasks", "**/*.rake")).each {|f| load f} 
+
+ActiveRecord::Base.logger = Mack.logger
+
+Mack::Database.establish_connection(Mack.env)

data/lib/migration_generator/migration_generator.rb

@@ -33,7 +33,7 @@ class MigrationGenerator < Genosaurus
 
   require_param :name
   
-  def setup
+  def setup # :nodoc:
     @table_name = param(:name).underscore.plural.gsub("create_", "")
     @migration_name = "#{next_migration_number}_#{param(:name).underscore}"
   end

data/lib/model_column.rb

@@ -0,0 +1,55 @@
+module Mack
+  module Genosaurus
+    module ActiveRecord
+      # Used to represent a 'column' from the param cols or columns for generators.
+      class ModelColumn
+      
+        # The name of the column.
+        attr_accessor :column_name
+        # The type of the column. Ie. string, integer, datetime, etc...
+        attr_accessor :column_type
+        # The name of the model associated with the column. Ie. user, post, etc...
+        attr_accessor :model_name
+      
+        # Takes in the model_name (user, post, etc...) and the column (username:string, body:text, etc...)
+        def initialize(model_name, column_unsplit)
+          self.model_name = model_name.singular.underscore
+          cols = column_unsplit.split(":")
+          self.column_name = cols.first#.underscore
+          self.column_type = cols.last#.underscore
+        end
+      
+        # Examples:
+        #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_name # => "user[username]"
+        #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_name # => "post[body]"
+        def form_element_name
+          "#{self.model_name}[#{self.column_name}]"
+        end
+
+        # Examples:
+        #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_id # => "user_username"
+        #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_id # => "post_body"
+        def form_element_id
+          "#{self.model_name}_#{self.column_name}"
+        end
+
+        # Generates the appropriate HTML form field for the type of column represented.
+        # 
+        # Examples:
+        #   Mack::Generator::ColumnObject.new("user", "username:string").form_field 
+        #     => "<input type="text" name="user[username]" id="user_username" size="30" value="<%= user.username %>" />"
+        #   Mack::Generator::ColumnObject.new("Post", "body:text").form_field
+        #     => "<textarea name="post[body]" id="post_id"><%= post.body %></textarea>"
+        def form_field
+          case self.column_type
+          when "text"
+            %{<textarea name="#{self.form_element_name}" id="#{self.form_element_id}" cols="60" rows="20"><%= @#{self.model_name}.#{self.column_name} %></textarea>}
+          else
+            %{<input type="text" name="#{self.form_element_name}" id="#{self.form_element_id}" size="30" value="<%= @#{self.model_name}.#{self.column_name} %>" />}
+          end
+        end
+      
+      end # ModelColumn
+    end # ActiveRecord
+  end # Generator
+end # Mack

data/lib/model_generator/manifest.yml

@@ -5,7 +5,15 @@ model_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "model.rb.template") %>
   output_path: <%= File.join("app", "models", "#{param(:name).singular.underscore}.rb") %>
+  
+<% if testing_framework == "test_case" %>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
-  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>
+  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>
+<% elsif testing_framework == "rspec" %>
+test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "rspec.rb.template") %>
+  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_spec.rb") %>
+<% end %>

data/lib/model_generator/model_generator.rb

@@ -39,8 +39,12 @@ class ModelGenerator < Genosaurus
   
   require_param :name
 
-  def after_generate
+  def after_generate # :nodoc:
     MigrationGenerator.run(@options.merge({"name" => "create_#{param(:name).plural}"}))
   end
   
+  def testing_framework # :nodoc:
+    app_config.mack.testing_framework
+  end
+  
 end

data/lib/model_generator/templates/rspec.rb.template

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+
+describe "<%= param(:name).singular.camelcase %>" do
+
+  it "should not blow up" do
+    true
+  end
+  
+end

data/lib/scaffold_generator/manifest.yml

@@ -18,7 +18,14 @@ show_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "views", "show.html.erb.template") %>
   output_path: <%= File.join("app", "views", @name_plural, "show.html.erb") %>
-functional_teat_template:
+<% if @test_framework == "test_case" -%>
+functional_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
-  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %>
+  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %>
+<% elsif @test_framework == "rspec" -%>
+functional_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "spec.rb.template") %>
+  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_spec.rb") %>
+<% end -%>

data/lib/scaffold_generator/scaffold_generator.rb

@@ -6,21 +6,22 @@ class ScaffoldGenerator < Genosaurus
   
   require_param :name
   
-  def setup
+  def setup # :nodoc:
     @name_singular = param(:name).singular.underscore
     @name_plural = param(:name).plural.underscore
     @name_singular_camel = @name_singular.camelcase
-    @name_plural_camel = @name_plural.camelcase    
+    @name_plural_camel = @name_plural.camelcase
+    @test_framework = app_config.mack.testing_framework
   end
   
-  def after_generate
+  def after_generate # :nodoc:
     ModelGenerator.run(@options)
     update_routes_file
   end
   
-  def update_routes_file
+  def update_routes_file # :nodoc:
     # update routes.rb
-    routes = File.join(Mack::Configuration.config_directory, "routes.rb")
+    routes = File.join(Mack.root, "config", "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

@@ -1,4 +1,5 @@
-class <%= @name_plural_camel %>Controller < Mack::Controller::Base
+class <%= @name_plural_camel %>Controller
+  include Mack::Controller
 
   # GET /<%= @name_plural %>
   def index
@@ -7,7 +8,7 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # GET /<%= @name_plural %>/1
   def show
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params[:id])
   end
 
   # GET /<%= @name_plural %>/new
@@ -17,12 +18,12 @@ 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 %>.find(params[:id])
   end
 
   # POST /<%= @name_plural %>
   def create
-    @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.new(params[:<%= @name_singular %>])
     if @<%= @name_singular %>.save
       redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
@@ -32,8 +33,8 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # PUT /<%= @name_plural %>/1
   def update
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
-    if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params[:id])
+    if @<%= @name_singular %>.update_attributes(params[:<%= @name_singular %>])
       redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
       render(:action, "edit")
@@ -42,7 +43,7 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # DELETE /<%= @name_plural %>/1
   def delete
-    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params[:id])
     @<%= @name_singular %>.destroy
     redirect_to(<%= @name_plural %>_index_url)
   end

data/lib/scaffold_generator/templates/spec.rb.template

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe <%= @name_plural_camel %>Controller do
+  
+  describe "index" do
+    
+    it "should list <%= @name_plural %>"
+    
+  end
+  
+  describe "show" do
+    
+    it "should show a <%= @name_singular %>"
+    
+  end
+  
+  describe "new" do
+    
+    it "should show a form to create a new <%= @name_singular %>"
+    
+  end
+  
+  describe "edit" do
+    
+    it "should edit a <%= @name_singular %>"
+    
+  end
+  
+  describe "create" do
+    
+    it "should create a <%= @name_singular %>"
+    
+  end
+  
+  describe "update" do
+    
+    it "should update a <%= @name_singular %>"
+    
+  end
+  
+  describe "delete" do
+    
+    it "should delete a <%= @name_singular %>"
+    
+  end
+  
+end

data/lib/tasks/db_create_drop_tasks.rake

@@ -1,70 +1,52 @@
 require 'rake'
 namespace :db do
+    
+  task :drop => :environment do
+    Mack::Database.drop_or_create_database(Mack.env, :drop)    
+  end
+  
+  namespace :drop do 
+    desc "Drop databases for both development and test environemnt"
+    task :all => :environment do
+      Mack::Database.drop_or_create_database("development", :drop)
+      Mack::Database.drop_or_create_database("test", :drop)
+    end
+  end
+  
+  task :create do
+    puts Mack.env
+    Mack::Database.drop_or_create_database(Mack.env, :create)
+  end
   
-  desc "Create the database for your environment."
-  task :create => :environment do
-    drop_create_database
+  task :recreate do
+    puts Mack.env
+    Mack::Database.drop_or_create_database(Mack.env, :drop_and_create)
   end
   
   namespace :create do
-    
     desc "Creates your Full environment. Does NOT create your production database!"
     task :all => :environment do
-      drop_create_database("development")
-      drop_create_database("test")
-      ActiveRecord::Base.establish_connection(Mack::Configuration.database_configurations["development"])
+      abcs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
+      db_settings = abcs[Mack.env]
+      
+      Mack::Database.drop_or_create_database("development", :create)
+      Mack::Database.drop_or_create_database("test", :create)
+      ActiveRecord::Base.establish_connection(db_settings)
       Rake::Task["db:migrate"].invoke
     end
-    
   end
-
-end
-
-private
-def drop_create_database(env = Mack::Configuration.env)
-  abcs = Mack::Configuration.database_configurations
-  db_settings = abcs[env]
-  case db_settings["adapter"]
-    when "mysql"
-      ActiveRecord::Base.establish_connection(
-        :adapter => "mysql",
-        :host => "localhost",
-        :database => "mysql",
-        :username => ENV["DB_USERNAME"] || "root",
-        :password => ENV["DB_PASSWORD"] || ""
-      )
-      puts "Dropping (MySQL): #{db_settings["database"]}"
-      ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS `#{db_settings["database"]}`"
-      
-      if db_settings["collation"]
-        puts "Dropping (MySQL): #{db_settings["database"]}"
-        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{db_settings["database"]}` DEFAULT CHARACTER SET `#{db_settings["charset"] || 'utf8'}` COLLATE `#{db_settings["collation"]}`"
-      else
-        puts "Creating (MySQL): #{db_settings["database"]}"
-        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{db_settings["database"]}` DEFAULT CHARACTER SET `#{db_settings["charset"] || 'utf8'}`"
-      end
-    when "postgresql"
-      ENV['PGHOST']     = db_settings["host"] if db_settings["host"]
-      ENV['PGPORT']     = db_settings["port"].to_s if db_settings["port"]
-      ENV['PGPASSWORD'] = db_settings["password"].to_s if db_settings["password"]
-      enc_option = "-E #{db_settings["encoding"]}" if db_settings["encoding"]
-
-      ActiveRecord::Base.clear_active_connections!
-      begin
-        puts "Dropping (PostgreSQL): #{db_settings["database"]}"
-        `dropdb -U "#{db_settings["username"]}" #{db_settings["database"]}`
-      rescue Exception => e
-      end
+  
+  namespace :recreate do
+    desc "Creates your Full environment. Does NOT create your production database!"
+    task :all => :environment do
+      abcs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
+      db_settings = abcs[Mack.env]
       
-      begin
-        puts "Creating (PostgreSQL): #{db_settings["database"]}"
-        `createdb #{enc_option} -U "#{db_settings["username"]}" #{db_settings["database"]}`
-      rescue Exception => e
-      end
-    when 'sqlite3'
-      ActiveRecord::Base.clear_active_connections!
-      FileUtils.rm_rf(db_settings["database"])
-    else
-      raise "Task not supported by '#{db_settings["adapter"]}'"
+      Mack::Database.drop_or_create_database("development")
+      Mack::Database.drop_or_create_database("test")
+      ActiveRecord::Base.establish_connection(db_settings)
+      Rake::Task["db:migrate"].invoke
+    end
   end
-end
+    
+end