zena 0.15.2 → 0.16.0

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

@@ -1,6 +1,4 @@
-<label for="node_c_file"><%= _("document file")  %></label>
-<div id="file" class='toggle_div'><%= link_to_remote(_("change"), :update=>'file_form', :url=>file_form_documents_path(:uuid => @uuid), :method => :get, :complete=>"['file', 'file_form'].each(Element.toggle);$('attachment#{@uuid}').click();") %></div>
-<div id="file_form" class='toggle_div' style='display:none;'></div>
+<%= upload_field(:type => :onclick) %>
 
 <label for='node_c_content_type'><%= _('content type') %></label>
 <input  id='node_c_content_type' type='text' name='node[c_content_type]' value='<%= @node.c_content_type %>'/><br/>

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

@@ -1,6 +1,4 @@
-<label for="node_c_file"><%= _("document file")  %></label>
-<div id="file" class='toggle_div'><%= link_to_remote(_("change"), :update=>'file_form', :url=>file_form_documents_path(:uuid => @uuid), :method => :get, :complete=>"['file', 'file_form'].each(Element.toggle);$('attachment#{@uuid}').click();") %></div>
-<div id="file_form" class='toggle_div' style='display:none;'></div>
+<%= upload_field(:type => :onclick) %>
 
 <%= @node.c_version_id == @node.v_id ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : "" %>
 

data/app/views/versions/_tr.rhtml

@@ -3,7 +3,7 @@
   <td class="number" onclick="Zena.diff_select(this);"><%= tr.number %></td>
   <td class="box"><%= tr.lang %></td>
   <td class="actions"><%= version_actions(tr) %></td>
-  <td class="sign"><%= tr.user.initials %></td>
+  <td class="sign"><%= tr.user.login %></td>
   <td class="date"><%= format_date(tr.created_at, 'age') %></td>
   <td class="comment"><%= tr.comment %></td>
 </tr>

data/app/views/versions/edit.rhtml

@@ -13,10 +13,10 @@
   </div>
   <div class='validate'>
     <div>
-      <input name="validate" type="submit" value="<%= _('validate') %>" />
+      <input name='validate' type='submit' value='<%= _('validate') %>' />
     </div>
     <div>
-      <input name="save" onclick="return Zena.save('<%= save_text_node_path(:id => @node[:zip]) %>',this.form,false);" type="button" value="<%= _('save') %>" />
+      <input name='save' onclick="return Zena.save('<%= save_text_node_path(:id => @node[:zip]) %>',this.form,false);" type='button' value='<%= _('save') %>' />
     </div>
     <div><a href='#' onclick='uploader=window.open("<%= new_document_path(:parent_id=>@node[:zip])%>", "uploader", "location=1,width=400,height=300");uploader.opener = opener;return false;'><%= _('btn_add_document')%></a></div>
     <% if @node.can_publish? && !visitor.site.auto_publish? %><div><small><input type='checkbox' name='node[v_backup]' value='true'/> <%= _('bak') %></small> <small><input type='checkbox' name='node[v_status]' value='50'<%= params[:pub] ? " checked='checked'" : '' %>/> <%= _('pub') %></small></div><% end -%>
@@ -29,27 +29,3 @@
 
 </form>
 </div>
-
-<%#= css_edit %>
-<% javascript_tag do -%>
-var current_sel = $('<%= partial[0] %>_sel');
-var current_tab = $('<%= partial[0] %>_tab');
-Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
-Event.observe(window, 'resize', function() { Zena.resizeElement('node_v_text'); } );
-function popup_loaded() {
-<% if params[:close] == 'true' %>
-  opener.window.location.href = opener.window.location.href;
-  window.close();
-<% else -%>
-  Zena.resizeElement('node_v_text');
-<% end -%>
-}
-
-$('node_form').getElements().each(function(input, index) {
-    new Form.Element.Observer(input, 3, function(element, value) {
-      <%= "opener.Zena.editor_preview('#{preview_node_version_path(:node_id=>@node[:zip], :id=>(@node.v_number || 0), :escape => false)}',element,value);" %>
-    });
-});
-
-<% end -%>
-<iframe id="UploadIFrame" name="UploadIFrame" src="about:blank"></iframe>

