kitsune 0.0.5 → 0.0.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name = "kitsune"
-  gem_spec.version = "0.0.5"
+  gem_spec.version = "0.0.6"
   gem_spec.summary = "Integrated Rails Content Management System."
   gem_spec.email = "matt@toastyapps.com"
   gem_spec.homepage = "http://github.com/toastyapps/kitsune"

data/app/controllers/admin/kitsune/application_controller.rb

@@ -1,21 +1,3 @@
 class Admin::Kitsune::ApplicationController < ActionController::Base
-  before_filter :load_models
-  
-  private
-  def load_models
-    models = Kitsune.models_with_admin.map{ |m| Kitsune::Inspector.new(m) }
-    category_map = {}
-    
-    @models =[]
-    models.each do |m|
-      if m.category
-        category_map[m.category] = [] unless category_map[m.category]
-        category_map[m.category] << m
-      else
-        @models << m
-      end
-    end
-    @models += category_map.to_a.map{|c| Hash[*c]}
-    #@models = models
-  end
+  # this class should only be overridden
 end

data/app/controllers/admin/kitsune/kitsune_controller.rb

@@ -0,0 +1,21 @@
+class Admin::Kitsune::KitsuneController < Admin::Kitsune::ApplicationController
+  before_filter :load_models
+  
+  private
+  def load_models
+    models = Kitsune.models_with_admin.map{ |m| Kitsune::Inspector.new(m) }
+    category_map = {}
+    
+    @models =[]
+    models.each do |m|
+      if m.category
+        category_map[m.category] = [] unless category_map[m.category]
+        category_map[m.category] << m
+      else
+        @models << m
+      end
+    end
+    @models += category_map.to_a.map{|c| Hash[*c]}
+    #@models = models
+  end
+end

data/app/controllers/admin/kitsune/models_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Kitsune::ModelsController < Admin::Kitsune::ApplicationController
+class Admin::Kitsune::ModelsController < Admin::Kitsune::KitsuneController
   layout 'admin/kitsune'
   
   before_filter :load_model

data/app/controllers/admin/kitsune/pages_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Kitsune::PagesController < Admin::Kitsune::ApplicationController
+class Admin::Kitsune::PagesController < Admin::Kitsune::KitsuneController
   layout 'admin/kitsune'
   
   before_filter :load_page
@@ -14,12 +14,20 @@ class Admin::Kitsune::PagesController < Admin::Kitsune::ApplicationController
   def create
     @page = ::Page.new(params[:page])
     if @page.save
-      redirect_to admin_kitsune_pages_path
+      redirect_to url_for(:controller => 'admin/kitsune/pages')
     else
       render 'new'
     end
   end
   
+  def update
+    if @page.update_attributes(params[:page])
+      redirect_to url_for(:controller => 'admin/kitsune/pages')
+    else
+      render 'edit'
+    end
+  end
+  
   private
   def load_page
     @page = Page.find_by_url(params[:id]) if params[:id]

data/app/controllers/admin/kitsune/records_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
+class Admin::Kitsune::RecordsController < Admin::Kitsune::KitsuneController
   layout 'admin/kitsune'
   
   before_filter :load_model
@@ -27,7 +27,13 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
     end
     if @record.save
       flash[:notice] = "Record Saved"
-      redirect_to admin_kitsune_model_records_path(params[:model_id])
+			if params[:redirect]
+				klass = params[:redirect].gsub(/_id$/, '').classify.constantize
+				record = klass.find(params[:redirect_id])
+				redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => klass.to_s, :id => params[:redirect_id], :action => :edit)
+			else
+				redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => @model.class_name)
+			end
     else
       flash[:notice] = "Could not save record"
       render 'new'
@@ -35,9 +41,23 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
   end
   
   def update
