ceo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 008b08c08e1bb883011dfa307098b1cb6642d2a0
-  data.tar.gz: 7e745cd40cfe1cb9d24f0ab399b2d95e6d8a231e
+  metadata.gz: 4fe4507acb62425bac279534c26165ad40ea9680
+  data.tar.gz: 81da4b3f285fdfc004af84b2282f41761e0623d1
 SHA512:
-  metadata.gz: 7319bc1cace93793d747a53c104c4a49d76833f36fc326f7347fa3d03daf1c0b2cd62def7b4e5e23a3e869adadff2222420d76a9532e245a0b11135d74d043e6
-  data.tar.gz: deafd1e7671597cc8870f325d65372d065e07210f4491ddbf44c5e4a4aa76c7114d77a72c90d109f111ed858039b110a358af4f2a0269efda8223e78e603413d
+  metadata.gz: 88770460906957b449ee82e101d41872045102dd73eeb6cd2b75fc764eb944eae6de788d99ac0452aea4e0b3cb14d9551d462e3943adae53f8ef7c1e59af1201
+  data.tar.gz: 9bdf1ac39832693cd2fa520ed77aaab8f5d2cd5df92d003bc2d607b0af07bd0374b900719f5ef548582f9f06e50dfce43521e2b1840609028909d32ba4be9510

data/README.md

@@ -2,9 +2,9 @@ CEO
 ---
 
 > Your app's chief executive.