data/bin/zena

@@ -1,10 +1,15 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'zena/info'
+
+if %w(--version -v).include? ARGV.first
+  puts "zena #{Zena::VERSION}"
+  exit(0)
+end
+
 require 'rails/version'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
-
 template_path = File.join(Zena::ROOT, 'lib', 'zena', 'deploy', 'template.rb')
 args = ["-m", template_path]
 args << ARGV.first

data/bricks/delayed_job/README

@@ -0,0 +1,18 @@
+== Presentation
+
+Provides delayed jobs: long running tasks can be processed offline,
+without halting the visitor's browser. If you enable sphinx, this is
+a must-have once your site grows bigger and you have lots of deltas
+between index rebuilds.
+
+== Install
+
+Drop the folder into the "bricks" folder and install the delayed_job gem:
+
+# install delayed_job gem:
+> sudo gem install delayed_job --source http://gemcutter.org
+
+# if you want to use this with sphinx you also need
+> sudo gem install ts-delayed-delta --source http://gemcutter.org
+
+# enable brick in config/bricks.yml

data/bricks/delayed_job/migrate/20091104191643_create_delayed_jobs_table.rb

@@ -0,0 +1,19 @@
+class CreateDelayedJobsTable < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.text     :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end

data/bricks/delayed_job/misc/init.rb

@@ -0,0 +1,8 @@
+require 'delayed_job'
+
+# Run during initialization
+Delayed::Job.destroy_failed_jobs = false
+silence_warnings do
+  Delayed::Job.const_set("MAX_ATTEMPTS", 3)
+  Delayed::Job.const_set("MAX_RUN_TIME", 5.minutes)
+end

data/bricks/delayed_job/misc/tasks.rb

@@ -0,0 +1,2 @@
+require 'delayed_job'
+require 'delayed/tasks'

data/bricks/math/patch/application_helper.rb

@@ -19,7 +19,7 @@ module Bricks
 
         if opts[:output] == 'latex'
           "#{pre}#{content}#{post}"
-        elsif ENABLE_MATH
+        elsif Zena::ENABLE_MATH
           # Create PNG image
           # 1. get image path
           math_id  = Digest::SHA1.hexdigest(content)[0..4]

data/bricks/sphinx/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 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/bricks/sphinx/README

@@ -0,0 +1,19 @@
+== Presentation
+
+Provides fulltext search through Sphinx.
+
+
+== Install
+
+Drop the folder into the "bricks" folder and install sphinx and thinking-sphinx:
+
+# install sphinx
+follow instructions: http://freelancing-god.github.com/ts/en/installing_sphinx.html
+
+# install thinking sphinx gem:
+> sudo gem install thinking-sphinx --source http://gemcutter.org
+
+# if you want to use the delayed delta feature (you should on a big website), you also need
+> sudo gem install ts-delayed-delta --source http://gemcutter.org
+
+# enable brick in config/bricks.yml

data/bricks/sphinx/lib/use_sphinx.rb

