shakes 0.4.2 → 0.4.3

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

@@ -1,5 +1,5 @@
 <%- unless Shakes::Helpers::ViewsHelper::Configuration.use_formtastic -%>
-<% form_for(@resource, :url => shakes_path_for(action, @resource)) do |form| %>
+<% form_for(@resource, :url => shakes_path_for(((action.eql? :new) ? :create : :update ), @resource)) do |form| %>
   <fieldset class="inputs">
     <ol>
     <%- shakes_fields_for(action).each do |field| -%>

data/lib/shakes.rb

@@ -4,5 +4,7 @@ module Shakes
   autoload :Helpers,      'shakes/helpers'
 end
 ActionController::Base.send :include, Shakes::HasTheShakes
+ActionController::Base.send :include, Shakes::Helpers::UrlHelper
 ActionView::Base.send       :include, Shakes::Helpers::LayoutHelper
+ActionView::Base.send       :include, Shakes::Helpers::UrlHelper
 ActionView::Base.send       :include, Shakes::Helpers::ViewsHelper

data/lib/shakes/actions/create.rb

@@ -2,11 +2,11 @@ module Shakes
   module Actions
     module Create
       def create
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.new(params[resource_instance_name.to_sym]))
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.new(params[self.class.shakes_resource_name.to_sym]))
 
         respond_to do |format|
           if @resource.save
-            format.html { redirect_to(@resource, :notice => "#{resource_class.to_s} was successfully created.") }
+            format.html { redirect_to(shakes_path_for(:show, @resource), :notice => "#{self.class.shakes_resource.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

@@ -2,11 +2,11 @@ module Shakes
   module Actions
     module Destroy
       def destroy
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.find(params[:id]))
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.find(params[:id]))
         @resource.destroy
 
         respond_to do |format|
-          format.html { redirect_to(method("#{resource_collection_name}_url".to_sym).call) }
+          format.html { redirect_to(shakes_path_for(:index)) }
           format.xml  { head :ok }
           format.json { head :ok }
         end

data/lib/shakes/actions/edit.rb

@@ -2,7 +2,7 @@ module Shakes
   module Actions
     module Edit
       def edit
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.find(params[:id]))
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.find(params[:id]))
       end
     end
   end

data/lib/shakes/actions/index.rb

@@ -2,7 +2,7 @@ module Shakes
   module Actions
     module Index
       def index
-        @resources = instance_variable_set("@#{resource_collection_name}", resource_class.all)
+        @resources = instance_variable_set("@#{self.class.shakes_resource_collection_name}", self.class.shakes_resource.all)
 
         respond_to do |format|
           format.html # index.html.erb

data/lib/shakes/actions/new.rb

@@ -2,7 +2,7 @@ module Shakes
   module Actions
     module New
       def new
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.new)
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.new)
 
         respond_to do |format|
           format.html # new.html.erb

data/lib/shakes/actions/show.rb

@@ -2,7 +2,7 @@ module Shakes
   module Actions
     module Show
       def show
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.find(params[:id]))
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.find(params[:id]))
 
         respond_to do |format|
           format.html # show.html.erb

data/lib/shakes/actions/update.rb

@@ -2,11 +2,11 @@ module Shakes
   module Actions
     module Update
       def update
-        @resource = instance_variable_set("@#{resource_instance_name}", resource_class.find(params[:id]))
+        @resource = instance_variable_set("@#{self.class.shakes_resource_name}", self.class.shakes_resource.find(params[:id]))
 
         respond_to do |format|
-          if @resource.update_attributes(params[resource_instance_name.to_sym])
-            format.html { redirect_to(@resource, :notice => "#{resource_class.to_s} was successfully updated.") }
+          if @resource.update_attributes(params[self.class.shakes_resource_name.to_sym])
+            format.html { redirect_to(shakes_path_for(:show, @resource), :notice => "#{self.class.shakes_resource.to_s} was successfully updated.") }
             format.xml  { head :ok }
             format.json { head :ok }
           else

data/lib/shakes/has_the_shakes.rb

@@ -19,8 +19,14 @@ module Shakes
     
     module ClassMethods
       def has_the_shakes(options={})
+        cattr_accessor :shakes_controller_name
+        self.shakes_controller_name ||= self.name.sub!(/Controller$/,'').singularize.underscore
+        cattr_accessor :shakes_resource_name
+        self.shakes_resource_name ||= options[:resource] ? options[:resource].to_s.singularize : self.shakes_controller_name
+        cattr_accessor :shakes_resource_collection_name
+        self.shakes_resource_collection_name ||= self.shakes_resource_name.pluralize
         cattr_accessor :shakes_resource
