shakes 0.4.1 → 0.4.2

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

@@ -1,5 +1,5 @@
 <%- unless Shakes::Helpers::ViewsHelper::Configuration.use_formtastic -%>
-<% form_for @resource do |form| %>
+<% form_for(@resource, :url => shakes_path_for(action, @resource)) do |form| %>
   <fieldset class="inputs">
     <ol>
     <%- shakes_fields_for(action).each do |field| -%>
@@ -18,7 +18,7 @@
   </fieldset>
 <% end %>
 <%- else -%>
-<% semantic_form_for @resource do |form| %>
+<% semantic_form_for(@resource, :url => shakes_path_for(action, @resource)) do |form| %>
   <%= form.inputs %>
   <%= form.buttons %>
 <% end %>

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-<%= form.label field %> <%= form.text_area field %>
+<%= form.label field, shakes_human_attribute_name_for(field).titleize %> <%= form.text_area field %>

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

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

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

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

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

@@ -4,14 +4,14 @@
   <%- 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' %>
+    <%= content_tag :th, 'Actions', :class => 'actions' %>
   </tr>
   <%- @resources.each do |resource| -%>
     <tr>
     <%- 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' %>
+      <%= content_tag :td, shakes_link_to_for([:show, :edit, :destroy], resource), :class => 'actions' %>
     </tr>
   <%- end -%>
 </table>

data/lib/shakes/has_the_shakes.rb

@@ -40,6 +40,10 @@ module Shakes
         @controller_class ||= Object::const_get(self.class.name.classify)
       end
 
+      def controller_class_name
+        @controller_class_name ||= self.class.name.sub!(/Controller$/,'').singularize.underscore
+      end
+
       def resource_class
         @resource_class ||= Object::const_get(self.class.shakes_resource.classify)
       end
@@ -64,6 +68,7 @@ module Shakes
           raise unless self.shakes_actions.include? options[:action].to_sym
 
           controller_class
+          controller_class_name
           resource_class
           resource_collection_name
           resource_instance_name

data/lib/shakes/helpers/layout_helper.rb

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

data/lib/shakes/helpers/views_helper.rb

@@ -24,23 +24,37 @@ module Shakes
       end
       
       def shakes_human_name
+        puts @resource_class.human_name
         @resource_class.human_name
       end
       
+      def shakes_path_for(action, resource=nil)
+        case action
+        when :index
+          method("#{@controller_class_name.pluralize}_path".to_sym).call
+        when :new
+          method("new_#{@controller_class_name}_path".to_sym).call
+        when :show, :destroy
+          method("#{@controller_class_name}_path".to_sym).call(resource)
+        when :edit
+          method("edit_#{@controller_class_name}_path".to_sym).call(resource)
+        end
+      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
+            links << link_to("Back", shakes_path_for(:index)) 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
+            links << link_to("New #{shakes_human_name}", shakes_path_for(:new)) if @controller_class.new.respond_to? :new
           when :show
-            links << link_to('Show', resource) if @controller_class.new.respond_to? :show
+            links << link_to('Show', shakes_path_for(: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
+            links << link_to('Edit', shakes_path_for(:edit, 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
+            links << link_to('Destroy', shakes_path_for(:destroy, resource), :confirm => 'Are you sure?', :method => :delete) if @controller_class.new.respond_to? :destroy
           end
         end
         links.join(' | ')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jason Stahl