quirkey-qadmin 0.1.1 → 0.2.0

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

@@ -0,0 +1,8 @@
+<div id="<%%= dom_id(@<%= file_name %>) %>">
+	<div class="fields_group">
+	  <% attributes.each do |attribute| -%>
+  	<h5><%= attribute.human_name %>:</h5>
+  	<%%= h @<%= singular_name %>.<%= attribute.name %> %>
+  	<% end -%>
+	</div>
+</div>

data/rails_generators/qadmin/templates/controller.rb

@@ -1,6 +1,6 @@
 class <%= controller_class_name %>Controller < ApplicationController
   #before_filter :login_required
-  #layout 'admin'
+  layout 'admin'
   qadmin
 
 end

data/rails_generators/qadmin/templates/functional_test.rb

@@ -1,77 +1,114 @@
-require File.dirname(__FILE__) + '<%= '/..' * controller_class_nesting_depth %>/../test_helper'
-require '<%= controller_file_path %>_controller'
+require 'test_helper'
 
-# Re-raise errors caught by the controller.
-class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  
+  context "<%= controller_class_name %>" do
+    setup do
+      @<%= file_name %> = <%= table_name %>(!!FIXTURE_NAME)
+      @<%= file_name %>_params = {
+<%= attributes.collect { |a| ":#{a.name} => '#{a.default}'" }.join(",\n\t") %>
+      }
+    end
 
-class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
-  fixtures :<%= model_name.tableize %>#, :users
+    context "html" do
+      context "GET index" do
+        setup do
+          get :index
+        end
 
-  def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    #login_as(:aaron)
-    @<%= file_name %> = <%= model_name.tableize %>(!!FIXTURENAME)
-  end
+        should_respond_with :success
 
-  # def test_should_require_login
-  #   logout
-  #   get :index
-  #   assert_redirected_to_login
-  # end
+        should "load paginated collection of <%= table_name %>" do
+          assert assigns(:<%= table_name %>)
+          assert assigns(:<%= table_name %>).respond_to?(:next_page)
+        end
 
-  def test_should_get_index
-    get :index
-    assert_response :success
-    assert assigns(:<%= model_name.tableize %>)
-  end
+        should "display <%= file_name %>" do
+          assert_select "#<%= file_name %>_#{@<%= file_name %>.id}"
+        end
+      end
 
-  def test_should_get_new
-    get :new
-    assert_response :success
-    assert_select 'form'
-  end
-  
-  def test_should_create_<%= file_name %>
-    assert_difference '<%= model_name %>.count' do
-      post :create, :<%= file_name %> => <%= file_name %>_params
-      assert_redirected_to <%= table_name.singularize %>_path(assigns(:<%= file_name %>))
-    end
-  end
+      context "GET show" do
+        setup do
+          get :show, :id => @<%= file_name %>.id
+        end
 
-  def test_should_show_<%= file_name %>
-    get :show, :id => @<%= file_name %>.id
-    assert_response :success
-    assert assigns(:<%= file_name %>)
-  end
+        should_respond_with :success
+        should_assign_to :<%= file_name %>
 
