kitsune 0.0.2 → 0.0.3

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.2"
+  gem_spec.version = "0.0.3"
   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

@@ -0,0 +1,20 @@
+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[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,10 +1,7 @@
-class Admin::Kitsune::ModelsController < ApplicationController
+class Admin::Kitsune::ModelsController < Admin::Kitsune::ApplicationController
   layout 'admin/kitsune'
   
   before_filter :load_model
-  def index
-    @models = Kitsune.models_with_admin
-  end
   
   private
   def load_model

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

@@ -1,4 +1,4 @@
-class Admin::Kitsune::PagesController < ApplicationController
+class Admin::Kitsune::PagesController < Admin::Kitsune::ApplicationController
   layout 'admin/kitsune'
   
   before_filter :load_page

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

@@ -1,4 +1,4 @@
-class Admin::Kitsune::RecordsController < ApplicationController
+class Admin::Kitsune::RecordsController < Admin::Kitsune::ApplicationController
   layout 'admin/kitsune'
   
   before_filter :load_model
@@ -19,7 +19,12 @@ class Admin::Kitsune::RecordsController < ApplicationController
   end
   
   def create
-    @record = @model.new_record(params[params[:model_id].underscore])
+    if @model.is_sti? && params[params[:model_id].underscore][@model.sti_column].present?
+      sti_model = Kitsune::Inspector.new(params[params[:model_id].underscore].delete(@model.sti_column).constantize)
+      @record = sti_model.new_record(params[params[:model_id].underscore])
+    else
+      @record = @model.new_record(params[params[:model_id].underscore])
+    end
     if @record.save
       flash[:notice] = "Record Saved"
       redirect_to admin_kitsune_model_records_path(params[:model_id])

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

@@ -1,3 +1,4 @@
-<% @models.each do |model| %>
-<%= link_to model, admin_kitsune_model_records_path(model) %>
-<% end %>
+<div class='kitsune_right'>
+	Use the left menu to manage your site. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+</div>
+

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

@@ -1,7 +1,7 @@
-<div id='menu'>
-	<%= link_to 'Back', admin_kitsune_model_records_path(params[:model_id]) %>
+<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]) %>
+	</div>
 </div>
-<div id='body'>
-<h2 class='legend'>Edit <%= params[:model_id] %></h3>
-<%= render 'form' %>
-</div>
+<%= render 'form' %>

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

@@ -1,9 +1,9 @@
-<div id='menu'>
-	<%= link_to 'Back', admin_kitsune_models_path %>
-	|
-	<%= link_to "New #{params[:id]}", new_admin_kitsune_model_record_path(params[:model_id]) %>
+<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]) %>
+	</div>
 </div>
-<div id='body'>
 <% @model.tabs.each do |key, value|%>
 <%= link_to key, value %>
 <% end %>
@@ -32,5 +32,4 @@
 	</tbody>
 </table>
 
-<%= will_paginate @records %>
-</div>
+<%= will_paginate @records %>

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

@@ -1,7 +1,8 @@
-<div id='menu'>
-	<%= link_to 'Back', admin_kitsune_model_records_path(params[:model_id]) %>
+<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]) %>
+	</div>
 </div>
-<div id='body'>
-<h2 class='legend'>New <%= params[:model_id] %></h3>
-<%= render 'form' %>
-</div>
+
+<%= render 'form' %>

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

@@ -8,8 +8,18 @@
 		<div id='content'>
 			<div id='header'>
 				<h1><a href='/admin/models'>Kitsune</a></h1>
+				<a href='/'>View Site</a>
+			</div>
+			<div class='kitsune_container'>
+				<div class='kitsune_left'>
+					<% @models.each do |model| %>
+						<div class='kitsune_model_link'><%= link_to model.admin_name, admin_kitsune_model_records_path(model.object_class) %></div>
+					<% end %>
+				</div>
+				<div class='kitsune_right'>
+					<%= yield %>
+				</div>
 			</div>
-			<%= yield %>
 		</div>
 	</body>
 </html>

data/generators/kitsune/USAGE

@@ -0,0 +1 @@
+script/generate kitsune

data/generators/kitsune/kitsune_generator.rb

@@ -16,11 +16,11 @@ class KitsuneGenerator < Rails::Generator::Base
       m.directory "public/stylesheets/kitsune/"
       m.file "stylesheets/global.css", "public/stylesheets/kitsune/global.css"
       m.directory "public/images/kitsune/"
-      %w[bg.jpg form-bg.gif grey-btn.png nicEditorIcons.gif].each do |image|
+      %w[bg.jpg form-bg.gif header-link.png grey-btn.png nicEditorIcons.gif].each do |image|
         m.file "images/#{image}", "public/images/kitsune/#{image}"
       end
       
