shakes 0.7.0 → 0.8.0

data/README.md

@@ -173,18 +173,14 @@ following command will create a new Shakes aware layout at `app/views/layouts/ar
 
 Configuring The Views
 ---------------------
-There are two configuration options available when rendering Shakes views. They tell Shakes to use
-[Formtastic](http://github.com/justinfrench/formtastic/) to render forms and Markdown to render text fields
-respectively. They both default to `false`. To change one or both to `true` you need to install the Shakes initializer.
-You can do that by running the following command (this will also generate a Shakes aware layout):
+There is only one configuration options available at the moment when rendering Shakes views. It tells Shakes to use
+Markdown to render text fields. It defaults to `false`. To change it to `true` you need to install the Shakes
+initializer. You can do that by running the following command (this will also generate a Shakes aware layout):
 
     script/generate shakes
     
 Than you can modify `config/initializers/shakes.rb` like so:
 
-    # Should Shakes attempt to use formtastic to render forms. Default is false
-    Shakes::Helpers::ViewsHelper::Configuration.use_formtastic = true
-
     # Should Shakes attempt to use markdown to display text fields. Default is false
     Shakes::Helpers::ViewsHelper::Configuration.use_markdown = true
 
@@ -246,11 +242,11 @@ Now, if I wanted the show view to render like the original scaffold markup, I co
 
     <%- show_attributes.each do |field| -%>
       <% content_tag :p do %>
-        <%= content_tag :b, shakes_human_attribute_name_for(field) %>
+        <%= content_tag :b, attribute_human_name(field) %>
         <%= h @resource[field] %>
       <% end %>
     <%- end -%>
-    <%= shakes_link_to_for([:edit, :index], @resource) %>
+    <%= links_to_actions([:edit, :index], @resource) %>
 
 Alternatively, I could have just created `app/views/shakes/show.html.erb` without running the generator if that's all I
 wanted to change.
@@ -260,6 +256,7 @@ TODO
 * Add validation error messages to forms
 * Style flash messages
 * Support custom actions and views
+* Support nested resources
 * Support Rails 3
 
 Copyright

data/app/views/shakes/_form.html.erb

@@ -1,10 +1,9 @@
-<%- unless Shakes::Helpers::ViewsHelper::Configuration.use_formtastic -%>
-<% form_for(@resource, :url => controller_action_path(controller, ((action.eql? :new) ? :create : :update ), @resource)) do |form| %>
+<% form_for(@resource, :url => action_path(((action.eql? :new) ? :create : :update ), @resource)) do |form| %>
   <fieldset class="fields">
     <ol>
-    <%- form_attributes(action).each do |field| -%>
-      <% content_tag :li, :class => ['field', shakes_field_type_for(field).to_s].join(' ') do -%>
-        <%= shakes_render_field field, action, @resource, form %>
+    <%- form_attributes(action).each do |attribute| -%>
+      <% content_tag :li, :class => ['attribute', attribute_type(attribute).to_s].join(' ') do -%>
+        <%= render_attribute action, attribute, @resource, form %>
       <%- end %>
     <%- end -%>
     </ol>
@@ -12,14 +11,8 @@
   <fieldset class="buttons">
     <ol>
       <% content_tag :li, :class => 'commit' do -%>
-        <%= form.submit "#{((action.eql? :new) ? 'Create' : 'Update')} #{shakes_human_name}" %>
+        <%= form.submit "#{((action.eql? :new) ? 'Create' : 'Update')} #{controller_human_name}" %>
       <%- end %>
     </ol>
   </fieldset>
 <% end %>
-<%- else -%>
-<% semantic_form_for(@resource, :url => controller_action_path(controller, action, @resource)) do |form| %>
-  <%= form.inputs %>
-  <%= form.buttons %>
-<% end %>
-<%- end -%>

data/app/views/shakes/edit.html.erb

@@ -1,6 +1,6 @@
 <div class="article">
   <div class="section">
-    <%= title "Edit #{shakes_human_name}", :h1 %>
+    <%= title "Edit #{controller_human_name}", :h1 %>
     <%= render :partial => 'shakes/form', :locals => { :action => :edit } %>
   </div>
 </div>
@@ -8,7 +8,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- shakes_link_to_for([:show, :destroy, :index], @resource).each do |link| -%>
+    <%- links_to_actions([:show, :destroy, :index], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/app/views/shakes/form/_boolean.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.check_box field %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.check_box attribute %>

data/app/views/shakes/form/_date.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.date_select field %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.date_select attribute %>

data/app/views/shakes/form/_datetime.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.datetime_select field %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.datetime_select attribute %>

data/app/views/shakes/form/_field.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.text_field field %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.text_field attribute %>

data/app/views/shakes/form/_text.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.text_area field, :rows => 10 %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.text_area attribute, :rows => 10 %>

data/app/views/shakes/form/_time.html.erb

@@ -1,2 +1,2 @@
-<%= form.label field, shakes_human_attribute_name_for(field).titleize %>
-<%= form.time_select field %>
+<%= form.label attribute, attribute_human_name(attribute).titleize %>
+<%= form.time_select attribute %>

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

@@ -1,22 +1,22 @@
 <div class="article">
   <div class="section">
-    <%= title "List #{shakes_human_name.pluralize}", :h1 %>
+    <%= title "List #{controller_human_name.pluralize}", :h1 %>
     <table class="collection">
       <tr class="headers">
-      <%- index_attributes.each do |field| -%>
-        <%= content_tag :th, shakes_human_attribute_name_for(field).titleize %>
+      <%- index_attributes.each do |attribute| -%>
+        <%= content_tag :th, attribute_human_name(attribute).titleize %>
       <%- end -%>
         <%= content_tag :th, 'Actions', :class => 'actions' %>
       </tr>
     <%- @resources.each do |resource| -%>
       <tr class="fields">
-      <%- index_attributes.each do |field| -%>
-        <%= content_tag :td, shakes_render_field(field, :index, resource),
-            :class => ['field', shakes_field_type_for(field).to_s].join(' ') %>
+      <%- index_attributes.each do |attribute| -%>
+        <%= content_tag :td, render_attribute(:index, attribute, resource),
+            :class => ['field', attribute_type(attribute).to_s].join(' ') %>
       <%- end -%>
         <% content_tag :td, :class => 'actions' do %>
           <ul class="links">
-          <% shakes_link_to_for([:show, :edit, :destroy], resource, :short_name => true).each do |link| %>
+          <% links_to_actions([:show, :edit, :destroy], resource, :short => true).each do |link| %>
             <%= content_tag :li, link %>
           <% end %>
           </ul>
@@ -30,7 +30,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- shakes_link_to_for([:new], @resource).each do |link| -%>
+    <%- links_to_actions([:new], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/app/views/shakes/index/_field.html.erb

@@ -1 +1 @@
-<%= h(resource[field]) %>
+<%= h(resource[attribute]) %>

data/app/views/shakes/index/_text.html.erb

@@ -1 +1 @@
-<%= resource[field].length > 255 ? shakedown("#{resource[field][0,252]}...") : shakedown(resource[field]) %>
+<%= resource[attribute].length > 255 ? shakedown("#{resource[attribute][0,252]}...") : shakedown(resource[attribute]) %>

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

@@ -1,6 +1,6 @@
 <div class="article">
   <div class="section">
-    <%= title "New #{shakes_human_name}", :h1 %>
+    <%= title "New #{controller_human_name}", :h1 %>
     <%= render :partial => 'shakes/form', :locals => { :action => :new } %>
   </div>
 </div>
@@ -8,7 +8,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- shakes_link_to_for([:index], @resource).each do |link| -%>
+    <%- links_to_actions([:index], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/app/views/shakes/show.html.erb

@@ -1,10 +1,10 @@
 <div class="article">
   <div class="section">
-    <%= title "Show #{shakes_human_name}", :h1 %>
+    <%= title "Show #{controller_human_name}", :h1 %>
     <ol class="fields">
-    <%- show_attributes.each do |field| -%>
-      <% content_tag :li, :class => ['field', shakes_field_type_for(field).to_s].join(' ') do -%>
-        <%= shakes_render_field field, :show, @resource %>
+    <%- show_attributes.each do |attribute| -%>
+      <% content_tag :li, :class => ['attribute', attribute_type(attribute).to_s].join(' ') do -%>
+        <%= render_attribute :show, attribute, @resource %>
       <%- end %>
     <%- end -%>
     </ol>
@@ -14,7 +14,7 @@
   <div class="section">
     <h1>Related Links</h1>
     <ul class="links">
-    <%- shakes_link_to_for([:edit, :destroy, :index], @resource).each do |link| -%>
+    <%- links_to_actions([:edit, :destroy, :index], @resource).each do |link| -%>
       <%= content_tag :li, link%>
     <%- end -%>
     </ul>

data/app/views/shakes/show/_field.html.erb

@@ -1,2 +1,2 @@
-<%= content_tag :label, shakes_human_attribute_name_for(field).titleize %>
-<%= content_tag :span, h(resource[field]) %>
+<%= content_tag :label, attribute_human_name(attribute).titleize %>
+<%= content_tag :span, h(resource[attribute]) %>

data/app/views/shakes/show/_text.html.erb

@@ -1,2 +1,2 @@
-<%= content_tag :label, shakes_human_attribute_name_for(field).titleize %>
-<%= content_tag :div, shakedown(resource[field]) %>
+<%= content_tag :label, attribute_human_name(attribute).titleize %>
+<%= content_tag :div, shakedown(resource[attribute]) %>

data/lib/shakes/actions/create.rb

@@ -6,7 +6,7 @@ module Shakes
 
         respond_to do |format|
           if @resource.save
-            format.html { redirect_to(controller_action_path(self, :show, @resource), :notice => "#{self.class.model_class.to_s} was successfully created.") }
+            format.html { redirect_to(action_path(:show, @resource), :notice => "#{self.class.model_class.to_s} was successfully created.") }
             format.xml  { render :xml => @resource, :status => :created, :location => @resource }
             format.json { render :json => @resource, :status => :created, :location => @resource }
           else

data/lib/shakes/actions/destroy.rb

@@ -6,7 +6,7 @@ module Shakes
         @resource.destroy
 
         respond_to do |format|
-          format.html { redirect_to(controller_action_path(self, :index)) }
+          format.html { redirect_to(action_path(:index)) }
           format.xml  { head :ok }
           format.json { head :ok }
         end

data/lib/shakes/actions/update.rb

@@ -6,7 +6,7 @@ module Shakes
 
         respond_to do |format|
           if @resource.update_attributes(params[self.class.model_name.to_sym])
-            format.html { redirect_to(controller_action_path(self, :show, @resource), :notice => "#{self.class.model_class.to_s} was successfully updated.") }
+            format.html { redirect_to(action_path(:show, @resource), :notice => "#{self.class.model_class.to_s} was successfully updated.") }
             format.xml  { head :ok }
             format.json { head :ok }
           else

data/lib/shakes/has_the_shakes.rb

@@ -88,6 +88,10 @@ module Shakes
           super "shakes/#{options[:action]}.html.erb"
         end
       end
+      
+      def action_path(action, resource=nil)
+        controller_action_path(self, action, resource)
+      end
     
       private
     

data/lib/shakes/helpers/views_helper.rb

@@ -2,8 +2,7 @@ module Shakes
   module Helpers
     module ViewsHelper
       class Configuration
-        cattr_accessor :use_formtastic, :use_markdown
-        self.use_formtastic = false
+        cattr_accessor :use_markdown
         self.use_markdown = false
       end
       
@@ -23,56 +22,85 @@ module Shakes
       def form_attributes(action)
         (action.eql? :new) ? controller.class.new_attributes : controller.class.edit_attributes
       end
-
-      def shakedown(content, options={})
-        Configuration.use_markdown && options[:markdown] ? markdown(h(content)) : h(content)
-      end
-
-
       
-      def shakes_field_type_for(field)
+      def attribute_type(attribute)
         columns_hash = controller.class.model_class.columns_hash
-        (columns_hash.has_key? field.to_s) ? columns_hash[field.to_s].type : 'string'
+        (columns_hash.has_key? attribute.to_s) ? columns_hash[attribute.to_s].type : 'string'
+      end
+      
+      def controller_human_name
+        controller.class.model_class.human_name
       end
       
-      def shakes_human_attribute_name_for(field)
-        controller.class.model_class.human_attribute_name field
+      def attribute_human_name(attribute)
+        controller.class.model_class.human_attribute_name attribute
+      end
+
+      def shakedown(text, options={})
+        Configuration.use_markdown && options[:markdown] ? markdown(h(text)) : h(text)
       end
       
-      def shakes_human_name
-        controller.class.model_class.human_name
+      def controller_action?(action)
+        controller.respond_to? action
       end
       
-      def shakes_link_to_for(actions=[], *args)
+      def action_path(action, resource=nil)
+        controller_action_path(controller, action, resource)
+      end
+      
+      def link_to_action(action, *args)
         resource  = (args.empty? or args.first.is_a? Hash) ? nil : args.shift
         options   = (args.empty?) ? {} : args.shift
         links     = []
-        options[:short_name] ||= false
+        options[:short] ||= false
+
+        case action
+        when :index
+          link_to(action_label(action, options), action_path(:index))
+        when :new
+          link_to(action_label(action, options), action_path(:new))
+        when :show
+          link_to(action_label(action, options), action_path(:show, resource))
+        when :edit
+          link_to(action_label(action, options), action_path(:edit, resource))
+        when :destroy
+          link_to(action_label(action, options), action_path(:destroy, resource), :confirm => 'Are you sure?', :method => :delete)
+        end
+      end
+      
+      def links_to_actions(actions=[], *args)
+        links = []
         (actions.map { |action| action.to_sym }).each do |action|
-          case action
-          when :index
-            links << link_to((options[:short_name] ? 'List' : "List all #{shakes_human_name.pluralize}"), controller_action_path(controller, :index)) if controller.respond_to? :index
-          when :new
-            links << link_to((options[:short_name] ? 'New' : "Create a new #{shakes_human_name}"), controller_action_path(controller, :new)) if controller.respond_to? :new
-          when :show
-            links << link_to((options[:short_name] ? 'Show' : "Show this #{shakes_human_name}"), controller_action_path(controller, :show, resource)) if controller.respond_to? :show
-          when :edit
-            links << link_to((options[:short_name] ? 'Edit' : "Edit this #{shakes_human_name}"), controller_action_path(controller, :edit, resource)) if controller.respond_to? :edit
-          when :destroy
-            links << link_to((options[:short_name] ? 'Delete' : "Delete this #{shakes_human_name}"), controller_action_path(controller, :destroy, resource), :confirm => 'Are you sure?', :method => :delete) if controller.respond_to? :destroy
-          end
+          links << link_to_action(action, *args) if controller_action? action
         end
         links
       end
       
-      def shakes_render_field(field, action, resource=nil, form=nil)
-        render :partial => "shakes/#{partial_directory_for action}/#{partial_name_for field, action}",
-            :locals => { :action => action, :field => field, :resource => resource, :form => form }
+      def render_attribute(action, attribute, resource=nil, form=nil)
+        render :partial => "shakes/#{partial_directory action}/#{partial_name action, attribute}",
+            :locals => { :action => action, :attribute => attribute, :resource => resource, :form => form }
       end
       
       private
       
-      def partial_directory_for(action)
+      def action_label(action, options={})
+        (case action
+        when :index
+          ['List', "List all #{controller_human_name.pluralize}"]
+        when :new
+          ['New', "Create a new #{controller_human_name}"]
+        when :show
+          ['Show', "Show this #{controller_human_name}"]
+        when :edit
+          ['Edit', "Edit this #{controller_human_name}"]
+        when :destroy
+          ['Delete', "Delete this #{controller_human_name}"]
+        else
+          ['Unknown', "Do something unknown"]
+        end)[options[:short] ? 0 : 1]
+      end
+      
+      def partial_directory(action)
         case action.to_sym
         when :new, :edit
           'form'
@@ -81,20 +109,20 @@ module Shakes
         end
       end
       
-      def partial_name_for(field, action)
-        field_type = shakes_field_type_for(field).to_sym
+      def partial_name(action, attribute)
+        type = attribute_type(attribute).to_sym
         case action.to_sym
         when :new, :edit
-          case field_type
+          case type
           when :boolean, :date, :datetime, :text, :time, :timestamp
-            field_type.to_s
+            type.to_s
           else
             'field'
           end
         else
-          case field_type
+          case type
           when :text
-            field_type.to_s
+            type.to_s
           else
             'field'
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jason Stahl