-  def test_should_get_edit
-    get :edit, :id =>  @<%= file_name %>.id
-    assert_response :success
-    assert assigns(:<%= file_name %>)
-    assert_select 'form'
-  end
-  
-  def test_should_update_<%= file_name %>
-    assert_no_difference '<%= model_name %>.count' do
-      put :update, :id => @<%= file_name %>.id, :<%= file_name %> => <%= file_name %>_params
-      assert_redirected_to <%= table_name.singularize %>_path(assigns(:<%= file_name %>))
-    end
-  end
-  
-  def test_should_destroy_<%= file_name %>
-    assert_difference '<%= model_name %>.count', -1 do
-      delete :destroy, :id => @<%= file_name %>.id
-      assert_redirected_to <%= table_name %>_path
+        should "load <%= file_name %>" do
+          assert_equal @<%= file_name %>, assigns(:<%= file_name %>)
+        end
+
+        should "display <%= file_name %>" do
+          assert_select "#<%= file_name %>_#{@<%= file_name %>.id}"
+        end
+      end
+
+      context "GET new" do
+        setup do
+          get :new
+        end
+
+        should_respond_with :success
+        should_assign_to :<%= file_name %>
+
+        should "display form" do
+          assert_select 'form'
+        end
+      end
+
+      context "POST create with valid <%= file_name %>" do
+        setup do
+          post :create, :<%= file_name %> => @<%= file_name %>_params
+        end
+
+        should_change '<%= model_name %>.count', :by => 1
+        should_redirect_to "<%= file_name %>_path(@<%= file_name %>)"
+        should_assign_to :<%= file_name %>
+      end
+
+      context "GET edit" do
+        setup do
+          get :edit, :id => @<%= file_name %>.id
+        end
+
+        should_respond_with :success
+        should_assign_to :<%= file_name %>
+
+        should "load <%= file_name %>" do
+          assert_equal @<%= file_name %>, assigns(:<%= file_name %>)
+        end
+
+        should "display form" do
+          assert_select 'form'
+        end
+      end
+
+      context "PUT update" do
+        setup do
+          put :update, :id => @<%= file_name %>.id, :<%= file_name %> => @<%= file_name %>_params
+        end
+
+        should_not_change '<%= model_name %>.count'
+        should_redirect_to "<%= file_name %>_path(@<%= file_name %>)"
+        should_assign_to :<%= file_name %>
+
+        should "load <%= file_name %>" do
+          assert_equal @<%= file_name %>, assigns(:<%= file_name %>)
+        end
+      end
+
+      context "DELETE destroy" do
+        setup do
+          delete :destroy, :id => @<%= file_name %>.id
+        end
+
+        should_change '<%= model_name %>.count', :by => -1
+        should_redirect_to "<%= table_name %>_path"
+        should_assign_to :<%= file_name %>
+      end
     end
   end
   
-  
-  protected
-  def <%= file_name %>_params(options = {})
-    {
-      <%= attributes.collect { |a| ":#{a.name} => #{a.default}" }.join(', ') %>
-    }.update(options)
-  end
 end

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

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

data/test/test_helper.rb

@@ -17,6 +17,10 @@ module ActiveRecord
         []
       end
       
+      def column_names
+        ['id'] #content_columns.collect {|c| c.name }
+      end
+      
     end
     self.pluralize_table_names = true
   end
@@ -59,6 +63,10 @@ class Item < ActiveRecord::Base
         MockColumn.new(name, type)
       end
     end
+    
+    def column_names
+      [] #content_columns.collect {|c| c.name }
+    end
   end
 end
 

data/test/test_qadmin_controller.rb

@@ -16,7 +16,7 @@ class TestQadminController < Test::Unit::TestCase
   def assert_does_not_define_actions(*actions)
     [actions].flatten.each do |action|
       assert !@controller.respond_to?(action), "Should not define ##{action}"
-    end    
+    end
   end
   public
 
@@ -26,6 +26,7 @@ class TestQadminController < Test::Unit::TestCase
         
         context "with no options" do
           setup do
+            class ::NoOption < ActiveRecord::Base; end
             class NoOptionsController < MockController
               qadmin
             end
@@ -36,6 +37,10 @@ class TestQadminController < Test::Unit::TestCase
             assert_defines_actions(crud_actions)
           end
           
+          should "set qadmin configuration" do
+            assert @controller.send(:qadmin_configuration).is_a?(Qadmin::Configuration)
+          end
+          
           should "set model_name from controller name" do
             assert_equal 'NoOption', @controller.send(:model_name)
           end
@@ -52,8 +57,9 @@ class TestQadminController < Test::Unit::TestCase
         context "with hashed options" do
           context "with :exclude" do
             setup do
+              class ::Exclude < ActiveRecord::Base; end
               class ExcludeController < MockController
-                qadmin :exclude => [:show, :destroy]
+                qadmin :available_actions => {:exclude => [:show, :destroy]}
               end
               @controller = ExcludeController.new
             end
@@ -69,8 +75,9 @@ class TestQadminController < Test::Unit::TestCase
           
           context "with :only" do
             setup do
+              class ::Only < ActiveRecord::Base; end
               class OnlyController < MockController
-                qadmin :only => [:index, :show]
+                qadmin :available_actions => {:only => [:index, :show]}
               end
               @controller = OnlyController.new
             end
@@ -103,12 +110,15 @@ class TestQadminController < Test::Unit::TestCase
           
           context "with two instances in different controllers" do
             setup do
+              class ::NewExclude < ActiveRecord::Base; end
               class NewExcludeController < MockController
