kitsune 0.0.16 → 0.0.17

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.16"
+  gem_spec.version = "0.0.17"
   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/kitsune_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Kitsune::KitsuneController < Admin::Kitsune::ApplicationController
   before_filter :load_models
-  
+  skip_before_filter :verify_authenticity_token
   private
   def load_models
     models = Kitsune.models_with_admin.map{ |m| Kitsune::Inspector.new(m) }

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

@@ -0,0 +1,27 @@
+class Admin::Kitsune::MediaController < Admin::Kitsune::KitsuneController
+  layout 'admin/kitsune'
+  
+  helper 'admin/kitsune/records'
+  
+  before_filter :load_model
+  
+  def new
+    @parent_instance = @parent.new_record
+    @media = @model.new_record
+    render :layout => false
+  end
+  
+  def create
+    @media = @model.new_record
+    @upload = @model.new_record
+    @parent_instance = @parent.new_record
+    @upload.update_attribute(@parent.kitsune_admin[:media].values.first, params['image'])
+    render 'new', :layout => false
+  end
+  
+  private
+  def load_model
+    @parent = Kitsune::Inspector.new(params[:model_id].constantize) if params[:model_id]
+    @model = Kitsune::Inspector.new(params[:id].constantize) if params[:id]
+  end
+end

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

@@ -5,7 +5,7 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::KitsuneController
   before_filter :load_record
   
   def index
-    order, @sort_param, @sort_dir = nil, nil, nil
+    order, @sort_param, @sort_dir = @model.order_by, nil, nil
     if params[:sort]
       @sort_param = params[:sort]
       @sort_dir = params[:sort_dir]
@@ -19,24 +19,28 @@ class Admin::Kitsune::RecordsController < Admin::Kitsune::KitsuneController
   end
   
   def create
-    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])
+    if request.xhr?
+      render :text => "Foo"
     else
-      @record = @model.new_record(params[params[:model_id].underscore])
-    end
-    if @record.save
-      flash[:notice] = "Record Saved"
-			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'
+      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"
+  			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'
+      end
     end
   end
   

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

@@ -5,13 +5,20 @@ module Admin::Kitsune::RecordsHelper
   
   def sort_link_to(resource, column)
     if resource.column_sortable(column)
+      ascending = false
+      unless params[:sort]
+        if resource.order_by_hash && resource.order_by_hash.keys.include?(column.name.to_sym)
+          params[:sort] = column.name
+          params[:sort_dir] = resource.order_by_hash[column.name.to_sym].to_s.upcase
+        end
+      end
       ascending = params[:sort] == column.name && params[:sort_dir] == 'DESC'
       options = {
         :model => resource.object,
         :sort => column.name, 
         :sort_dir => (ascending ? 'ASC' : 'DESC')
       }
-      link_to column.name.to_s.titleize + (ascending ? ' ↓' : ' ↑'), options
+      link_to column.name.to_s.titleize + (ascending ? ' ↓' : (params[:sort] == column.name ? ' ↑' : ' ↕')), options
     else
       column.name.to_s.titleize
     end

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

