kitsune 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/kitsune_controller.rb

@@ -1,6 +1,7 @@
 class KitsuneController < ApplicationController
   def show 
-    @page = ::Page.find_by_url([params[:url]].flatten.join('/'))
+    @page = ::Page.find_by_url('/'+[params[:url]].flatten.join('/'))
+    raise ::ActionController::RoutingError, "No route matches #{request.path.inspect}" unless @page.present?
 		@title = @page.title
   end
 end

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

@@ -15,7 +15,7 @@
           = link_to 'Current Version →', :version => nil
     - @model.columns(:edit).each do |column|
       .field
-        - unless params[column.name]
+        - unless params[column.name] && !@model.always?(column)
           = form.label column.name
           = form.send(@model.form_type(column), column.name, *@model.options_for(column))
           = additional_content_for(@model, @record, column)

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

@@ -3,22 +3,24 @@
     %tr
       - model.columns(:display).each do |column|
         %th= sort_link_to(model, column)
-      %th Actions
+      - unless model.disabled?(:edit) && model.disabled?(:delete)
+        %th Actions
   %tbody
     - records.each do |record|
       %tr{:class=>cycle('odd', 'even')}
         - model.columns(:display).each do |column|
-          %td= sanitize(model.display_for(record, column.name).to_s)
-        %td
-          - unless model.disabled?(:edit)
-            - 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
-          - unless model.disabled?(:edit) || model.disabled?(:delete)
-            \- 
-          - unless model.disabled?(:delete)
-            - 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?")
+          %td= model.column_linked?(column) ? link_to(sanitize(model.display_for(record, column.name).to_s), url_for(:controller => 'admin/kitsune/records', :action => :show, :model_id => model.object_class, :id => record.id)): sanitize(model.display_for(record, column.name).to_s)
+        - unless model.disabled?(:edit) && model.disabled?(:delete)
+          %td
+            - unless model.disabled?(:edit)
+              - 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
+            - unless model.disabled?(:edit) || model.disabled?(:delete)
+              \- 
+            - unless model.disabled?(:delete)
+              - 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?")

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

@@ -4,9 +4,3 @@
     = link_to 'Back', :controller => 'admin/kitsune/records', :model_id => params[:model_id]
 
 = render 'form'
-
-- @model.columns(:reflections).each do |column|
-  .reflection
-    %h3= column.name.to_s.titleize
-    = 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 }

data/app/views/admin/kitsune/records/show.html.haml

@@ -0,0 +1,11 @@
+#kitsune_record_header
+  %h2.legend Show #{params[:model_id]}
+  %dl
+    - @model.columns(:show).each do |column|
+      %dt= column.name.capitalize
+      %dd= @record.send(column.name)
+- @model.columns(:reflections).each do |column|
+  .reflection
+    %h3= column.name.to_s.titleize
+    = 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 }

