kitsune 0.0.3 → 0.0.4

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.3"
+  gem_spec.version = "0.0.4"
   gem_spec.summary = "Integrated Rails Content Management System."
   gem_spec.email = "matt@toastyapps.com"
   gem_spec.homepage = "http://github.com/toastyapps/kitsune"
@@ -18,4 +18,4 @@ task :gemspec do
   File.open("#{gem_spec.name}.gemspec", 'w') do |f|
     f.write gem_spec.to_yaml
   end
-end
+end

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

@@ -4,17 +4,18 @@ class Admin::Kitsune::ApplicationController < ActionController::Base
   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
+    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/views/layouts/admin/kitsune.html.erb

@@ -13,7 +13,18 @@
 			<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>
+						<% if model.is_a? Hash %>
+							<% model.each do |key, value| %>
+								<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>
+									<% end %>
+								</div>
+							<% end %>
+						<% else %>
+							<div class='kitsune_model_link'><%= link_to model.admin_name, admin_kitsune_model_records_path(model.object_class) %></div>
+						<% end %>
 					<% end %>
 				</div>
 				<div class='kitsune_right'>

data/generators/kitsune_flat_files/kitsune_flat_files_generator.rb

@@ -0,0 +1,8 @@
+class KitsuneFlatFilesGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # lets do something brilliant
+      puts "Some win..."
+    end
+  end
+end

data/generators/kitsune_flat_files/templates/index.html.erb

@@ -0,0 +1,35 @@
+<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>
+<% @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 %>

data/lib/kitsune/builder.rb

@@ -48,6 +48,11 @@ module Kitsune
       multipart
     end
     
+    def image(field)
+      add :file_field, field
+      multipart
+    end
+    
     def multipart(value = true)
       @resource.kitsune_admin[:multipart] = value
     end

data/lib/kitsune/inspector.rb

@@ -82,10 +82,10 @@ module Kitsune
     end
     
     def form_type(column)
-      if kitsune_admin[:fields][column.name.to_sym] && kitsune_admin[:fields][column.name.to_sym][:type]
-        case kitsune_admin[:fields][column.name.to_sym][:type]
+      if type = field_type(column.name)
+        case type
         when :sti
-          if kitsune_admin[:fields][column.name.to_sym][:options] && kitsune_admin[:fields][column.name.to_sym][:options][:classes]
+          if field_options(field) && field[:classes]
             :select
           else
             :text_field
@@ -148,18 +148,39 @@ module Kitsune
     end
     
     def options_for(column)
-      if column.name =~ /_id$/
+      
+      field = column.name
+      
+      if field_type(field) == :select
+        [field_options(field), {:include_blank => true}]
+      elsif column.name =~ /_id$/
         id = :id
         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}]
+        [collection.map { |element| [ element.send(name), element.send(id) ] }, {:include_blank => true}]
+      elsif field_type(field) == :sti && (options = field_options(field)) && options[:classes]
+        [options[:classes].map {|element| [element.to_s, element.to_s]}, {:include_blank => true}]
       else
-        options = {}
+        options = field_options(field) || {}
         options[:size] = '80x10' if [:text_area, :wysiwyg].include?(form_type(column))
         [options]
       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
+    
+    def field_options(field)
+      options = kitsune_admin[:fields][field.to_sym][:options] if field_defined(field)
+      return (options.is_a?(Proc) ? options.call : options) if options
+      return nil
+    end
   end
 end

data/lib/kitsune/page.rb

@@ -4,6 +4,7 @@ module Kitsune
       model.class_eval do
         admin do
           wysiwyg :body
+          select :layout, Proc.new {Dir.glob(File.join(RAILS_ROOT, 'app', 'views', 'layouts', '*.html.haml')).map{|f| File.basename(f).split('.').first}}
         end
         
         before_save :update_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kitsune
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthew Mongeau <matt@toastyapps.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -05:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,8 @@ files:
 - generators/kitsune/templates/README
 - generators/kitsune/templates/stylesheets/global.css
 - generators/kitsune/USAGE
+- generators/kitsune_flat_files/kitsune_flat_files_generator.rb
+- generators/kitsune_flat_files/templates/index.html.erb
 - lib/kitsune/active_record.rb
 - lib/kitsune/builder.rb
 - lib/kitsune/extensions/routes.rb
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - mislav-will_paginate
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Integrated Rails Content Management System.