@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head>
+    	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    	<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7"/>
+			<%= javascript_include_tag 'kitsune/jquery.js', 'kitsune/kitsune_jquery.js', 'kitsune/upload_maker.js' %>
+    	<script type="text/javascript">
+    	 $(document).ready(function() {
+    	   //Get the parent window
+    	   up = window.parent.document;
+    	   <%	if @upload %>
+    	    var destination = '<%= params['destination'] %>'
+    	    //Update value
+    	    $('#' + destination, up).val('<%= @upload.send(@parent.kitsune_admin[:media].values.first).url %>');
+    	    //Trigger select
+    	    $('#' + destination, up).focus();
+    	   <% end %>
+    	 })
+    	</script>
+    </head>
+    <body style="background-color:transparent; margin:0px; padding:0px; overflow:hidden;">
+				<% form_for(@parent_instance, :url => url_for_record(@parent_instance).gsub(/records/, 'media')+"?id=#{@media.class.to_s}", :html => {:multipart => true, :id => "upload_image_form"}) do |form| %>
+            <input type="hidden" name="destination" value="<%= params['destination'] %>">
+            <div id="controls">
+                                    <input type="hidden" name="domain" value="data"/>
+
+                    <div style="font:normal 11px 'Lucida Grande',Verdana; color:#aaa;
+                    text-decoration:none; cursor:pointer; position:absolute;
+                    right:0px; top:0px; height:16px; line-height:16px;">+ Upload photo</div>
+                            </div>
+
+            <div
+            style="position:absolute; right:0px; top:0px;
+            width:100px; height:24px;
+            filter:alpha(opacity=0); -moz-opacity:0; opacity:0; overflow:hidden;"><input
+            type="file" id="image" name="image"
+            style="cursor:pointer; height:24px; position:absolute;
+            right:0px; top:0px;"
+            onchange="document.getElementById('upload_image_form').submit();
+            document.getElementById('controls').style.display = 'none';
+            document.getElementById('loader').style.display = 'inline';"/></div>
+
+            <img src="http://assets.tumblr.com/images/bookmarklet_loader.gif" id="loader" style="display:none; width:16px;
+            height:16px; position:absolute; top:0px; right:0px;"/>
+        <% end %>
+    </body>
+
+</html>

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

@@ -25,3 +25,4 @@
           = hidden_field_tag :redirect_id, params[column.name]
     .submit_button
       %button(value="Save" type='submit' class="submitBtn") <span>Save</span>
+= yield :below_form

data/app/views/admin/kitsune/shared/_flashes.html.haml

@@ -0,0 +1,6 @@
+#flash_messages
+  - [:notice,:error].each do |flash_type|
+    - if flash[flash_type]
+      %div{ :class => "flash_#{flash_type}" }
+        - flash[flash_type].each do |n,msg|
+          = "#{n} #{msg}"

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

@@ -2,12 +2,26 @@
 <html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
 	<head>
 		<title>Kitsune CMS</title>
-    <%= javascript_include_tag 'kitsune/jquery.js', 'kitsune/kitsune_jquery.js' %>
+    <%= javascript_include_tag 'kitsune/jquery.js', 'kitsune/kitsune_jquery.js', 'kitsune/upload_maker.js' %>
 		<%= stylesheet_link_tag 'kitsune/global.css' %>
 		<!--[if IE]>
       <%= stylesheet_link_tag 'kitsune/ie.css' %>
     <![endif]-->
-		<%= javascript_include_tag 'kitsune/nicEdit.js' %>
+		<%= javascript_include_tag 'kitsune/tiny_mce/tiny_mce.js' %>
+		<script type='text/javascript'>
+			tinyMCE.init({
+				plugins: "iespell",
+				theme: "advanced",
+				width: "650px",
+				height: "500px",
+				theme_advanced_buttons1 : "bold,italic,strikethrough,|,bullist,numlist,|,outdent,indent,|,image,link,unlink,|,code",
+				theme_advanced_buttons2 : "",
+				theme_advanced_buttons3 : "",
+				theme_advanced_toolbar_location : "top",
+				convert_urls : false
+			});
+		</script>
+		<%= yield :head %>
 	</head>
 	<body>
 		<div id='content'>
@@ -15,6 +29,7 @@
 				<h1><%= link_to 'Kitsune CMS', :controller => 'admin/kitsune/models' %></h1>
 				<a href='/' class='view'>View Site</a>
 			</div>
+			<%= render "admin/kitsune/shared/flashes" %>
 			<div class='kitsune_container'>
 				<div class='kitsune_right_container'>
 					<div class='kitsune_right wrapper'>

data/config/kitsune_routes.rb

@@ -5,6 +5,7 @@ ActionController::Routing::Routes.draw do |map|
       kitsune.resources :pages
       kitsune.resources :models do |model|
 				model.resources :records
+        model.resources :media, :only => [:new, :create]
 			end
     end
   end

data/generators/kitsune/kitsune_generator.rb

@@ -3,19 +3,24 @@ class KitsuneGenerator < Rails::Generator::Base
   
   def initialize(runtime_args, runtime_options = {})
     @versioned = runtime_args.delete("--versioned")
+    @include_pages = runtime_args.delete("--include-page-model")
+    @include_users = runtime_args.delete("--include-user-model")
     super
   end
   
   def manifest
     record do |m|
