zena 0.15.2 → 0.16.0

data/.gitignore

@@ -0,0 +1,20 @@
+.DS_Store
+config/deploy_config.rb
+config/database.yml
+config/*.sphinx.conf
+db/sphinx
+doc/coverage
+log/
+pkg/*
+public/images/ext/*_pv.png
+public/images/ext/*_std.png
+public/images/ext/*_tiny.png
+public/images/ext/*_mini.png
+REVISION
+sandbox
+sites/*
+test/fixtures/*.yml
+tmp/*
+db/*.sqlite3
+coverage
+vendor/apache2_upload_progress/*

data/CREDITS

@@ -0,0 +1,27 @@
+javascript date selection
+-------------------------
+    Mihai Bazon
+    http://dynarch.com
+    adapted to Rails by Gaspard Bucher
+
+tablekit table editor
+---------------------
+    Andrew Tetlaw & Millstream Web Software
+    http://www.millstream.com.au/view/code/tablekit/
+    add/remove columns and drag&drop support added by Gaspard Bucher
+    
+soft icons
+----------
+    Mark James
+    http://www.famfamfam.com/lab/icons/silk/
+    
+xspf mp3 player
+---------------
+    Fabricio Zuardi
+    http://musicplayer.sourceforge.net/
+	
+upload progress bar (sample application demo)
+-------------------
+    Tim
+    http://itblog.mcgeecorp.com/articles/2007/05/15/mongrel-upload-progress-demo
+    

data/Capfile

@@ -0,0 +1,3 @@
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'config/deploy'

data/DEVELOPERS

@@ -0,0 +1,46 @@
+style
+=====
+
+Please strip trailing whitespace from your files before commit. You can "strip on save"
+in TextMate (http://blogobaggins.com/2009/03/31/waging-war-on-whitespace.html#fn3) or
+any other well built editor.
+
+==== start server with mongrel upload progress (done through mongrel)
+> lib/upload_progress_server.rb start
+> mongrel_rails start -s config/mongrel_upload_progress.conf
+
+==== development using passenger
+Install version >= 2.1.1, install mod_upload_progress (file in vendor/apache_upload)
+
+example config:
+-------------------
+ServerName test.host
+
+LoadModule upload_progress_module libexec/apache2/mod_upload_progress.so
+LoadModule passenger_module /Users/gaspard/git/passenger/ext/apache2/mod_passenger.so
+PassengerRoot /Users/gaspard/git/passenger
+PassengerRuby /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+
+<VirtualHost test.host>
+    ServerName test.host
+    DocumentRoot /Users/gaspard/git/zena/sites/test.host/public
+    CustomLog "/Users/gaspard/git/zena/sites/test.host/log/access.log" common
+    ErrorLog "/Users/gaspard/git/zena/sites/test.host/log/error.log"
+
+    PassengerAppRoot /Users/gaspard/git/zena
+    RailsEnv production
+
+    <Directory /Users/gaspard/git/zena/sites/test.host/public>
+      Order deny,allow
+      Allow from all
+    </Directory>
+
+    <Location />
+        TrackUploads On
+    </Location>
+
+    <Location /upload_progress>
+        ReportUploads On
+    </Location>
+</VirtualHost>
+-------------------

data/History.txt

@@ -1,3 +1,18 @@
+== 0.16.0 2010-01-15
+
+* 3 major enhancements:
+  * Sphinx search support
+  * Authlogic authentification
+  * attachments can now be provided with an url
+  * added [node:attribute_name] to use in querybuilder
+
+* 5 minor enhancement
+  * logrotate setup support with capistrano
+  * fixed contact content zip bug
+  * fixed fullpath set to NULL instead of kept in sync
+  * fixed zafu generated partials not reloaded bug
+  * using jeweler instead of bones for gem management
+
 == 0.15.2 2010-01-06
 
 * 1 minor enhancement

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2007-2009 Gaspard Bucher
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,44 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'
+
+task :default => 'zena:test'
+
+require 'zena'
+
+# GEM management
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = 'zena'
+    gemspec.summary = 'CMS with super natural powers, based on Ruby on Rails'
+    gemspec.description = "zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour)."
+    gemspec.email = "gaspard@teti.ch"
+    gemspec.homepage = "http://zenadmin.org"
+    gemspec.authors = ['Gaspard Bucher']
+    gemspec.version = Zena::VERSION
+    gemspec.rubyforge_project = 'zena'
+
+    # Gem dependecies
+    Zena.gem_configuration.each do |gem_name, gem_config|
+      if gem_config
+        if gem_config['development_only']
+          gemspec.add_development_dependency(gem_name, gem_config['version'])
+        else
+          gemspec.add_dependency(gem_name, gem_config['version'])
+        end
+      else
+        gemspec.add_dependency(gem_name)
+      end
+    end
+  end
+rescue LoadError
+  puts "Jeweler not available. Gem packaging tasks not available."
+end

data/TODO

@@ -0,0 +1,24 @@
+== Parts that need an urgent cleanup ==
+
+Some parts of zena have become really messy and need an URGENT cleanup. These parts are mostly
+related to nested attributes and the cleanup should be made during the move to rails 2.3+.
+
+Some really ugly parts:
+
+=== links ===
+
+We support many different ways to alter links and it's becoming hard to maintain:
+
+node[hot_id] = ZIP
+node[link][hot][other_id] = ZIP
+node[link][1][other_id] = ZIP along with node[link][1][role] = 'hot'
+link[other_id]  = ZIP
+link[other_zip] = ZIP
+
+We need 'other_zip' because select_id helper needs to read the value... "select_id" is really bad code. yuk.
+
+===== documentation ======
+
+using negative ids to remove links:
+
+friend_id = -ZIP  ====> ensure there is no 'friend' relationship with node ZIP.

data/TODO_ZENA_1_0

@@ -0,0 +1,23 @@
+List of things to discuss
+=========================
+
+Relation between zena, custom applications and bricks:
+
+1. custom models
+2. custom migrations
+3. custom zafu rules
+4. custom tests
+
+Folder structure should be like a rails application with some elements missing (all zena controllers, views, helpers, etc). It
+should still launch in Passenger and all other servers like mongrel.
+
+my_app
+  +-- app             (same structure as a brick)
+  |    +-- models     (custom application stuff)
+  |    +-- controllers
+  |    +-- helpers
+  |    +-- zafu       (custom zafu tags)
+  +-- bricks
+  +-- config
+  +-- sites
+  +-- vendor

data/app/controllers/application_controller.rb

@@ -1,3 +1,6 @@
+
 class ApplicationController < ActionController::Base
+
   include Zena::App
+
 end

data/app/controllers/documents_controller.rb

@@ -1,5 +1,5 @@
 class DocumentsController < ApplicationController
-  before_filter :find_node, :except => [ :file_form, :upload_progress ]
+  before_filter :find_node, :except => [ :get_uf, :upload_progress ]
 
   skip_before_filter :set_lang,      :only => :upload_progress
   skip_before_filter :authorize,     :only => :upload_progress
@@ -44,57 +44,29 @@ class DocumentsController < ApplicationController
   def upload
     create_document
 
-    responds_to_parent do # execute the redirect in the main window
+    responds_to_parent do # execute the redirect in the iframe's parent window
       render :update do |page|
-        page.call "UploadProgress.setAsFinished"
-        page.delay(1) do # allow the progress bar fade to complete
-          page.redirect_to document_url(@node[:zip])
+        if @node.new_record?
+          page.replace_html 'form_errors', error_messages_for(@node)
+          page.call 'UploadProgress.setAsError'
+        else
+          page.call 'UploadProgress.setAsFinished'
+          page.delay(1) do # allow the progress bar fade to complete
+            page.redirect_to document_url(@node[:zip])
+          end
         end
       end
     end
   end
 
   def upload_progress
-    # When using the mod_upload_progress module, this is never hit:
-    # <Location /upload_progress>
-    #   ReportUploads On
-    # </Location>
-    #
-    # When using Mongrel: mimic apache2 mod_upload_progress
-    #
-    # if (!found) {
-    #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'starting' })");
-    # } else if (err_status >= HTTP_BAD_REQUEST  ) {
-    #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'error', 'status' : %d })", err_status);
-    # } else if (done) {
-    #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'done' })");
-    # } else if ( length == 0 && received == 0 ) {
-    #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'starting' })");
-    # } else {
-    #   response = apr_psprintf(r->pool, "new Object({ 'state' : 'uploading', 'received' : %d, 'size' : %d, 'speed' : %d  })", received, length, speed);
-    # }
-    render :update do |page|
-      begin
-        @status = Mongrel::Uploads.check(params[:"X-Progress-ID"])
-        if @status
-          if @status[:received] != @status[:size]
-            page << "new Object({ 'state' : 'uploading', 'received' : #{@status[:received]}, 'size' : #{@status[:size]} })"
-          else
-            page << "new Object({ 'state' : 'done' })"
-          end
-        else
-          #page << "new Object({ 'state' : 'done' })"
-        end
-      rescue NameError
-        page << "new Object({ 'state' : 'upload in progress..' })"
-      end
-    end
+    render_upload_progress
   end
 
   # TODO: test
   # display an upload field.
-  def file_form
-    render :inline=>"<%= link_to_function(_('cancel'), \"['file', 'file_form'].each(Element.toggle);$('file_form').innerHTML = '';\")%><input id='attachment#{params[:uuid]}' name='attachment' onchange=\"Zena.get_filename('attachment#{params[:uuid]}','node_v_title'); $('node_v_title').focus(); $('node_v_title').select();\" class='file' type='file' />"
+  def get_uf
+    render_get_uf
   end
 
   # TODO: test
@@ -120,22 +92,16 @@ class DocumentsController < ApplicationController
 
     def create_document
       attrs = params['node']
-      attrs['c_file'] = params['attachment'] if params['attachment']
-      attrs[:klass] ||= 'Document'
-      if attrs['c_file'].kind_of?(String)
-        attrs['c_file'] = StringIO.new(attrs['c_file'])
-        # StringIO
-        if attrs['name'] =~ /^.*\.(\w+)$/ && types = EXT_TO_TYPE[$1]
-          content_type = types[0]
-        else
-          content_type = ''
-        end
-        (class << attrs['c_file']; self; end;).class_eval do
-          define_method(:content_type) { content_type }
-          define_method(:original_filename) { attrs['name'] || 'file.txt' }
-        end
+      file, error = get_attachment
+      attrs['c_file'] = file if file
+      attrs['klass'] ||= 'Document'
+      if error
+        @node = secure!(Document) { Document.new }
+        @node.attributes = attrs
+        @node.errors.add('c_file', error)
+      else
+        @node = secure!(Document) { Document.create_node(attrs) }
       end
-      @node = secure!(Document) { Document.create_node(attrs) }
     end
 
 end

data/app/controllers/nodes_controller.rb

@@ -118,10 +118,10 @@ class NodesController < ApplicationController
           # math rendered as png, ...
           filename     = "#{asset}.#{params[:format]}"
           content_path = @node.asset_path(filename)
-          content_type = (EXT_TO_TYPE[params[:format]] || ['application/octet-stream'])[0]
+          content_type = (Zena::EXT_TO_TYPE[params[:format]] || ['application/octet-stream'])[0]
           send_file(content_path, :filename=>filename, :type => content_type, :disposition=>'inline', :x_sendfile => ENABLE_XSENDFILE)
           cache_page(:content_path => content_path, :authenticated => @node.public?) # content_path is used to cache by creating a symlink
-        elsif @node.kind_of?(Document) && params[:format] == @node.c_ext
+        elsif @node.kind_of?(Document) && params[:format] == @node.version.content.ext
           # Get document data (inline if possible)
           content_path = nil
 
@@ -160,7 +160,14 @@ class NodesController < ApplicationController
 
   def create
     attrs = params['node']
+    file, file_error = get_attachment
+    if file
+      attrs['c_file'] = file
+      attrs['klass'] = 'Document'
+    end
+
     @node = secure!(Node) { Node.create_node(attrs) }
+    @node.errors.add('c_file', file_error) if file_error
 
     respond_to do |format|
       if @node.errors.empty?
@@ -213,20 +220,28 @@ class NodesController < ApplicationController
     if klass == 'Skin' && !defaults.has_key?('v_status')
       defaults['v_status'] = Zena::Status[:pub]
     end
-    @nodes = secure!(Node) { Node.create_nodes_from_folder(
-      :klass    => klass,
-      :archive  => params[:attachment],
-      :parent   => @node,
-      :defaults => defaults
-    )}.values
-    # parse pseudo_ids
-    parse_assets(@nodes)
-
-    responds_to_parent do # execute the redirect in the main window
-      render :update do |page|
-        page.call "UploadProgress.setAsFinished"
-        page.delay(1) do # allow the progress bar fade to complete
-          page.replace_html 'import_tab', :partial => 'import_results'
+    attachment, error = get_attachment
+    if error
+      responds_to_parent do
+        page.replace 'form_errors', error
+      end
+    else
+      # TODO: UploadProgress.setAsProcessing..... would be nice...
+      @nodes = secure!(Node) { Node.create_nodes_from_folder(
+        :klass    => klass,
+        :archive  => attachment,
+        :parent   => @node,
+        :defaults => defaults
+      )}.values
+      # parse pseudo_ids
+      parse_assets(@nodes)
+
+      responds_to_parent do # execute the redirect in the main window
+        render :update do |page|
+          page.call 'UploadProgress.setAsFinished'
+          page.delay(1) do # allow the progress bar fade to complete
+            page.replace_html 'import_tab', :partial => 'import_results'
+          end
         end
       end
     end
@@ -237,9 +252,12 @@ class NodesController < ApplicationController
   end
 
   def update
-    params['node']['c_file'] = params['attachment'] if params['attachment']
+    file, file_error = get_attachment
+    params['node']['c_file'] = file if file
+
     @v_status_before_update = @node.v_status
     @node.update_attributes_with_transformation(params['node'])
+    @node.errors.add('c_file', file_error) if file_error
 
     if @node.errors.empty?
       flash.now[:notice] = _('node updated')
@@ -247,8 +265,8 @@ class NodesController < ApplicationController
       flash.now[:error]  = _('could not update')
     end
 
-    if params[:attachment]
-      responds_to_parent do # execute the redirect in the main window
+    if params[:iframe]
+      responds_to_parent do # execute the redirect in the iframe's parent window
         render :update do |page|
           page.call "UploadProgress.setAsFinished"
           page.delay(1) do # allow the progress bar fade to complete
@@ -265,7 +283,7 @@ class NodesController < ApplicationController
             redirect_to zen_path(@node, :mode => params[:mode])
           end
         end
-        format.js   { @flash = flash }
+        format.js { @flash = flash }
       end
     end
   end
@@ -458,17 +476,14 @@ class NodesController < ApplicationController
 
     def do_search
       @node = current_site.root_node
-      query = Node.match_query(params[:q], :node => @node)
-
-      @nodes = secure(Node) do
-        @nodes_previous_page, @nodes, @nodes_next_page = Node.find_with_pagination(:all,query.merge(:per_page => 10, :page => params[:page]))
-        @nodes # important: this is the 'secure' yield return, it is used to secure found nodes
-      end
+      @search_per_page = params[:per_page] ? params[:per_page].to_i : 20
+      @nodes = secure(Node) { Node.search_records(params[:q], :node => @node, :page => params[:page], :per_page => @search_per_page) }
+      @search_count = 100 # FIXME: @nodes ? @nodes.total_entries : 0
     end
 
     # Document data do not change session[:lang] and can point at cached content (no nee to redirect to AUTHENTICATED_PREFIX).
     def avoid_prefix_redirect
-      @node.kind_of?(Document) && params[:format] == @node.c_ext
+      @node.kind_of?(Document) && params[:format] == @node.version.content.ext
     end
 
     # Transform pseudo id into absolute paths (used after import)