quirkey-qadmin 0.1.0 → 0.1.1

data/Rakefile

@@ -9,7 +9,8 @@ $hoe = Hoe.new('qadmin', Qadmin::VERSION) do |p|
   p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = 'quirkey'
   p.extra_deps         = [
-    ['activesupport','>= 2.2.0']
+    ['activesupport','>= 2.2.0'],
+    ['restful_query','>= 0.1.0']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/lib/qadmin/controller.rb

@@ -3,34 +3,36 @@ module Qadmin
 
     module Macros
       
+      
       def qadmin(options = {})
+        extend ::Qadmin::Options
         self.cattr_accessor :model_name, :model_instance_name, :model_collection_name, :model_human_name, :available_actions
         self.available_actions     = [:index, :show, :new, :create, :edit, :update, :destroy]
         self.available_actions     = [options[:only]].flatten    if options[:only]
         self.available_actions    -= [options[:exclude]].flatten if options[:exclude]
-        self.model_name            = self.to_s.demodulize.gsub(/Controller/,'').singularize
-        self.model_instance_name   = model_name.underscore
-        self.model_collection_name = model_instance_name.pluralize    
-        self.model_human_name      = model_instance_name.humanize
-        self.append_view_paths(File.join(File.dirname(__FILE__), 'views'))
+        self.extract_model_from_options(options)
+        self.append_view_path(File.join(File.dirname(__FILE__), 'views'))
+        include Qadmin::Templates
+        include Qadmin::Overlay
         define_admin_actions(available_actions, options)
       end
-
+      
       private
+      
       def define_admin_actions(actions, options = {})
         action_method_code = {
           :index => %{
           def index
-            @#{model_collection_name} = #{model_name}.paginate(:page => (params[:page] || 1))
+            @model_collection = @#{model_collection_name} = #{model_name}.paginate(:page => (params[:page] || 1))
             respond_to do |format|
-              format.html
+              format.html { render_template_for_section }
               format.xml
             end
           end
           },
           :show => %{
           def show
-            @#{model_instance_name} = #{model_name}.find(params[:id])
+            @model_instance = @#{model_instance_name} = #{model_name}.find(params[:id])
             respond_to do |format|
               format.html
               format.xml
@@ -39,8 +41,7 @@ module Qadmin
           },
           :new => %{
           def new
-            @#{model_instance_name} = #{model_name}.new
-
+            @model_instance = @#{model_instance_name} = #{model_name}.new
             respond_to do |format|
               format.html # new.html.erb
               format.xml  { render :xml => @#{model_instance_name} }
@@ -49,7 +50,7 @@ module Qadmin
           },
           :create => %{
           def create
-            @#{model_instance_name} = #{model_name}.new(params[:#{model_instance_name}])
+            @model_instance = @#{model_instance_name} = #{model_name}.new(params[:#{model_instance_name}])
             respond_to do |format|
               if @#{model_instance_name}.save
                 flash[:message] = '#{model_human_name} was successfully created.'
@@ -64,12 +65,12 @@ module Qadmin
           },
           :edit => %{
           def edit
-            @#{model_instance_name} = #{model_name}.find(params[:id])
+            @model_instance = @#{model_instance_name} = #{model_name}.find(params[:id])
           end
           },
           :update => %{
           def update
-            @#{model_instance_name} = #{model_name}.find(params[:id])
+            @model_instance = @#{model_instance_name} = #{model_name}.find(params[:id])
 
             respond_to do |format|
               if @#{model_instance_name}.update_attributes(params[:#{model_instance_name}])
@@ -85,7 +86,7 @@ module Qadmin
           },
           :destroy => %{
           def destroy
-            @#{model_instance_name} = #{model_name}.find(params[:id])
+            @model_instance =  @#{model_instance_name} = #{model_name}.find(params[:id])
             @#{model_instance_name}.destroy
             flash[:message] = "#{model_human_name} \#{@#{model_instance_name}} was deleted"
             respond_to do |format|
@@ -96,26 +97,13 @@ module Qadmin
           }
         }
         action_code = actions.collect {|a| action_method_code[a.to_sym] }.join("\n")
+        helper_methods = %{
+          helper_method :model_name, :model_instance_name, :model_collection_name, :model_human_name, :model_klass, :available_actions
+        }
+        action_code = helper_methods << action_code
         self.class_eval(action_code)
       end
     end
 
-
-    # GET /<%= controller_file_path %>/new
-    # GET /<%= controller_file_path %>/new.xml
-    
-    # GET /<%= controller_file_path %>/1/edit
-    
-    # POST /<%= controller_file_path %>
-    # POST /<%= controller_file_path %>.xml
-    
-    # PUT /<%= controller_file_path %>/1
-    # PUT /<%= controller_file_path %>/1.xml
-
-    
-    # DELETE /<%= controller_file_path %>/1
-    # DELETE /<%= controller_file_path %>/1.xml
-
-
   end
 end

data/lib/qadmin/helper.rb

@@ -1,11 +1,12 @@
-module Qadmin
-  module Helper
+module Qadmin  
+  module Helper    
+    include ::Qadmin::Options
     
     def fieldset(legend = nil, options = {}, &block)
-      content_tag(:fieldset, options) do
+      concat(content_tag_for(:fieldset, options) do
         content_tag(:legend, legend) if legend
-        yield
-      end
+        capture(&block)
+      end)
     end
 
     def admin_controls(name, options = {}, &block)
@@ -50,6 +51,43 @@ module Qadmin
         html
       end
     end
+    
+    def sortable_column_header(attribute_name, options = {})
+      
+    end
+        
+
+    def admin_table(collection, options = {})
+      html = '<table>'
+      html <<	'<tr>'
+      attributes = options[:attributes] || model_klass.column_names
+      attributes.each_with_index do |attribute, i|
+        html << (i == 0 ? '<th class="first_col">' : '<th>')
+        html << sortable_column_header(attribute)
+        html << '</th>'
+      end
+      html << %{
+        <th>View</th>
+        <th>Edit</th>
+        <th>Delete</th>
+        </tr>
+      }
+      collection.each do |instance|
+        html << %{<tr id="#{dom_id(instance)}" #{alt_rows}>}
+        attributes.each_with_index do |attribute, i|
+          if i == 0
+            html << %{<td class="first_col">#{link_to(instance.send(attribute), send("#{model_instance_name}_path", instance))}</td>}
+          else
+            html << %{<td>#{h(instance.send(attribute))}</td>}
+          end
+        end
+        html << %{<td>#{link_to(image_tag('admin/icon_show.png'), send("#{model_instance_name}_path", instance))}</td>}
+        html << %{<td>#{link_to(image_tag('admin/icon_edit.png'), send("edit_#{model_instance_name}_path", instance))}</td>}
+        html << %{<td>#{link_to(image_tag('admin/icon_destroy.png'), send("#{model_instance_name}_path", instance), :confirm => 'Are you sure?', :method => :delete)}</td>}
+        html << '</tr>'
+      end
+      html << '</table>'
+    end
 
     def alt_rows
       %{class="#{cycle('alt', '')}"}

data/lib/qadmin.rb

@@ -6,8 +6,13 @@ unless defined?(ActiveSupport)
 end
 
 module Qadmin
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 
-require 'qadmin/helper'
-require 'qadmin/controller'
+%w{
+  options
+  helper
+  overlay
+  templates
+  controller
+}.each {|lib| require "qadmin/#{lib}" }

data/rails/init.rb

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

data/rails_generators/qadmin/qadmin_generator.rb

@@ -39,10 +39,10 @@ class QadminGenerator < Rails::Generator::NamedBase
       m.directory(File.join('public','images','admin'))
 
       #copy form over too
-      m.template("_form.html.erb",File.join('app','views', controller_class_path, controller_file_name, "_form.html.erb"))
+      m.template("_form.erb",File.join('app','views', controller_class_path, controller_file_name, "_form.erb"))
 
       # Layout and stylesheet.
-      m.template('layout.html.erb', File.join('app','views','layouts', "admin.html.erb"))
+      m.template('layout.erb', File.join('app','views','layouts', "admin.erb"))
       m.template('style.css', 'public/stylesheets/admin.css')
 
       m.template(

data/test/test_helper.rb

@@ -4,6 +4,9 @@ require 'test/unit'
 require 'mocha'
 require 'shoulda'
 
+require File.dirname(__FILE__) + '/../lib/qadmin'
+
+
 # mock AR::BASE
 module ActiveRecord
   class Base
@@ -19,7 +22,6 @@ module ActiveRecord
   end
 end
 
-require File.dirname(__FILE__) + '/../lib/qadmin'
 
 
 class MockColumn
@@ -62,7 +64,10 @@ end
 
 class MockController
   class << self
-    def append_view_paths(paths)
+    def append_view_path(paths)
+    end
+    
+    def helper_method(*args)
     end
   end
   

data/test/test_qadmin_generator.rb

@@ -26,8 +26,8 @@ class TestQadminGenerator < Test::Unit::TestCase
     end
     assert_generated_class('test/functional/items_controller_test')
     assert_directory_exists('app/views/items')
-    assert_generated_file('app/views/items/_form.html.erb')
-    assert_generated_file('app/views/layouts/admin.html.erb')
+    assert_generated_file('app/views/items/_form.erb')
+    assert_generated_file('app/views/layouts/admin.erb')
     assert_directory_exists('public/images/admin/')
   end
 
@@ -44,7 +44,7 @@ class TestQadminGenerator < Test::Unit::TestCase
   def base_files
     [ 
       'public/stylesheets/style.css',
-      'app/views/layouts/main.html.erb',
+      'app/views/layouts/main.erb',
       'config/routes.rb'
     ]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quirkey-qadmin
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Quint

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

@@ -1,12 +0,0 @@
-<h2>Editing <%= singular_name.humanize.capitalize %></h2>
-
-<%%= admin_controls :<%= table_name %>, :for => :edit, :object => @<%= singular_name %> %>
-
-<%%= error_messages_for :<%= singular_name %> %>
-
-<%% form_for(@<%= singular_name %>) do |f| %>
-  <%%= render :partial => 'form', :locals => {:f => f, :<%= singular_name %> => @<%= singular_name %>} %>
-  <p><%%= f.submit "Update" %></p>
-<%% end %>
-
-<%%= admin_controls :<%= table_name %>, :for => :edit, :object => @<%= singular_name %> %>

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

@@ -1,31 +0,0 @@
-<h2><%= plural_name.humanize.capitalize %></h2>
-
-<%%= admin_controls :<%= table_name %>, :for => :index %>
-
-<%%= will_paginate(@<%= plural_name %>) %>
-<table>
-  <tr>
-<% attributes.each_with_index do |attribute, i| -%>
-    <th<% if i == 0 -%> class="first_col"<% end -%>><%%= sorterable_link :<%= attribute.name -%> %></th>
-<% end -%>
-	<th>View</th>
-	<th>Edit</th>
-	<th>Delete</th>
-  </tr>
-  
-<%%  @<%= plural_name %>.each do |<%= singular_name %>| %>
-  <tr id="<%%= dom_id(<%= singular_name %>) %>" <%%= alt_rows %>>
-<% attributes.each_with_index do |attribute, i| -%>
-    <% if i == 0 -%><td class="first_col"><%%= link_to <%= singular_name %>.<%= attribute.name %>, <%= table_name.singularize %>_path(<%= singular_name %>)  %></td><%- else -%>
-   <td><%%= h <%= singular_name %>.<%= attribute.name %> %></td>
-	<%- end -%>
-<% end -%>
-    <td><%%= link_to image_tag('admin/icon_show.png'), <%= table_name.singularize %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to image_tag('admin/icon_edit.png'), edit_<%= table_name.singularize %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to image_tag('admin/icon_destroy.png'), <%= table_name.singularize %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<%% end %>
-</table>
-<%%= will_paginate(@<%= plural_name %>) %>
-
-<%%= admin_controls :<%= table_name %>, :for => :index %>

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

@@ -1,12 +0,0 @@
-<h2><%= singular_name.humanize.capitalize %>: New</h2>
-
-<%%= admin_controls :<%= table_name %>, :for => :new %>
-
-<%%= error_messages_for :<%= singular_name %> %>
-
-<%% form_for(@<%= singular_name %>) do |f| %>
-  <%%= render :partial => 'form', :locals => {:f => f, :<%= singular_name %> => @<%= singular_name %>} %>
-  <p><%%= f.submit "Create" %></p>
-<%% end %>
-
-<%%= admin_controls :<%= table_name %>, :for => :new %>

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

@@ -1,14 +0,0 @@
-<h2><%= plural_name.humanize.capitalize %>: <%%= @<%= singular_name %>.to_s %></h2>
-
-<%%= admin_controls :<%= table_name %>, :for => :show, :object => @<%= singular_name %> %>
-
-<div id="<%%= dom_id(@<%= singular_name %>) %>">
-	<div class="fields_group">
-	<% attributes.each do |attribute| -%>
-	<h5><%= attribute.human_name %>:</h5>
-	<%%=h @<%= singular_name %>.<%= attribute.name %> %>
-	<% end -%>
-	</div>
-</div>
-
-<%%= admin_controls :<%= table_name %>, :for => :show, :object => @<%= singular_name %> %>

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

@@ -1,7 +0,0 @@
-<%% 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 %>

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

@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>Admin</title>
-
-	<%%= stylesheet_link_tag 'admin' %>
-	<%%= javascript_include_tag :defaults %>
-	<%%= javascript_include_tag 'file_browser' %>
-</head>
-<body>
-	<div id="header">
-		<h1>Admin</h1>
-		<div id="loginbox"><%% if logged_in? %>Welcome, <%%= current_user %> / <%%= link_to "Logout", '/logout' %><%% else %><%%= link_to "Login", '/login' %><%% end %></div>
-	</div>
-	<div id="main">
-		<div id="left_menu">
-			<h3>Panels</h3>
-			<ul class="menu">
-				<%% simple_menu([]) do |name,controller| %>
-				<li><%%= link_to(name.titleize, {:controller => controller}, :class => (like_current_page?(:controller => controller) ? 'selected' : '')) %></li>
-				<%% end %>
-			</ul>
-			<h3>Quick Links</h3>
-			<ul class="menu">
-			</ul>
-		</div>
-		<div id="content">
-			<%% if flash[:message] %>
-			<div id="message_main" class="message">
-				<%%= h flash[:message] %>
-			</div>
-			<%% elsif flash[:warning] %>
-			<div id="message_main" class="message warning">
-				<%%= h flash[:warning] %>
-			</div>
-			<%% end %>
-			<%%= yield  %>
-		</div>
-	</div>
-</body>
-</html>