dobro 0.1.0alpha3 → 0.1.0alpha4

data/README.textile

@@ -28,7 +28,9 @@ Before you get too carried away though, you'll almost certainly want to edit the
 
 h2. Usage
 
-If you'd like to customise the views, just put your versions in @app/views/dobro@, broken down by resources. For example, a custom edit view for users would end up in @app/views/dobro/users/edit.html.erb@.
+Customising the @_form.html.erb@ and @_show.html.erb@ partials for each of your resources is highly recommended. You can also add a @_dashboard.html.erb@, which will show up on resource indices.
+
+It's not recommended, but you're also welcome to customise the views. Just put your versions in @app/views/dobro@, broken down by resources. For example, a custom edit view for users would end up in @app/views/dobro/users/edit.html.erb@.
 
 The standard set of views for Dobro includes:
 
@@ -38,11 +40,6 @@ The standard set of views for Dobro includes:
 * edit
 * delete
 
-Generally it's not recommended you edit those though - best to stick to the partials:
-
-* _form (used by both new and edit views)
-* _show (used by the show view)
-
 And perhaps you want to add custom controllers into the mix? That's easy too. For the relevant resources, just give them their own @dobro_for@ call, and specify the custom controller:
 
 <pre><code>dobro_for :pages, :controller => 'pages'</code></pre>

data/app/controllers/dobro/application_controller.rb

@@ -1,10 +1,11 @@
 class Dobro::ApplicationController < Dobro.controller_base
   layout 'dobro'
+  helper :dobro
 
-  expose(:resource)           { default_resource.to_sym }
+  expose(:resource)           { Dobro.resources[default_resource.to_sym] }
   expose(:singular_class)     { singular_reference.capitalize.constantize }
