beef-admin_area 0.1.7 → 0.1.9

data/Rakefile

@@ -4,17 +4,17 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "admin_area"
+    gem.name = "beef-admin_area"
     gem.summary = %Q{Rails engine that provides a standard admin area with user managament}
     gem.email = "steve@wearebeef.co.uk"
     gem.homepage = "http://github.com/beef/admin"
     gem.authors = ["Steve England"]
-    gem.add_dependency("thoughtbot-clearance", [">= 0.6.6"])
+    gem.add_dependency("clearance", [">= 0.6.6"])
     gem.add_dependency("thoughtbot-sortable_table")
-    gem.add_dependency("mislav-will_paginate", ['>= 2.3.8'])
+    gem.add_dependency("will_paginate", ['>= 2.3.8'])
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.9

data/app/controllers/admin/users_controller.rb

@@ -5,7 +5,7 @@ class Admin::UsersController < Admin::BaseController
   # GET /users
   # GET /users.xml
   def index
-    @users = User.paginate :page => params[:page], :per_page => 20, :order => sort_order
+    @users = User.paginate :page => params[:page], :per_page => 20, :order => sort_order(:default => 'asc')
 
     respond_to do |format|
       format.html # index.html.erb
@@ -67,6 +67,7 @@ class Admin::UsersController < Admin::BaseController
   def destroy
     @user = User.find(params[:id])
     @user.destroy
+    flash[:notice] = 'User was successfully deleted.'
     
     respond_to do |format|
       format.html { redirect_to(admin_users_url) }

data/app/views/admin/users/show.html.erb

@@ -26,11 +26,11 @@
 
   <p>
     <%= f.label :role %><br/>
-    <%= f.select :role, User::ROLES %>
+    <%= f.select :role, User::ROLES.map{|r| r.to_s } %>
   </p>
 
   <p>
-    <%= f.submit "Save", :disable_with => 'Saving...' %> or <%= link_to 'Cancel', admin_users_path %>
+    <%= f.submit @user.new_record? ? 'Create' : 'Update', :disable_with => 'Submitting...' %> or <%= link_to 'Cancel', admin_users_path %>
   </p>
 <% end %>
 

data/app/views/layouts/admin.html.erb

@@ -32,7 +32,7 @@
 		  <h1><strong><%= Settings.site_name %></strong> Content Management System</h1>
   		<ul id="status">
   			<% if signed_in? %><li class="no_bull"><%= current_user.name %> is logged in</li><% end %>
-  			<li><%= link_to 'Logout', session_path, :method => :delete %></li>
+  			<li><%= link_to 'Sign Out', session_path, :method => :delete %></li>
   			<%= tab 'Users', admin_users_path, :admin %>
   			<%= tab 'Settings', admin_settings_path if current_user.admin? %>
   			<li><%= link_to 'Live Site', '/' %></li>

data/app/views/sessions/new.html.erb

@@ -9,10 +9,6 @@
     <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
-  <div class="text_field">
-    <%= form.check_box :remember_me %>
-    <%= form.label :remember_me %>
-  </div>
   <div class="submit_field">
     <%= form.submit "Sign in", :disable_with => "Please wait..." %>
   </div>

data/{admin_area.gemspec → beef-admin_area.gemspec}

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{admin_area}
-  s.version = "0.1.7"
+  s.name = %q{beef-admin_area}
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-09}
+  s.date = %q{2009-10-28}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,7 +22,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "admin_area.gemspec",
      "app/controllers/admin/base_controller.rb",
      "app/controllers/admin/settings_controller.rb",
      "app/controllers/admin/users_controller.rb",
@@ -34,6 +36,7 @@ Gem::Specification.new do |s|
      "app/views/admin/users/show.html.erb",
      "app/views/layouts/admin.html.erb",
      "app/views/sessions/new.html.erb",
+     "beef-admin_area.gemspec",
      "config/routes.rb",
      "generators/admin_area_files/USAGE",
      "generators/admin_area_files/admin_area_files_generator.rb",
@@ -131,8 +134,7 @@ Gem::Specification.new do |s|
      "generators/admin_scaffold/templates/admin_controller.rb",
      "generators/admin_scaffold/templates/admin_index.html.erb",
      "generators/admin_scaffold/templates/admin_show.html.erb",
-     "generators/admin_scaffold/templates/helper.rb",
-     "generators/admin_scaffold/templates/helper_test.rb",
+     "generators/admin_scaffold/templates/factory.rb",
      "generators/admin_scaffold/templates/layout.html.erb",
      "generators/admin_scaffold/templates/style.css",
      "generators/admin_scaffold/templates/view_controller.rb",
@@ -157,17 +159,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thoughtbot-clearance>, [">= 0.6.6"])
+      s.add_runtime_dependency(%q<clearance>, [">= 0.6.6"])
       s.add_runtime_dependency(%q<thoughtbot-sortable_table>, [">= 0"])
-      s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<will_paginate>, [">= 2.3.8"])
     else