-      
+      m.readme "README"
     end
   end
 end

data/generators/kitsune/templates/README

@@ -0,0 +1,18 @@
+*******************************************************************************
+
+ Only two steps remain!
+
+ 1. Add this to environment.rb if it's not there already
+	
+	    config.gem 'will_paginate', :source => 'http://gemcutter.org'
+	
+	  and run 
+	
+	    rake gems:install
+  
+ 2. Please make sure to delete the two default routes:
+   
+      map.connect ':controller/:action/:id'
+      map.connect ':controller/:action/:id.:format'
+  
+*******************************************************************************

data/generators/kitsune/templates/stylesheets/global.css

@@ -88,15 +88,77 @@ body {
 
 #header {
 	width: 100%;
-	height: 25px;
-	padding: 8px 0 6px 0;
+	height: 38px;
 	
 }
 
-h1 a {
+#header h1 {
+	float: left;
+	padding-top: 8px;
+	margin-left: 15px;
+}
+
+#header > a {
+	height: 38px;
+	background: url(/images/kitsune/header-link.png) top left no-repeat;
+	width: 90px;
+	float: right;
+	margin-right: 15px;
+	color: #CCC;
+	font-size: 0.8em;
+	line-height: 38px;
+	text-align: center;
+	text-decoration:none;
+}
+
+#header > a:hover {
+	color: #FFF;
+}
+
+#header h1 a {
 	text-decoration: none;
 	color: #fff;
-	margin-left: 10px;
+}
+
+.kitsune_container {
+	width:100%;
+	float: right;
+	margin-left: -250px;
+}
+
+.kitsune_left {
+	margin-top: 15px;
+	width: 250px;
+	padding: 15px;
+	float: left;
+	background: #FFF;
+	border: 1px solid #CCC;
+	margin-left: 15px;
+}
+
+
+.kitsune_right {
+	margin-left: 310px;
+	margin-right: 15px;
+	margin-top: 15px;
+	padding: 15px;
+	background: #FFF;
+	border: 1px solid #CCC;
+}
+
+#kitsune_record_header {
+	float:left;
+	width: 100%;
+	margin-bottom: 15px;
+}
+
+#kitsune_record_header h2 {
+	float:left;
+	width: 45%;
+}
+
+#kitsune_record_header #menu {
+	float: right;
 }
 
 

data/lib/kitsune.rb

@@ -8,7 +8,7 @@ module Kitsune
   autoload :Page, 'kitsune/page'
   class << self
     def version
-      '0.0.1'
+      '0.0.2'
     end
   
     def model_paths # abstract this to something else
@@ -16,7 +16,7 @@ module Kitsune
     end
     
     def models_with_admin
-      models.select{|m| m.respond_to?(:kitsune_admin)} # quacks like a duck
+      models.select{|m| m.respond_to?(:kitsune_admin) && !m.kitsune_admin[:no_admin]} # quacks like a duck
     end
     
     def models

data/lib/kitsune/active_record.rb

@@ -11,14 +11,15 @@ module Kitsune
           :display => {}, 
           :edit => {}, 
           :fields => {}, 
-          :tabs => {}
+          :tabs => {},
+          :is_sti => false
         }
       end
     end
   
     def admin &block
-      setup_admin
-      Kitsune::Builder.generate(self, &block)
+      setup_admin unless self.respond_to?(:kitsune_admin)
+      Kitsune::Builder.generate(self, &block) unless self.kitsune_admin[:no_admin]
     end
   
     def no_admin

data/lib/kitsune/builder.rb

@@ -8,6 +8,14 @@ module Kitsune
       self.instance_eval &block
     end
     
+    def category category
+      @resource.kitsune_admin[:category] = category
+    end
+    
+    def name name
+      @resource.kitsune_admin[:name] = name
+    end
+    
     def no_admin
       @resource.kitsune_admin[:no_admin] = true
     end
@@ -36,7 +44,7 @@ module Kitsune
     end
     
     def file(field)
-      add_definition(:file_field, field)
+      add :file_field, field
       multipart
     end
     
@@ -45,39 +53,49 @@ module Kitsune
     end
     
     def select(field, options)
-      add_definition(:select, field, {:options => options})
+      add :select, field, {:options => options}
+    end
+    
+    def sti(field, options = {})
+      add :sti, field, {:options => options}
+      is_sti field
+    end
+    
+    def is_sti(field)
+      @resource.kitsune_admin[:is_sti] = true
+      @resource.kitsune_admin[:sti_column] = field
     end
     
     def display_and_edit(*args)
