crudify 0.0.3 → 0.0.4

data/lib/crudify/hook_methods.rb

@@ -6,68 +6,73 @@ module Crudify
       
       def before_create
         # just a hook!
-        puts "> Crud::before_create"
+        puts "> Crud::before_create" if @crud_options[:log]
         before_action
       end    
         
       def before_update
         # just a hook!
-        puts "> Crud::before_update"
+        puts "> Crud::before_update" if @crud_options[:log]
         before_action
       end    
         
       def before_destroy
         # just a hook!
-        puts "> Crud::before_destroy"
+        puts "> Crud::before_destroy" if @crud_options[:log]
+        set_what
         before_action
       end
-      
-      
+            
       def before_action
         # just a hook!
-        puts "> Crud::before_action"
-        @what = @crud_options[:use_class_name_as_title] ? @instance.class.to_s.humanize : @instance.send(@crud_options[:title_attribute].to_sym).inspect
-        true
+        puts "> Crud::before_action" if @crud_options[:log]
+        #true
       end
       
               
       
       def successful_create
-        puts "> Crud::successful_create"
-        
-        flash[:notice] = t('crudify.created', :what => @what)
+        puts "> Crud::successful_create" if @crud_options[:log]
+
+        flash[:notice] = t('crudify.created', :what => set_what)
         
         after_success
       end
       
       def successful_update
-        puts "> Crud::successful_update"
+        puts "> Crud::successful_update" if @crud_options[:log]
         
-        flash[:notice] = t('crudify.updated', :what => @what)
+        flash[:notice] = t('crudify.updated', :what => set_what)
         
         after_success
       end
       
       def successful_destroy
-        puts "> Crud::successful_destroy"
-        
+        puts "> Crud::successful_destroy" if @crud_options[:log]
         flash.notice = t('crudify.destroyed', :what => @what)
         
         after_success
       end
       
       def after_success
-        puts "> Crud::after_success"
+        puts "> Crud::after_success" if @crud_options[:log]
         
         unless request.xhr?
-          if params[:commit].match(/continue/)
+          if @redirect_to_url
+            redirect_to @redirect_to_url
+          elsif params[:commit].to_s.match(/continue/)
             if params[:action] == 'create'
               redirect_to request.referer.sub('new', "#{@what.to_param}/edit")
             else
               redirect_to request.referer
             end            
           else
-            redirect_back_or_default eval(@crud_options[:redirect_to_url])
+            url = eval(@crud_options[:redirect_to_url])
+            if defined?(redirect_back_or_default)
+              redirect_back_or_default url
+            else
+              redirect_to url
+            end
           end
         else
           render :partial => "/shared/message"
@@ -79,33 +84,25 @@ module Crudify
       
       
       def failed_create
-        puts "> Crud::failed_create"
-        
-        flash[:error] = t('crudify.failed_create', :what => @what)
-        
+        puts "> Crud::failed_create" if @crud_options[:log]
+        flash[:error] = t('crudify.failed_create', :what => set_what)
         after_fail
       end
       
       def failed_update
-        puts "> Crud::failed_update"
-        
-        flash[:error] = t('crudify.failed_update', :what => @what)
-        
+        puts "> Crud::failed_update" if @crud_options[:log]
+        flash[:error] = t('crudify.failed_update', :what => set_what)
         after_fail
       end
       
       def failed_destroy
-        puts "> Crud::failed_destroy"
-        
+        puts "> Crud::failed_destroy" if @crud_options[:log]
         flash[:error] = t('crudify.failed_destroy', :what => @what)
-        
         after_fail
       end
-    
-    
+      
       def after_fail
-        puts "> Crud::after_fail"
-        
+        puts "> Crud::after_fail" if @crud_options[:log]
         unless request.xhr?
           render :action => request.post? ? 'new' : 'edit'
         else          

data/lib/crudify/version.rb

@@ -1,3 +1,3 @@
 module Crudify
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/dummy/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Dummy::Application.load_tasks

data/test/dummy/app/controllers/admin/peanut_butters_controller.rb

@@ -0,0 +1,5 @@
+class Admin::PeanutButtersController < ApplicationController
+  
+  crudify :peanut_butter, :use_class_name_as_title => true
+  
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/dummy/app/controllers/jellies_controller.rb

@@ -0,0 +1,7 @@
+class JelliesController < ApplicationController
+  
+  crudify :jelly,
+    :redirect_to_url => "jellies_url",
+    :order           => "created_at DESC"
+  
+end

data/test/dummy/app/models/jelly.rb

@@ -0,0 +1,9 @@
+class Jelly < ActiveRecord::Base
+  
+  validates_presence_of :title
+  validates_presence_of :name
+  
+  cattr_reader :per_page
+  @@per_page = 3
+    
+end

