shakes 0.3.1 → 0.4.0

data/README.md

@@ -81,6 +81,29 @@ placed in `app/views/shakes`:
 
     script/generate shakes_views
 
+Now, if I wanted to add a header to the show view, I could by modifying `app/views/shakes/show.html.erb` to the following:
+
+    <h1>Showing <%= @resource_class.human_name.downcase %></h1>
+    
+    <%- @resource_class.column_names.each do |column_name| %>
+      <%- unless %w{id created_at updated_at}.include? column_name %>
+        <p>
+          <b><%= @resource_class.human_attribute_name column_name.to_sym %>:</b>
+          <%=h @resource[column_name.to_sym]%>
+        </p>
+      <% end -%>
+    <% end -%>
+
+    <%- if @controller_class.new.respond_to? :edit %>
+      <%= link_to 'Edit', method("edit_#{@resource_instance_name}_path".to_sym).call(@resource) %>
+    <% end -%>
+    <%- if @controller_class.new.respond_to? :edit and @controller_class.new.respond_to? :index %>
+      |
+    <% end -%>
+    <%- if @controller_class.new.respond_to? :index %>
+      <%= link_to "Back", method("#{@resource_collection_name}_path".to_sym).call %>
+    <% end -%>
+
 Formtastic Aware Layouts
 ------------------------
 The default `new` and `edit` view implementations use Formtastic to create the form HTML. To get the most out of

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

@@ -1,4 +1,25 @@
+<%- unless Shakes::Helpers::ViewsHelper::Configuration.use_formtastic -%>
+<% form_for @resource do |form| %>
+  <fieldset class="inputs">
+    <ol>
+    <%- shakes_fields_for(action).each do |field| -%>
+      <% content_tag :li, :class => shakes_field_type_for(field).to_s do -%>
+        <%= shakes_render_field field, action, @resource, form %>
+      <%- end %>
+    <%- end -%>
+    </ol>
+  </fieldset>
+  <fieldset class="buttons">
+    <ol>
+      <% content_tag :li, :class => 'commit' do -%>
+        <%= form.submit "#{((action.eql? :new) ? 'Create' : 'Update')} #{shakes_human_name}" %>
+      <%- end %>
+    </ol>
+  </fieldset>
+<% end %>
+<%- else -%>
 <% semantic_form_for @resource do |form| %>
   <%= form.inputs %>
   <%= form.buttons %>
 <% end %>
+<%- end -%>

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

@@ -1,12 +1,3 @@
-<h1>Editing <%= @resource_class.human_name.downcase %></h1>
-<%= render :partial => 'shakes/form' %>
-
-<%- if @controller_class.new.respond_to? :show %>
-  <%= link_to 'Show', @resource %>
-<% end -%>
-<%- if @controller_class.new.respond_to? :show and @controller_class.new.respond_to? :index %>
-  |
-<% end -%>
-<%- if @controller_class.new.respond_to? :index %>
-  <%= link_to "Back", method("#{@resource_collection_name}_path".to_sym).call %>
-<% end -%>
+<h1>Editing <%= shakes_human_name %></h1>
+<%= render :partial => 'shakes/form', :locals => { :action => :edit } %>
+<%= content_tag :p, shakes_link_to_for([:show, :index], @resource), :class => 'actions' %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.check_box field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.date_select field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.datetime_select field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.text_field field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.text_area field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.time_select field %>

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

@@ -0,0 +1 @@
+<%= form.label field %> <%= form.datetime_select field %>

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

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

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

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

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

@@ -1,39 +1,18 @@
-<h1>Listing <%= @resource_class.human_name.downcase.pluralize %></h1>
-
+<h1>Listing <%= shakes_human_name.pluralize %></h1>
 <table>
   <tr>
-    <%- @resource_class.column_names.each do |column_name| %>
-      <%- unless %W{id created_at updated_at}.include? column_name %>
-        <th><%= @resource_class.human_attribute_name column_name.to_sym %></th>
-      <% end -%>
-    <% end -%>
+  <%- shakes_fields_for(:index).each do |field| -%>
+    <%= content_tag :th, shakes_human_attribute_name_for(field).titleize, :class => shakes_field_type_for(field).to_s %>
+  <%- end -%>
+  <%= content_tag :th, 'Actions', :class => 'actions' %>
   </tr>
