mack-data_mapper 0.5.5 → 0.6.0

data/lib/mack-data_mapper.rb

@@ -1,25 +1,52 @@
 require 'rubygems'
 require 'genosaurus'
-require 'erubis'
-begin
-  require 'mack-orm_common'
-rescue Exception => e
-end
 
-gem("datamapper", "0.3.2")
+# gem 'dm-core', '0.9.2'
+# require 'dm-core'
+# gem 'dm-validations', '0.9.2'
+# require 'dm-validations'
+# gem 'dm-migrations', '0.9.2'
+# require 'dm-migrations'
+$: << File.expand_path(File.join(File.dirname(__FILE__), "dm_patches"))
 require 'data_mapper'
 
 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
-  
-  property :version, :integer, :default => 0
-end
+require File.join(fl, "database")
+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].each do |folder|
+
+[:helpers, :migration_generator, :model_generator, :scaffold_generator, :dm_patches].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} 
+
+English::Inflect.word 'email_address'
+English::Inflect.word 'address' 
+
+module DataMapper # :nodoc:
+  class Logger # :nodoc:
+    
+    [:debug, :info, :warn, :error, :fatal].each do |m|
+      unless method_defined?("dm_#{m}")
+        eval %{
+          alias_method :dm_#{m}, :#{m}
+    
+          def #{m}(message)
+            Mack.logger.#{m}(message)
+            dm_#{m}(message)
+          end
+        }
+      end
+    end
+    
+  end
+end
+
+DataMapper.logger = DataMapper::Logger.new(StringIO.new, 0)
+
+Mack::Database.establish_connection(Mack.env)

data/lib/migration_generator/migration_generator.rb

@@ -4,28 +4,30 @@
 #   rake generate:migration name=create_users
 # 
 # db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     self.up
+#   migration <number>, :create_users do
+#     up do
 #     end
-# 
-#     self.down
+#   
+#     down do
 #     end
 #   end
 # 
 # Example with columns:
-#   rake generate:migration name=create_users cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
+#   rake generate:migration name=create_users cols=username:string,email_address:string,created_at:date_time,updated_at:date_time
 # 
 # db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     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
+#   migration <number>, :create_users do
+#     up do
+#       create_table :users do
+#         column :id, Integer, :serial => true
+#         column :username, String, :size => 50
+#         column :email, String, :size => 50
+#         column :created_at, DateTime
+#         column :updated_at, DateTime
+#       end
 #     end
-# 
-#     self.down
+#   
+#     down do
 #       drop_table :users
 #     end
 #   end
@@ -33,9 +35,18 @@ class MigrationGenerator < Genosaurus
 
   require_param :name
   