-  expose(:plural_class)       { resource.to_s.capitalize }
-  expose(:singular_reference) { resource.to_s.singularize }
+  expose(:plural_class)       { resource.reference.to_s.capitalize }
+  expose(:singular_reference) { resource.reference.to_s.singularize }
   expose(:records)            { singular_class.all }
   expose(:current_record)     {
     if params[:id]
@@ -18,7 +19,7 @@ class Dobro::ApplicationController < Dobro.controller_base
 
   def create
     if current_record.save
-      redirect_to current_record
+      redirect_to resource.route_for(current_record)
     else
       render 'new'
     end
@@ -26,7 +27,7 @@ class Dobro::ApplicationController < Dobro.controller_base
 
   def update
     if current_record.update_attributes(params[singular_reference])
-      redirect_to current_record
+      redirect_to resource.route_for(current_record)
     else
       render 'edit'
     end
@@ -34,13 +35,13 @@ class Dobro::ApplicationController < Dobro.controller_base
 
   def destroy
     current_record.destroy
-    redirect_to resource
+    redirect_to resource.index_route
   end
 
   private
 
   def default_resource
-    params[:resource] || Dobro.resources.first
+    params[:resource] || Dobro.resources.keys.first
   end
 
   def prepend_view_paths

data/app/helpers/dobro_helper.rb

@@ -0,0 +1,29 @@
+module DobroHelper
+  def standard_dobro_columns
+    singular_class.columns.select { |column|
+      !hidden_dobro_column_names.include?(column.name.to_s)
+    }
+  end
+
+  def dobro_field_for(form, column)
+    column_name = column.name.to_sym
+    case column.type.to_sym
+    when :integer
+      form.text_field column_name, :class => 'integer'
+    when :date
+      form.text_field column_name, :placeholder => 'yyyy-mm-dd'
+    when :text
+      form.text_area column_name
+    when :boolean
+      form.check_box column_name
+    else
+      form.text_field column_name
+    end
+  end
+
+  private
+
+  def hidden_dobro_column_names
+    %w( id created_at updated_at )
+  end
+end

data/app/views/dobro/application/_form.html.erb

@@ -1,14 +1,12 @@
-<%= form_for current_record do |f| %>
+<%= form_for resource.route_for(current_record) do |f| %>
   <fieldset>
-    <% singular_class.column_names.each do |column| %>
-      <p>
-        <%= f.label column.to_sym %>
-        <%= f.text_field column.to_sym %>
-      </p>
+    <% standard_dobro_columns.each do |column| %>
+      <%= f.label column.name.to_sym %>
+      <%= dobro_field_for f, column %>
     <% end %>
   </fieldset>
 
-  <fieldset>
+  <fieldset class="buttons">
     <%= f.submit "Save #{singular_class}" %>
   </fieldset>
 <% end %>

data/app/views/dobro/application/delete.html.erb

@@ -1,4 +1,4 @@
-<%= form_for current_record, :html => {:method => :delete} do |f| %>
+<%= form_for resource.route_for(current_record), :html => {:method => :delete} do |f| %>
   <p>Are you sure you want to delete this record? This cannot be undone.</p>
 
   <%= f.submit 'Confirm' %>

data/app/views/dobro/application/index.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'dashboard' %>

data/app/views/dobro/application/show.html.erb

@@ -4,10 +4,10 @@
   <nav>
     <ul>
       <li>
-        <%= link_to 'Edit', [:edit, current_record], :class => 'edit' %>
+        <%= link_to 'Edit', resource.route_for(:edit, current_record), :class => 'edit' %>
       </li>
       <li>
-        <%= link_to 'Delete', [:delete, current_record], :class => 'cancel' %>
+        <%= link_to 'Delete', resource.route_for(:delete, current_record), :class => 'cancel' %>
       </li>
     </ul>
   </nav>

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

@@ -18,10 +18,10 @@
         </header>
 
         <ul class="records">
-          <% Dobro.resources.each do |res| %>
+          <% Dobro.resources.each do |reference, res| %>
             <li class="record">
-              <%= link_to res, :class => (resource == res && 'selected') do %>
-                <h4><%= res.to_s.titleize %></h4>
+              <%= link_to res.index_route, :class => (resource.reference == reference && 'selected') do %>
+                <h4><%= reference.to_s.titleize %></h4>
               <% end %>
             </li>
           <% end %>
@@ -33,14 +33,14 @@
           <h3><%= plural_class.titleize %></h3>
           <nav>
             <ul>
-              <li><%= link_to "New #{singular_class}", [:new, singular_reference.to_sym], :class => 'new' %></li>
+              <li><%= link_to "New #{singular_class}", resource.route_for(:new, singular_reference.to_sym), :class => 'new' %></li>
             </ul>
           </nav>
         </header>
 
         <ul class="records">
           <% records.each do |record| %>
-            <li class="record"><h5><%= link_to record.identifier, record %></h5></li>
+            <li class="record"><h5><%= link_to record.identifier, resource.route_for(record), :class => (current_record.present? && current_record == record && 'selected')%></h5></li>
           <% end %>
         </ul>
       </section>

data/lib/dobro.rb

@@ -3,7 +3,7 @@ require 'action_controller'
 require 'decent_exposure'
 
 module Dobro
-  @resources = []
+  @resources = {}
   def self.resources
     @resources
   end
@@ -20,5 +20,6 @@ end
 
 require 'dobro/engine'
 require 'dobro/file_system_resolver'
+require 'dobro/resource'
 require 'dobro/routes'
 require 'dobro/version'

data/lib/dobro/file_system_resolver.rb

@@ -8,7 +8,7 @@ class Dobro::FileSystemResolver < ActionView::FileSystemResolver
   end
 
   def find_templates(name, prefix, partial, details)
-    prefix = "dobro/#{resource}" if prefix == 'dobro/application'
+    prefix = "dobro/#{resource.reference}" if prefix == 'dobro/application'
     super name, prefix, partial, details
   end
 end

data/lib/dobro/resource.rb

@@ -0,0 +1,22 @@
+class Dobro::Resource
+  attr_accessor :reference, :options
+
+  def initialize(reference, options = {})
+    @reference, @options = reference, options
+  end
+
+  def index_route
+    [namespace, reference].compact
+  end
+
+  def route_for(action, object = nil)
+    action, object = nil, action if object.nil?
+    [action, namespace, object].compact
+  end
+
+  private
+
+  def namespace
+    options[:namespace]
+  end
+end

data/lib/dobro/routes.rb

@@ -1,15 +1,19 @@
 class ActionDispatch::Routing::Mapper
   def dobro_for(*resources)
     options = resources.extract_options!
+    outer_module, @scope[:module] = @scope[:module], nil
 
     resources.each do |res|
-      Dobro.resources << res
+
+      Dobro.resources[res] = Dobro::Resource.new res, :namespace => @scope[:as]
 
       self.resources res, dobro_options_for(res).merge(options) do
         member { get :delete }
         yield if block_given?
       end
     end
+
+    @scope[:module] = outer_module
   end
 
   private

data/lib/dobro/version.rb

@@ -1,3 +1,3 @@
 module Dobro
-  VERSION = '0.1.0alpha3'
+  VERSION = '0.1.0alpha4'
 end

data/spec/acceptance/custom_views_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'custom views', :driver => :rack_test do
+describe 'custom views' do
   before :each do
     Widget.create! :name => 'Thing'
   end

data/spec/acceptance/namespaced_resource_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'namespaced views' do
+  before :each do
+    Author.create :name => 'Neil Gaiman'
+    Author.create :name => 'Terry Pratchett'
+  end
+
+  it "lists the pages" do
+    visit admin_authors_path
+
+    page.should have_content('Authors')
+    page.should have_content('Neil Gaiman')
+    page.should have_content('Terry Pratchett')
+  end
+
+  it "creates a new page" do
+    visit admin_authors_path
+
+    click_link 'New Author'
+
+    fill_in 'Name', :with => 'Haruki Murakami'
+    click_button 'Save Author'
+
+    page.should have_content('Haruki Murakami')
+  end
+
+  it "edits an existing page" do
+    visit admin_authors_path
+
+    click_link 'Neil Gaiman'
+    click_link 'Edit'
+
+    fill_in 'Name', :with => 'China Mieville'
+    click_button 'Save Author'
+
+    page.should have_content('China Mieville')
+    page.should have_no_content('Neil Gaiman')
+  end
+
+  it "deletes pages" do
+    visit admin_authors_path
+
+    click_link 'Neil Gaiman'
+    click_link 'Delete'
+    click_button 'Confirm'
+
+    page.should have_content('Terry Pratchett')
+    page.should have_no_content('Neil Gaiman')
+  end
+end

data/spec/acceptance/scoped_resource_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'scoped views' do
+  before :each do
+    Link.create :title => 'XKCD',        :url => 'http://xkcd.com'
+    Link.create :title => 'Big Picture', :url => 'http://boston.com/bigpicture/'
+  end
+
+  it "lists the pages" do
+    visit my_links_path
+
+    page.should have_content('Links')
+    page.should have_content('XKCD')
+    page.should have_content('Big Picture')
+  end
+
+  it "creates a new page" do
+    visit my_links_path
+
+    click_link 'New Link'
+
+    fill_in 'Title', :with => 'Github'
+    fill_in 'Url',   :with => 'http://github.com'
+    click_button 'Save Link'
+
+    page.should have_content('Github')
+  end
+
+  it "edits an existing page" do
+    visit my_links_path
+
+    click_link 'Big Picture'
+    click_link 'Edit'
+
+    fill_in 'Title', :with => 'Boston Herald'
+    click_button 'Save Link'
+
+    page.should have_content('Boston Herald')
+    page.should have_no_content('Big Picture')
+  end
+
+  it "deletes pages" do
+    visit my_links_path
+
+    click_link 'Big Picture'
+    click_link 'Delete'
+    click_button 'Confirm'
+
+    page.should have_content('XKCD')
+    page.should have_no_content('Big Picture')
+  end
+end

data/spec/acceptance/standard_namespace_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'standard setup', :driver => :rack_test do
+describe 'standard setup' do
   before :each do
     Page.create :name => 'About Us', :content => 'All you need to know'
     Page.create :name => 'FAQ',      :content => 'All you need to ask'

data/spec/internal/app/models/author.rb

@@ -0,0 +1,5 @@
+class Author < ActiveRecord::Base
+  def identifier
+    name
+  end
+end

data/spec/internal/app/models/link.rb

@@ -0,0 +1,5 @@
+class Link < ActiveRecord::Base
+  def identifier
+    title
+  end
+end

data/spec/internal/app/views/dobro/widgets/_form.html.erb

@@ -6,7 +6,7 @@
     </p>
   </fieldset>
 
-  <fieldset>
+  <fieldset class="buttons">
     <%= f.submit "Save This Widget" %>
   </fieldset>
 <% end %>

data/spec/internal/config/routes.rb

@@ -8,4 +8,12 @@ Rails.application.routes.draw do
       put :approve
     end
   end
+
+  namespace :admin do
+    dobro_for :authors
+  end
+
+  scope 'my', :as => 'my' do
+    dobro_for :links
+  end
 end

data/spec/internal/db/schema.rb

@@ -1,4 +1,15 @@
 ActiveRecord::Schema.define do
+  create_table(:authors, :force => true) do |t|
+    t.string :name
+    t.timestamps
+  end
+
+  create_table(:links, :force => true) do |t|
+    t.string :title
+    t.string :url
+    t.timestamps
+  end
+
   create_table(:pages, :force => true) do |t|
     t.string :name
     t.text   :content
@@ -8,6 +19,7 @@ ActiveRecord::Schema.define do
   create_table(:tasks, :force => true) do |t|
     t.string :description
     t.boolean :approved
+    t.timestamps
   end
 
   create_table(:widgets, :force => true) do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dobro
 version: !ruby/object:Gem::Version
-  version: 0.1.0alpha3
+  version: 0.1.0alpha4
   prerelease: 5
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-08-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70338764799960 !ruby/object:Gem::Requirement
+  requirement: &70268690516720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.0rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70338764799960
+  version_requirements: *70268690516720
 - !ruby/object:Gem::Dependency
   name: decent_exposure
-  requirement: &70338764799460 !ruby/object:Gem::Requirement
+  requirement: &70268690513540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338764799460
+  version_requirements: *70268690513540
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70338764798960 !ruby/object:Gem::Requirement
+  requirement: &70268690511680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 3.1.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70338764798960
+  version_requirements: *70268690511680
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70338764798460 !ruby/object:Gem::Requirement
+  requirement: &70268690510640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70338764798460
+  version_requirements: *70268690510640
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70338764797960 !ruby/object:Gem::Requirement
+  requirement: &70268690509420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70338764797960
+  version_requirements: *70268690509420
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70338764797500 !ruby/object:Gem::Requirement
+  requirement: &70268690507540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *70338764797500
+  version_requirements: *70268690507540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70338764797020 !ruby/object:Gem::Requirement
+  requirement: &70268690505100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,7 +89,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70338764797020
+  version_requirements: *70268690505100
 description: A Rails Engine that provides a simple yet effective interface, perfect
   for admin management.
 email:
@@ -115,6 +115,8 @@ files:
 - app/assets/stylesheets/dobro/_fonts.css.scss
 - app/assets/stylesheets/dobro/_reset.css.scss
 - app/controllers/dobro/application_controller.rb
+- app/helpers/dobro_helper.rb
+- app/views/dobro/application/_dashboard.html.erb
 - app/views/dobro/application/_form.html.erb
 - app/views/dobro/application/_show.html.erb
 - app/views/dobro/application/delete.html.erb
@@ -128,12 +130,17 @@ files:
 - lib/dobro.rb
 - lib/dobro/engine.rb
 - lib/dobro/file_system_resolver.rb
+- lib/dobro/resource.rb
 - lib/dobro/routes.rb
 - lib/dobro/version.rb
 - spec/acceptance/custom_actions_spec.rb
 - spec/acceptance/custom_views_spec.rb
+- spec/acceptance/namespaced_resource_spec.rb
+- spec/acceptance/scoped_resource_spec.rb
 - spec/acceptance/standard_namespace_spec.rb
 - spec/internal/app/controllers/tasks_controller.rb
+- spec/internal/app/models/author.rb
+- spec/internal/app/models/link.rb
 - spec/internal/app/models/page.rb
 - spec/internal/app/models/task.rb
 - spec/internal/app/models/widget.rb
@@ -161,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2005177753622462932
+      hash: 2852548357804714324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,8 +184,12 @@ summary: Simple, clean Rails admin interface
 test_files:
 - spec/acceptance/custom_actions_spec.rb
 - spec/acceptance/custom_views_spec.rb
+- spec/acceptance/namespaced_resource_spec.rb
+- spec/acceptance/scoped_resource_spec.rb
 - spec/acceptance/standard_namespace_spec.rb
 - spec/internal/app/controllers/tasks_controller.rb
+- spec/internal/app/models/author.rb
+- spec/internal/app/models/link.rb
 - spec/internal/app/models/page.rb
 - spec/internal/app/models/task.rb
 - spec/internal/app/models/widget.rb