dry_crud 1.2.0 → 1.2.5

data/README.rdoc

@@ -73,18 +73,18 @@ This only displays these three attributes in the table. All other templates, as
 
 Next, let's adapt a part of the general behavior used in all CRUD controllers. As an example, we include pagination with will_paginate[http://wiki.github.com/mislav/will_paginate/] in all our overview tables: 
 
-In <tt>app/controllers/crud_controller.rb</tt>, change the index action to
+In <tt>app/controllers/list_controller.rb</tt>, change the index action to
 
   def index
     @entries = list_entries.paginate(:page => params[:page])
     respond_with @entries   
   end
 
-In <tt>app/views/crud/index.html.erb</tt>, add the following line for the pagination links:
+In <tt>app/views/list/index.html.erb</tt>, add the following line for the pagination links:
    <%= will_paginate @entries %>
 
-And we are done again. All our controllers inheriting from +CrudController+, including above +PeopleController+, now have paginated index views. Because our customization for the people table is in the separate <tt> _list</tt> partial, no further modifications are required. 
-If the current page should be remembered while viewing or editing an entry, just add :page to the remembered_params in <tt>CrudController::Memory</tt>:
+And we are done again. All our controllers inheriting from +ListController+, including above +PeopleController+, now have paginated index views. Because our customization for the people table is in the separate <tt>_list</tt> partial, no further modifications are required. 
+If the current page should be remembered while viewing or editing an entry, just add :page to the remembered_params in <tt>ListController::Memory</tt>:
   
   controller.remember_params = [:q, :sort, :sort_dir, :page]
 
@@ -180,7 +180,9 @@ All generated files are supposed to provide a reasonable foundation for the CRUD
 
 === Controller:
 
