zena 0.16.3 → 0.16.4

data/.gitignore

@@ -3,6 +3,7 @@ config/deploy_config.rb
 config/database.yml
 config/*.sphinx.conf
 db/sphinx
+db/development_structure.sql
 doc/coverage
 log/
 pkg/*

data/History.txt

@@ -1,3 +1,14 @@
+== 0.16.4 2010-02-22
+
+* 3 major enhancement
+  * fixed installation and runtime bugs on Windows
+  * moved ruby files in 'lib' into their Zena namespace
+  * german translations [Lars Kanis]
+
+* 2 minor enhancments
+  * fixed edgy bug with name duplicates
+  * fixed bug that would show a 'site not found' error instead of a 404
+
 == 0.16.3 2010-01-19
 
 * 1 major enhancement

data/app/controllers/nodes_controller.rb

@@ -125,7 +125,7 @@ class NodesController < ApplicationController
           # Get document data (inline if possible)
           content_path = nil
 
-          if @node.kind_of?(Image) && !ImageBuilder.dummy?
+          if @node.kind_of?(Image) && !Zena::Use::ImageBuilder.dummy?
             if img_format = Iformat[params[:mode]]
               content_path = @node.version.content.filepath(img_format)
               # force creation of image data

data/app/controllers/versions_controller.rb

@@ -27,7 +27,7 @@ class VersionsController < ApplicationController
           return redirect_to(params.merge(:format => (@node.safe_content_read('ext') || 'html')))
         end
 
-        if @node.kind_of?(Image) && !ImageBuilder.dummy?
+        if @node.kind_of?(Image) && !Zena::Use::ImageBuilder.dummy?
           img_format = Iformat[params[:mode]]
           data = @node.version.content.file(img_format)
           content_path = @node.version.content.filepath(img_format)

data/app/controllers/virtual_classes_controller.rb

@@ -1,12 +1,12 @@
 class VirtualClassesController < ApplicationController
   before_filter :visitor_node
-  before_filter :find_virtual_class, :except => [:index, :create, :new]
+  before_filter :find_virtual_class, :except => [:index, :create, :new, :import]
   before_filter :check_is_admin
   layout :admin_layout
 
   def index
     secure(VirtualClass) do
-      @virtual_classes = VirtualClass.paginate(:all, :order => 'name', :per_page => 20, :page => params[:page])
+      @virtual_classes = VirtualClass.paginate(:all, :order => 'kpath', :per_page => 20, :page => params[:page])
     end
     @virtual_class  = VirtualClass.new
     respond_to do |format|
@@ -15,6 +15,33 @@ class VirtualClassesController < ApplicationController
     end
   end
 
+  def export
+    secure(VirtualClass) do
+      @virtual_classes = VirtualClass.all
+    end
+    ###
+  end
+
+  def import
+    attachment = params[:attachment]
+    if attachment.nil?
+      flass[:error] = "Upload failure: no definitions."
+      redirect_to :action => :index
+    else
+      data = YAML.load(attachment.read) rescue nil
+      if data.nil?
+        flash[:error] = "Could not parse yaml document"
+        redirect_to :action => :index
+      else
+        @virtual_classes = secure(VirtualClass) { VirtualClass.import(data) }.paginate(:per_page => 200)
+        @virtual_class  = VirtualClass.new
+        respond_to do |format|
+          format.html { render :action => 'index' }
+        end
+      end
+    end
+  end
+
   def show
     respond_to do |format|
       format.html # show.erb

data/app/models/cached_page.rb

@@ -111,8 +111,8 @@ class CachedPage < ActiveRecord::Base
       filepath = "#{SITES_ROOT}#{path}"
       FileUtils.mkpath(File.dirname(filepath))
       if content_path
-        FileUtils::rm(filepath) if File.exist?(filepath)
-        File.symlink(content_path, filepath)
+        FileUtils.rm(filepath) if File.exist?(filepath)
+        FileUtils.symlink_or_copy(content_path, filepath)
       else
         File.open(filepath, "wb+") { |f| f.write(content_data) }
       end
@@ -128,7 +128,7 @@ class CachedPage < ActiveRecord::Base
     def cached_page_on_destroy
       filepath = "#{SITES_ROOT}#{path.gsub('..','')}" # just in case...
       CachedPage.logger.info "remove #{filepath}"
-      FileUtils::rm(filepath) if File.exist?(filepath)
+      FileUtils.rm(filepath) if File.exist?(filepath)
       CachedPage.connection.execute "DELETE FROM cached_pages_nodes WHERE cached_page_id = '#{id}'"
     end
 end

data/app/models/document.rb

@@ -125,26 +125,7 @@ class Document < Node
 
     # Make sure name is unique
     def node_before_validation
-      # we are in a scope, we cannot just use the normal validates_...
-      # FIXME: remove 'with_exclusive_scope' once scopes are clarified and removed from 'secure'
-      Node.send(:with_exclusive_scope) do
-        if new_record?
-          cond = ["name = ? AND parent_id = ? AND kpath LIKE 'ND%'", self[:name], self[:parent_id]]
-        else
-          cond = ["name = ? AND parent_id = ? AND kpath LIKE 'ND%' AND id != ? ", self[:name], self[:parent_id], self[:id]]
-        end
-
-        if taken_name = Node.find(:first, :select => 'name', :conditions => cond, :order => "LENGTH(name) DESC")
-          if taken_name =~ /^#{self[:name]}-(\d)/
-            self[:name] = "#{self[:name]}-#{$1.to_i + 1}"
-            i = $1.to_i + 1
-          else
-            self[:name] = "#{self[:name]}-1"
-            i = 1
-          end
-          version.title = "#{version.title}-#{i}" unless version.title.blank?
-        end
-      end
+      get_unique_name_in_scope('ND%')
       super
     end
 end

data/app/models/iformat.rb

@@ -39,7 +39,7 @@ class Iformat < ActiveRecord::Base
     end
 
     def formats_for_site(site_id, as_hash = true)
-      formats = ::ImageBuilder::DEFAULT_FORMATS.dup
+      formats = Zena::Use::ImageBuilder::DEFAULT_FORMATS.dup
 
       site_formats = {}
       last_update = nil
@@ -59,7 +59,7 @@ class Iformat < ActiveRecord::Base
     end
 
     def new_from_default(key)
-      return nil unless default = ImageBuilder::DEFAULT_FORMATS[key]
+      return nil unless default = Zena::Use::ImageBuilder::DEFAULT_FORMATS[key]
       obj = self.new
       default.each do |k,v|
         next if k == :hash_id
@@ -117,7 +117,7 @@ class Iformat < ActiveRecord::Base
       :height  => height,
       :gravity => eval("Magick::#{gravity}"),
     }
-    h.merge!(:hash_id => ImageBuilder.hash_id(h))
+    h.merge!(:hash_id => Zena::Use::ImageBuilder.hash_id(h))
     h.merge!(:popup => popup) if popup
     h
   end
@@ -125,7 +125,7 @@ class Iformat < ActiveRecord::Base
   # This is a unique identifier used to cache images with format:
   # image30_pv.jpg#{node.updated_at.to_i + format.hash_id}
   def hash_id
-    ImageBuilder.hash_id(self.as_hash)
+    Zena::Use::ImageBuilder.hash_id(self.as_hash)
   end
 
   def size

data/app/models/image.rb

@@ -57,7 +57,7 @@ class Image < Document
 
   class << self
     def accept_content_type?(content_type)
-      ImageBuilder.image_content_type?(content_type)
+      Zena::Use::ImageBuilder.image_content_type?(content_type)
     end
 
     # This is a callback from acts_as_multiversioned

data/app/models/image_content.rb

@@ -55,7 +55,7 @@ class ImageContent < DocumentContent
     max        = format['max_value'].to_f * (format['max_unit'] == 'Mb' ? 1024 : 1) * 1024
 
     # crop image
-    img = ImageBuilder.new(:file=>original)
+    img = Zena::Use::ImageBuilder.new(:file=>original)
     img.crop!(x, y, w, h) if x && y && w && h
     img.format       = format['format'] if new_type && new_type != content_type
     img.max_filesize = max if format['max_value'] && max
@@ -71,7 +71,7 @@ class ImageContent < DocumentContent
   # Set content file, will refuse to accept the file if it is not an image.
   def file=(file)
     super
-    return unless ImageBuilder.image_content_type?(file.content_type)
+    return unless Zena::Use::ImageBuilder.image_content_type?(file.content_type)
     img = image_with_format(nil)
     self[:width ] = img.width
     self[:height] = img.height
@@ -132,11 +132,11 @@ class ImageContent < DocumentContent
 
   def image_with_format(format=nil)
     if @new_file
-      ImageBuilder.new(:file => @new_file).transform!(format)
+      Zena::Use::ImageBuilder.new(:file => @new_file).transform!(format)
     elsif !new_record?
       format   ||= Iformat['full']
       @formats ||= {}
-      @formats[format[:name]] ||= ImageBuilder.new(:path => filepath,
+      @formats[format[:name]] ||= Zena::Use::ImageBuilder.new(:path => filepath,
               :width => self[:width], :height => self[:height]).transform!(format)
     else
       raise StandardError, "No image to work on"
@@ -170,7 +170,7 @@ class ImageContent < DocumentContent
 
     def valid_file
       return false unless super
-      if @new_file && !ImageBuilder.image_content_type?(@new_file.content_type)
+      if @new_file && !Zena::Use::ImageBuilder.image_content_type?(@new_file.content_type)
         errors.add('file', 'must be an image')
         return false
       else

data/app/models/node.rb

@@ -1404,6 +1404,10 @@ class Node < ActiveRecord::Base
           version.title = self.name
         elsif !version.title.blank?
           self.name = version.title.url_name
+          if !new_record? && kind_of?(Page) && name_changed?
+            # we only rebuild Page names on update
+            get_unique_name_in_scope('NP%')
+          end
         end
       end
 
@@ -1689,6 +1693,27 @@ class Node < ActiveRecord::Base
       end
     end
 
+    def get_unique_name_in_scope(kpath)
+      Node.send(:with_exclusive_scope) do
+        if new_record?
+          cond = ["name = ? AND parent_id = ? AND kpath LIKE ?", self[:name], self[:parent_id], kpath]
+        else
+          cond = ["name = ? AND parent_id = ? AND kpath LIKE ? AND id != ? ", self[:name], self[:parent_id], kpath, self[:id]]
+        end
+
+        if taken_name = Node.find(:first, :select => 'name', :conditions => cond, :order => "LENGTH(name) DESC")
+          if taken_name =~ /^#{self[:name]}-(\d)/
+            self[:name] = "#{self[:name]}-#{$1.to_i + 1}"
+            i = $1.to_i + 1
+          else
+            self[:name] = "#{self[:name]}-1"
+            i = 1
+          end
+          version.title = "#{version.title}-#{i}" unless version.title.blank?
+        end
+      end
+    end
+
 end
 
 Bricks.apply_patches

data/app/models/text_document_version.rb

@@ -1,7 +1,16 @@
 =begin rdoc
 This is the version used by TextDocument. It behave exactly like its superclass (DocumentVersion) except for the content class, set to TextDocumentContent.
 =end
+
 class TextDocumentVersion < DocumentVersion
+  class AssetHelper
+    attr_accessor :visitor
+    include Zena::Acts::Secure            # secure
+    include Zena::Use::Zazen::ViewMethods # make_image, ...
+    include Zena::Use::Zafu::Common       # template_url_for_asset
+    include Zena::Use::Urls::Common       # data_path
+  end
+
   before_save :parse_assets_before_save
 
   def self.content_class
@@ -11,9 +20,8 @@ class TextDocumentVersion < DocumentVersion
   private
     def parse_assets_before_save
       if text_changed? && content.content_type == 'text/css'
-        # Dummy controller so we have access to urls. Any better idea gladly welcome.
-        helper = ApplicationController.new
-        helper.instance_variable_set(:@visitor, visitor)
+        helper = AssetHelper.new
+        helper.visitor = visitor
         self.text = node.parse_assets(self.text, helper, 'v_text')
       end
     end

data/app/models/virtual_class.rb

@@ -1,8 +1,54 @@
 class VirtualClass < ActiveRecord::Base
+  attr_accessor :import_result
   belongs_to    :create_group, :class_name => 'Group', :foreign_key => 'create_group_id'
   validate      :valid_virtual_class
   include Zena::Use::Relations::ClassMethods
 
+  # Import a hash of virtual class definitions and try to build the virtual classes.
+  def self.import(data)
+    data.keys.map do |klass|
+      build_virtual_class(klass, data)
+    end
+  end
+
+  # Build a virtual class from a name and a hash of virtual class definitions. If
+  # the superclass is in the data hash, it is built first.
+  def self.build_virtual_class(klass, data)
+    return data[klass]['result'] if data[klass].has_key?('result')
+    if virtual_class = Node.get_class(klass)
+      if virtual_class.superclass.to_s == data[klass]['superclass']
+        virtual_class.import_result = 'same'
+        return data[klass]['result'] = virtual_class
+      else
+        virtual_class.errors.add(:base, 'conflict')
+        return data[klass]['result'] = virtual_class
+      end
+    else
+      superclass_name = data[klass]['superclass']
+      if data[superclass_name]
+        superclass = build_virtual_class(superclass_name, data)
+        unless superclass.errors.empty?
+          virtual_class = VirtualClass.new(:name => klass, :superclass => superclass_name, :create_group_id => current_site.public_group_id)
+          virtual_class.errors.add(:base, 'conflict in superclass')
+          return data[klass]['result'] = virtual_class
+        end
+      elsif superclass = Node.get_class(superclass_name)
+        # ok
+      else
+        virtual_class = VirtualClass.new(:name => klass, :superclass => superclass_name, :create_group_id => current_site.public_group_id)
+        virtual_class.errors.add(:base, 'missing superclass')
+        return data[klass]['result'] = virtual_class
+      end
+
+      # build
+      create_group_id = superclass.kind_of?(VirtualClass) ? superclass.create_group_id : current_site.public_group_id
+      virtual_class = create(data[klass].merge(:name => klass, :create_group_id => create_group_id))
+      virtual_class.import_result = 'new'
+      return data[klass]['result'] = virtual_class
+    end
+  end
+
+
   def to_s
     name
   end
@@ -84,6 +130,10 @@ class VirtualClass < ActiveRecord::Base
     end
   end
 
+  def import_result
+    @import_result || errors[:base]
+  end
+
   private
     def valid_virtual_class
       if self[:name].blank?

data/app/views/templates/edit_tabs/_image.rhtml

@@ -2,7 +2,7 @@
 
 <%= @node.c_version_id == @node.v_id ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : "" %>
 
-<% if !ImageBuilder.dummy? %>
+<% if !Zena::Use::ImageBuilder.dummy? %>
 <label for="c_crop_x"><%= _("image")  %></label>
 <div id="crop" class='toggle_div'>
   <div class='img_left'><%= link_to_remote(img_tag(@node,:mode=>'pv'), :url => crop_form_document_path(@node[:zip]), :method => :get) %></div>

data/app/views/versions/_list.rhtml

@@ -1,5 +1,7 @@
 <table cellspacing="0" id='versions'>
-  <% if @node.versions.count == 1 && @node.version.status == Zena::Status[:rem] && !@node.can_destroy_version? %><tr><td class='warn' colspan='8'><%= _('This node contains sub-nodes: it cannot be destroyed.') %></td></tr><% end -%>
+  <% if !@node.errors.empty? -%>
+    <tr><td class='warn' colspan='8'><%= error_messages_for(@node) %></td></tr>
+  <% elsif @node.versions.count == 1 && @node.version.status == Zena::Status[:rem] && !@node.can_destroy_version? %><tr><td class='warn' colspan='8'><%= _('This node contains sub-nodes: it cannot be destroyed.') %></td></tr><% end -%>
   <%= render :partial=>'versions/tr', :collection => @node.versions %>
 </table>
 <div class='hidden' id='node_zip'><%= @node.zip %></div>

data/app/views/virtual_classes/_li.erb

@@ -1,9 +1,9 @@
 <tr id='virtual_class<%= li[:id] %>'>
-  <td class="adm_icon"><%= link_to_remote( _('virtual_class_img'),
+  <td class="adm_icon"><%= (li.new_record? || !li.errors.empty?) ? _('virtual_class_error_img') : link_to_remote( _('virtual_class_img'),
           :update =>"virtual_class#{li[:id]}",
           :url    => edit_virtual_class_path(li),
           :method => :get) %></td>
-  <td><%= li.name %></td>
+  <td style='font-size:90%;'><span style='font-family:monospace;color:white;'><%= li.kpath[1..-1] + li.kpath[1..-1] %></span><%= li.name %><%= li.import_result ? " (#{li.import_result})" : ''%></td>
   <td class="adm_icon" ><%= !li.icon.blank? ? "<img src='#{li.icon}'/>" : "" %></td>
   <td class="auto_create_discussion" ><%= li.auto_create_discussion ? _('auto discussion') : '' %></td>
   <td class="create_group"><%= li.create_group.name %></td>

data/app/views/virtual_classes/index.erb

@@ -4,4 +4,12 @@
   <tr><th class='nav' colspan='7'><%= will_paginate @virtual_classes %></th></tr>
   <%= render :partial=>'virtual_classes/li',  :collection=>@virtual_classes %>
   <%= render :partial=>'virtual_classes/add' %>
-</table>
+</table>
+
+<div class='admin_group'><h3><%= _('import definitions') %></h3>
+
+<%= form_tag({ :controller => 'virtual_classes', :action => 'import'}, {:multipart => true} ) %>
+<input style='line-height:1.5em;' name="attachment" class='file' type="file" />
+<p class="btn_validate"><input type="submit" value='<%= _('import') %>'/></p>
+</form>
+</div>

data/bricks/tags/patch/node.rb

@@ -12,4 +12,4 @@ class Link
   end
 end
 
-NodeQuery.add_filter_field('tag', :key => 'comment', :table => ['nodes', 'links', 'TABLE1.id = TABLE2.source_id AND TABLE2.relation_id IS NULL'])
+Zena::Use::QueryNode.add_filter_field('tag', :key => 'comment', :table => ['nodes', 'links', 'TABLE1.id = TABLE2.source_id AND TABLE2.relation_id IS NULL'])

data/config/bricks.yml

@@ -23,7 +23,7 @@ production:
   tags:     ON
   captcha:  ON
   sphinx:
-    switch: ON
+    switch: OFF
     activate_if:
       gem: 'thinking_sphinx'
       adapter: 'mysql,postgresql'

data/config/gems.yml

@@ -1,6 +1,6 @@
 hpricot:
 gettext:        '= 1.93.0'
-querybuilder:   '= 0.5.6'
+querybuilder:   '= 0.5.8'
 rubyless:       '>= 0.3.5'
 ruby-recaptcha: '= 1.0.0'
 syntax:         '= 1.0.0'
@@ -23,15 +23,17 @@ RedCloth:
 rmagick:
   optional:     yes
   lib:          'RMagick'
-  version:      '>= 2.11.1'
+  version:      '>= 2.10.0'
 
 thinking-sphinx:
   optional:     yes
+  brick:        sphinx
   lib:          'thinking_sphinx'
   version:      '>= 1.3.14'
 
 ts-delayed-delta:
   optional:     yes
+  brick:        sphinx
   lib:          'thinking_sphinx/deltas/delayed_delta'
   version:      '>= 1.0.2'