admin_views 0.2 → 0.3

data/README.md

@@ -1,7 +1,7 @@
 Admin Views
 =================
 
-A Rails generator to create admin scaffolding for a model.
+A Rails generator to create admin scaffolding with searching and sorting for a model.
 
 The generator is pretty opinionated, because I wrote this after I became tired of writing the same
 code over and over. It expects that your admin controllers will reside under app/controllers/admin and

data/generators/admin_views/admin_views_generator.rb

@@ -3,29 +3,32 @@ require 'active_support/inflector'
 class AdminViewsGenerator < Rails::Generator::NamedBase
   include ActiveSupport::Inflector
 
-  attr_reader :model_class, :model_name, :model_plural, :columns
+  attr_reader :model_class, :model_name, :plural_name, :columns
 
   def initialize(runtime_args, runtime_options = {})
     super
 
-    @model_class = name
-    @model_name = underscore(@model_class)
-    @model_plural = underscore(pluralize(@model_class))
-    @columns = Object.const_get(@model_class).columns
+    #@model_class = name
+    #@model_human = name.underscore.humanize
+    #@model_name = @model_class.underscore
+
+    @columns = Object.const_get(name).columns
   end
 
   def manifest
     record do |m|
       m.directory("app/controllers/admin")
-      m.template('controllers/controller.rb', "app/controllers/admin/#{model_plural}_controller.rb")
-
-      m.directory("app/views/admin/#{model_plural}")
-      m.template('views/_form.html.erb', "app/views/admin/#{model_plural}/_form.html.erb")
-      m.template('views/_model.html.erb', "app/views/admin/#{model_plural}/_#{model_name}.html.erb")
-      m.template('views/edit.html.erb', "app/views/admin/#{model_plural}/edit.html.erb")
-      m.template('views/index.html.erb', "app/views/admin/#{model_plural}/index.html.erb")
-      m.template('views/new.html.erb', "app/views/admin/#{model_plural}/new.html.erb")
-      m.template('views/show.html.erb', "app/views/admin/#{model_plural}/show.html.erb")
+      m.template('controllers/model_controller.rb', "app/controllers/admin/#{plural_name}_controller.rb")
+
+      m.directory("app/helpers/admin")
+      m.template('helpers/admin_view_helper.rb', "app/helpers/admin/admin_view_helper.rb")
+
+      m.directory("app/views/admin/#{plural_name}")
+      m.template('views/model/_form.html.erb', "app/views/admin/#{plural_name}/_form.html.erb")
+      m.template('views/model/edit.html.erb', "app/views/admin/#{plural_name}/edit.html.erb")
+      m.template('views/model/index.html.erb', "app/views/admin/#{plural_name}/index.html.erb")
+      m.template('views/model/new.html.erb', "app/views/admin/#{plural_name}/new.html.erb")
+      m.template('views/model/show.html.erb', "app/views/admin/#{plural_name}/show.html.erb")
     end
   end
 end

data/generators/admin_views/templates/controllers/admin_controller.rb

@@ -0,0 +1,21 @@
+class Admin::AdminController < ApplicationController
+  before_filter :admin_required
+  layout 'admin/layouts/admin'
+
+  protected
+    def admin_required
+      unless current_user && current_user.admin?
+        flash[:notice] = "You do not have permission to do that."
+        redirect_to root_url
+      end
+    end
+
+    def order_sql(params)
+      if params[:order]
+        split = params[:order].split("_")
+        order = split.last.upcase
+        column = split[0..-2].join("_")
+        "#{column} #{order}"
+      end
+    end
+end

data/generators/admin_views/templates/controllers/dashboard_controller.rb

@@ -0,0 +1,27 @@
+class Admin::DashboardController < Admin::AdminController
+  helper_method :output_graph
+  
+  def index
+    plot(Users)
+  end
+
+  protected
+    def plot(klass)
+      models = klass.find(:all,
+        :select => "*, count(*) AS count",
+        :group => "DATE_FORMAT(created_at,'%y-%m-%d')"
+      )
+
+      series = TimeFlot.new do |f|
+        f.series_for(klass.to_s, cumulative(models), :x => :created_at, :y => :count)
+      end
+      eval("@#{klass.to_s.underscore}_flot = series")
+      @flot_plots ||= []
+      @flot_plots << {:name =>, :plot => }
+    end
+  
+    def cumulative(models)
+      total = 0
+      models.each {|a| total = a.count = a.count.to_i + total }
+    end
+end

data/generators/admin_views/templates/controllers/model_controller.rb