@@ -0,0 +1,78 @@
+require 'thinking_sphinx'
+
+module Bricks
+  module Sphinx
+    module NodeClassMethods
+      include Zena::Acts::Secure
+      def search_records(query, opts = {})
+        with = opts[:with] || {}
+        with[:site_id] = current_site.id
+        if offset = opts[:offset]
+          limit = opts[:limit] || 20
+          ids = search_for_ids(query, :with => with, :limit => (offset + limit) * [limit,20].max)
+          return [] if ids.empty?
+          # 1. filter with secure
+          secure_ids = Zena::Db.fetch_ids("SELECT id FROM nodes WHERE id IN (#{ids.join(',')}) AND #{secure_scope('nodes')}")
+          # 2. reorder and apply offset
+          if offset_ids = (ids & secure_ids)[offset..(offset + limit - 1)]
+            # 3. populate
+            records = Node.find(:all, :conditions => {:id => offset_ids})
+            # 4. reorder
+            offset_ids.map {|id| records.detect {|r| r.id == id }}
+          else
+            []
+          end
+        else
+          if per_page = opts[:per_page]
+            page = opts[:page].to_i
+            page = 1 if page < 1
+            search_records(query, :offset => (page - 1) * per_page, :limit => per_page)
+          else
+            puts opts.inspect
+            search(query, opts).compact
+          end
+        end
+      end
+    end
+
+    module NodeSearch
+      def self.included(klass)
+        klass.extend NodeClassMethods
+
+        begin
+          require 'thinking_sphinx/deltas/delayed_delta'
+          ThinkingSphinx::Deltas::DelayedDelta
+          has_dd = Bricks::CONFIG['delayed_job']
+        rescue LoadError
+          has_dd = false
+        end
+
+        klass.class_eval do
+          define_index do
+            indexes name
+            indexes versions.title,                    :as => 'title'
+            indexes versions.text,                     :as => 'text'
+            indexes versions.summary,                  :as => 'summary'
+            indexes versions.dynamic_attributes.value, :as => 'attribute'
+            #indexes versions.dynamic_attributes.key,   :as => 'key'
+
+            has site_id
+
+            where "versions.status >= #{Zena::Status[:pub]}"
+
+            set_property :field_weights => { :title => 5, :summary => 3, :text => 2, :attribute => 1 }
+            set_property :group_concat_max_len => 30000 # FIXME: articles can easily have a length of 17000 chars...
+            set_property :delta => (has_dd ? :delayed : true)
+          end
+        end
+
+        klass.before_save :set_delta
+      end
+
+      private
+        def set_delta
+          self.delta = true
+        end
+    end # NodeSearch
+  end # Sphinx
+end # Bricks

data/bricks/sphinx/migrate/20091102171258_add_delta_for_sphinx.rb

@@ -0,0 +1,9 @@
+class AddDeltaForSphinx < ActiveRecord::Migration
+  def self.up
+    add_column :nodes, :delta, :boolean, :default => true, :null => false
+  end
+
+  def self.down
+    remove_column :nodes, :delta
+  end
+end

data/bricks/sphinx/misc/deploy.rb

@@ -0,0 +1,20 @@
+require 'thinking_sphinx/deploy/capistrano'
+
+Capistrano::Configuration.instance(:must_exist).load do
+
+  # FIXME: we should find a way to write a clean 'before' hook
+  # so that this is simply appeded to existing rules !!
+  task :before_update_code, :roles => [:app] do
+    thinking_sphinx.stop
+  end
+
+  task :after_update_code, :roles => [:app] do
+    symlink_sphinx_indexes
+    thinking_sphinx.configure
+    thinking_sphinx.start
+  end
+
+  task :symlink_sphinx_indexes, :roles => [:app] do
+    run "ln -nfs #{shared_path}/db/sphinx #{current_path}/db/sphinx"
+  end
+end

data/bricks/sphinx/misc/sphinx.yml

@@ -0,0 +1,12 @@
+test:
+  sql_range_step: 10000000
+
+production:
+  enable_star: 1
+  min_infix_len: 2
+  pid_file: /var/zena/shared/tmp/searchd.pid
+  searchd_files: /var/zena/shared/db/sphinx
+
+development:
+  enable_star: 1
+  min_infix_len: 2

data/bricks/sphinx/misc/tasks.rb

@@ -0,0 +1,21 @@
+require 'thinking_sphinx'
+require 'thinking_sphinx/tasks'
+
+begin
+  require 'thinking_sphinx/deltas/delayed_delta/tasks'
+  require 'thinking_sphinx/deltas/delayed_delta' # we need this line for the ts:dd job runner
+rescue LoadError
+  # no delayed_delta
+end
+
+namespace :sphinx do
+
+  desc "Create a default configuration file"
+  task :config do
+    if File.exist?("#{RAILS_ROOT}/config/sphinx.yml")
+      puts "#{RAILS_ROOT}/config/sphinx.yml exists, not copying"
+    else
+      FileUtils.cp(File.join(File.dirname(__FILE__), 'sphinx.yml'), "#{RAILS_ROOT}/config/sphinx.yml")
+    end
+  end
+end