-      page_model = "app/models/page.rb"
-      if File.exists?(page_model)
-        m.insert_into page_model, "include Kitsune::Page"
-      else
-        m.directory File.join("app", "models")
-        m.file "page.rb", page_model
-        m.migration_template "migrations/create_pages.rb", 'db/migrate', :migration_file_name => "kitsune_create_pages"
+      if !!@include_pages
+        page_model = "app/models/page.rb"
+        if File.exists?(page_model)
+          m.insert_into page_model, "include Kitsune::Page"
+        else
+          m.directory File.join("app", "models")
+          m.file "page.rb", page_model
+          m.migration_template "migrations/create_pages.rb", 'db/migrate', :migration_file_name => "kitsune_create_pages"
+        end
       end
+      
       if !!@versioned
         Rails::Generator::Scripts::Generate.new.run(['vestal_versions_migration'])
       end

data/generators/kitsune/templates/javascripts/upload_maker.js

@@ -0,0 +1,19 @@
+$.fn.upload_maker = function(destination) {
+	$(this).each(function() {
+		//Get some vars
+		var id = $(this).attr('id');
+		var image_input_id = id + '_image_url';
+		//write the iframe
+		$(this).before('<iframe src="'+destination+'?destination=' + image_input_id +'" frameborder="0"></iframe>');
+		//write hidden input
+		$(this).after('<input id="' + image_input_id +'" name="' + image_input_id +'" style="position:absolute;left:-9999em" />');
+		$('#' + image_input_id).focus(function() {
+			var url = $(this).val();
+			if (tinyMCE && (ed = tinyMCE.get(id))) {
+				ed.execCommand('mceInsertContent', false, '<img src="' + url + '" alt="' + url + '" />');		
+			} else {
+				insertTag(id, '<img src="' + url + '" alt="' + url + '" />');
+			}
+	  });
+	})
+}

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

@@ -307,6 +307,10 @@ button.submitBtn:hover {
 			color: #fff;
 		}
 
+#flash_messages {padding:0px;}
+	.flash_notice {background:green; padding:5px; color:white;}
+	.flash_error {background:red; padding:5px; color:white;}
+
 .kitsune_container {
 	background:url('/images/kitsune/content-bg.gif') repeat-x left top;
 	padding-top: 20px;

data/lib/kitsune.rb

@@ -8,7 +8,7 @@ module Kitsune
   autoload :Page, 'kitsune/page'
   class << self
     def version
-      '0.0.16'
+      '0.0.17'
     end
   
     def model_paths # abstract this to something else

data/lib/kitsune/active_record.rb

@@ -15,7 +15,9 @@ module Kitsune
           :tabs => {},
           :is_sti => false,
 					:disabled => [],
-					:versioned => false
+					:versioned => false,
+					:order_by => nil,
+					:media => nil # class to store images into
         }
       end
     end

data/lib/kitsune/builder.rb

@@ -1,7 +1,7 @@
 module Kitsune
   class TypeError < StandardError; end
   class Builder
-    
+        
     TYPES = [:check_box, :datetime_select, :password_field, :text_area, :text_field, :wysiwyg]
     def initialize(resource, &block)
       @resource = resource
@@ -16,10 +16,17 @@ module Kitsune
       @resource.kitsune_admin[:name] = name
     end
     
+    def media media
+      @resource.kitsune_admin[:media] = media
+    end
+    
 		def no_menu
 			no_admin
 		end
 		
+		def order_by(order)
+		  @resource.kitsune_admin[:order_by] = order
+	  end
 		
 		def versioned
 		  @resource.send(:versioned)
@@ -78,6 +85,14 @@ module Kitsune
       add :select, field, {:options => options}
     end
     
+    def string(field)
+      add :text_field, field
+    end
+    
+    def text(field)
+      add :text_area, field
+    end
+    
     def sti(field, options = {})
       add :sti, field, {:options => options}
       is_sti field
@@ -94,13 +109,36 @@ module Kitsune
     end
     
     def display(*fields)