-      display(*args)
-      edit(*args)
+      display *args
+      edit *args
     end
     
     def display(*fields)
-      set_options_for_fields(:display, fields)
+      set :display, fields
     end
     
     def edit(*fields)
-      set_options_for_fields(:edit, fields)
+      set :edit, fields
     end
     
     def no_edit(*fields)
-      set_options_for_fields(:no_edit, fields)
+      set :no_edit, fields
     end
     
     def method_missing(method, *args, &block)
       if TYPES.include?(method)
-        add_definition(method, *args)
+        add method, *args
       end
     end
     
     private
-    def add_definition(type, field, options = {})
+    def add(type, field, options = {})
       @resource.kitsune_admin[:fields] ||= {}
       @resource.kitsune_admin[:fields][field] = options.merge(:type => type)
     end
     
-    def set_options_for_fields(type, fields)
+    def set(type, fields)
       @resource.kitsune_admin[type] = {} unless @resource.kitsune_admin[type]
       @resource.kitsune_admin[type][:fields] ||= []
       fields.each do |field|

data/lib/kitsune/inspector.rb

@@ -9,12 +9,28 @@ module Kitsune
       @collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
     end
     
+    def admin_name
+      kitsune_admin[:name] || @object.to_s.pluralize
+    end
+    
+    def category
+      kitsune_admin[:category] || nil
+    end
+    
+    def is_sti?
+      kitsune_admin[:is_sti]
+    end
+    
+    def sti_column
+      kitsune_admin[:sti_column]
+    end
+    
     def tabs
       kitsune_admin[:tabs]
     end
     
     def object_class
-      @object.class
+      @object.to_s
     end
     
     def new_record(*args)
@@ -67,7 +83,16 @@ module Kitsune
     
     def form_type(column)
       if kitsune_admin[:fields][column.name.to_sym] && kitsune_admin[:fields][column.name.to_sym][:type]
-        kitsune_admin[:fields][column.name.to_sym][:type]
+        case kitsune_admin[:fields][column.name.to_sym][:type]
+        when :sti
+          if kitsune_admin[:fields][column.name.to_sym][:options] && kitsune_admin[:fields][column.name.to_sym][:options][:classes]
+            :select
+          else
+            :text_field
+          end
+        else
+          kitsune_admin[:fields][column.name.to_sym][:type]
+        end
       elsif column.name =~ /_id$/
         :select
       else
@@ -76,6 +101,7 @@ module Kitsune
           when :datetime then :datetime_select
           when :date then :date_select
           when :time then :time_select
+          when :boolean then :check_box
           else :text_field
         end
       end
@@ -127,6 +153,8 @@ module Kitsune
         collection = find_association_class(column).all
         name = detect_label(collection)
         [collection.map { |r| [ r.send(name), r.send(id) ] }, {:include_blank => true}]
+      elsif kitsune_admin[:fields][column.name.to_sym] && kitsune_admin[:fields][column.name.to_sym][:type] == :sti && kitsune_admin[:fields][column.name.to_sym][:options] && kitsune_admin[:fields][column.name.to_sym][:options][:classes]
+        [kitsune_admin[:fields][column.name.to_sym][:options][:classes].map {|c| [c.to_s, c.to_s]}, {:include_blank => true}]
       else
         options = {}
         options[:size] = '80x10' if [:text_area, :wysiwyg].include?(form_type(column))

data/rails/init.rb

@@ -1,3 +1,2 @@
 require 'kitsune'
-
 ActiveRecord::Base.extend(Kitsune::ActiveRecord)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kitsune
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matthew Mongeau <matt@toastyapps.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -04:00
+date: 2009-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - README.textile
+- app/controllers/admin/kitsune/application_controller.rb
 - app/controllers/admin/kitsune/models_controller.rb
 - app/controllers/admin/kitsune/pages_controller.rb
 - app/controllers/admin/kitsune/records_controller.rb
@@ -56,11 +57,14 @@ files:
 - generators/kitsune/templates/images/bg.jpg
 - generators/kitsune/templates/images/form-bg.gif
 - generators/kitsune/templates/images/grey-btn.png
+- generators/kitsune/templates/images/header-link.png
 - generators/kitsune/templates/images/nicEditorIcons.gif
 - generators/kitsune/templates/javascripts/nicEdit.js
 - generators/kitsune/templates/migrations/create_pages.rb
 - generators/kitsune/templates/page.rb
+- generators/kitsune/templates/README
 - generators/kitsune/templates/stylesheets/global.css
+- generators/kitsune/USAGE
 - lib/kitsune/active_record.rb
 - lib/kitsune/builder.rb
 - lib/kitsune/extensions/routes.rb