-  <% @resources.each do |resource| %>
+  <%- @resources.each do |resource| -%>
     <tr>
-      <%- @resource_class.column_names.each do |column_name| %>
-        <%- unless %W{id created_at updated_at}.include? column_name %>
-          <td><%=h resource[column_name.to_sym]%></td>
-        <% end -%>
-      <% end -%>
-      <td>
-        <%- if @controller_class.new.respond_to? :show %>
-          <%= link_to 'Show', resource %>
-        <% end -%>
-      </td>
-      <td>
-        <%- if @controller_class.new.respond_to? :edit %>
-          <%= link_to 'Edit', method("edit_#{@resource_instance_name}_path".to_sym).call(resource) %>
-        <% end -%>
-      </td>
-      <td>
-        <%- if @controller_class.new.respond_to? :destroy %>
-          <%= link_to 'Destroy', resource, :confirm => 'Are you sure?', :method => :delete %>
-        <% end -%>
-      </td>
+    <%- shakes_fields_for(:index).each do |field| -%>
+      <%= content_tag :td, shakes_render_field(field, :index, resource), :class => shakes_field_type_for(field).to_s %>
+    <%- end -%>
+    <%= content_tag :td, shakes_link_to_for([:show, :edit, :destroy], resource), :class => 'actions' %>
     </tr>
-  <% end %>
+  <%- end -%>
 </table>
-
-<%- if @controller_class.new.respond_to? :new %>
-  <%= link_to "New #{@resource_class.human_name.downcase}", method("new_#{@resource_instance_name}_path".to_sym).call %>
-<% end -%>
+<%= content_tag :p, shakes_link_to_for([:new]), :class => 'actions' %>

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

@@ -1,6 +1,3 @@
-<h1>New <%= @resource_class.human_name.downcase %></h1>
-<%= render :partial => 'shakes/form' %>
-
-<%- if @controller_class.new.respond_to? :index %>
-  <%= link_to "Back", method("#{@resource_collection_name}_path".to_sym).call %>
-<% end -%>
+<h1>New <%= shakes_human_name %></h1>
+<%= render :partial => 'shakes/form', :locals => { :action => :new } %>
+<%= content_tag :p, shakes_link_to_for([:index], @resource), :class => 'actions' %>

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

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

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

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

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

@@ -1,18 +1,9 @@
-<%- @resource_class.column_names.each do |column_name| %>
-  <%- unless %W{id created_at updated_at}.include? column_name %>
-    <p>
-      <b><%= @resource_class.human_attribute_name column_name.to_sym %>:</b>
-      <%=h @resource[column_name.to_sym]%>
-    </p>
-  <% end -%>
-<% end -%>
-
-<%- if @controller_class.new.respond_to? :edit %>
-  <%= link_to 'Edit', method("edit_#{@resource_instance_name}_path".to_sym).call(@resource) %>
-<% end -%>
-<%- if @controller_class.new.respond_to? :edit and @controller_class.new.respond_to? :index %>
-  |
-<% end -%>
-<%- if @controller_class.new.respond_to? :index %>
-  <%= link_to "Back", method("#{@resource_collection_name}_path".to_sym).call %>
-<% end -%>
+<h1>Showing <%= shakes_human_name %></h1>
+<ol class="fields">
+<%- shakes_fields_for(:show).each do |field| -%>
+<% content_tag :li, :class => shakes_field_type_for(field).to_s do -%>
+  <%= shakes_render_field field, :show, @resource %>
+<%- end %>
+<%- end -%>
+</ol>
+<%= content_tag :p, shakes_link_to_for([:edit, :index], @resource), :class => 'actions' %>

data/generators/shakes/shakes_generator.rb

@@ -5,9 +5,9 @@ class ShakesGenerator < Rails::Generator::Base
   
   def manifest
     record do |m|
+      m.directory 'config/initializers'
+      m.file 'initializer.rb', "config/initializers/shakes.rb"
       m.dependency 'shakes_layout', []
-      m.dependency 'shakes_views', []
-      m.dependency 'shakes_actions', []
     end
   end
   

data/generators/{shakes_actions → shakes}/templates/initializer.rb