data/test/dummy/app/models/peanut_butter.rb

@@ -0,0 +1,8 @@
+class PeanutButter < ActiveRecord::Base
+  
+  validates_presence_of :viscosity
+  
+  cattr_reader :per_page
+  @@per_page = 3
+    
+end

data/test/dummy/app/views/admin/peanut_butters/_fields.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <%= form.label :viscosity %>
+  <%= form.text_field :viscosity %>
+</p>

data/test/dummy/app/views/admin/peanut_butters/edit.html.erb

@@ -0,0 +1,11 @@
+<h3>Edit Peanut Butter</h3>
+
+<%= render 'shared/error_messages', :target => @peanut_butter %>
+
+<%= form_for [:admin, @peanut_butter] do |f| %>
+  <%= render 'fields', :form => f %>
+  <p class="action">
+    <%= f.submit 'update' %>
+    or <%= link_to "cancel", admin_peanut_butters_path %>
+  </p>
+<% end %>

data/test/dummy/app/views/admin/peanut_butters/index.html.erb

@@ -0,0 +1,23 @@
+<h3>Listing Peanut Butters</h3>
+<%= link_to "<em>create</em> a new peanut_butter".html_safe, new_admin_peanut_butter_path %>
+
+<% if @peanut_butters.empty? %>
+  to start your adventure. 
+<% else %>
+  or 
+  <ul class="items">
+    <% @peanut_butters.each do |peanut_butter| %>
+      <li>
+        <span>
+          <%= link_to content_tag(:em, "read"), admin_peanut_butter_path(peanut_butter) %>, 
+          <%= link_to content_tag(:em, "update"), edit_admin_peanut_butter_path(peanut_butter) %> or 
+          <%= link_to content_tag(:em, "delete"), admin_peanut_butter_path(peanut_butter), :method => :delete, :confirm => "Are you sure?" %>
+        </span>
+        <b><%= peanut_butter.viscosity.inspect %></b>
+      </li>
+    <% end %>
+  </ul>
+  <%= will_paginate @peanut_butters %>
+  <br/>
+  <p>So much peanut_butter, <strike>so little time</strike> and time to eat it too.</p>
+<% end %>

data/test/dummy/app/views/admin/peanut_butters/new.html.erb

@@ -0,0 +1,11 @@
+<h3>New Peanut Butter</h3>
+
+<%= render 'shared/error_messages', :target => @peanut_butter %>
+
+<%= form_for [:admin, @peanut_butter] do |f| %>
+  <%= render 'fields', :form => f %>
+  <p class="action">
+    <%= f.submit 'create' %>
+    or <%= link_to "cancel", admin_peanut_butters_path %>
+  </p>
+<% end %> 

data/test/dummy/app/views/admin/peanut_butters/show.html.erb

@@ -0,0 +1,14 @@
+<h3>Show Peanut Butter</h3>
+
+<%= render 'shared/error_messages', :target => @peanut_butter %>
+
+<h3><%= @peanut_butter.viscosity %></h3>
+
+<br/>
+
+<p>
+  <%= link_to content_tag(:em, "update"), edit_admin_peanut_butter_path(@peanut_butter) %> or 
+  <%= link_to content_tag(:em, "delete"), admin_peanut_butter_path(@peanut_butter), :method => :delete, :confirm => "Are you sure?" %>
+  this peanut_butter, or 
+  <%= link_to "return to peanut_butters", admin_peanut_butters_path %>
+</p>

data/test/dummy/app/views/jellies/_fields.html.erb

@@ -0,0 +1,8 @@
+<p>
+  <%= form.label :title %>
+  <%= form.text_field :title %> 
+</p>
+<p>
+  <%= form.label :name %>
+  <%= form.text_field :name %> 
+</p>

data/test/dummy/app/views/jellies/edit.html.erb

@@ -0,0 +1,11 @@
+<h3>Edit Jelly</h3>
+
+<%= render 'shared/error_messages', :target => @jelly %>
+
+<%= form_for @jelly do |f| %>
+  <%= render 'fields', :form => f %>
+  <p class="action">
+    <%= f.submit 'update' %>
+    or <%= link_to "cancel", jellies_path %>
+  </p>
+<% end %>

data/test/dummy/app/views/jellies/index.html.erb