-      s.add_dependency(%q<thoughtbot-clearance>, [">= 0.6.6"])
+      s.add_dependency(%q<clearance>, [">= 0.6.6"])
       s.add_dependency(%q<thoughtbot-sortable_table>, [">= 0"])
-      s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.8"])
+      s.add_dependency(%q<will_paginate>, [">= 2.3.8"])
     end
   else
-    s.add_dependency(%q<thoughtbot-clearance>, [">= 0.6.6"])
+    s.add_dependency(%q<clearance>, [">= 0.6.6"])
     s.add_dependency(%q<thoughtbot-sortable_table>, [">= 0"])
-    s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.8"])
+    s.add_dependency(%q<will_paginate>, [">= 2.3.8"])
   end
 end

data/generators/admin_scaffold/admin_scaffold_generator.rb

@@ -5,19 +5,16 @@ class AdminScaffoldGenerator < ScaffoldGenerator
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions("#{controller_class_name}Controller", "Admin::#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions("#{controller_class_name}Controller", "Admin::#{controller_class_name}Controller")
       m.class_collisions(class_name)
 
-      # Controller, helper, views, test and stylesheets directories.
-      m.directory(File.join('app/models', class_path))
+      # Controller, views, test and stylesheets directories.
+      m.directory(File.join('spec','factories'))
       m.directory(File.join('app/controllers', controller_class_path))
       m.directory(File.join('app/controllers/admin', controller_class_path))
-      m.directory(File.join('app/helpers', controller_class_path))
       m.directory(File.join('app/views', controller_class_path, controller_file_name))
       m.directory(File.join('app/views/admin', controller_class_path, controller_file_name))
       m.directory(File.join('app/views/layouts', controller_class_path))
-      m.directory(File.join('test/unit', class_path))
-      m.directory(File.join('test/unit/helpers', class_path))
       m.directory(File.join('public/stylesheets', class_path))
 
       for action in ['index', 'show']
@@ -29,24 +26,24 @@ class AdminScaffoldGenerator < ScaffoldGenerator
       
       m.template(
         "view_index.html.erb",
-        File.join('app/views/admin', controller_class_path, controller_file_name, "view.html.erb")
+        File.join('app/views', controller_class_path, controller_file_name, "index.html.erb")
       )
-
-
       m.template(
         'view_controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       )
       m.template(
         'admin_controller.rb', File.join('app/controllers/admin', controller_class_path, "#{controller_file_name}_controller.rb")
       )
-
-      m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
-      m.template('helper_test.rb',     File.join('test/unit/helpers',    controller_class_path, "#{controller_file_name}_helper_test.rb"))
+      m.template(
+        'factory.rb', File.join('spec','factories', "#{singular_name}.rb")
+      )
 
       m.route_resources controller_file_name
       m.route_resources_to_namespace('admin', controller_file_name)
-
-      m.dependency 'model', [name, '--skip-fixture'] + @args, :collision => :skip
+      
+      m.dependency 'rpec_controller', [controller_file_name, 'index'], :collision => :skip
+      m.dependency 'rpec_controller', ["admin/#{controller_file_name}", 'index', 'show'], :collision => :skip
+      m.dependency 'rpec_model', [name, '--skip-fixture'] + @args, :collision => :skip
     end
   end
 

data/generators/admin_scaffold/templates/admin_controller.rb

@@ -1,8 +1,6 @@
 class Admin::<%= controller_class_name %>Controller < Admin::BaseController
-  sortable_attributes :<%= attributes.collect{|a| a.name}.join(', :') %> 
+  sortable_attributes :created_at, :updated_at, :<%= attributes.collect{|a| a.name}.join(', :') %> 
 
-  # GET /<%= table_name %>
-  # GET /<%= table_name %>.xml
   def index
     @<%= table_name %> = <%= class_name %>.paginate :page => params[:page], :order => sort_order
 
@@ -12,8 +10,6 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
     end
   end
 
-  # GET /<%= table_name %>/1
-  # GET /<%= table_name %>/1.xml
   def show
     @<%= file_name %> = <%= class_name %>.find(params[:id])
 
@@ -23,8 +19,6 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
     end
   end
 
-  # GET /<%= table_name %>/new
-  # GET /<%= table_name %>/new.xml
   def new
     @<%= file_name %> = <%= class_name %>.new
 
@@ -34,8 +28,6 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
     end
   end
 
-  # POST /<%= table_name %>
-  # POST /<%= table_name %>.xml
   def create
     @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
 
@@ -45,14 +37,12 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
         format.html { redirect_to(admin_<%= table_name %>_url) }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
-        format.html { render :action => "new" }
+        format.html { render :action => "show" }
         format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # PUT /<%= table_name %>/1
-  # PUT /<%= table_name %>/1.xml
   def update
     @<%= file_name %> = <%= class_name %>.find(params[:id])
 
@@ -62,14 +52,12 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
         format.html { redirect_to(admin_<%= table_name %>_url) }
         format.xml  { head :ok }
       else
-        format.html { render :action => "edit" }
+        format.html { render :action => "show" }
         format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # DELETE /<%= table_name %>/1
-  # DELETE /<%= table_name %>/1.xml
   def destroy
     @<%= file_name %> = <%= class_name %>.find(params[:id])
     @<%= file_name %>.destroy

data/generators/admin_scaffold/templates/admin_index.html.erb

@@ -3,13 +3,15 @@
 <ul class="choices">
   <li><%%= link_to 'New <%= singular_name.titleize %>', new_admin_<%= singular_name %>_path %></li>
 </ul>
-
+<%% paginated_section do -%>
 <table>
   <thead>
     <tr>
 <% for attribute in attributes -%>
-      <%%= sortable_table_header :name => "<%= attribute.column.human_name %>",  :sort => "<%= attribute.name %>" %>
+      <%%= sortable_table_header :name => "<%= attribute.column.human_name %>", :sort => "<%= attribute.name %>" %>
 <% end -%>
+      <%%= sortable_table_header :name => "Created", :sort => "created_at" %>
+      <%%= sortable_table_header :name => "Updated", :sort => "updated_at" %>
       <th colspan="2">Actions</th>
     </tr>
   </thead>
@@ -23,6 +25,8 @@
       <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
 <% end -%>
+      <td><%%=h <%= singular_name %>.created_at.to_formatted_s(:short_ordinal) %></td>
+      <td><%%=h <%= singular_name %>.created_at.to_formatted_s(:short_ordinal) %></td>
       <td><%%= link_to 'Edit', admin_<%= singular_name %>_path(<%= singular_name %>), :class => 'edit' %></td>
       <td><%%= link_to 'Destroy', admin_<%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %></td>
     </tr>
@@ -33,7 +37,10 @@
 <% for attribute in attributes -%>
       <%%= sortable_table_header :name => "<%= attribute.column.human_name %>",  :sort => "<%= attribute.name %>" %>
 <% end -%>
+      <%%= sortable_table_header :name => "Created", :sort => "created_at" %>
+      <%%= sortable_table_header :name => "Updated", :sort => "updated_at" %>
       <th colspan="2">Actions</th>
     </tr>
   </tfoot>
 </table>
+<%% end -%>

data/generators/admin_scaffold/templates/factory.rb

@@ -0,0 +1,5 @@
+Factory.define :<%= singular_name %> do |<%= singular_name %>|
+<% for attribute in attributes -%>
+  <%= singular_name %>.<%= attribute.name %> {Faker::Lorem.words(5).join(' ').titleize}
+<% end -%>
+end

data/generators/admin_scaffold/templates/view_index.html.erb

@@ -1,17 +1,20 @@
 <h1>Listing <%= plural_name.titleize %></h1>
 
 <table>
-  <tr>
+  <thead>
+    <tr>
 <% for attribute in attributes -%>
-    <th><%= attribute.column.human_name %></th>
+      <th><%= attribute.column.human_name %></th>
 <% end -%>
-  </tr>
-
+    </tr>
+  </thead>
+  <tbody>
 <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
-  <tr>
+    <tr>
 <% for attribute in attributes -%>
-    <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
+      <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
-  </tr>
+    </tr>
 <%% end %>
+  </tbody>
 </table>

data/rails/init.rb

@@ -5,6 +5,6 @@ require 'admin_area'
 
 config.after_initialize do
   # Put Clearance views at bottom of view paths
-  path = ActionController::Base.view_paths.find { |p| p.to_s =~ /thoughtbot-clearance/ }
+  path = ActionController::Base.view_paths.find { |p| p.to_s =~ /clearance/ }
   ActionController::Base.view_paths << ActionController::Base.view_paths.delete(path)
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-admin_area
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors: 
 - Steve England
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-10-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-clearance
+  name: clearance
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mislav-will_paginate
+  name: will_paginate
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -58,7 +58,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- admin_area.gemspec
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/settings_controller.rb
 - app/controllers/admin/users_controller.rb
@@ -73,6 +72,7 @@ files:
 - app/views/admin/users/show.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/sessions/new.html.erb
+- beef-admin_area.gemspec
 - config/routes.rb
 - generators/admin_area_files/USAGE
 - generators/admin_area_files/admin_area_files_generator.rb
@@ -170,8 +170,7 @@ files:
 - generators/admin_scaffold/templates/admin_controller.rb
 - generators/admin_scaffold/templates/admin_index.html.erb
 - generators/admin_scaffold/templates/admin_show.html.erb
-- generators/admin_scaffold/templates/helper.rb
-- generators/admin_scaffold/templates/helper_test.rb
+- generators/admin_scaffold/templates/factory.rb
 - generators/admin_scaffold/templates/layout.html.erb
 - generators/admin_scaffold/templates/style.css
 - generators/admin_scaffold/templates/view_controller.rb
@@ -180,9 +179,10 @@ files:
 - rails/init.rb
 - test/admin_area_test.rb
 - test/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/beef/admin
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8

data/generators/admin_scaffold/templates/helper.rb

@@ -1,2 +0,0 @@
-module <%= controller_class_name %>Helper
-end

data/generators/admin_scaffold/templates/helper_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class <%= controller_class_name %>HelperTest < ActionView::TestCase
-end