-                qadmin :exclude => [:show, :new]
+                qadmin do |config|
+                  config.available_actions.exclude = [:show, :new]
+                end
               end
               @exclude_controller = NewExcludeController.new
               class NewOnlyController < MockController
-                qadmin :only => [:index, :show]
+                qadmin :model_name => 'Item', :available_actions => {:only => [:index, :show]}
               end
               @only_controller = NewOnlyController.new
             end
@@ -126,7 +136,7 @@ class TestQadminController < Test::Unit::TestCase
             end
             
             should "set model name independently" do
-              assert_equal 'NewOnly', @only_controller.send(:model_name)
+              assert_equal 'Item', @only_controller.send(:model_name)
               assert_equal 'NewExclude', @exclude_controller.send(:model_name)
             end
           end

data/test/test_qadmin_generator.rb

@@ -26,10 +26,20 @@ 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.erb')
-    assert_generated_file('app/views/layouts/admin.erb')
+    assert_generated_file('app/views/items/_form.html.erb')
+    assert_generated_file('app/views/layouts/admin.html.erb')
     assert_directory_exists('public/images/admin/')
   end
+  
+  def test_generator_with_after_scaffold_should_only_generate_test_and_erbs
+    name = 'Item'
+    run_generator('qadmin', [name, '--after-scaffold'], sources, :destination => APP_ROOT)
+    assert_file_does_not_exist('app/controllers/items_controller.rb')
+    assert_generated_class('test/functional/items_controller_test')
+    assert_generated_file('app/views/items/_form.html.erb')
+    assert_generated_file('app/views/items/_item.html.erb')    
+    assert_file_does_not_exist('app/views/layouts/admin.erb')
+  end
 
   private
   def sources
@@ -41,6 +51,11 @@ class TestQadminGenerator < Test::Unit::TestCase
     "rails_generators"
   end
   
+  def assert_file_does_not_exist(path)
+      assert !File.exist?("#{APP_ROOT}/#{path}"),
+        "The file '#{APP_ROOT}/#{path}' should not exist"
+  end
+  
   def base_files
     [ 
       'public/stylesheets/style.css',

data/test/test_qadmin_option_set.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestQadminOptionSet < Test::Unit::TestCase
+
+  context "OptionSet" do
+    context "initializing" do
+      context "with an array" do
+        setup do
+          @option_set = Qadmin::OptionSet.new([:index, :show, :delete])
+        end
+        
+        should "set array as default" do
+          assert_equal [:index, :show, :delete], @option_set.default
+        end
+        
+        should "return array as current" do
+          assert_equal [:index, :show, :delete], @option_set.current
+        end
+      end
+      
+      context "with only options" do
+        setup do
+          @option_set = Qadmin::OptionSet.new(:default => [:index, :show, :delete], :exclude => :delete)
+        end
+        
+        should "set default with options" do
+          assert_equal [:index, :show, :delete], @option_set.default
+        end
+        
+        should "set exclude with options" do
+          assert_equal [:delete], @option_set.exclude
+        end
+      end
+      
+      context "with an array and options" do
+        setup do
+          @option_set = Qadmin::OptionSet.new([:index, :show, :delete], :only => :delete)
+        end
+        
+        should "set default as array" do
+          assert_equal [:index, :show, :delete], @option_set.default
+        end
+        
+        should "set only with options" do
+          assert_equal [:delete], @option_set.only
+        end
+      end
+    end
+    
+    context "an Option Set" do
+      context "with exclude set" do
+        setup do
+          @option_set = Qadmin::OptionSet.new(:default => [:index, :show, :delete], :exclude => :delete)
+        end
+        
+        should "return current without excludes" do
+          assert_equal [:index, :show], @option_set.current
+        end
+        
+        should "itterate over current" do
+          @option_set.each do |option|
+            assert [:index, :show].include?(option)
+          end
+        end
+      end
+      
+      context "with only set" do
+        setup do
+          @option_set = Qadmin::OptionSet.new(:default => [:index, :show, :delete], :only => [:show, :delete])
+        end
+        
+        should "return only as current" do
+          assert_equal [:show, :delete], @option_set.current
+        end
+        
+        should "itterate over only" do
+          @option_set.each do |option|
+            assert [:show, :delete].include?(option)
+          end
+
+        end        
+      end
+    end
+  end
+
+end