@@ -0,0 +1,23 @@
+<h3>Listing Jellies</h3>
+<%= link_to "<em>create</em> a new jelly".html_safe, new_jelly_path %>
+
+<% if @jellies.empty? %>
+  to start your adventure. 
+<% else %>
+  or 
+  <ul class="items">
+    <% @jellies.each do |jelly| %>
+      <li>
+        <span>
+          <%= link_to content_tag(:em, "read"), jelly_path(jelly) %>, 
+          <%= link_to content_tag(:em, "update"), edit_jelly_path(jelly) %> or 
+          <%= link_to content_tag(:em, "delete"), jelly_path(jelly), :method => :delete, :confirm => "Are you sure?" %>
+        </span>
+        jelly named <b><%= jelly.name %></b>
+      </li>
+    <% end %>
+  </ul>
+  <%= will_paginate @jellies %>
+  <br/>
+  <p>So much jelly, <strike>so little time</strike> and time to eat it too.</p>
+<% end %>

data/test/dummy/app/views/jellies/new.html.erb

@@ -0,0 +1,11 @@
+<h3>New Jelly</h3>
+
+<%= render 'shared/error_messages', :target => @jelly %>
+
+<%= form_for @jelly do |f| %>
+  <%= render 'fields', :form => f %>
+  <p class="action">
+    <%= f.submit 'create' %>
+    or <%= link_to "cancel", jellies_path %>
+  </p>
+<% end %> 

data/test/dummy/app/views/jellies/show.html.erb

@@ -0,0 +1,15 @@
+<h3>Show Jelly</h3>
+
+<%= render 'shared/error_messages', :target => @jelly %>
+
+<h3><%= @jelly.title %></h3>
+<p><%= @jelly.name %></p>
+
+<br/>
+
+<p>
+  <%= link_to content_tag(:em, "update"), edit_jelly_path(@jelly) %> or 
+  <%= link_to content_tag(:em, "delete"), jelly_path(@jelly), :method => :delete, :confirm => "Are you sure?" %>
+  this jelly, or 
+  <%= link_to "return to jellies", jellies_path %>
+</p>

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Crudify Dummy</title>
+  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag 'styles' %>
+  <%= javascript_include_tag :defaults %>
+</head>
+<body>
+
+<div id="container">
+
+  <div id="header">
+    <h1 class="title">Crudify</h1>
+    <h2>All the CRUD, no hassle.</h2>
+  </div>
+  
+  <hr/>  
+  <h4><em>Disclaimer</em></h4>
+  <p>Crudify was shamlessly robbed from <%= link_to "refinerycms", "https://github.com/resolve/refinerycms/blob/master/core/lib/refinery/crud.rb" %>'s internals and customized for use in other projects. Much credit and many thanks to the guys at <%= link_to "resolve digital", "http://resolvedigital.com/" %> for all their hard work on the <%= link_to "refinery cms project", "http://resolvedigital.com/development/refinery%C2%A0cms" %>. Keep it up!</p>
+  
+  <hr/>
+  <h3>Here's the controller running this demo:</h3>
+  
+  <% file = File.expand_path("../../../controllers/#{controller.controller_path}_controller.rb", __FILE__) %>
+  <% if File.exists?(file) %>
+    <pre><%= File.read(file) %></pre>
+  <% end %>
+    
+  <hr/>
+  <h3>Here's the CRUD:</h3>
+  
+  <%= content_tag(:p, flash[:notice], :id => 'flash_notice', :class => 'flash') if flash[:notice] %>
+  <%= content_tag(:p, flash[:error], :id => 'flash_error', :class => 'flash') if flash[:error] %>
+  
+  <div id="content">
+    <%= yield %>
+  </div>
+
+  
+  <h3>Here's some more info:</h3>
+
+  <p>Like the available options:</p>
+  <pre>
+:title_attribute => "title",
+:use_class_name_as_title => false,
+:paginate => true,
+:sortable => true,
+:searchable => true,
+:include => [],
+:order => ('position ASC' if this_class.table_exists?
+  && this_class.column_names.include?('position')),
+:conditions => '',
+:search_conditions => '',
+:redirect_to_url => "admin_#{plural_name}_url",
+:log => Rails.env == 'development'</pre>
+  
+  
+  
+  <hr/>
+  <h3>Get some:</h3>
+  <p class="small"><%= link_to "Github", "https://github.com/citrus/crudify" %> or <%= link_to "Ruby Gems", "http://rubygems.org/gems/crudify" %>; take your pick.</p>
+  
+  
+  
+  <hr/>
+  <em>Now enjoy your jellies with no hassle from crud!</em>
+
+</div>
+
+</body>
+</html>

data/test/dummy/app/views/shared/_error_messages.html.erb

@@ -0,0 +1,9 @@
+<% target ||= nil %>
+<% unless target.nil? || target.errors.to_a.empty? %>
+  <div class="flash">
+    <b>Errors:</b>
+    <ul class="errors">
+      <%= target.errors.to_a.collect{|e|"<li>#{e}</li>"}.join("\n").html_safe %>
+    </ul>
+  </div>
+<% end %>

data/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/dummy/config/application.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+
+Bundler.require
+require "crudify"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end