+    
+    if @model.is_sti_child? && params[params[:model_id].underscore][:type]
+      if params[params[:model_id].underscore][:type].to_s != @record.type.to_s
+        @record.type = params[params[:model_id].underscore][:type]
+        @record.save
+      end
+    end
+    
     if @record.update_attributes(params[params[:model_id].underscore])
       flash[:notice] = "Record Saved"
-      redirect_to admin_kitsune_model_records_path(params[:model_id])
+			if params[:redirect]
+				klass = params[:redirect].gsub(/_id$/, '').classify.constantize
+				record = klass.find(params[:redirect_id])
+				redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => klass.to_s, :id => params[:redirect_id], :action => :edit)
+			else
+				redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => @model.class_name)
+			end
     else
       flash[:notice] = "Could not save record"
       render 'edit'
@@ -47,7 +67,13 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
   def destroy
     @record.destroy
     flash[:notice] = "Record Deleted"
-    redirect_to admin_kitsune_model_records_path(params[:model_id])
+		if params[:redirect]
+			klass = params[:redirect].gsub(/_id$/, '').classify.constantize
+			record = klass.find(params[:redirect_id])
+			redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => klass.to_s, :id => params[:redirect_id], :action => :edit)
+		else
+			redirect_to url_for(:controller => 'admin/kitsune/records', :model_id => @model.class_name)
+		end
   end
   
   private
@@ -57,4 +83,4 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
   def load_record
     @record = @model.find(params[:id]) if params[:id]
   end
-end
+end

data/app/controllers/kitsune_controller.rb

@@ -1,5 +1,5 @@
 class KitsuneController < ApplicationController
   def show 
-    @page = ::Page.find_by_url(params[:url].join('/'))
+    @page = ::Page.find_by_url([params[:url]].flatten.join('/'))
   end
 end

data/app/helpers/admin/kitsune/records_helper.rb

@@ -16,4 +16,12 @@ module Admin::Kitsune::RecordsHelper
       column.name.to_s.titleize
     end
   end
-end
+
+	def additional_content_for(model, record, column)
+		if model.field_type(column.name) == :file_field && (file = record.send(column.name)).present?
+			"<p><strong>Current File</strong>: " + link_to(file.to_s, file.to_s) + "</p>"
+		elsif model.field_type(column.name) == :image_field && (file = record.send(column.name)).present?
+			"<p><strong>Current File</strong>: " + image_tag(file.to_s) + "</p>"
+		end
+	end
+end

data/app/views/admin/kitsune/pages/edit.html.erb

@@ -1,5 +1,5 @@
 <div id='menu'>
-	<%= link_to 'Back', admin_kitsune_pages_path %>
+	<%= link_to 'Back', :controller => 'admin/kitsune/pages' %>
 </div>
 <div id='body'>
 <h2 class='legend'>Edit Page</h3>

data/app/views/admin/kitsune/pages/index.html.erb

@@ -2,4 +2,4 @@
 	<%= page.title %>
 <% end %>
 
-<%= link_to 'New Page', new_admin_kitsune_page_path %>
+<%= link_to 'New Page', :controller => 'admin/kitsune/pages', :action => :new %>

data/app/views/admin/kitsune/pages/new.html.erb

@@ -1,5 +1,5 @@
 <div id='menu'>
-	<%= link_to 'Back', admin_kitsune_pages_path %>
+	<%= link_to 'Back', :controller => 'admin/kitsune/pages' %>
 </div>
 <div id='body'>
 <h2 class='legend'>New Page</h3>

data/app/views/admin/kitsune/records/_form.html.erb

@@ -3,12 +3,19 @@
 <%= form.error_messages %>
 <% @model.columns(:edit).each do |column| %>
 	<div class='field'>
