quirkey-qadmin 0.1.1 → 0.2.0

data/lib/qadmin/helper.rb

@@ -1,11 +1,12 @@
 module Qadmin  
   module Helper    
-    include ::Qadmin::Options
     
     def fieldset(legend = nil, options = {}, &block)
-      concat(content_tag_for(:fieldset, options) do
-        content_tag(:legend, legend) if legend
-        capture(&block)
+      concat(content_tag(:fieldset, options) do
+        html = ''
+        html << content_tag(:legend, legend) if legend
+        html << capture(&block)
+        html
       end)
     end
 
@@ -25,7 +26,8 @@ module Qadmin
         :edit       => link_to(image_tag('admin/icon_edit.png') + " Edit", general_link_attributes.merge(:action => 'edit', :id => obj)),
         :show       => link_to(image_tag('admin/icon_show.png') + " View", general_link_attributes.merge(:action => 'show', :id => obj)),
         :destroy    => link_to(image_tag('admin/icon_destroy.png') + " Delete", general_link_attributes.merge(:action => 'destroy', :id => obj), :confirm => 'Are you sure?', :method => :delete),
-        :ports      => link_to(image_tag('admin/icon_export.png') + " Import/Export", general_link_attributes.merge(:action => 'ports'))
+        :ports      => link_to(image_tag('admin/icon_export.png') + " Import/Export", general_link_attributes.merge(:action => 'ports')),
+        :export      => link_to(image_tag('admin/icon_export.png') + " Export", general_link_attributes.merge(:action => 'export'))
       }
 
       control_sets = {
@@ -34,10 +36,11 @@ module Qadmin
         :edit  => [:index,:new,:show,:destroy],
         :show  => [:index,:new,:edit,:destroy]
       }
-
-      control_set = (options[:for] ? control_sets[options[:for]] : options[:controls])
+      
+      control_set = (options[:controls] || []).dup
+      control_set.unshift(control_sets[options[:for]]) if options[:for]
       control_set << :ports if options[:ports]
-      controls = Array(control_set).collect {|c| control_links[c] }.compact
+      controls = [control_set].flatten.collect {|c| control_links[c] }.compact
 
       html = ""
       html << %{<ul class="admin_controls">}
@@ -45,22 +48,41 @@ module Qadmin
       if block_given?
         html << capture(&block)
         html << %{</ul>}
-        concat(html,block.binding)
+        concat(html)
       else
         html << %{</ul>}
         html
       end
     end
     
-    def sortable_column_header(attribute_name, options = {})
-      
+    def sortable_column_header(attribute_name, text = nil, options = {})
+      link_text = text || self.qadmin_configuration.column_headers[attribute_name] || attribute_name.to_s.humanize
+      return link_text unless qadmin_configuration.model_klass.can_query?
+      query_parser = model_restful_query_parser(options)
+      query_param = options[:query_param] || :query
+      logger.warn 'params:' +  self.params[query_param].inspect
+      logger.warn 'parser:' + query_parser.inspect
+      sorting_this = query_parser.sort(attribute_name)
+      logger.warn "sorting #{attribute_name}:" + sorting_this.inspect
+      link_text << " #{image_tag("admin/icon_#{sorting_this.direction.downcase}.gif")}" if sorting_this
+      query_parser.set_sort(attribute_name, sorting_this ? sorting_this.next_direction : 'desc')
+      link_to link_text, self.params.dup.merge(query_param => query_parser.to_query_hash), :class => 'sortable_column_header'
+    end
+    
+    def model_restful_query_parser(options = {})
+      query_param = options[:query_param] || :query
+      qadmin_configuration.model_klass.restful_query_parser(params[query_param], options)
     end
         
-
     def admin_table(collection, options = {})
       html = '<table>'
       html <<	'<tr>'
-      attributes = options[:attributes] || model_klass.column_names
+      attributes = options[:attributes] || self.qadmin_configuration.display_columns
+      model_column_types = SuperHash.new
+      attributes.each do |attribute_name|
+        column = self.qadmin_configuration.model_klass.columns.detect {|c| c.name == attribute_name.to_s }
+        model_column_types[attribute_name] = column.type if column
+      end
       attributes.each_with_index do |attribute, i|
         html << (i == 0 ? '<th class="first_col">' : '<th>')
         html << sortable_column_header(attribute)