@@ -18,3 +18,9 @@
 
 # Set the default destroy action module. Default is Shakes::Actions::Destroy
 # Shakes::HasTheShakes::Configuration.destroy_action = Shakes::Actions::Destroy
+
+# Should Shakes attempt to use formtastic to render forms. Default is false
+# Shakes::Helpers::ViewsHelper::Configuration.use_formtastic = false
+
+# Should Shakes attempt to use markdown to display text fields. Default is false
+# Shakes::Helpers::ViewsHelper::Configuration.use_markdown = false

data/generators/shakes_layout/shakes_layout_generator.rb

@@ -9,8 +9,9 @@ class ShakesLayoutGenerator < Rails::Generator::Base
       m.directory 'app/views/layouts'
       m.directory 'public/stylesheets'
       m.template 'layout.html.erb', "app/views/layouts/#{file_name}.html.erb"
+      m.file 'shakes.css', "public/stylesheets/shakes.css"
+      m.file 'shakes_changes.css', "public/stylesheets/shakes_changes.css"
       m.file 'stylesheet.css', "public/stylesheets/#{file_name}.css"
-      m.dependency 'formtastic', []
     end
   end
   

data/generators/shakes_layout/templates/layout.html.erb

@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <title><%%= "#{controller.controller_name}##{controller.action_name}" %></title>
-  <%%= formtastic_stylesheet_link_tag %>
+  <title><%%= "#{controller.controller_name}##{controller.action_name}" %> - <%= file_name.titleize %></title>
+  <%%= shakes_stylesheet_link_tag %>
   <%%= stylesheet_link_tag '<%= file_name %>' %>
   <%%= yield :head %>
 </head>

data/generators/shakes_layout/templates/stylesheet.css

@@ -1,17 +1 @@
-body {
-	background-color: #fff;
-	color: #666;
-	font-family: Tahoma,Arial,Helvetica,sans-serif;
-	margin: 1em auto;
-	width: 940px;
-}
-a {
-	color: #000;
-	font-weight: bold;
-}
-h1, h2, h3, h4, h5, h6 {
-	color: #696;
-	font-family: Georgia,Utopia,Palatino,'Palatino Linotype',serif;
-	font-variant: small-caps;
-	letter-spacing: 0.1em;
-}
+/* Put your layout specifc styles in this file. */

data/lib/shakes/helpers/layout_helper.rb

@@ -0,0 +1,9 @@
+module Shakes
+  module Helpers
+    module LayoutHelper
+      def shakes_stylesheet_link_tag
+        stylesheet_link_tag("shakes") + stylesheet_link_tag("shakes_changes")
+      end
+    end
+  end
+end

data/lib/shakes/helpers/views_helper.rb

@@ -0,0 +1,87 @@
+module Shakes
+  module Helpers
+    module ViewsHelper
+      class Configuration
+        cattr_accessor :use_formtastic, :use_markdown
+        self.use_formtastic = false
+        self.use_markdown = false
+      end
+      
+      def shakedown(content, options={})
+        Configuration.use_markdown && options[:markdown] ? markdown(h(content)) : h(content)
+      end
+      
+      def shakes_field_type_for(field)
+        @resource_class.columns_hash[field.to_s].type
+      end
+      
+      def shakes_fields_for(action)
+        (@resource_class.column_names - %w{id created_at updated_at}).map { |f| f.to_sym }
+      end
+      
+      def shakes_human_attribute_name_for(field)
+        @resource_class.human_attribute_name field
+      end
+      
+      def shakes_human_name
+        @resource_class.human_name
+      end
+      
+      def shakes_link_to_for(actions=[], resource=nil)
+        links = []
+        (actions.map { |action| action.to_sym }).each do |action|
+          case action
+          when :index
+            links << link_to("Back", method("#{@resource_collection_name}_path".to_sym).call) if @controller_class.new.respond_to? :index
+          when :new
+            links << link_to("New #{shakes_human_name}", method("new_#{@resource_instance_name}_path".to_sym).call) if @controller_class.new.respond_to? :new
+          when :show
+            links << link_to('Show', resource) if @controller_class.new.respond_to? :show
+          when :edit
+            links << link_to('Edit', method("edit_#{@resource_instance_name}_path".to_sym).call(resource)) if @controller_class.new.respond_to? :edit
+          when :destroy
+            links << link_to('Destroy', resource, :confirm => 'Are you sure?', :method => :delete) if @controller_class.new.respond_to? :destroy
+          end
+        end
+        links.join(' | ')
+      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 }
+      end
+      
+      protected
+      
+      def partial_directory_for(action)
+        case action.to_sym
+        when :new, :edit
+          'form'
+        else
+          action.to_s
+        end
+      end
+      
+      def partial_name_for(field, action)
+        field_type = (shakes_field_type_for field).to_sym
+        
+        case action.to_sym
+        when :new, :edit
+          case field_type
+          when :boolean, :date, :datetime, :text, :time, :timestamp
+            field_type.to_s
+          else
+            'field'
+          end
+        else
+          case field_type
+          when :text
+            field_type.to_s
+          else
+            'field'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shakes/helpers.rb