-  def setup
-    @table_name = param(:name).underscore.plural.gsub("create_", "")
-    @migration_name = "#{next_migration_number}_#{param(:name).underscore}"
+  def setup # :nodoc:
+    @table_name = param(:name).underscore.gsub("create_", "")
+    @current_migration_number = next_migration_number
+    @migration_name = "#{@current_migration_number}_#{param(:name).underscore}"
+  end
+  
+  def migration_columns # :nodoc:
+    [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten
+  end
+  
+  def get_column_type(column) # :nodoc:
+    column.column_type.camelcase
   end
   
 end

data/lib/migration_generator/templates/db/migrations/%=@migration_name%.rb.template

@@ -1,14 +1,14 @@
-class <%= param(:name).camelcase %> < DataMapper::Migration
+migration <%= @current_migration_number.to_i %>, :<%= param(:name) %> do
 
-  def self.up
+  up do
 <%
     unless columns.empty?
 -%>
-    create_table :<%= @table_name %> do |t|
+    create_table :<%= @table_name %> do
 <%
-      for column in columns
+      for column in migration_columns
 -%>
-      t.column :<%= column.column_name %>, :<%= column.column_type %>
+      column :<%= column.column_name %>, <%= get_column_type(column) %>
 <%
       end
 -%>
@@ -18,7 +18,7 @@ class <%= param(:name).camelcase %> < DataMapper::Migration
 -%>
   end
 
-  def self.down
+  down do
 <%
     unless columns.empty?
 -%>

data/lib/model_column.rb

@@ -0,0 +1,42 @@
+module Mack
+  module Genosaurus
+    module DataMapper
+      # 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
+
+        # Generates the appropriate HTML form field for the type of column represented.
+        # 
+        # Examples:
+        #   Mack::Generator::ColumnObject.new("user", "username:string").form_field 
+        #     => "<%= model_text_field(@user, :username) %>"
+        #   Mack::Generator::ColumnObject.new("Post", "body:text").form_field
+        #     => "<%= model_textarea(@user, :username) %>"
+        def form_field
+          case self.column_type
+          when "text"
+            %{<%= model_textarea(@#{self.model_name}, :#{self.column_name}) %>}
+          else
+            %{<%= model_text_field(@#{self.model_name}, :#{self.column_name}) %>}
+          end
+        end
+      
+      end # ModelColumn
+    end # DataMapper
+    
+  end # Generator
+end # Mack

data/lib/model_generator/manifest.yml

@@ -5,7 +5,14 @@ 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 app_config.mack.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") %>
+  template_path: <%= File.join(templates_directory_path, "test_case.rb.template") %>
+  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>
+<% elsif app_config.mack.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

@@ -5,15 +5,15 @@
 # 
 # app/models/user.rb:
 #   class User
-#     include DataMapper::Persistence
+#     include DataMapper::Resource
 #     
 #   end
 # db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     self.up
+#   migration <number>, :create_users do
+#     up do
 #     end
-# 
-#     self.down
+#   
+#     down do
 #     end
 #   end
 # 
@@ -22,24 +22,25 @@
 # 
 # app/models/user.rb:
 #   class User
-#     include DataMapper::Persistence
+#     include DataMapper::Resource
 # 
-#     property :username, :string
-#     property :email_address, :string
-#     property :created_at, :datetime
-#     property :updated_at, :datetime
+#     property :username, String
+#     property :email_address, String
+#     property :created_at, DateTime
+#     property :updated_at, DateTime
 #   end
 # db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     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
+#   migration <number>, :create_users do
+#     up do
+#       create_table :users do
+#         column :username, String, :size => 50
+#         column :email, String, :size => 50
+#         column :created_at, DateTime
+#         column :updated_at, DateTime
+#       end
 #     end
-# 
-#     self.down
+#   
+#     down do
 #       drop_table :users
 #     end
 #   end
@@ -47,8 +48,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 migration_columns # :nodoc:
+    [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten
+  end
+  
 end

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

@@ -1,10 +1,10 @@
 class <%= param(:name).singular.camelcase %>
-  include DataMapper::Persistence
-  
+  include DataMapper::Resource
+
 <% 
-for column in columns
+for column in migration_columns
 -%>
-  property :<%= column.column_name %>, :<%= column.column_type %>
+  property :<%= column.column_name %>, <%= column.column_type.camelcase %>
 <%
 end
 -%>

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

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe <%= param(:name).singular.camelcase %> do
+
+  it "should do something :)"
+
+end

data/lib/resource.rb

@@ -0,0 +1,17 @@
+module DataMapper
+  module Resource
+    
+    # Returns the key of the DataMapper::Resource object when passed into a url helper
+    # 
+    # Example:
+    #   class User
+    #     include DataMapper::Resource
+    #     property :name, String, :key => true
+    #   end
+    #   users_show_url(User.new(:username => "markbates")) # => /users/markbates
+    def to_param
+      self.key
+    end
+    
+  end
+end

data/lib/runner.rb

@@ -0,0 +1,17 @@
+#--
+# module Mack
+#   class Runner
+#     
+#     alias_method :data_mapper_custom_dispatch_wrapper, :custom_dispatch_wrapper# if self.respond_to? :custom_dispatch_wrapper
+#     
+#     # Wrap all requests in a 'default' DataMapper repository block.
+#     def custom_dispatch_wrapper(&block)
+#       repo = (app_config.mack.default_respository_name || "default").to_sym
+#       repository(repo) do
+#         data_mapper_custom_dispatch_wrapper(&block)
+#       end
+#     end
+#     
+#   end # Runner
+# end # Mack
+#++

data/lib/scaffold_generator/manifest.yml

@@ -18,7 +18,18 @@ 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:
+helper_template:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
-  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %>
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "helper.rb.template") %>
+  output_path: <%= File.join("app", "helpers", "controllers", "#{@name_plural}_controller_helper.rb") %>
+<% if app_config.mack.testing_framework == "test_case" -%>
+functional_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "functional", "test_case.rb.template") %>
+  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %>
+<% elsif app_config.mack.testing_framework == "rspec" -%>
+functional_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "functional", "rspec.rb.template") %>
+  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_spec.rb") %>
+<% end -%>

data/lib/scaffold_generator/scaffold_generator.rb

@@ -6,21 +6,21 @@ 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    
   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,5 +1,6 @@
-class <%= @name_plural_camel %>Controller < Mack::Controller::Base
-
+class <%= @name_plural_camel %>Controller
+  include Mack::Controller
+  
   # GET /<%= @name_plural %>
   def index
     @<%= @name_plural %> = <%= @name_singular_camel %>.all
@@ -7,7 +8,7 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # GET /<%= @name_plural %>/1
   def show
-    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.get(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 %>.first(params(:id))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.get(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 %>))
     else
@@ -32,8 +33,8 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # PUT /<%= @name_plural %>/1
   def update
-    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
-    if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
+    @<%= @name_singular %> = <%= @name_singular_camel %>.get(params[:id])
+    if @<%= @name_singular %>.update_attributes(params[:<%= @name_singular %>])
       redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
     else
       render(:action, "edit")
@@ -42,8 +43,8 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
 
   # DELETE /<%= @name_plural %>/1
   def delete
-    @<%= @name_singular %> = <%= @name_singular_camel %>.first(params(:id))
-    @<%= @name_singular %>.destroy!
+    @<%= @name_singular %> = <%= @name_singular_camel %>.get(params[:id])
+    @<%= @name_singular %>.destroy
     redirect_to(<%= @name_plural %>_index_url)
   end