@@ -0,0 +1,65 @@
+class Admin::<%= name.pluralize %>Controller < Admin::AdminController
+  helper 'admin/admin_view'
+
+  # GET /admin/<%= plural_name %>
+  def index
+    if params[:search]
+      sql, sql_params = [], []
+      # By default searches all text fields
+<% search_cols = columns.find_all {|col| [:text, :string].include?(col.type) }.collect {|col| "'#{col.name}'" }.join(",") -%>
+      [<%= search_cols %>].each do |col|
+        sql << "#{col} LIKE ?"
+        sql_params << "%#{params[:search]}%"
+      end
+      conditions = [sql.join(" OR "), sql_params].flatten
+      @<%= plural_name %> = <%= name %>.paginate(:all, :page => params[:page], :conditions => conditions, :order => order_sql(params))
+    else
+      @<%= plural_name %> = <%= name %>.paginate(:all, :page => params[:page], :order => order_sql(params))
+    end
+  end
+ 
+  # GET /admin/<%= plural_name %>/1
+  def show
+    @<%= singular_name %> = <%= name %>.find(params[:id])
+  end
+ 
+  # GET /admin/<%= plural_name %>/new
+  def new
+    @<%= singular_name %> = <%= name %>.new
+  end
+ 
+  # GET /admin/<%= plural_name %>/1/edit
+  def edit
+    @<%= singular_name %> = <%= name %>.find(params[:id])
+  end
+ 
+  # POST /admin/<%= plural_name %>
+  def create
+    @<%= singular_name %> = <%= name %>.new(params[:<%= singular_name %>])
+ 
+    if @<%= singular_name %>.save
+      redirect_to(admin_<%= singular_name %>_url(@<%= singular_name %>), :notice => '<%= class_name %> was successfully created.')
+    else
+      render :action => "new"
+    end
+  end
+ 
+  # PUT /admin/<%= plural_name %>/1
+  def update
+    @<%= singular_name %> = <%= name %>.find(params[:id])
+ 
+    if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+      redirect_to(admin_<%= singular_name %>_url(@<%= singular_name %>), :notice => '<%= name %> was successfully updated.')
+    else
+      render :action => "edit"
+    end
+  end
+ 
+  # DELETE /admin/<%= plural_name %>/1
+  def destroy
+    @<%= singular_name %> = <%= name %>.find(params[:id])
+    @<%= singular_name %>.destroy
+
+    redirect_to(admin_<%= plural_name %>_url)
+  end
+end

data/generators/admin_views/templates/helpers/admin_view_helper.rb

@@ -0,0 +1,22 @@
+module Admin::AdminViewHelper
+  def order_param(col_name)
+    order = params[:order]
+
+    if order == "#{col_name}_asc"
+      "#{col_name}_desc"
+    elsif order == "#{col_name}_desc"
+      "#{col_name}_asc"
+    else
+      "#{col_name}_asc"
+    end
+  end
+
+  def order_sql(params)
+    if params[:order]
+      split = params[:order].split("_")
+      order = split.last.upcase
+      column = split[0..-2].join("_")
+      "#{column} #{order}"
+    end
+  end
+end

data/generators/admin_views/templates/views/dashboard/index.html.erb

@@ -0,0 +1,17 @@
+<% content_for :header do %>
+  <%= flot_includes(:jquery => false) %>
+<% end %>
+
+<div class="title">
+  <h2>Dashboard</h2>
+</div>
+
+<div class="box" style="min-height: 400px;">
+  <% @flot_plots.each do |flot| %>
+    <h4><%= flot[:name]%></h4>
+    <%= flot_canvas(flot[:name].underscore, :style => "width: 400px; height: 200px;") %>
+    <% flot_graph(flot[:name].underscore, flot[:plot]) do %>
+      <%= flot_plot %>
+    <% end %>
+  <% end %>
+</div>

data/generators/admin_views/templates/views/layouts/_header.html.erb

@@ -0,0 +1,4 @@
+<div id="header">
+  <h1><%= link_to 'Admin', admin_root_path, :class => "main_section_link" %></h1>
+  <div class="menu">Welcome <%= link_to current_user.email %> | <%= link_to 'Public Site', root_path %> | <%= link_to 'Log Out', user_session_path, :method => :delete %></div>
+</div>

data/generators/admin_views/templates/views/layouts/_sidebar.html.erb