-		<%= form.label column.name %>
-		<%= form.send(@model.form_type(column), column.name, *@model.options_for(column)) %>
+		<% unless params[column.name] %>
+			<%= form.label column.name %>
+			<%= form.send(@model.form_type(column), column.name, *@model.options_for(column)) %>
+			<%= additional_content_for(@model, @record, column) %>
+		<% else %>
+			<%= form.hidden_field column.name, :value => params[column.name] %>
+			<%= hidden_field_tag :redirect, column.name %>
+			<%= hidden_field_tag :redirect_id, params[column.name] %>
+		<% end %>
 	</div>
 <% end %>
 <div class="submit_button">
 	<button value="Save" class="submitBtn"><span>Save</span></button>
 </div>
 </fieldset>
-<% end %>
+<% end %>

data/app/views/admin/kitsune/records/_list.html.erb

@@ -0,0 +1,32 @@
+<table>
+	<thead>
+		<tr>
+			<% model.columns(:display).each do |column| %>
+				<th><%= sort_link_to(model, column) %></th>
+			<% end %>
+			<th>Actions</th>
+		</tr>
+	</thead>
+	<tbody>
+		<% records.each do |record| %>
+			<tr class="<%= cycle('odd', 'even') %>">
+				<% model.columns(:display).each do |column| %>
+					<td><%= truncate(sanitize(model.display_for(record, column.name).to_s), :length => 20) %></td>
+				<% end %>
+				<td>
+					<% if parent %>
+						<%= link_to 'Edit', :controller => 'admin/kitsune/records', :action => :edit, :model_id => model.object_class, :id => record.id, (parent.class.to_s.underscore+'_id').to_sym => parent.id %>
+					<% else %>
+						<%= link_to 'Edit', :controller => 'admin/kitsune/records', :action => :edit, :model_id => model.object_class, :id => record.id %>
+				<% end %>
+					- 
+					<% if parent %>
+						<%= link_to('Delete', url_for(:controller => 'admin/kitsune/records', :model_id => model.object_class, :id => record.id, :action => :destroy, :redirect => (parent.class.to_s.underscore+'_id'), :redirect_id => parent.id), :method => :delete, :confirm => "Are you sure?") %>
+					<% else %>
+						<%= link_to('Delete', url_for(:controller => 'admin/kitsune/records', :model_id => model.object_class, :id => record.id, :action => :destroy), :method => :delete, :confirm => "Are you sure?") %>
+					<% end %>
+				</td>
+			</tr>
+		<% end %>
+	</tbody>
+</table>

data/app/views/admin/kitsune/records/edit.html.erb

@@ -1,7 +1,15 @@
 <div id='kitsune_record_header'>
 	<h2 class='legend'>Edit <%= params[:model_id] %></h2>
 	<div id='menu'>
-		<%= link_to 'Back', admin_kitsune_model_records_path(params[:model_id]) %>
+		<%= link_to 'Back', :controller => 'admin/kitsune/records', :model_id => params[:model_id] %>
 	</div>
 </div>
-<%= render 'form' %>
+<%= render 'form' %>
+
+<% @model.columns(:reflections).each do |column| %>
+	<div class='reflection'>
+		<h3><%= column.name.to_s.titleize %></h3>
+		<%= link_to 'New', :controller => 'admin/kitsune/records', :action => :new, :model_id => column.name.to_s.classify, (@record.class.to_s.underscore+'_id').to_sym => @record.id %>
+		<%= render :partial => 'list', :locals => { :model => Kitsune::Inspector.new(column.name.to_s.classify.constantize), :records => @record.send(column.name), :parent => @record } %>
+	</div>
+<% end %>

data/app/views/admin/kitsune/records/index.html.erb

@@ -1,35 +1,11 @@
 <div id='kitsune_record_header'>
 	<h2><%= @model.admin_name %></h2>
 	<div id='menu'>
-		<%= link_to "New #{params[:id]}", new_admin_kitsune_model_record_path(params[:model_id]) %>
+		<%= link_to "New #{params[:id]}", :controller => 'admin/kitsune/records', :action => :new, :model_id => params[:model_id] %>
 	</div>
 </div>
 <% @model.tabs.each do |key, value|%>
 <%= link_to key, value %>
 <% end %>