@@ -75,10 +97,19 @@ module Qadmin
       collection.each do |instance|
         html << %{<tr id="#{dom_id(instance)}" #{alt_rows}>}
         attributes.each_with_index do |attribute, i|
+          raw_value = instance.send(attribute)
+          value = case model_column_types[attribute]
+          when :boolean
+            yes?(raw_value)
+          when :text
+            truncate_words(raw_value, 10, ". . . #{link_to('More', send("#{model_instance_name}_path", instance))}")
+          else
+            h(raw_value)
+          end
           if i == 0
-            html << %{<td class="first_col">#{link_to(instance.send(attribute), send("#{model_instance_name}_path", instance))}</td>}
+            html << %{<td class="first_col">#{link_to(value, send("#{model_instance_name}_path", instance))}</td>}
           else
-            html << %{<td>#{h(instance.send(attribute))}</td>}
+            html << %{<td>#{value}</td>}
           end
         end
         html << %{<td>#{link_to(image_tag('admin/icon_show.png'), send("#{model_instance_name}_path", instance))}</td>}

data/lib/qadmin/option_set.rb

@@ -0,0 +1,48 @@
+module Qadmin
+  class OptionSet < Array
+
+    def initialize(*args)
+      first = args.shift
+      if first.is_a?(Array)
+        self.default = first 
+        options = args.shift
+      else
+        options = first
+      end
+      if options.is_a?(Hash)
+        options.each do |option, value|
+          self.send("#{option}=", value)
+        end
+      end
+    end
+    
+    def current
+      [self].flatten.dup
+    end
+    
+    [:exclude, :only, :default].each do |meth|
+      class_eval <<-EOT
+      def #{meth}
+        @#{meth} ||= []
+      end
+      
+      def #{meth}=(#{meth})
+        @#{meth} = [#{meth}].flatten if #{meth}
+        reset_current
+      end
+      EOT
+    end
+    alias_method :except, :exclude
+    alias_method :except=, :exclude=
+    
+    protected
+    def reset_current
+      new_current = if !only.empty?
+          only
+        else
+          default - exclude
+        end
+      self.replace(new_current)
+    end
+  end
+end

data/lib/qadmin/overlay.rb

@@ -0,0 +1,31 @@
+module Qadmin
+  module Overlay
+
+    def self.included(other)
+      other.module_eval do
+        helper_method :overlay?
+      end
+    end
+
+    protected
+    def layout_or_overlay(options = {})
+      @_overlay = false
+      fallback_layout = options[:default] || 'admin'
+      if (options[:only] && !Array(options[:only]).include?(action_name)) || (options[:except] && Array(options[:except]).include?(action_name))
+        return fallback_layout
+      end
+      if params[:_overlay]
+        @_overlay = true
+        false 
+      else
+        fallback_layout
+      end
+    end
+
+    # 
+    def overlay?
+      @_overlay && @_overlay == true
+    end
+
+  end
+end

data/lib/qadmin/page_titles.rb

@@ -0,0 +1,34 @@
+module Qadmin
+  module PageTitles
+
+    def self.included(other)
+      other.module_eval do
+        include ControllerMethods
+        extend MacroMethods
+        helper_method :get_page_title, :set_page_title
+      end
+    end
+    
+    module MacroMethods
+      def page_title(add_title)
+        before_filter do |controller|
+          controller.set_page_title(add_title)
+        end
+      end
+    end
+
+    module ControllerMethods
+
+      def get_page_title(delimeter = ' : ')
+        @page_title ||= []
+        @page_title.join(delimeter)
+      end
+      
+
+      def set_page_title(add_this)
+        get_page_title
+        @page_title << "#{add_this}"
+      end
+    end 
+  end
+end

data/lib/qadmin/templates.rb

@@ -0,0 +1,52 @@
+module Qadmin
+  module Templates
+
+    def self.included(klass)
+      if klass.respond_to?(:helper_method) 
+        klass.module_eval do
+          helper_method :template_for_section, :partial_for_section
+        end
+      end
+    end
+
+    protected        
+    def render_template_for_section(action = nil, options = {})
+      action ||= action_name
+      render({:template => template_for_section(action)}.merge(options))
+    end
+
+    def template_for_section(template_name, file_name = nil, options = {})
+      file_name ||= template_name
+      section_specific_template?(file_name, options) ? section_specific_template(template_name, options) : default_section_template(template_name, options)
+    end
+
+    def partial_for_section(partial_name, options = {})
+      template_for_section(partial_name, "_#{partial_name}", options)
+    end
+
+    def section_specific_template?(template_name, options = {})
+      template_exists?(section_specific_template(template_name, options))
+    end
+
+    def section_specific_template(template_name, options = {})
+      "#{current_section_name(options)}/#{template_name}"
+    end
+
+    def default_section_template(template_name, options = {})
+      "default/#{template_name}"
+    end
+
+    def current_section_name(options = {})
+      options[:section_name] ? options[:section_name] : (@section ? @section.name : controller_name)
+    end
+    
+    def template_exists?(template_path)
+      logger.info "Checking for template: #{template_path}"
+      self.view_paths.find_template(template_path)
+    rescue ActionView::MissingTemplate
+      logger.info "Template not found: #{template_path}"
+      false
+    end
+
+  end
+end

data/lib/qadmin/views/content_forms/_photos_form.erb

@@ -0,0 +1,4 @@
+<fieldset>
+	<legend>Photos</legend>
+	<%= f.asset_selector(:photos, options) %>
+</fieldset>

data/lib/qadmin/views/default/edit.erb

@@ -0,0 +1,12 @@
+<h2><%= model_human_name %>: Edit</h2>
+
+<%= admin_controls model_collection_name, :for => :edit %>
+
+<%= error_messages_for model_instance_name %>
+
+<% form_for(@model_instance, :html => {:multipart => qadmin_configuration.multipart_forms}) do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, model_instance_name.to_sym => @model_instance} %>
+  <p><%= f.submit "Update" %></p>
+<% end %>
+
+<%= admin_controls model_collection_name, :for => :edit %>

data/lib/qadmin/views/default/index.erb

@@ -0,0 +1,9 @@
+<h2><%= model_human_name.pluralize %></h2>
+
+<%= admin_controls model_collection_name, :for => :index, :ports => qadmin_configuration.ports, :controls => qadmin_configuration.controls  %>
+
+<%= will_paginate(@model_collection) %>
+<%= admin_table(@model_collection) %>
+<%= will_paginate(@model_collection) %>
+
+<%= admin_controls model_collection_name, :for => :index, :ports => qadmin_configuration.ports, :controls => qadmin_configuration.controls %>

data/lib/qadmin/views/default/new.erb

@@ -0,0 +1,12 @@
+<h2><%= model_human_name %>: New</h2>
+
+<%= admin_controls model_collection_name, :for => :new %>
+
+<%= error_messages_for model_instance_name %>
+
+<% form_for(@model_instance, :html => {:multipart => qadmin_configuration.multipart_forms}) do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, model_instance_name.to_sym => @model_instance} %>
+  <p><%= f.submit "Create" %></p>
+<% end %>
+
+<%= admin_controls model_collection_name, :for => :new %>

data/lib/qadmin/views/default/show.erb

@@ -0,0 +1,7 @@
+<h2><%= model_human_name.pluralize %>: <%= @model_instance.to_s %></h2>
+
+<%= admin_controls model_collection_name, :for => :show, :object => @model_instance %>
+
+<%= render :partial => model_instance_name, :object => @model_instance %>
+
+<%= admin_controls model_collection_name, :for => :show, :object => @model_instance %>

data/rails/init.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'qadmin')
 
 ActionController::Base.send(:extend, Qadmin::Controller::Macros)
-ActionView::Base.send(:include, Qadmin::Helper)
+ActionView::Base.send(:include, Qadmin::Helper)
+ActionView::Base.default_form_builder = Qadmin::FormBuilder

data/rails_generators/qadmin/qadmin_generator.rb

@@ -10,6 +10,8 @@ class QadminGenerator < Rails::Generator::NamedBase
   alias_method  :controller_file_name,  :controller_singular_name
   alias_method  :controller_table_name, :controller_plural_name
 
+  attr_accessor :after_scaffold
+
   def initialize(runtime_args, runtime_options = {})
     super
 
@@ -23,6 +25,7 @@ class QadminGenerator < Rails::Generator::NamedBase
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
+    extract_options
   end
 
   def manifest
@@ -32,35 +35,41 @@ class QadminGenerator < Rails::Generator::NamedBase
       m.class_collisions(controller_class_path, "#{controller_class_name}Controller")
 
       # Controller, helper, views, and test directories.
-      m.directory(File.join('app','controllers', controller_class_path))
-      m.directory(File.join('app', 'helpers', controller_class_path))
+      if !after_scaffold
+        m.directory(File.join('app','controllers', controller_class_path))
+        m.directory(File.join('app', 'helpers', controller_class_path))
+        m.directory(File.join('public','images','admin'))
+      end
+
       m.directory(File.join('app', 'views', controller_class_path, controller_file_name))
       m.directory(File.join('test', 'functional', controller_class_path))
-      m.directory(File.join('public','images','admin'))
 
       #copy form over too
-      m.template("_form.erb",File.join('app','views', controller_class_path, controller_file_name, "_form.erb"))
+      m.template("_form.html.erb",File.join('app','views', controller_class_path, controller_file_name, "_form.html.erb"))
+      m.template("_instance.html.erb", File.join('app','views', controller_class_path, controller_file_name, "_#{file_name}.html.erb"))
 
-      # Layout and stylesheet.
-      m.template('layout.erb', File.join('app','views','layouts', "admin.erb"))
-      m.template('style.css', 'public/stylesheets/admin.css')
+      if !after_scaffold
+        # Layout and stylesheet.
+        m.template('layout.html.erb', File.join('app','views','layouts', "admin.erb"))
+        m.template('style.css', 'public/stylesheets/admin.css')
 
-      m.template(
-      'controller.rb', File.join('app','controllers', controller_class_path, "#{controller_file_name}_controller.rb")
-      )
-
-      m.template('shoulda_functional_test.rb', File.join('test','functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
+        m.template('controller.rb', File.join('app','controllers', controller_class_path, "#{controller_file_name}_controller.rb"))
+      end
+      
+      m.template('functional_test.rb', File.join('test','functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
 
-      m.route_resources controller_file_name
+      if !after_scaffold
+        m.route_resources controller_file_name
 
-      # Copy Icons
-      Dir[File.join(File.dirname(__FILE__),'templates','images/*')].each do |image|
-        m.file File.join('images',File.basename(image)), File.join('public','images','admin',File.basename(image))
+        # Copy Icons
+        Dir[File.join(File.dirname(__FILE__),'templates','images/*')].each do |image|
+          m.file File.join('images',File.basename(image)), File.join('public','images','admin',File.basename(image))
+        end
       end
-
+      
     end
   end
-  
+
   protected
   # Override with your own usage banner.
   def banner
@@ -71,7 +80,7 @@ class QadminGenerator < Rails::Generator::NamedBase
     %w[ index show new edit ]
   end
 
-  def model_name 
+  def model_name
     class_name.demodulize
   end
 
@@ -91,4 +100,12 @@ class QadminGenerator < Rails::Generator::NamedBase
   def ignore_attributes
     %w{created_at updated_at}.push klass.protected_attributes
   end
+
+  def add_options!(opts)
+    opts.on('--after-scaffold', "For use after generating a scaffold, generates the _form and the functional test") {|o| options[:after_scaffold] = o }
+  end
+
+  def extract_options
+    self.after_scaffold = options[:after_scaffold]
+  end
 end

data/rails_generators/qadmin/templates/_form.html.erb

@@ -0,0 +1,7 @@
+<%% fieldset do %>
+<% attributes.each do |attribute| -%>
+<% unless ignore_attributes.include?(attribute.name) -%>
+<p><label><%= attribute.human_name %></label><%%= f.text_field :<%= attribute.name %> %></p>
+<% end -%>
+<% end -%>
+<%% end %>