@@ -0,0 +1,15 @@
+<div id="sidebar">
+  <div class="title">
+    <h2>Navigation</h2>
+  </div>
+  <div class="navigation">
+    <ul>
+      <li class='<%= check_active_nav(%r{/dashboard}) %>'><%= link_to 'Dashboard', admin_dashboard_path %></li>
+      <li class='<%= check_active_nav(%r{/users}) %>'><%= link_to 'Users', admin_users_path %></li>
+        <ul>
+          <li><%= link_to 'More', admin_users_path %></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</div>

data/generators/admin_views/templates/views/layouts/admin.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="content-Type" content="text/html;charset=utf-8" />
+    <title>Admin</title>
+    <%= stylesheet_link_tag ['admin','formtastic', 'formtastic_changes'] %>
+    <%= javascript_include_tag ['jquery','jquery-ui','jrails','minmax'] %>
+    <%= yield :header %>
+</head>
+<body>
+  <%= render :partial => "admin/layouts/header" %>
+
+  <div id="wrapper">
+    <%= render :partial => "admin/layouts/sidebar" %>
+    <div id="content">
+      <% for type, message in flash %>
+        <div id="<%= type %>"><strong><%= type.to_s.humanize %></strong>: <%= message %></div>
+      <% end %>
+      <% if @breadcrumbs %>
+        <div id="breadcrumbs" style="float: right; padding-right: 20px;">
+          <%= link_to 'Users', admin_users_path %> > Create
+        </div>
+      <% end %>
+      <%= yield %>
+    </div>
+  </div>
+</body>
+</html>

data/generators/admin_views/templates/views/layouts/modal.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="content-Type" content="text/html;charset=utf-8" />
+  <title>Pushkart Scoring Server</title>
+  <%= stylesheet_link_tag ['login','form'] %>
+  <%= yield :header %>
+</head>
+<body>
+  <div id="box">
+    <%= yield %>
+  </div>
+</body>
+</html>

data/generators/admin_views/templates/views/{_form.html.erb → model/_form.html.erb}

@@ -1,8 +1,12 @@
-<%% semantic_form_for [:admin, @<%= model_name %>] do |form| %>
+<%% semantic_form_for [:admin, @<%= singular_name %>] do |form| %>
+  <%%= form.inputs %>
+
+  <%%= form.buttons :commit %>
+<%% end %>
+
+  <!-- Here are the fields separated out
 <% # http://github.com/justinfrench/formtastic %>
 <% for col in columns -%>
   <%%= form.input :<%= col.name %> -%>
 <% end -%>
-
-  <%%= form.buttons :commit %>
-<%% end %>
+  -->

data/generators/admin_views/templates/views/model/edit.html.erb

@@ -0,0 +1,4 @@
+<h2>Edit <%= singular_name.humanize %></h2>
+<div class="box">
+  <%%= render :partial => "form" %>
+</div>

data/generators/admin_views/templates/views/model/index.html.erb

@@ -0,0 +1,54 @@
+<%% content_for :header do %>
+ <%%= stylesheet_link_tag 'admin/table' %>
+<%% end %>
+
+<div class="title">
+  <h2><%= singular_name.humanize.pluralize %></h2>
+</div>
+
+<div class="box">
+  <div id="actions">
+    <div style="float: right;">
+      <form method="get" style="margin-top: -5px;">
+        <%%= text_field_tag 'search', params[:search], :class => 'search-input' %>
+        <%%= submit_tag "Search" %>
+      </form>
+    </div>
+  <%%= link_to "Create New <%= name %>", new_admin_<%= singular_name %>_path %>
+  </div>
+  <table>
+
+<table>
+  <thead>
+  <tr>
+<% columns.each do |col| -%>
+    <th><%%= link_to '<%= col.human_name %>', params.merge(:order => order_param('<%= col.name %>')) %></th>
+<% end -%>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+<%% @<%= plural_name %>.each do |<%= singular_name %>| %>
+  <tr id="<%= singular_name %>_<%%= <%= singular_name %>.id %>">
+    <td><%%= link_to <%= singular_name %>.id, admin_<%= singular_name %>_path(<%= singular_name %>) %></td>
+<% columns.find_all {|col| col.name != "id" }.each do |col| -%>
+<% next if [:binary, :text].include? col.type -%>
+<% if [:datetime, :date].include? col.type -%>
+      <td><%%= h <%= singular_name %>.<%= col.name %>.to_formatted_s(:short) if <%= singular_name %>.<%= col.name %> %></td>
+<% elsif [:string].include? col.type -%>
+      <td><%%= h truncate(<%= singular_name %>.<%= col.name %>, :length => 20) %></td>
+<% else %>
+      <td><%%= h <%= singular_name %>.<%= col.name %> %></td>
+<% end -%>
+<% end -%>
+    <td>
+      <%%= link_to "Edit", edit_admin_<%= singular_name %>_path(<%= singular_name %>) %>
+      <%%= link_to "Delete", admin_<%= singular_name %>_path(<%= singular_name %>), :method => :delete, :confirm => "Are you sure?" %>
+    </td>
+  </tr>
+<%% end -%>
+  </tbody>
+  </table>
+</div>
+
+<%%= will_paginate @<%= plural_name %> %>

