zena 1.0.0.rc2 → 1.0.0.rc3

data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb

@@ -1,9 +1,9 @@
 module Bricks
-  module PDF
+  module Pdf
     module Engine
       module Xhtml2pdf
         # Not supported until they have http auth and base url settings.
       end # Xhtml2pdf
     end # Engine
-  end # PDF
+  end # Pdf
 end # Bricks

data/bricks/pdf/lib/bricks/pdf/install.rb

@@ -13,19 +13,19 @@ require 'tempfile'
 # end
 
 module Bricks
-  module PDF
+  module Pdf
     class Install
 
-      # Utility to install library necessary to PDF on unix like machine.
+      # Utility to install library necessary to Pdf on unix like machine.
       #
-      # To install xhtml2pdf and his dependencies, see PDF::xhtml2pdf in zena/tasks.rb
+      # To install xhtml2pdf and his dependencies, see Pdf::xhtml2pdf in zena/tasks.rb
 
       include FileUtils::Verbose
 
       attr_reader :url, :file, :md5, :sha1, :force
 
       def self.from_url url, opts={}
-        tmpf = Tempfile.new('PDF').path
+        tmpf = Tempfile.new('Pdf').path
         install_dir = "#{tmpf}_d"
         FileUtils.mkpath(install_dir)
         in_dir(install_dir) do
@@ -111,7 +111,7 @@ module Bricks
       end
 
     end # Install
-  end # PDF
+  end # Pdf
 end # Bricks
 
 

data/bricks/pdf/lib/bricks/pdf.rb

@@ -1,19 +1,19 @@
 =begin rdoc
-  PDF is module to render file or IO streams (strings obviously) into pdf.
+  Pdf is module to render file or IO streams (strings obviously) into pdf.
 
   Examples:
 
-  Bricks::PDF.engine = 'Xhtml2pdf'
+  Bricks::Pdf.engine = 'Xhtml2pdf'
 
-  Bricks::PDF.render_file "myfile.html"                            => STDOUT       (strings)
-  Bricks::PDF.render_file "myfile.html", "out.pdf"                 => out.pdf      (file)
+  Bricks::Pdf.render_file "myfile.html"                            => STDOUT       (strings)
+  Bricks::Pdf.render_file "myfile.html", "out.pdf"                 => out.pdf      (file)
 
-  Bricks::PDF.render_string "This is text to render."              => STDOUT       (strings)
-  Bricks::PDF.render_string "This is text to render.", "out.pdf"   => out.pdf      (file)
+  Bricks::Pdf.render_string "This is text to render."              => STDOUT       (strings)
+  Bricks::Pdf.render_string "This is text to render.", "out.pdf"   => out.pdf      (file)
 =end
 
 module Bricks
-  module PDF
+  module Pdf
     extend self
     # Wrapper around pdf engines
     module Engine
@@ -31,10 +31,10 @@ module Bricks
     end
 
     def engine=(engine_name)
-      engine_module = Zena.resolve_const("Bricks::PDF::Engine::#{engine_name.to_s.capitalize}")
+      engine_module = Zena.resolve_const("Bricks::Pdf::Engine::#{engine_name.to_s.capitalize}")
       extend engine_module
     rescue NameError
-      raise PDF::InvalidEngine, "Could not load pdf engine '#{engine_name}'."
+      raise Pdf::InvalidEngine, "Could not load pdf engine '#{engine_name}'."
     end
 
     def render(options)
@@ -66,7 +66,7 @@ module Bricks
 
         target_file = Tempfile.new('trg').path + '.pdf'
 