@@ -0,0 +1,6 @@
+module Shakes
+  module Helpers
+    autoload :LayoutHelper, 'shakes/helpers/layout_helper'
+    autoload :ViewsHelper,  'shakes/helpers/views_helper'
+  end
+end

data/lib/shakes.rb

@@ -1,5 +1,8 @@
 module Shakes
   autoload :Actions,      'shakes/actions'
   autoload :HasTheShakes, 'shakes/has_the_shakes'
+  autoload :Helpers,      'shakes/helpers'
 end
 ActionController::Base.send :include, Shakes::HasTheShakes
+ActionView::Base.send       :include, Shakes::Helpers::LayoutHelper
+ActionView::Base.send       :include, Shakes::Helpers::ViewsHelper

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jason Stahl
@@ -17,23 +17,8 @@ cert_chain: []
 
 date: 2010-05-26 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: formtastic
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: Shakes provides default implementations for Rails controller actions and views.
 email: jason@jasonstahl.net
 executables: []
@@ -45,14 +30,26 @@ extra_rdoc_files: []
 files: 
 - app/views/shakes/_form.html.erb
 - app/views/shakes/edit.html.erb
+- app/views/shakes/form/_boolean.html.erb
+- app/views/shakes/form/_date.html.erb
+- app/views/shakes/form/_datetime.html.erb
+- app/views/shakes/form/_field.html.erb
+- app/views/shakes/form/_text.html.erb
+- app/views/shakes/form/_time.html.erb
+- app/views/shakes/form/_timestamp.html.erb
+- app/views/shakes/index/_field.html.erb
+- app/views/shakes/index/_text.html.erb
 - app/views/shakes/index.html.erb
 - app/views/shakes/new.html.erb
+- app/views/shakes/show/_field.html.erb
+- app/views/shakes/show/_text.html.erb
 - app/views/shakes/show.html.erb
 - generators/shakes/shakes_generator.rb
-- generators/shakes_actions/shakes_actions_generator.rb
-- generators/shakes_actions/templates/initializer.rb
+- generators/shakes/templates/initializer.rb
 - generators/shakes_layout/shakes_layout_generator.rb
 - generators/shakes_layout/templates/layout.html.erb
+- generators/shakes_layout/templates/shakes.css
+- generators/shakes_layout/templates/shakes_changes.css
 - generators/shakes_layout/templates/stylesheet.css
 - generators/shakes_views/shakes_views_generator.rb
 - generators/shakes_views/templates/touchfile
@@ -65,6 +62,9 @@ files:
 - lib/shakes/actions/update.rb
 - lib/shakes/actions.rb
 - lib/shakes/has_the_shakes.rb
+- lib/shakes/helpers/layout_helper.rb
+- lib/shakes/helpers/views_helper.rb
+- lib/shakes/helpers.rb
 - lib/shakes.rb
 - rails/init.rb
 - README.md

data/generators/shakes_actions/shakes_actions_generator.rb

@@ -1,22 +0,0 @@
-class ShakesActionsGenerator < Rails::Generator::Base
-  def initialize(runtime_args, runtime_options = {})
-    super
-  end
-  
-  def manifest
-    record do |m|
-      m.directory 'config/initializers'
-      m.file 'initializer.rb', "config/initializers/shakes.rb"
-    end
-  end
-  
-  def file_name
-    @name.underscore
-  end
-  
-  protected
- 
-  def banner
-    "Usage: #{$0} #{spec.name}"
-  end
-end