-        self.shakes_resource = options[:resource] ? options[:resource].to_s : self.name.sub!(/Controller$/,'')
+        self.shakes_resource ||= Object::const_get(self.shakes_resource_name.classify)
         send :include, InstanceMethods
 
         cattr_accessor :shakes_actions
@@ -36,43 +42,14 @@ module Shakes
     end
   
     module InstanceMethods
-      def controller_class
-        @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
-    
-      def resource_collection_name
-        @resource_collection_name ||= self.class.shakes_resource.tableize.pluralize
-      end
-    
-      def resource_instance_name
-        @resource_instance_name ||= self.class.shakes_resource.tableize.singularize
-      end
-
       def render(options = nil, extra_options = {}, &block)
         begin
           super
         rescue ActionView::MissingTemplate
           raise unless locate_resource?
-          
           options ||= {}
           options[:action] ||= params[:action]
-
           raise unless self.shakes_actions.include? options[:action].to_sym
-
-          controller_class
-          controller_class_name
-          resource_class
-          resource_collection_name
-          resource_instance_name
-
           super "shakes/#{options[:action]}.html.erb"
         end
       end
@@ -80,8 +57,8 @@ module Shakes
       private
     
       def locate_resource?
-        @resources ||= instance_variable_get("@#{resource_collection_name}")
-        @resource ||= instance_variable_get("@#{resource_instance_name}")
+        @resources ||= instance_variable_get("@#{self.class.shakes_resource_collection_name}")
+        @resource ||= instance_variable_get("@#{self.class.shakes_resource_name}")
         (@resources || @resource)
       end
     end

data/lib/shakes/helpers.rb

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

data/lib/shakes/helpers/url_helper.rb

@@ -0,0 +1,24 @@
+module Shakes
+  module Helpers
+    module UrlHelper
+      def shakes_path_for(action, resource=nil)
+        case action
+        when :index, :create
+          method("#{shakes_controller_name.pluralize}_path".to_sym).call
+        when :new
+          method("new_#{shakes_controller_name}_path".to_sym).call
+        when :show, :update, :destroy
+          method("#{shakes_controller_name}_path".to_sym).call(resource)
+        when :edit
+          method("edit_#{shakes_controller_name}_path".to_sym).call(resource)
+        end
+      end
+      
+      private
+      
+      def shakes_controller_name
+        (controller || self).class.shakes_controller_name
+      end
+    end
+  end
+end

data/lib/shakes/helpers/views_helper.rb

@@ -12,33 +12,19 @@ module Shakes
       end
       
       def shakes_field_type_for(field)
-        @resource_class.columns_hash[field.to_s].type
+        controller.class.shakes_resource.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 }
+        (controller.class.shakes_resource.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
+        controller.class.shakes_resource.human_attribute_name field
       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
+        controller.class.shakes_resource.human_name
       end
       
       def shakes_link_to_for(actions=[], resource=nil)
@@ -46,15 +32,15 @@ module Shakes
         (actions.map { |action| action.to_sym }).each do |action|
           case action
           when :index
-            links << link_to("Back", shakes_path_for(:index)) if @controller_class.new.respond_to? :index
+            links << link_to("Back", shakes_path_for(:index)) if controller.respond_to? :index
           when :new
-            links << link_to("New #{shakes_human_name}", shakes_path_for(:new)) if @controller_class.new.respond_to? :new
+            links << link_to("New #{shakes_human_name}", shakes_path_for(:new)) if controller.respond_to? :new
           when :show
-            links << link_to('Show', shakes_path_for(:show, resource)) if @controller_class.new.respond_to? :show
+            links << link_to('Show', shakes_path_for(:show, resource)) if controller.respond_to? :show
           when :edit
-            links << link_to('Edit', shakes_path_for(:edit, resource)) if @controller_class.new.respond_to? :edit
+            links << link_to('Edit', shakes_path_for(:edit, resource)) if controller.respond_to? :edit
           when :destroy
-            links << link_to('Destroy', shakes_path_for(: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.respond_to? :destroy
           end
         end
         links.join(' | ')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shakes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Jason Stahl
@@ -63,6 +63,7 @@ files:
 - lib/shakes/actions.rb
 - lib/shakes/has_the_shakes.rb
 - lib/shakes/helpers/layout_helper.rb
+- lib/shakes/helpers/url_helper.rb
 - lib/shakes/helpers/views_helper.rb
 - lib/shakes/helpers.rb
 - lib/shakes.rb