data/bricks/sphinx/patch/node.rb

@@ -0,0 +1,8 @@
+if errors = Bricks.runtime_requirement_errors('sphinx')
+  Node.logger.warn "## search might not work: #{errors.join(', ')}"
+  puts "## search might not work: #{errors.join(', ')}"
+end
+
+class Node
+  include Bricks::Sphinx::NodeSearch
+end

data/bricks/tags/lib/has_tags.rb

@@ -2,7 +2,9 @@ module Bricks
   module Tags
     class StringHash
       include RubyLess::SafeClass
-      safe_method [:[], String] => {:class => String, :nil => true}
+      safe_context [:[], String] => String
+      safe_method :keys => [String]
+      undef_method(:safe_read) # FIXME: use 'disable_safe_read' when new rubyless gem is published
     end
 
     module HasTags
@@ -15,8 +17,8 @@ module Bricks
     module TriggerClassMethod
       def has_tags
         after_save    :update_tags
-        zafu_context  :tags => ["Link"]
-        safe_method   :tag_list => String, :tag => String, :tagged => StringHash
+        safe_context  :tags => ['Link']
+        safe_method   :tag_list => String, :tag => String, :tagged => StringHash, :tag_names => [String]
 
         class_eval <<-END
           include Bricks::Tags::InstanceMethods

data/bricks/tags/test/zafu/tags.yml

@@ -25,4 +25,16 @@ tagged_query:
 
 images_tagged_blue:
   src: "<r:images where='tag=\"blue\"' in='site' do='each' join=', ' do='[name]'/>"
-  res: "bird"
+  res: "bird"
+
+tagged_keys_rubyless:
+  context:
+    node: 'status'
+  src: "<r:tagged do='keys'><r:each join=', ' do='show'/></r:tagged>"
+  res: "sky, blue"
+
+tag_names:
+  context:
+    node: 'status'
+  src: "<r:tag_names><r:each join=', ' do='show'/></r:tagged>"
+  res: "sky, blue"

data/config/bricks.yml

@@ -0,0 +1,35 @@
+test:
+  tags:     ON
+  captcha:  ON
+  sphinx:   OFF
+  delayed_job: OFF
+
+development:
+  tags:     ON
+  captcha:  ON
+  sphinx:
+    switch: OFF
+    activate_if:
+      gem: 'thinking_sphinx'
+      adapter: 'mysql,postgresql'
+    run_if:
+      file: 'log/searchd.development.pid'
+  delayed_job:
+    switch:  OFF
+    activate_if:
+      gem: 'delayed_job'
+
+production:
+  tags:     ON
+  captcha:  ON
+  sphinx:
+    switch: ON
+    activate_if:
+      gem: 'thinking_sphinx'
+      adapter: 'mysql,postgresql'
+    run_if:
+      file: 'log/searchd.production.pid'
+  delayed_job:
+    switch:  ON
+    activate_if:
+      gem: 'delayed_job'

data/config/deploy.rb

@@ -1,5 +1,5 @@
 set :db_name,             "zena"   # If you change this: no dots in this name !
-set :server_ip,           nil      # FIXME: set this to your remote server IP in the form: "215.0.0.1"
+set :server_ip,           3333      # FIXME: set this to your remote server IP in the form: "215.0.0.1"
 set :mongrel_port,        "8000"
 set :mongrel_count,       "3"
 set :db_password,         nil      # FIXME: set password (can be anything).
@@ -25,6 +25,13 @@ if self[:server_ip]
   role :db,          "#{ssh_user}@#{server_ip}", :primary => true
 
   #================= END ADVANCED SETTINGS ==========#
+  # We need to set RAILS_ROOT and RAILS_ENV to know which bricks we need to load, activate
+  if !defined?(::RAILS_ROOT)
+    ::RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  end
+  if !defined?(::RAILS_ENV)
+    ::RAILS_ENV = 'production'
+  end
   require 'zena/deploy'
 
 else