-<table>
-	<thead>
-		<tr>
-			<% @model.columns(:display).each do |column| %>
-				<th><%= sort_link_to(@model, column) %></th>
-			<% end %>
-			<th>Actions</th>
-		</tr>
-	</thead>
-	<tbody>
-		<% @records.each do |record| %>
-			<tr class="<%= cycle('odd', 'even') %>">
-				<% @model.columns(:display).each do |column| %>
-					<td><%= truncate(sanitize(record.send(column.name).to_s), :length => 20) %></td>
-				<% end %>
-				<td>
-					<%= link_to 'Edit', edit_admin_kitsune_model_record_path(params[:model_id], record.id) %> 
-					- 
-					<%= link_to 'Delete', admin_kitsune_model_record_path(params[:model_id], record.id), :method => :delete, :confirm => "Are you sure?" %>
-				</td>
-			</tr>
-		<% end %>
-	</tbody>
-</table>
-
-<%= will_paginate @records %>
+<%= render :partial => 'list', :locals => {:model => @model, :records => @records, :parent => nil } %>
+<%= will_paginate @records %>

data/app/views/admin/kitsune/records/new.html.erb

@@ -1,7 +1,7 @@
 <div id='kitsune_record_header'>
 	<h2 class='legend'>New <%= params[:model_id] %></h2>
 	<div id='menu'>
-		<%= link_to 'Back', admin_kitsune_model_records_path(params[:model_id]) %>
+		<%= link_to 'Back', :controller => 'admin/kitsune/records', :model_id => params[:model_id] %>
 	</div>
 </div>
 

data/app/views/layouts/admin/kitsune.html.erb

@@ -18,12 +18,12 @@
 								<div class='kitsune_category'>
 									<h3><%= key %></h3>
 									<% value.each do |inner_model| %>
-										<div class='kitsune_inner_model_link'><%= link_to inner_model.admin_name, admin_kitsune_model_records_path(inner_model.object_class) %></div>
+										<div class='kitsune_inner_model_link'><%= link_to inner_model.admin_name, :controller => 'admin/kitsune/records', :model_id => inner_model.object_class %></div>
 									<% end %>
 								</div>
 							<% end %>
 						<% else %>
-							<div class='kitsune_model_link'><%= link_to model.admin_name, admin_kitsune_model_records_path(model.object_class) %></div>
+							<div class='kitsune_model_link'><%= link_to model.admin_name, :controller => 'admin/kitsune/records', :model_id => model.object_class %></div>
 						<% end %>
 					<% end %>
 				</div>

data/config/kitsune_routes.rb

@@ -3,9 +3,10 @@ ActionController::Routing::Routes.draw do |map|
   map.namespace :admin do |admin|
     admin.namespace :kitsune do |kitsune|
       kitsune.resources :pages
-      kitsune.resources :models, :has_many => [:records]
+      kitsune.resources :models do |model|
+				model.resources :records
+			end
     end
   end
-  
   map.connect '/*url', :controller => 'kitsune', :action => 'show'
-end
+end

data/lib/kitsune/active_record.rb

@@ -10,6 +10,7 @@ module Kitsune
           :multipart => false, 
           :display => {}, 
           :edit => {}, 
+          :reflections => {},
           :fields => {}, 
           :tabs => {},
           :is_sti => false

data/lib/kitsune/builder.rb

@@ -49,7 +49,7 @@ module Kitsune
     end
     
     def image(field)
-      add :file_field, field
+      add :image_field, field
       multipart
     end
     
@@ -81,7 +81,10 @@ module Kitsune
     end
     
     def edit(*fields)
-      set :edit, fields
+      fields.each do |field|
+        type = @resource.reflections[field.to_sym] ? :reflections : :edit
+        set type, field
+      end
     end
     
     def no_edit(*fields)
@@ -103,7 +106,7 @@ module Kitsune
     def set(type, fields)
       @resource.kitsune_admin[type] = {} unless @resource.kitsune_admin[type]
       @resource.kitsune_admin[type][:fields] ||= []