data/generators/admin_views/templates/views/model/new.html.erb

@@ -0,0 +1,4 @@
+<h2>Create New <%= singular_name.humanize %></h2>
+<div class="box">
+  <%%= render :partial => "form" %>
+</div>

data/generators/admin_views/templates/views/model/show.html.erb

@@ -0,0 +1,16 @@
+<%% content_for :header do %>
+ <%%= stylesheet_link_tag 'admin/table' %>
+<%% end %>
+
+<h2><%= singular_name.humanize %> <%%= @<%= singular_name %>.id %></h2>
+<div class="box">
+  <div id="actions" style="float: right;">
+    <%%= link_to "Show All <%= singular_name.humanize.pluralize %>", admin_<%= plural_name %>_path %>
+    <%%= link_to "Edit <%= model_class %>", edit_admin_<%= singular_name %>_path(@<%= singular_name %>) %>
+  </div>
+  <table>
+<% for col in columns -%>
+    <tr><td><%= col.human_name %></td><td><%%= h @<%= singular_name %>.<%= col.name %> %></td></tr>
+<% end -%>
+  </table>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: admin_views
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Conor Hunt
@@ -45,12 +45,23 @@ files:
 - LICENSE
 - Changelog
 - generators/admin_views/admin_views_generator.rb
-- generators/admin_views/templates/controllers/controller.rb
-- generators/admin_views/templates/views/_form.html.erb
-- generators/admin_views/templates/views/edit.html.erb
-- generators/admin_views/templates/views/index.html.erb
-- generators/admin_views/templates/views/new.html.erb
-- generators/admin_views/templates/views/show.html.erb
+- generators/admin_views/templates/controllers/admin_controller.rb
+- generators/admin_views/templates/controllers/dashboard_controller.rb
+- generators/admin_views/templates/controllers/model_controller.rb
+- generators/admin_views/templates/helpers/admin_view_helper.rb
+- generators/admin_views/templates/stylesheets/admin.css
+- generators/admin_views/templates/stylesheets/formtastic-changes.css
+- generators/admin_views/templates/stylesheets/table.css
+- generators/admin_views/templates/views/dashboard/index.html.erb
+- generators/admin_views/templates/views/layouts/_header.html.erb
+- generators/admin_views/templates/views/layouts/_sidebar.html.erb
+- generators/admin_views/templates/views/layouts/admin.html.erb
+- generators/admin_views/templates/views/layouts/modal.html.erb
+- generators/admin_views/templates/views/model/_form.html.erb
+- generators/admin_views/templates/views/model/edit.html.erb
+- generators/admin_views/templates/views/model/index.html.erb
+- generators/admin_views/templates/views/model/new.html.erb
+- generators/admin_views/templates/views/model/show.html.erb
 has_rdoc: true
 homepage: http://github.com/conorh/admin_views
 licenses: []

data/generators/admin_views/templates/controllers/controller.rb