-        data = Bricks::PDF.render(get_render_auth_params.merge(
+        data = Bricks::Pdf.render(get_render_auth_params.merge(
           :data   => data,
           :output => target_file
         ))
@@ -106,5 +106,5 @@ module Bricks
 
     module ZafuMethods
     end # ZafuMethods
-  end # PDF
+  end # Pdf
 end # Bricks

data/bricks/pdf/test/engines/test_prince.rb

@@ -2,14 +2,14 @@ require 'helper'
 require 'bricks/pdf/engine/prince'
 
 class TestPrince < Test::Unit::TestCase
-  context 'With a Prince based PDF engine' do
+  context 'With a Prince based Pdf engine' do
     subject do
       Module.new do
-        extend Bricks::PDF
-        extend Bricks::PDF::Engine::Prince
+        extend Bricks::Pdf
+        extend Bricks::Pdf::Engine::Prince
       end
     end
 
     should_behave_as_pdf_engine
-  end # With a Prince based PDF engine
+  end # With a Prince based Pdf engine
 end

data/bricks/pdf/test/engines/test_xhtml2pdf.rb

@@ -2,14 +2,14 @@ require 'helper'
 require 'bricks/pdf/engine/xhtml2pdf'
 
 class TestXhtml2pdf < Test::Unit::TestCase
-  context 'With a Prince based PDF engine' do
+  context 'With a Prince based Pdf engine' do
     subject do
       Module.new do
-        extend Bricks::PDF
-        extend Bricks::PDF::Engine::Xhtml2pdf
+        extend Bricks::Pdf
+        extend Bricks::Pdf::Engine::Xhtml2pdf
       end
     end
 
     should_behave_as_pdf_engine
-  end # With a Xhtml2pdf based PDF engine
+  end # With a Xhtml2pdf based Pdf engine
 end

data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb

@@ -27,7 +27,7 @@ class Test::Unit::TestCase
       end
 
       should 'fill STDOUT if no destination is specified' do
-        assert_match %r{^%PDF}, subject.render(:input => contact_html)
+        assert_match %r{^%Pdf}, subject.render(:input => contact_html)
       end
     end
 
@@ -40,7 +40,7 @@ class Test::Unit::TestCase
       end
 
       should 'fill STDOUT if no destination is specified' do
-        assert_match %r{^%PDF}, subject.render(:data => '<html>Hello World</html>')
+        assert_match %r{^%Pdf}, subject.render(:data => '<html>Hello World</html>')
       end
     end
 

data/bricks/pdf/zena/init.rb

@@ -1,5 +1,5 @@
 require 'bricks/pdf'
 
-Bricks::PDF.engine = Bricks::CONFIG['pdf']['engine']
+Bricks::Pdf.engine = Bricks::CONFIG['pdf']['engine']
 
-Zena::Use.module Bricks::PDF
+Zena::Use.module Bricks::Pdf

data/bricks/pdf/zena/tasks.rb

@@ -1,7 +1,7 @@
 namespace :pdf do
   desc "Install binary for xhtml2pdf library"
   task :xhtml2pdf => :environment do
-    install = Bricks::PDF::Install
+    install = Bricks::Pdf::Install
     install.from_url "http://pypi.python.org/packages/source/p/pisa/pisa-3.0.33.tar.gz", :md5 => 'e2040b12211303d065bc4ae2470d2700'
 
     install.from_url "http://www.reportlab.com/ftp/reportlab-2.5.tar.gz"
@@ -12,6 +12,6 @@ namespace :pdf do
 
     install.from_url 'http://pybrary.net/pyPdf/pyPdf-1.12.tar.gz'
 
-    puts "\n==========================================\nBricks::PDF dependencies installation done"
+    puts "\n==========================================\nBricks::Pdf dependencies installation done"
   end
 end

data/bricks/sphinx/lib/bricks/sphinx.rb

@@ -7,7 +7,7 @@ module Bricks
       def search_text(query, opts = {})
         if offset = opts[:offset]
           limit = opts[:limit] || 20
-          ids = search_for_ids(query, :with => with, :limit => (offset + limit) * [limit,20].max)
+          ids = search_for_ids(query, :with => opts[: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 #{secure_scope('nodes')} AND id IN (#{ids.join(',')})")
@@ -56,7 +56,11 @@ module Bricks
 
             where "versions.status >= #{Zena::Status[:pub]}"
 
-            set_property :field_weights => { :idx_text_high => 5, :idx_text_medium => 3, :idx_text_low => 2 }
+            set_property :field_weights => { 
+              :idx_text_high   => 5,
+              :idx_text_medium => 3, 
+              :idx_text_lowv   => 2
+            }
             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

data/bricks/sphinx/zena/{sphinx.yml → sphinx.yml.erb}

@@ -4,8 +4,8 @@ test:
 production:
   enable_star: 1
   min_infix_len: 2
-  pid_file: /var/zena/shared/log/searchd.pid
-  searchd_files: /var/zena/shared/db/sphinx
+  pid_file: <%= shared_path %>/log/searchd.production.pid
+  searchd_files: <%= shared_path %>/db/sphinx
   run_indexer_at: "10,40"
 
 development:

data/bricks/sphinx/zena/tasks.rb

@@ -2,6 +2,28 @@
 # environment since it needs to get configuration settings from the classes in zena.
 require 'tempfile'
 require 'yaml'
+require 'thinking_sphinx'
+
+
+class RenderClass
+  def initialize(path)
+    @text = File.read(path)
+  end
+
+  def render(hash)
+    @values = hash
+    ERB.new(@text).result(binding)
+  end
+
+  def method_missing(sym)
+    return @values[sym] if @values.has_key?(sym)
+    super
+  end
+end
+
+def render(file, hash)
+  RenderClass.new(file).render(hash)
+end
 
 namespace :sphinx do
   setup_done = File.exist?("#{RAILS_ROOT}/config/#{RAILS_ENV}.sphinx.conf")
@@ -14,7 +36,10 @@ namespace :sphinx do
     if File.exist?("#{RAILS_ROOT}/config/sphinx.yml")
       puts "Sphinx searchd: config/sphinx.yml exists, not copying"
     else
-      FileUtils.cp(File.join(File.dirname(__FILE__), 'sphinx.yml'), "#{RAILS_ROOT}/config/sphinx.yml")
+      conf = render(File.join(File.dirname(__FILE__), 'sphinx.yml.erb'), :shared_path => File.expand_path(File.join(RAILS_ROOT,'..', '..', 'shared')))
+      File.open("#{RAILS_ROOT}/config/sphinx.yml", 'wb') do |f|
+        f.puts conf
+      end
       puts "Sphinx searchd: created initial config/sphinx.yml"
     end
 
@@ -48,7 +73,8 @@ namespace :sphinx do
     else
       crontab = res.chomp.split("\n")
       res = []
-      job = "#{every} *  *   *   *     /usr/bin/rake RAILS_ENV=production sphinx:index >> /root/cron.log 2>&1"
+      root = File.expand_path(File.join(RAILS_ROOT, '..', '..', 'current'))
+      job = "#{every} *  *   *   *     cd #{root} && /usr/bin/env rake RAILS_ENV=production sphinx:index >> /root/cron.log 2>&1"
       job_inserted = false
       job_action   = 'install'
       crontab.each do |line|

data/bricks/tags/lib/bricks/tags.rb

@@ -24,6 +24,18 @@ module Bricks
     end
 
     module InstanceMethods
+      def self.included(base)
+        # TODO: when we use to_xml instead of XmlSerializer, we can
+        # use 'tag_names' => SerializableArray.new('tag_names', 'tag', tag_names)
+        base.export_xml(Proc.new do |opts|
+          builder, rec = opts[:builder], opts[:record]
+          builder.tag!('tag_names', :type => :array) do
+            rec.tag_names.each do |tag|
+              builder.tag!('tag', tag, :type => :string)
+            end
+          end
+        end)
+      end
 
       def l_tag
         l_comment
@@ -77,6 +89,10 @@ module Bricks
         @tag_names ||= (tags || []).map {|t| t[:comment]}
       end
 
+      def tag_names=(tag_array)
+        @tag_names = tag_array
+      end
+
       # List of Links that are tags for the current node.
       def tags
         return @tags if defined?(@tags)
@@ -118,7 +134,6 @@ module Bricks
         end
       end
 
-
       private
 
         def tags_as_list(str)

data/bricks/tags/zena/test/unit/tags_test.rb

@@ -100,4 +100,19 @@ class TagsTest < Zena::Unit::TestCase
     assert_equal 'big, brown, socks', node.tag_list
   end
 
+  context 'A node with tags' do
+    setup do
+      login(:tiger)
+    end
+
+    subject do
+      secure(Node) { nodes(:status) }
+    end
+
+    should 'serialize tag values in xml' do
+      assert_equal %w{blue sky}, Hash.from_xml(subject.to_xml)['node']['tag_names']
+    end
+  end # A node with tags
+
+
 end

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

@@ -1,4 +1,4 @@
-# test_file: ../../../../test/helpers/zena_parser_test.rb
+# test_file: ../../../../../test/integration/zafu_compiler_test.rb
 default:
   context:
     node: 'status'
@@ -39,3 +39,7 @@ tag_names:
     node: 'status'
   src: "<r:tag_names><r:each join=', ' do='show'/></r:tag_names>"
   res: "blue, sky"
+
+checkbox_tagged:
+  src: "<r:input type='checkbox' name='tagged[blue]'/>"
+  res: "<input type='checkbox' name='node[tagged][blue]' value='blue' checked='checked'/>"

data/bricks/worker/lib/bricks/worker.rb

@@ -0,0 +1,39 @@
+module Bricks
+  module Worker
+    class Job < ActiveRecord::Base
+      include RubyLess
+      set_table_name :delayed_jobs
+
+      safe_method  :run_at => Time, :created_at => Time, :info   => String
+      # can be nil
+      safe_context :locked_at => Time, :locked_by => String
+
+      def info
+        obj = YAML.load(self[:handler])
+        if obj.respond_to?(:info)
+          obj.info
+        else
+          obj.inspect
+        end
+      end
+    end # Job
+
+    module ViewMethods
+      include RubyLess
+
+      safe_context :delayed_jobs => [Job]
+
+      def delayed_jobs
+        jobs = Bricks::Worker::Job.find(:all,
+          # FIXME: find a way to add site_id to delayed_jobs...
+          #:conditions => ['site_id = ?', current_site.id],
+          :order => 'run_at ASC'
+        )
+        jobs.empty? ? nil : jobs
+      end
+    end # ViewMethods
+  end # Worker
+end
+
+# Make sure the class is loaded before first YAML.load
+Zena::SiteWorker

data/bricks/worker/zena/deploy.rb

@@ -1,5 +1,3 @@
-require 'thinking_sphinx/deploy/capistrano'
-
 Capistrano::Configuration.instance(:must_exist).load do
 
   task :worker_stop, :roles => [:app] do

data/bricks/worker/zena/init.rb

@@ -7,3 +7,4 @@ silence_warnings do
   Delayed::Job.const_set("MAX_RUN_TIME", 5.minutes)
 end
 
+Zena::Use.module Bricks::Worker

data/bricks/worker/zena/test/sites/zena/delayed_jobs.yml

@@ -0,0 +1,16 @@
+zena_index:
+  run_at: 2011-03-21 10:41
+  handler: |
+    --- !ruby/struct:Zena::SiteWorker
+    site_id: 705790410
+    action: :rebuild_index
+    page: 1
+
+ocean_vhash:
+  run_at: 2011-03-21 10:05
+  handler: |
+    --- !ruby/struct:Zena::SiteWorker
+    site_id: 740511775
+    action: :rebuild_vhash
+    page: 1
+

data/bricks/worker/zena/test/zafu/worker.yml

@@ -0,0 +1,8 @@
+# test_file: ../../../../test/integration/zafu_compiler_test.rb
+default:
+  context:
+    node: 'status'
+    visitor: 'anon'
+  src: "<r:delayed_jobs do='each' join=', '>[<r:run_at format='%Y-%m-%d %H:%M'/> <r:info/>]</r:delayed_jobs>"
+  tem: "/delayed_jobs/"
+  res: "[2011-03-21 10:05 -], [2011-03-21 10:41 rebuild_index, page 1/1]"