inherited_resources_views 0.3.1 → 0.4.0

data/README.md

@@ -18,11 +18,6 @@ If you are confused about the difference to some other similarly named projects,
 
 [Inherited Views](http://github.com/gregbell/inherited_views) tries to solve the same problem we're solving, but from a slightly different angle. It is more complex, requires [Formtastic](http://github.com/justinfrench/formtastic) and [WillPaginate](http://github.com/mislav/will_paginate), and it only generates erb templates. **Inherited Resources Views** on the other hand, is extremely simple, is library-agnostic (it only depends on [Inherited Resources](http://github.com/josevalim/inherited_resources)), and it supports both erb and [haml](http://github.com/nex3/haml) templates.
 
-## Todo
-
-* Add tests
-* Make default views more elegant and perhaps customisable
-
 ## Dependencies
 
 * [Inherited Resources](http://github.com/josevalim/inherited_resources)
@@ -37,7 +32,7 @@ As a Rails plugin:
 
     # rails 3
     rails plugin install git://github.com/fredwu/inherited_resources_views.git
-    
+
     # rails 2
     script/plugin install git://github.com/fredwu/inherited_resources_views.git
 
@@ -51,10 +46,12 @@ It is *extremely* simple to use Inherited Resources Views. The only step you nee
 
     # rails 3
     rails generate inherited_resources_views
-    
+
     # rails 2
     script/generate inherited_resources_views
 
+    # Please remember to restart your server!
+
 This will generate a set of views in your `app/views/inherited_resources` folder. Edit away!
 
 ## Author

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/inherited_resources_views.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inherited_resources_views}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fred Wu"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-11-04}
   s.description = %q{Using Inherited Resources is an excellent way to reduce the amount of repetition in your controllers. But what about views? A lot of times resources share the same views, so why not DRY 'em up using Inherited Resources Views!}
   s.email = %q{ifredwu@gmail.com}
   s.extra_rdoc_files = [
@@ -26,7 +26,13 @@ Gem::Specification.new do |s|
      "lib/generators/inherited_resources_views/generators/current_generator.rb",
      "lib/generators/inherited_resources_views/generators/legacy_generator.rb",
      "lib/generators/inherited_resources_views/inherited_resources_views_generator.rb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_collection_table.html.erb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_edit_navigation.html.erb",
      "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_form.html.erb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_index_navigation.html.erb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_new_navigation.html.erb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_resource_detail.html.erb",
+     "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_show_navigation.html.erb",
      "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/edit.html.erb",
      "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/index.html.erb",
      "lib/generators/inherited_resources_views/templates/app/views/inherited_resources/new.html.erb",

data/lib/generators/inherited_resources_views/generators/current_generator.rb

@@ -38,6 +38,20 @@ class InheritedResourcesViewsGenerator < Rails::Generators::Base
   end
 
   def create_and_copy_haml_views
+    begin
+      require 'hpricot'
+    rescue LoadError
+      say "Hpricot is not installed, or it is not specified in your Gemfile."
+      exit
+    end
+
+    begin
+      require 'ruby_parser'
+    rescue LoadError
+      say "Ruby_parser is not installed, or it is not specified in your Gemfile."
+      exit
+    end
+
     require 'tmpdir'
     html_root = "#{self.class.source_root}/inherited_resources"
 

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_collection_table.html.erb

@@ -0,0 +1,23 @@
+<table class="<%= collection.first.class.to_s.downcase.pluralize %> collection">
+  <thead>
+    <tr>
+    <% collection.first.attributes.each_pair do |field, value| %>
+      <% next if ['id', 'created_at', 'updated_at'].include?(field) %>
+      <th><%= field.titleize %></th>
+    <% end %>
+    </tr>
+  </thead>
+  <tbody>
+  <% collection.each do |r| %>
+    <tr>
+    <% r.attributes.each_pair do |field, value| %>
+      <% next if ['id', 'created_at', 'updated_at'].include?(field) %>
+      <td><%= value %></td>
+    <% end %>
+      <td><%= link_to "Show", resource_url(r) %></td>
+      <td><%= link_to "Edit", edit_resource_url(r) %></td>
+      <td><%= link_to "Destroy", resource_url(r), :confirm => 'Are you sure?', :method => :delete %></td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_edit_navigation.html.erb

@@ -0,0 +1,2 @@
+<p><%= link_to "Show", resource_url(resource) %></p>
+<p><%= link_to "Back", collection_url %></p>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_form.html.erb

@@ -1,5 +1,8 @@
 <table>
-<%- form_for(resource, :url => resource.new_record? ? collection_url : resource_url(resource)) do |f| %>
+<%- form_for("#{resource_instance_name.to_s.downcase}",
+      resource,
+      :url => resource.new_record? ? collection_url : resource_url(resource),
+      :html => { :method => (resource.new_record? ? "post" : "put") }) do |f| %>
   <% if resource.errors.any? %>
   <tr>
     <td colspan="2">
@@ -12,10 +15,11 @@
     </td>
   </tr>
   <% end %>
-  <% resource.attributes.each do |a| %>
+  <% resource.attributes.each_pair do |field, value| %>
+    <% next if ['id', 'created_at', 'updated_at'].include?(field) %>
     <tr>
-      <td><%= a[0] %></td>
-      <td><%= f.text_field a[0].to_sym %></td>
+      <td><%= field.titleize %></td>
+      <td><%= f.text_field field.to_sym %></td>
     </tr>
   <% end %>
   <tr>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_index_navigation.html.erb

@@ -0,0 +1 @@
+<p><%= link_to "New", new_resource_url %></p>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_new_navigation.html.erb

@@ -0,0 +1 @@
+<p><%= link_to "Back", collection_url %></p>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_resource_detail.html.erb

@@ -0,0 +1,9 @@
+<table class="<%= collection.first.class.to_s.downcase %> detail">
+<% resource.attributes.each_pair do |attr, value| %>
+  <% next if ['id', 'created_at', 'updated_at'].include?(attr) %>
+  <tr>
+    <th><%= attr.titleize %></th>
+    <td><%= value %></td>
+  </tr>
+<% end %>
+</table>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_show_navigation.html.erb

@@ -0,0 +1,2 @@
+<p><%= link_to "Edit", edit_resource_url(resource) %></p>
+<p><%= link_to "Back", collection_url %></p>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/edit.html.erb

@@ -1,4 +1,5 @@
+<h1>Edit <%= resource.class %></h1>
+
 <%= render "form" %>
 
-<p><%= link_to "Show", resource_url(resource) %></p>
-<p><%= link_to "Back", collection_url %></p>
+<%= render "edit_navigation" %>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/index.html.erb

@@ -1,25 +1,7 @@
-<p><%= link_to "New", new_resource_url %></p>
+<h1><%= controller.controller_name.titleize %></h1>
+
+<%= render "index_navigation" %>
 
 <% if collection.any? %>
-<table>
-  <thead>
-    <tr>
-    <% collection.first.attributes.each do |a| %>
-      <th><%= a[0] %></th>
-    <% end %>
-    </tr>
-  </thead>
-  <tbody>
-  <% collection.each do |r| %>
-    <tr>
-    <% r.attributes.each do |a| %>
-      <td><%= a[1] %></td>
-    <% end %>
-      <td><%= link_to "Show", resource_url(r) %></td>
-      <td><%= link_to "Edit", edit_resource_url(r) %></td>
-      <td><%= link_to "Destroy", resource_url(r), :confirm => 'Are you sure?', :method => :delete %></td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+  <%= render "collection_table" %>
 <% end %>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/new.html.erb

@@ -1,3 +1,5 @@
+<h1>New <%= resource.class.titleize %></h1>
+
 <%= render "form" %>
 
-<p><%= link_to "Back", collection_url %></p>
+<%= render "new_navigation" %>

data/lib/generators/inherited_resources_views/templates/app/views/inherited_resources/show.html.erb

@@ -1,11 +1,5 @@
-<table>
-<% resource.attributes.each do |a| %>
-  <tr>
-    <th><%= a[0] %></th>
-    <td><%= a[1] %></td>
-  </tr>
-<% end %>
-</table>
+<h1><%= resource.class %></h1>
 
-<p><%= link_to "Edit", edit_resource_url(resource) %></p>
-<p><%= link_to "Back", collection_url %></p>
+<%= render("resource_detail") %>
+
+<%= render("show_navigation") %>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Fred Wu
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +10:00
+date: 2010-11-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,13 @@ files:
 - lib/generators/inherited_resources_views/generators/current_generator.rb
 - lib/generators/inherited_resources_views/generators/legacy_generator.rb
 - lib/generators/inherited_resources_views/inherited_resources_views_generator.rb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_collection_table.html.erb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_edit_navigation.html.erb
 - lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_form.html.erb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_index_navigation.html.erb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_new_navigation.html.erb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_resource_detail.html.erb
+- lib/generators/inherited_resources_views/templates/app/views/inherited_resources/_show_navigation.html.erb
 - lib/generators/inherited_resources_views/templates/app/views/inherited_resources/edit.html.erb
 - lib/generators/inherited_resources_views/templates/app/views/inherited_resources/index.html.erb
 - lib/generators/inherited_resources_views/templates/app/views/inherited_resources/new.html.erb