data/kitsune.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kitsune}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["toastyapps", "<matt@toastyapps.com>"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-15}
   s.description = %q{Integrated Rails Content Management System.}
   s.email = %q{matt@toastyapps.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "app/views/admin/kitsune/records/edit.html.haml",
      "app/views/admin/kitsune/records/index.html.haml",
      "app/views/admin/kitsune/records/new.html.haml",
+     "app/views/admin/kitsune/records/show.html.haml",
      "app/views/admin/kitsune/sessions/new.html.haml",
      "app/views/admin/kitsune/shared/_flashes.html.haml",
      "app/views/kitsune/show.html.erb",

data/lib/kitsune/active_record.rb

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

data/lib/kitsune/builder.rb

@@ -25,6 +25,7 @@ module Kitsune
 		end
 		
 		def order_by(order)
+		  order = {order => :asc} unless order.is_a?(Hash)
 		  @resource.kitsune_admin[:order_by] = order
 	  end
 		
@@ -67,6 +68,20 @@ module Kitsune
       end
     end
     
+    def always(*fields)
+      @resource.kitsune_admin[:always] ||= []
+      fields.each do |field|
+        @resource.kitsune_admin[:always] << field.to_sym
+      end
+    end
+    
+    def linked(*fields) # link to resource
+      @resource.kitsune_admin[:linked] ||= []
+      fields.each do |field|
+        @resource.kitsune_admin[:linked] << field.to_sym
+      end
+    end
+    
     def file(field)
       add :file_field, field
       multipart
@@ -121,6 +136,19 @@ module Kitsune
       end
     end
     
+    def show(*fields)
+      fields.each do |field|
+        if field.is_a?(Hash)
+          field.each do |key, value|
+            set :show, key
+            set_attributes(key, value)
+          end
+        else
+          set :show, field
+        end
+      end
+    end
+    
     def set_attributes(field, attributes)
       [attributes].flatten.each do |attribute|
         send(attribute.to_sym, field)

data/lib/kitsune/inspector.rb

@@ -67,7 +67,7 @@ module Kitsune
       else
         kolumns = send("columns_for_#{type}") if respond_to?("columns_for_#{type}")
       end
-      include_pk ? kolumns : kolumns.reject{|c| c.primary }
+      include_pk ? kolumns : (kolumns || []).reject{|c| c.primary }
     end
     
     def columns_for_edit
@@ -102,6 +102,21 @@ module Kitsune
       end
     end
     
+    def columns_for_show
+      columns = @object.columns.dup
+      if kitsune_admin[:show] && kitsune_admin[:show][:fields]
+        columns = columns.select{|c| kitsune_admin[:show][:fields].include?(c.name.to_sym)}
+        column_names = columns.map{|c| c.name.to_sym}
+        fields_to_add = kitsune_admin[:show][:fields].reject{|f| column_names.include?(f)}
+        fields_to_add.each do |field|
+          columns << Kitsune::FauxColumn.new(field, :string)
+        end
+        columns
+      else
+        columns
+      end
+    end
+    
     def columns_for_reflections
 			if kitsune_admin[:reflections] && kitsune_admin[:reflections][:fields]
 				kitsune_admin[:reflections][:fields].map do |field|
@@ -117,6 +132,16 @@ module Kitsune
       kitsune_admin[:sortable] && kitsune_admin[:sortable].include?(column.name.to_sym)
     end
     
+    def always?(column)
+      # move to column proxy
+      kitsune_admin[:always] && kitsune_admin[:always].include?(column.name.to_sym)
+    end
+    
+    def column_linked?(column)
+      # move to column proxy
+      kitsune_admin[:linked] && kitsune_admin[:linked].include?(column.name.to_sym)
+    end
+    
     def method_missing(method, *args, &block)
       @object.send(method, *args, &block)
     end

data/lib/kitsune/page.rb

@@ -3,19 +3,32 @@ module Kitsune
     def self.included(model)
       model.class_eval do
         admin do
+          display :title, :layout, :parent_id, :url
           wysiwyg :body
-          select :layout, Proc.new {Dir.glob(File.join(RAILS_ROOT, 'app', 'views', 'layouts', '*.html.haml')).map{|f| File.basename(f).split('.').first}}
+          select :layout, Proc.new {Dir.glob(File.join(RAILS_ROOT, 'app', 'views', 'layouts', '*.html.*')).map{|f| File.basename(f).split('.').first}}
         end
         
         before_save :update_url
         belongs_to :page, :foreign_key => "parent_id"
         belongs_to :parent, :class_name => 'Page'
+        validate :must_be_kitsune_route
+        validates_uniqueness_of :url
+        
+        def title_for_url
+          CGI.escape(title.downcase.gsub(/\s+/, '-')).squeeze('-')
+        end
+        
+        def url_for_page
+          parent ? parent.url_for_page + '/' + title_for_url : '/' + title_for_url
+        end
         
         def update_url
-          unless url.present?
-            write_attribute :url, CGI.escape(title.downcase.gsub(/\s+/, '-')) 
-          else
-            write_attribute :url, CGI.escape(url)
+          write_attribute :url, (url.present? ? url : url_for_page)
+        end
+        
+        def must_be_kitsune_route
+          unless ActionController::Routing::Routes.recognize_path(url.present? ? url : url_for_page)[:controller] == 'kitsune'
+            errors.add_to_base("URL is already being used")
           end
         end
       end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ $: << File.dirname(__FILE__)
  
 require 'rubygems'
 require 'test/unit'
-require 'activerecord'
+require 'active_record'
 require 'shoulda'
 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.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - toastyapps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-01-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - app/views/admin/kitsune/records/edit.html.haml
 - app/views/admin/kitsune/records/index.html.haml
 - app/views/admin/kitsune/records/new.html.haml
+- app/views/admin/kitsune/records/show.html.haml
 - app/views/admin/kitsune/sessions/new.html.haml
 - app/views/admin/kitsune/shared/_flashes.html.haml
 - app/views/kitsune/show.html.erb