@@ -1,87 +0,0 @@
-class Admin::<%= pluralize(model_class) %>Controller < Admin::AdminController
-  helper_method :order_param
-  
-  # GET /admin/<%= model_plural %>
-  def index
-    if params[:search]
-      sql, sql_params = [], []
-      # By default searches all text fields
-<% search_cols = columns.find_all {|col| [:text, :string].include?(col.type) }.collect {|col| "'#{col.name}'" }.join(",") -%>
-      [<%= search_cols %>].each do |col|
-        sql << "#{col} LIKE ?"
-        sql_params << "%#{params[:search]}%"
-      end
-      conditions = [sql.join(" OR "), sql_params].flatten
-      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page], :conditions => conditions, :order => order_sql(params))
-    else
-      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page], :order => order_sql(params))
-    end
-  end
- 
-  # GET /admin/<%= model_plural %>/1
-  def show
-    @<%= model_name %> = <%= model_class %>.find(params[:id])
-  end
- 
-  # GET /admin/<%= model_plural %>/new
-  def new
-    @<%= model_name %> = <%= model_class %>.new
-  end
- 
-  # GET /admin/<%= model_plural %>/1/edit
-  def edit
-    @<%= model_name %> = <%= model_class %>.find(params[:id])
-  end
- 
-  # POST /admin/<%= model_plural %>
-  def create
-    @<%= model_name %> = <%= model_class %>.new(params[:<%= model_name %>])
- 
-    if @<%= model_name %>.save
-      redirect_to(@<%= model_name %>, :notice => '<%= class_name %> was successfully created.')
-    else
-      render :action => "new"
-    end
-  end
- 
-  # PUT /admin/<%= model_plural %>/1
-  def update
-    @<%= model_name %> = <%= model_class %>.find(params[:id])
- 
-    if @<%= model_name %>.update_attributes(params[:<%= model_name %>])
-      redirect_to(admin_<%= model_plural %>_url(@<%= model_name %>), :notice => '<%= model_class %> was successfully updated.')
-    else
-      render :action => "edit"
-    end
-  end
- 
-  # DELETE /admin/<%= model_plural %>/1
-  def destroy
-    @<%= model_name %> = <%= model_class %>.find(params[:id])
-    @<%= model_name %>.destroy
-
-    redirect_to(admin_<%= model_plural %>_url)
-  end
-  
-  private
-    def order_sql(params)
-      if params[:order]
-        split = params[:order].split("_")
-        order = split.last.upcase
-        column = split[0..-2].join("_")
-        "#{column} #{order}"
-      end
-    end
-  
-    def order_param(col_name)
-      order = params[:order]
-      
-      if order == "#{col_name}_asc"
-        "#{col_name}_asc"
-      elsif order == "#{col_name}_desc"
-        "#{col_name}_desc"
-      else
-        "#{col_name}_asc"
-      end
-    end
-end

data/generators/admin_views/templates/views/edit.html.erb

@@ -1,3 +0,0 @@
-<h2>Edit <%= model_class %></h2>
-
-<%%= render :partial => "form" %>

data/generators/admin_views/templates/views/index.html.erb

@@ -1,33 +0,0 @@
-<div id="create-link" style="float: right; font-size: 1.2em; font-weight: bold">
-  <%%= link_to "Create New <%= model_class %>", new_admin_<%= model_name %>_path %>
-</div>
-
-<div id="search">
-  <form method="get">
-    <%%= text_field_tag 'search', params[:search] %>
-    <%%= submit_tag "Search" %>
-  </form>
-</div>
-
-<h2><%= model_class %></h2>
-<table>
-  <tr>
-<% columns.each do |col| -%>
-    <th><%%= link_to '<%= col.human_name %>', params.merge(:order => order_param('<%= col.name %>')) %></th>
-<% end -%>
-    <th></th>
-  </tr>
-<%% @<%= model_plural %>.each do |<%= model_name %>| %>
-  <tr id="<%= model_name %>_<%%= <%= model_name %>.id %>">
-<% columns.each do |col| -%>
-    <td><%%= h <%= model_name %>.<%= col.name %> %></td>
-<% end -%>
-    <td>
-      <%%= link_to "Edit", edit_admin_<%= model_name %>_path(<%= model_name %>) %>
-      <%%= link_to "Delete", admin_<%= model_name %>_path(<%= model_name %>), :method => :delete, :confirm => "Are you sure?" %>
-    </td>
-  </tr>
-<%% end -%>
-</table>
-
-<%%= will_paginate @<%= model_plural %> %>

data/generators/admin_views/templates/views/new.html.erb

@@ -1,3 +0,0 @@
-<h2>Create New <%= model_class %></h2>
-
-<%%= render :partial => "form" %>

data/generators/admin_views/templates/views/show.html.erb

@@ -1,11 +0,0 @@
-<h2><%= model_class %> <%%= @<%= model_name %>.id %></h2>
-<div id="create-link" style="float: right; font-size: 1.2em; font-weight: bold">
-  <%%= link_to "Show All <%= pluralize(model_class) %>", admin_<%= model_plural %>_path %>
-  <%%= link_to "Edit <%= model_class %>", edit_admin_<%= model_name %>_path(@<%= model_name %>) %>
-</div>
-
-<table>
-<% for col in columns -%>
-  <tr><td><%= col.human_name %></td><td><%%= h @<%= model_name %>.<%= col.name %> %></td></tr>
-<% end -%>
-</table>