-      set :display, fields
+      fields.each do |field|
+        if field.is_a?(Hash)
+          field.each do |key, value|
+            set :display, key
+            set_attributes(key, value)
+          end
+        else
+          set :display, field
+        end
+      end
+    end
+    
+    def set_attributes(field, attributes)
+      [attributes].flatten.each do |attribute|
+        send(attribute.to_sym, field)
+      end
     end
     
     def edit(*fields)
       fields.each do |field|
-        type = @resource.reflections[field.to_sym] ? :reflections : :edit
-        set type, field
+        if field.is_a?(Hash)
+          field.each do |key, value|
+            type = @resource.reflections[key.to_sym] ? :reflections : :edit
+            set(type, key)
+            set_attributes(key, value)
+          end
+        else
+          type = @resource.reflections[field.to_sym] ? :reflections : :edit
+          set type, field
+        end
       end
     end
     
@@ -111,6 +149,8 @@ module Kitsune
     def method_missing(method, *args, &block)
       if TYPES.include?(method)
         add method, *args
+      else
+        raise Exception, "THIS IS WRONG@! #{method.to_s}"
       end
     end
     

data/lib/kitsune/form_helper_ext.rb

@@ -5,7 +5,18 @@ module ActionView
         sanitized_object_name = @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
         sanitized_method_name = method.to_s.sub(/\?$/,"")
         id = "#{sanitized_object_name}_#{sanitized_method_name}"
-        @template.send('text_area', @object_name, method, objectify_options(options.merge({:class => 'wysiwyg'}))) + @template.content_tag('script', "new nicEditor().panelInstance('#{id}');")
+        if @object.kitsune_admin[:media]
+          @template.content_for(:head) do 
+            @template.capture do
+              "<script>
+              $(function() {
+                $('textarea.wysiwyg').upload_maker('#{@template.url_for({:id => @object.kitsune_admin[:media].keys.first.to_s.classify, :action=>"new", :controller=>"admin/kitsune/media"})}');
+              })
+              </script>"
+            end
+          end
+        end
+        @template.send('text_area', @object_name, method, objectify_options(options.merge({:class => 'wysiwyg'}))) + @template.content_tag('script', "tinyMCE.execCommand('mceAddControl', true, '#{id}');")
       end
     end
   end

data/lib/kitsune/inspector.rb

@@ -13,6 +13,14 @@ module Kitsune
       kitsune_admin[:name] || @object.to_s.pluralize
     end
     
+    def order_by
+       order_by_hash ? order_by_hash.map{|k,v| "#{k} #{v}"}.join(' ') : nil
+    end
+    
+    def order_by_hash
+      kitsune_admin[:order_by] || nil
+    end
+    
     def category
       kitsune_admin[:category] || nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kitsune
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Matthew Mongeau <matt@toastyapps.com>
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -05:00
+date: 2009-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,11 +45,13 @@ files:
 - README.textile
 - app/controllers/admin/kitsune/application_controller.rb
 - app/controllers/admin/kitsune/kitsune_controller.rb
+- app/controllers/admin/kitsune/media_controller.rb
 - app/controllers/admin/kitsune/models_controller.rb
 - app/controllers/admin/kitsune/pages_controller.rb
 - app/controllers/admin/kitsune/records_controller.rb
 - app/controllers/kitsune_controller.rb
 - app/helpers/admin/kitsune/records_helper.rb
+- app/views/admin/kitsune/media/new.html.erb
 - app/views/admin/kitsune/models/index.html.haml
 - app/views/admin/kitsune/pages/_form.html.erb
 - app/views/admin/kitsune/pages/edit.html.erb
@@ -60,6 +62,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/shared/_flashes.html.haml
 - app/views/kitsune/show.html.erb
 - app/views/layouts/admin/kitsune.html.erb
 - config/kitsune_routes.rb
@@ -77,6 +80,7 @@ files:
 - generators/kitsune/templates/javascripts/jquery.js
 - generators/kitsune/templates/javascripts/kitsune_jquery.js
 - generators/kitsune/templates/javascripts/nicEdit.js
+- generators/kitsune/templates/javascripts/upload_maker.js
 - generators/kitsune/templates/migrations/create_pages.rb
 - generators/kitsune/templates/page.rb
 - generators/kitsune/templates/README