-{controller/crud_controller.rb}[http://codez.ch/dry_crud/?q=CrudController]:: Abstract controller providing basic CRUD actions. This implementation mainly follows the one of the Rails scaffolding controller and responses to HTML and XML requests. Some enhancements were made to ease extendability. Several protected helper methods are there to be (optionally) overriden by subclasses. There are two modules included that provide search and sort functionality for the table displayed in the index action. With the help of additional callbacks, it is possible to hook into the action procedures without overriding the entire method.
+{controller/crud_controller.rb}[http://codez.ch/dry_crud/?q=CrudController]:: Abstract controller providing basic CRUD actions. This implementation mainly follows the one of the Rails scaffolding controller and responses to HTML and XML requests. Some enhancements were made to ease extendability. Several protected helper methods are there to be (optionally) overriden by subclasses. With the help of additional callbacks, it is possible to hook into the action procedures without overriding the entire method. This class is based on ListController.
+
+{controller/list_controller.rb}[http://codez.ch/dry_crud/?q=ListController]:: Abstract controller providing a basic list action. There are two sub-modules that provide search and sort functionality for the table displayed in the list action. A third sub-module remembers the list parameters in order to return to an identical list.
 
 {controller/render_inheritable.rb}[http://codez.ch/dry_crud/?q=RenderInheritable]:: A controller enhancement that allows one to render inheritable views and partials. If no view file is found for the current controller, the corresponding file is looked up in its superclass hierarchy. Thus, only views or partials that look differently have to be overwritten.
 
@@ -191,6 +193,8 @@ All generated files are supposed to provide a reasonable foundation for the CRUD
 
 {helpers/crud_helper.rb}[http://codez.ch/dry_crud/?q=CrudHelper]:: A small helper for CrudController to render tables and forms with a default set of attributes.
 
+{helpers/list_helper.rb}[http://codez.ch/dry_crud/?q=ListHelper]:: A small helper for ListController to render the list table with a default set of attributes.
+
 {helpers/standard_table_builder.rb}[http://codez.ch/dry_crud/?q=StandardTableBuilder]:: A simple helper object to easily define tables listing several rows of the same data type.
 
 {helpers/standard_form_builder.rb}[http://codez.ch/dry_crud/?q=StandardFormBuilder]:: A form builder that automatically selects the corresponding input element for ActiveRecord columns. Input elements are rendered with a corresponding label by default.
@@ -198,25 +202,38 @@ All generated files are supposed to provide a reasonable foundation for the CRUD
 
 === Views:
 
-views/crud/index.html.erb:: The index view displaying a table with all entries and an action link to add new ones. If you have +search_columns+ defined for your controller, then a search box is rendered as well.
-
-views/crud/_list.html.erb:: A partial defining the table in the index view. To change the displayed attributes in your CRUD model, just create an own _list.html.erb in your models view directory.
+All templates in the +crud+ folder may be 'overriden' individually in a respective view folder. Define the basic structure of your CRUD views here and adapt it as required for each single model.
 
-views/crud/_search.html.erb:: A partial defining a simple search form that is displayed when +search_columns+ are defined in a subclassing controller.
 
 views/crud/show.html.erb:: The show view displaying all the attributes of one entry and the various actions to perform on it.
 
 views/crud/_attrs.html.erb:: A partial defining the attributes to be displayed in the show view. 
 
+views/crud/_list.html.erb:: A partial defining the table in the index view. To change the displayed attributes for your list model, just create an own _list.html.erb in your controller's view directory.
+
 views/crud/new.html.erb:: The view to create a new entry.
 
 views/crud/edit.html.erb:: The view to edit an existing entry.
 
-views/crud/_form.html.erb:: The form used to create and edit entries. If you would like to customize this form for various models, just create an own _form.html.erb in your models view directory.
+views/crud/_form.html.erb:: The form used to create and edit entries. If you would like to customize this form for various models, just create an own _form.html.erb in your controller's view directory.
+
+views/crud/_actions_index.html.erb:: The action links available in the index view.
+
+views/crud/_actions_show.html.erb:: The action links available in the show view.
+
+views/crud/_actions_edit.html.erb:: The action links available in the edit view.
+
+views/list/index.html.erb:: The index view displaying a sortable table with all entries. If you have +search_columns+ defined for your controller, then a search box is rendered as well.
+
+views/list/_list.html.erb:: A partial defining the table in the index view. To change the displayed attributes for your list model, just create an own _list.html.erb in your controller's view directory.
+
+views/list/_search.html.erb:: A partial defining a simple search form that is displayed when +search_columns+ are defined in a subclassing controller.
+
+views/list/_actions_index.html.erb:: The action links available in the index view. None by default.
 
 views/shared/_labeled.html.erb:: Partial to define the layout for an arbitrary content with a label.
 
-views/layouts/crud.html.erb:: An example layout showing how to use the @title and +flash+. Most probably you want to include this in your application.html.erb or adapt this main crud templates, so you wont need this file.
+views/layouts/crud.html.erb:: An example layout showing how to use the @title and +flash+. Most probably you want to merge this with your application.html.erb or adapt the main CRUD templates, so you wont need this file.
 
 public/stylesheets/crud.css:: A simple CSS with all the classes and ids used in the CRUD code. 
 

data/Rakefile

@@ -51,8 +51,9 @@ namespace :test do
     desc "Initializes the test application with a couple of classes"
     task :init => :generate_crud do
       FileUtils.cp_r(File.join(File.dirname(__FILE__), 'test', 'templates', '.'), TEST_APP_ROOT)
+      FileUtils.rm_f(File.join(TEST_APP_ROOT, 'app', 'views', 'layouts', 'crud.html.erb'))
       FileUtils.cd(TEST_APP_ROOT) do
-        sh "rake db:migrate db:test:prepare"
+        sh "rake db:migrate db:seed db:test:prepare"
       end
     end
   end

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.5

data/lib/generators/dry_crud/templates/INSTALL

@@ -11,4 +11,3 @@ required:
  * Add a :label method to your models for a human-friendly representation.
 
 Enjoy dry_crud and stay DRY!
- 

data/lib/generators/dry_crud/templates/app/controllers/crud_controller.rb

@@ -4,31 +4,24 @@
 # Several protected helper methods are there to be (optionally) overriden by subclasses.
 # With the help of additional callbacks, it is possible to hook into the action procedures without
 # overriding the entire method.
-class CrudController < ApplicationController
-  
-  include RenderInheritable 
-  
+class CrudController < ListController
+    
   # Set up entry object to use in the various actions.
   before_filter :build_entry, :only => [:new, :create]
   before_filter :set_entry,   :only => [:show, :edit, :update, :destroy]
   
-  helper :standard
-  helper_method :model_class, :models_label, :full_entry_label
+  helper_method :full_entry_label
   
-  delegate :model_class, :model_identifier, :models_label, :to => 'self.class'  
+  delegate :model_identifier, :to => 'self.class'  
   
-  hide_action :model_class, :models_label, :model_identifier, :run_callbacks, :inheritable_root_controller
-  
-  
-  # Callbacks
-  extend ActiveModel::Callbacks
+  hide_action :model_identifier, :run_callbacks
+   
    
   # Defines before and after callback hooks for create, update, save and destroy.
   define_model_callbacks :create, :update, :save, :destroy
   
   # Defines before callbacks for the render actions.
-  define_model_callbacks :render_index, 
-                         :render_show, 
+  define_model_callbacks :render_show, 
                          :render_new, 
                          :render_edit, 
                          :only => :before,
@@ -43,14 +36,7 @@ class CrudController < ApplicationController
   
    
   ##############  ACTIONS  ############################################
-  
-  # List all entries of this model.
-  #   GET /entries
-  #   GET /entries.xml
-  def index
-    @entries = list_entries
-    respond_with @entries
-  end
+
   
   # Show one entry of this model.
   #   GET /entries/1
@@ -112,14 +98,7 @@ class CrudController < ApplicationController
   protected 
   
   #############  CUSTOMIZABLE HELPER METHODS  ##############################
-  
-  # Convenience method to respond to various formats with the given object.
-  def respond_with(object)
-    respond_to do |format|
-      format.html { render_with_callback action_name }
-      format.xml  { render :xml => object }
-    end
-  end
+
   
   # Convenience method to respond to various formats if the performed
   # action may succeed or fail. In case of failure, a standard response
@@ -151,12 +130,7 @@ class CrudController < ApplicationController
   def full_entry_label
     "#{models_label.singularize} '#{@entry.label}'"
   end
-  
-  # The entries to be displayed in the current index page.
-  def list_entries
-    model_class.scoped
-  end
-  
+   
   # Redirects to the show action of a single entry.
   def redirect_to_show
     redirect_to @entry
@@ -166,13 +140,6 @@ class CrudController < ApplicationController
   def redirect_to_index
     redirect_to polymorphic_path(model_class, :returning => true)
   end
-   
-  # Helper method to run before_render callbacks and render the action.
-  # If a callback renders or redirects, the action is not rendered.
-  def render_with_callback(action)
-    run_callbacks(:"render_#{action}")
-    render :action => action unless performed?
-  end
   
   # Saves the current entry with callbacks.
   def save_entry
@@ -186,151 +153,12 @@ class CrudController < ApplicationController
   end
   
   class << self
-    # The ActiveRecord class of the model.
-    def model_class
-      @model_class ||= controller_name.classify.constantize
-    end
-    
     # The identifier of the model used for form parameters.
     # I.e., the symbol of the underscored model name.
     def model_identifier
       @model_identifier ||= model_class.name.underscore.to_sym
     end
-    
-    # A human readable plural name of the model.
-    def models_label
-      @models_label ||= model_class.model_name.human.pluralize
-    end   
-  end
-  
-  # The search functionality for the index table.
-  # Extracted into an own module for convenience.
-  module Search
-    # Adds a :search_columns class attribute.
-    def self.included(controller)    
-      # Define an array of searchable columns in your subclassing controllers.
-      controller.class_attribute :search_columns
-      controller.search_columns = []
-      
-      controller.helper_method :search_support?
-      
-      controller.alias_method_chain :list_entries, :search
-    end
-    
-    protected
-    
-    # Enhance the list entries with an optional search criteria
-    def list_entries_with_search
-      list_entries_without_search.where(search_condition)
-    end
-    
-    # Compose the search condition with a basic SQL OR query.
-    def search_condition
-      if search_support? && params[:q].present?
-        clause = search_columns.collect {|f| "#{model_class.table_name}.#{f} LIKE ?" }.
-                                join(" OR ")
-        param = "%#{params[:q]}%"
-         ["(#{clause})"] + [param] * search_columns.size
-      end
-    end
-  
-    # Returns true if this controller has searchable columns.
-    def search_support?
-      search_columns.present?
-    end
-       
-  end
-  
-  include Search
-  
-  # Sort functionality for the index table.
-  # Extracted into an own module for convenience.
-  module Sorting
-    # Adds a :sort_mappings class attribute.
-  	def self.included(controller)
-  	  # Define a map of (virtual) attributes to SQL order expressions.
-  	  # May be used for sorting table columns that do not appear directly
-  	  # in the database table. E.g., map :city_id => 'cities.name' to
-  	  # sort the displayed city names.
-  	  controller.class_attribute :sort_mappings
-  	  controller.sort_mappings = {}
-  	  
-  	  controller.helper_method :sortable?
-  	
-  	  controller.alias_method_chain :list_entries, :sort
-  	end
-  	
-  	protected
-  	
-  	# Enhance the list entries with an optional sort order.
-  	def list_entries_with_sort
-  	  if params[:sort].present? && sortable?(params[:sort])
-  	    list_entries_without_sort.except(:order).order(sort_expression)
-  	  else
-  	  	list_entries_without_sort
-  	  end
-  	end
-  	
-  	# Return the sort expression to be used in the list query.
-  	def sort_expression
-  	  col = sort_mappings[params[:sort].to_sym] || 
-  	        "#{model_class.table_name}.#{params[:sort]}"
-  	  "#{col} #{sort_dir}"
-  	end
-  	
-  	# The sort direction, either 'asc' or 'desc'.
-  	def sort_dir
-      params[:sort_dir] == 'desc' ? 'desc' : 'asc'
-    end
-  	
-  	# Returns true if the passed attribute is sortable.
-  	def sortable?(attr)
-  	  model_class.column_names.include?(attr.to_s) || 
-  	  sort_mappings.include?(attr.to_sym)
-  	end
+
   end
   
-  include Sorting
-  
-  # Remembers certain params of the index action in order to return
-  # to the same list after an entry was viewed or edited.
-  # If the index is called with a param :returning, the remembered params
-  # will be re-used.
-  # Extracted into an own module for convenience.
-  module Memory
-  
-    # Adds the :remember_paramas class attribute and a before filter to the index action.
-    def self.included(controller)  	  
-      # Define a list of param keys that should be remembered for the list action.
-  	  controller.class_attribute :remember_params
-  	  controller.remember_params = [:q, :sort, :sort_dir]
-  	  
-      controller.before_filter :handle_remember_params, :only => [:index]
-    end
-    
-    private
-    
-    # Store and restore the corresponding params.
-    def handle_remember_params
-      remembered = remembered_params
-      if params[:returning]
-        # restore params
-        remember_params.each {|p| params[p] ||= remembered[p] }
-      end
-      
-      # store current params
-      remember_params.each {|p| remembered[p] = params[p].presence }
-    end
-    
-    # Get the params stored in the session.
-    # Params are stored by request path to play nice when a controller
-    # is used in different routes.
-    def remembered_params
-    	session[:list_params] ||= {}
-    	session[:list_params][request.path] ||= {}
-    end
-  end
-  
-  include Memory
-  
 end

data/lib/generators/dry_crud/templates/app/controllers/list_controller.rb

@@ -0,0 +1,212 @@
+# Abstract controller providing a basic list action.
+# This action lists all entries of a certain model and provides functionality to 
+# search and sort this list. 
+# Furthermore, it remembers the last search and sort parameters. When the action
+# is called with a param returning=true, these parameters are reused to present
+# the user the same list as he left it.  
+class ListController < ApplicationController
+    
+  include RenderInheritable 
+    
+  # Move this declaration to the application controller.
+  helper :standard
+  
+  helper_method :model_class, :models_label
+  
+  delegate :model_class, :models_label, :to => 'self.class'  
+  
+  hide_action :model_class, :models_label, :inheritable_root_controller
+  
+    
+  # Callbacks
+  extend ActiveModel::Callbacks  
+  
+  # Defines before callbacks for the render actions.
+  define_model_callbacks :render_index, 
+                         :only => :before,
+                         :terminator => "result == false || performed?"
+                         
+                                          
+  ##############  ACTIONS  ############################################
+          
+  # List all entries of this model.
+  #   GET /entries
+  #   GET /entries.xml
+  def index
+    @entries = list_entries
+    respond_with @entries
+  end
+  
+  
+  protected
+  
+  # The entries to be displayed in the current index page.
+  def list_entries
+    model_class.scoped
+  end     
+       
+  # Convenience method to respond to various formats with the given object.
+  def respond_with(object)
+    respond_to do |format|
+      format.html { render_with_callback action_name }
+      format.xml  { render :xml => object }
+    end
+  end
+  
+  
+  # Helper method to run before_render callbacks and render the action.
+  # If a callback renders or redirects, the action is not rendered.
+  def render_with_callback(action)
+    run_callbacks(:"render_#{action}")
+    render :action => action unless performed?
+  end
+  
+    
+  class << self
+    # The ActiveRecord class of the model.
+    def model_class
+      @model_class ||= controller_name.classify.constantize
+    end
+        
+    # A human readable plural name of the model.
+    def models_label
+      @models_label ||= model_class.model_name.human.pluralize
+    end   
+  end
+  
+  # The search functionality for the index table.
+  # Extracted into an own module for convenience.
+  module Search
+    def self.included(controller)    
+      # Define an array of searchable columns in your subclassing controllers.
+      controller.class_attribute :search_columns
+      controller.search_columns = []
+      
+      controller.helper_method :search_support?
+      
+      controller.alias_method_chain :list_entries, :search
+    end
+    
+    protected
+    
+    # Enhance the list entries with an optional search criteria
+    def list_entries_with_search
+      list_entries_without_search.where(search_condition)
+    end
+    
+    # Compose the search condition with a basic SQL OR query.
+    def search_condition
+      if search_support? && params[:q].present?
+        clause = search_columns.collect {|f| "#{model_class.table_name}.#{f} LIKE ?" }.
+                                join(" OR ")
+        param = "%#{params[:q]}%"
+         ["(#{clause})"] + [param] * search_columns.size
+      end
+    end
+  
+    # Returns true if this controller has searchable columns.
+    def search_support?
+      search_columns.present?
+    end
+       
+  end
+  
+  include Search
+  
+  # Sort functionality for the index table.
+  # Extracted into an own module for convenience.
+  module Sorting
+    # Adds a :sort_mappings class attribute.
+    def self.included(controller)
+      # Define a map of (virtual) attributes to SQL order expressions.
+      # May be used for sorting table columns that do not appear directly
+      # in the database table. E.g., map :city_id => 'cities.name' to
+      # sort the displayed city names.
+      controller.class_attribute :sort_mappings
+      controller.sort_mappings = {}
+      
+      controller.helper_method :sortable?
+    
+      controller.alias_method_chain :list_entries, :sort
+    end
+    
+    protected
+    
+    # Enhance the list entries with an optional sort order.
+    def list_entries_with_sort
+      if params[:sort].present? && sortable?(params[:sort])
+        list_entries_without_sort.except(:order).order(sort_expression)
+      else
+        list_entries_without_sort
+      end
+    end
+    
+    # Return the sort expression to be used in the list query.
+    def sort_expression
+      col = sort_mappings[params[:sort].to_sym] || 
+            "#{model_class.table_name}.#{params[:sort]}"
+      "#{col} #{sort_dir}"
+    end
+    
+    # The sort direction, either 'asc' or 'desc'.
+    def sort_dir
+      params[:sort_dir] == 'desc' ? 'desc' : 'asc'
+    end
+    
+    # Returns true if the passed attribute is sortable.
+    def sortable?(attr)
+      model_class.column_names.include?(attr.to_s) || 
+      sort_mappings.include?(attr.to_sym)
+    end
+  end
+  
+  include Sorting
+  
+  # Remembers certain params of the index action in order to return
+  # to the same list after an entry was viewed or edited.
+  # If the index is called with a param :returning, the remembered params
+  # will be re-used.
+  # Extracted into an own module for convenience.
+  module Memory
+  
+    # Adds the :remember_params class attribute and a before filter to the index action.
+    def self.included(controller)     
+      # Define a list of param keys that should be remembered for the list action.
+      controller.class_attribute :remember_params
+      controller.remember_params = [:q, :sort, :sort_dir]
+      
+      controller.before_filter :handle_remember_params, :only => [:index]
+    end
+    
+    private
+    
+    # Store and restore the corresponding params.
+    def handle_remember_params
+      remembered = remembered_params
+      if params[:returning]
+        # restore params
+        remember_params.each {|p| params[p] ||= remembered[p] }
+      end
+      
+      # store current params
+      remember_params.each do |p| 
+        remembered[p] = params[p].presence
+        remembered.delete(p) if remembered[p].nil?
+      end
+      
+      # clear void params
+      session[:list_params].delete(request.path) if remembered.blank?
+    end
+    
+    # Get the params stored in the session.
+    # Params are stored by request path to play nice when a controller
+    # is used in different routes.
+    def remembered_params
+      session[:list_params] ||= {}
+      session[:list_params][request.path] ||= {}
+    end
+  end
+  
+  include Memory
+  
+end

data/lib/generators/dry_crud/templates/app/helpers/crud_helper.rb

@@ -6,23 +6,21 @@ module CrudHelper
   # Create a table of the @entries variable with the default or 
   # the passed attributes in its columns.
   def crud_table(*attrs, &block)
-    # only use default attrs if no attrs and no block are given
-    attributes = (block_given? || attrs.present?) ? attrs : default_attrs
-    table(@entries) do |t|
-	  t.sortable_attrs(*attributes)
-	  if block_given? 
-	    yield t
-	  else
-	    add_list_actions(t)
-	  end
+    if block_given?
+      list_table(*attrs, &block)
+    else      
+      attrs = default_attrs if attrs.blank?
+      list_table(*attrs) do |t| 
+         add_list_actions(t)
+      end
     end
   end
   
   # Adds a set of standard action link column (show, edit, destroy) to the given table.
   def add_list_actions(table)
-    table.col { |e| link_action_show(e) }
-    table.col { |e| link_action_edit(e) }
-    table.col { |e| link_action_destroy(e) }
+    table.col('', :class => 'center') { |e| link_action_show(e) }
+    table.col('', :class => 'center') { |e| link_action_edit(e) }
+    table.col('', :class => 'center') { |e| link_action_destroy(e) }
   end
   
   # Renders a generic form for the current entry with :default_attrs or the 
@@ -36,12 +34,4 @@ module CrudHelper
     standard_form(@entry, attrs, &block)
   end
   
-  # The default attributes to use in attrs, list and form partials.
-  # These are all defined attributes except certain special ones like 'id' or 'position'.
-  def default_attrs	
-    attrs = model_class.column_names.collect(&:to_sym)
-    [:id, :position].each {|a| attrs.delete(a) }
-    attrs
-  end
-    
 end

data/lib/generators/dry_crud/templates/app/helpers/list_helper.rb

@@ -0,0 +1,25 @@
+# Extension of StandardHelper functionality to provide a set of default 
+# attributes for the current model to be used in tables and forms. This helper
+# is included in CrudController.
+module ListHelper
+  
+  # Create a table of the @entries variable with the default or 
+  # the passed attributes in its columns.
+  def list_table(*attrs, &block)
+    # only use default attrs if no attrs and no block are given
+    attributes = (block_given? || attrs.present?) ? attrs : default_attrs
+    table(@entries) do |t|
+  	  t.sortable_attrs(*attributes)	  
+  	  yield t if block_given? 
+    end
+  end
+    
+  # The default attributes to use in attrs, list and form partials.
+  # These are all defined attributes except certain special ones like 'id' or 'position'.
+  def default_attrs	
+    attrs = model_class.column_names.collect(&:to_sym)
+    [:id, :position].each {|a| attrs.delete(a) }
+    attrs
+  end
+    
+end

data/lib/generators/dry_crud/templates/app/helpers/standard_helper.rb

@@ -178,11 +178,12 @@ module StandardHelper
     val = obj.send(attr)
     return EMPTY_STRING if val.nil?
     case column_type(obj, attr)
-      when :time    then val.strftime(TIME_FORMAT)
-      when :date    then val.to_date.to_s
-      when :text    then simple_format(h(val))
+      when :time    then f(val.to_time)
+      when :date    then f(val.to_date)
+      when :datetime, :timestamp then "#{f(val.to_date)} #{f(val.to_time)}"
+      when :text    then val.present? ? simple_format(h(val)) : EMPTY_STRING
       when :decimal then f(val.to_s.to_f)
-    else f(val)
+      else f(val)
     end
   end
   

data/lib/generators/dry_crud/templates/app/helpers/standard_table_builder.rb

@@ -65,9 +65,9 @@ class StandardTableBuilder
     entry = entries.first
     case column_type(entry, attr)
       when :integer, :float, :decimal 
-        'right_align' unless association(entry, attr, :belongs_to)
+        'right' unless association(entry, attr, :belongs_to)
       when :boolean  
-        'center_align'
+        'center'
     end
   end