+
 [![Dependency Status](http://img.shields.io/gemnasium/littlelines/ceo.svg)](https://gemnasium.com/littlelines/ceo)
 [![Gem Version](http://img.shields.io/gem/v/ceo.svg)](https://rubygems.org/gems/ceo)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://littlelines.mit-license.org)
 [![Build Status](https://travis-ci.org/littlelines/ceo.svg?branch=master)](https://travis-ci.org/littlelines/ceo)
 [![Code Climate](https://codeclimate.com/github/littlelines/ceo/badges/gpa.svg)](https://codeclimate.com/github/littlelines/ceo)
-

data/app/controllers/admin/admin_controller.rb

@@ -166,7 +166,7 @@ class Admin::AdminController < ApplicationController
   # Returns the path of the thing.
   def thing_path(model, object)
     id = object['ID'] || object['id']
-    send(:"admin_#{model.to_s.underscore.downcase}_path", id: id)
+    send(:"admin_#{undersingularize(model)}_path", id: id)
   end
 
   # Private: Returns the index path of a model.
@@ -176,7 +176,7 @@ class Admin::AdminController < ApplicationController
   # Returns the path of many things.
   def things_path(object = nil)
     object ||= @route_name || controller_name
-    send(:"admin_#{object.to_s.pluralize.downcase}_path")
+    send(:"admin_#{underpluralize(object)}_path")
   end
 
   # Private
@@ -187,7 +187,7 @@ class Admin::AdminController < ApplicationController
   # Returns the edit path of a model.
   def edit_thing_path(model, object)
     id = object['ID'] || object['id']
-    send(:"edit_admin_#{model}_path", id: id)
+    send(:"edit_admin_#{undersingularize(model)}_path", id: id)
   end
 
   # Private
@@ -196,9 +196,8 @@ class Admin::AdminController < ApplicationController
   # object - An instance of a model.
   #
   # Returns the new path of a model.
-  def new_thing_path(model, object)
-    id = object['ID'] || object['id']
-    send(:"new_admin_#{model}_path", id: id)
+  def new_thing_path(model)
+    send(:"new_admin_#{undersingularize(model)}_path")
   end
 
   # Private
@@ -208,6 +207,24 @@ class Admin::AdminController < ApplicationController
   #
   # Returns the paginated path of an object.
   def thing_page_path(model, page)
-    send(:"page_admin_#{model.to_s.underscore.pluralize}_path", page: page)
+    send(:"page_admin_#{underpluralize(model)}_path", page: page)
+  end
+
+  # Private
+  #
+  # noun - Something to underpluralize. (String)
+  #
+  # Returns an underscored and pluralized string.
+  def underpluralize(noun)
+    noun.to_s.underscore.pluralize.downcase
+  end
+
+  # Private
+  #
+  # noun - Something to undersingularize. (String)
+  #
+  # Returns an underscored and singularized string.
+  def undersingularize(noun)
+    noun.to_s.underscore.singularize.downcase
   end
 end

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

@@ -1,11 +1,14 @@
 <h1><%= @title %></h1>
 
+<div>
+  <p><%= link_to "New #{@title.singularize}", new_thing_path(@model_name), id: "new-#{@model_name}" %></p>
+  <p><%= "There are no #{@human_model.downcase.pluralize} in the database." if @things.blank? %></p>
+</div>
+
 <table>
   <thead>
     <tr>
-      <% if @things.blank? %>
-        <%= "There are no #{@human_model.downcase.pluralize} in the database." %>
-      <% else %>
+      <% unless @things.blank? %>
         <% @things.first.each_key do |heading| %>
           <th>
             <%= heading %>
@@ -17,15 +20,15 @@
 
   <tbody>
     <% @things.each do |thing| %>
-      <tr>
+      <tr id="#{@controller_name}-#{thing.id}">
       <% thing.each do |heading, value| %>
         <td label="<%= heading %>: ">
           <%= value %>
         </td>
 
         <div class="actions">
-          <td><%= link_to("Edit #{@title}", edit_thing_path(@model_name, thing)) %></td>
-          <td><%= link_to("Show #{@title}", thing_path(@model_name, thing)) %></td>
+          <td><%= link_to("Edit", edit_thing_path(@model_name, thing)) %></td>
+          <td><%= link_to("Show", thing_path(@model_name, thing)) %></td>
         </div>
       <% end %>
       </tr>
@@ -35,28 +38,30 @@
 
 <nav class="navigation" role="navigation">
   <ul>
-    <% unless @page == 1 %>
+    <% if @page == 1 %>
+      <li><a>1</a></li>
+    <% else %>
       <!-- First Page -->
       <li>
         <%= link_to('1', thing_page_path(@model_name, @page - 1)) %>
       </li>
     <% end %>
 
-    <% if @page > 1 %>
+    <% if @page.to_i > 2 %>
       <!-- Previous Page -->
       <li>
-        <%= link_to("#{page - 1}", thing_page_path(@model_name, @page - 1)) %>
+        <%= link_to("#{@page - 1}", thing_page_path(@model_name, @page - 1)) %>
       </li>
     <% end %>
 
-    <% unless @total_page == 1 %>
+    <% unless @page == 1 %>
       <!-- Current Page -->
       <li>
         <a><%= @page %></a>
       </li>
     <% end %>
 
-    <% if @page < @total_pages %>
+    <% if @page < @total_pages && @page + 1 < @total_pages %>
       <!-- Next Page -->
       <li>
         <%= link_to("#{@page + 1}", thing_page_path(@model_name, @page + 1)) %>

data/lib/ceo/version.rb

@@ -1,3 +1,3 @@
 module CEO
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/generators/admin/USAGE

@@ -0,0 +1,11 @@
+Description:
+    Admin page generator.
+
+Example:
+    rails generate admin apples
+
+    This will create:
+        app/controllers/admin/apples_controller.rb
+
+    AND route:
+        admin_for :apples

data/lib/generators/admin/admin_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators'
+
+# Public: Generator for admin page controllers.
+class AdminGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('../templates', __FILE__)
+
+  def create_admin_page_controller
+    @controller = file_name
+    template(
+      'admin_page_controller.rb.erb',
+      "app/controllers/admin/#{@controller.underscore}_controller.rb"
+    )
+  end
+
+  def add_admin_route
+    route "admin_for :#{@controller.underscore}"
+  end
+
+  def add_form_view
+    unless Dir.exist?(Rails.root.join('app/views/admin'))
+      Dir.mkdir(Rails.root.join('app/views/admin'))
+    end
+
+    create_file "app/views/admin/#{@controller.underscore}/_form.html.erb", <<VIEW
+<% # "f" is exposed as a form object %>
+VIEW
+  end
+end

data/lib/generators/admin/templates/admin_page_controller.rb.erb

@@ -0,0 +1,5 @@
+module Admin
+  class <%= @controller.camelize %>Controller < AdminController
+    # leave empty for basic CRUD
+  end
+end

data/test/ceo/index_apple_test.rb

@@ -1,24 +1,35 @@
 require 'test_helper'
 
-describe 'apples admin pages' do
+describe 'Apple admin pages' do
   include TestHelper
+
   describe 'index' do
     before do
+      30.times { Apple.create }
       admin_page '/apples'
     end
 
+    it 'should not error when there are no apples' do
+      Apple.delete_all
+      admin_page '/apples'
+
+      assert_equal 0, Apple.count
+      expected_text = 'There are no apples in the database.'
+      assert page.has_css?('p', text: expected_text)
+    end
+
     describe 'correct attributes' do
       let(:attributes) { Apple.new.attributes.keys }
-      let(:headers) { page.all('table thead th') }
 
       it 'should have the right number of headers' do
+        headers = page.all('table thead th')
         assert_equal attributes.size, headers.size
       end
 
       it 'should have the right header names' do
-        page.has_css?('table thead tr th', text: 'ID')
-        page.has_css?('table thead tr th', text: 'Name')
-        page.has_css?('table thead tr th', text: 'Fruit')
+        assert page.has_css?('table thead tr th', text: 'ID')
+        assert page.has_css?('table thead tr th', text: 'Name')
+        assert page.has_css?('table thead tr th', text: 'Fruit')
       end
 
       it 'should have all IDs shown' do
@@ -27,5 +38,48 @@ describe 'apples admin pages' do
         end
       end
     end
+
+    it 'it should include a new button' do
+      el = page.find('a#new-apple')
+      assert_equal '/admin/apples/new', el['href']
+      assert_equal 'New Apple', el.text
+    end
+
+    describe 'pagination' do
+      it 'shows 20 apples per page' do
+        assert_equal 20, page.all('table tbody tr').size
+        refute_equal 20, Apple.count
+      end
+
+      describe 'pagination links' do
+        describe 'first page' do
+          it 'should have a disabled link' do
+            el = page.find('nav ul li a', text: '1')
+            assert_equal '1', el.text
+            assert el['href'].nil?
+          end
+
+          it 'should have a link to the next page' do
+            el = page.find('nav ul li a', text: '2')
+            assert_equal '/admin/apples/page/2', el['href']
+          end
+        end
+
+        describe 'second page' do
+          before { visit '/admin/apples/page/2' }
+
+          it 'should have a disabled link' do
+            el = page.find('nav ul li a', text: '2')
+            assert_equal '2', el.text
+            assert el['href'].nil?
+          end
+
+          it 'should have a first page button' do
+            el = page.find('nav ul li a', text: '1')
+            assert_equal '/admin/apples/page/1', el['href']
+          end
+        end
+      end
+    end
   end
 end

data/test/dummy/log/development.log

@@ -0,0 +1,7 @@
+  Apple Load (2.4ms)  SELECT  "apples".* FROM "apples"  ORDER BY "apples"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+  SQL (8.7ms)  INSERT INTO "apples" DEFAULT VALUES RETURNING "id"
+   (0.5ms)  COMMIT
+  Apple Load (0.5ms)  SELECT  "apples".* FROM "apples"  ORDER BY "apples"."id" ASC LIMIT 1
+  Apple Load (0.5ms)  SELECT  "apples".* FROM "apples"  ORDER BY "apples"."id" ASC LIMIT 1
+  Apple Load (0.4ms)  SELECT  "apples".* FROM "apples"  ORDER BY "apples"."id" ASC LIMIT 1