-      fields.each do |field|
+      [fields].flatten.each do |field|
         unless field.is_a?(Hash)
           @resource.kitsune_admin[type][:fields] << field
         else
@@ -112,4 +115,4 @@ module Kitsune
       end
     end
   end
-end
+end

data/lib/kitsune/inspector.rb

@@ -21,6 +21,10 @@ module Kitsune
       kitsune_admin[:is_sti]
     end
     
+    def is_sti_child?
+      @object.ancestors[1] != ::ActiveRecord::Base
+    end
+    
     def sti_column
       kitsune_admin[:sti_column]
     end
@@ -72,6 +76,16 @@ module Kitsune
       end
     end
     
+    def columns_for_reflections
+			if kitsune_admin[:reflections] && kitsune_admin[:reflections][:fields]
+				kitsune_admin[:reflections][:fields].map do |field|
+					Kitsune::FauxColumn.new(field, :string)
+				end
+			else
+				[]
+			end
+    end
+    
     def column_sortable(column)
       # move to column proxy
       kitsune_admin[:sortable] && kitsune_admin[:sortable].include?(column.name.to_sym)
@@ -82,14 +96,17 @@ module Kitsune
     end
     
     def form_type(column)
+      field = column.name
       if type = field_type(column.name)
         case type
         when :sti
-          if field_options(field) && field[:classes]
+          if (options = field_options(field)) && options[:classes]
             :select
           else
             :text_field
           end
+				when :image_field
+					:file_field
         else
           kitsune_admin[:fields][column.name.to_sym][:type]
         end
@@ -109,7 +126,7 @@ module Kitsune
     
     def detect_label(collection)
       @collection_label_methods.each do |label_name|
-        return label_name if collection.first.respond_to?(label_name)
+        return label_name if [collection].flatten.first.respond_to?(label_name)
       end
       'to_s'
     end
@@ -135,6 +152,16 @@ module Kitsune
       end
     end
     
+    def display_for(record, method, *args, &block)
+      if method.to_s =~ /_id$/
+        associated_record = record.send(method.to_s.gsub(/_id$/, '').to_sym, *args, &block)
+        label_method = detect_label(associated_record)
+        associated_record.send(label_method.to_sym)
+      else
+        record.send(method.to_sym, *args, &block)
+      end
+    end
+    
     def form_options_for(record)
       options = {:method => method_for_record(record)}
       if kitsune_admin[:multipart]
@@ -167,15 +194,15 @@ module Kitsune
       end
     end
     
-    private
-    def field_defined(field)
-      !!kitsune_admin[:fields][field.to_sym]
-    end
-
     def field_type(field)
       return kitsune_admin[:fields][field.to_sym][:type] if field_defined(field)
       return nil
     end
+
+    private
+    def field_defined(field)
+      !!kitsune_admin[:fields][field.to_sym]
+    end
     
     def field_options(field)
       options = kitsune_admin[:fields][field.to_sym][:options] if field_defined(field)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kitsune
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthew Mongeau <matt@toastyapps.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -05:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ files:
 - Rakefile
 - README.textile
 - app/controllers/admin/kitsune/application_controller.rb
+- app/controllers/admin/kitsune/kitsune_controller.rb
 - app/controllers/admin/kitsune/models_controller.rb
 - app/controllers/admin/kitsune/pages_controller.rb
 - app/controllers/admin/kitsune/records_controller.rb
@@ -46,6 +47,7 @@ files:
 - app/views/admin/kitsune/pages/index.html.erb
 - app/views/admin/kitsune/pages/new.html.erb
 - app/views/admin/kitsune/records/_form.html.erb
+- app/views/admin/kitsune/records/_list.html.erb
 - app/views/admin/kitsune/records/edit.html.erb
 - app/views/admin/kitsune/records/index.html.erb
 - app/views/admin/kitsune/records/new.html.erb