zena 1.1.3 → 1.2.0

data/bricks/grid/lib/bricks/grid.rb

@@ -0,0 +1,110 @@
+# encoding: utf-8
+require 'json'
+
+module Bricks
+  module Grid
+    module Common
+
+      def get_table_from_json(text)
+        error = nil
+        if !text.blank?
+          begin
+            table = JSON.parse(text) rescue nil
+          end
+          if table &&
+             table.kind_of?(Array) &&
+             table.size == 2 &&
+             table[0].kind_of?(Hash) &&
+             table[0]['type'] == 'table'
+            # ok
+          else
+            table = nil
+            error = "<span class='unknownLink'>could not build table from text</span>"
+          end
+        end
+
+        table ||= [{"type"=>"table"},[]]
+
+        return table, error
+      end
+
+    end # Common
+
+    module ControllerMethods
+      include Common
+    end
+
+    # Routes = {
+    #  :cell_update => :post, :table_update => :post, :cell_edit => :get
+    # }
+
+    module ViewMethods
+      include Common
+
+      # Create a table from an attribute
+      def make_table(opts)
+        style, node, attribute = opts[:style], opts[:node], opts[:attribute]
+        case (style || '').sub('.', '')
+        when ">"
+          prefix = "<div class='img_right'>"
+          suffix = "</div>"
+        when "<"
+          prefix = "<div class='img_left'>"
+          suffix = "</div>"
+        when "="
+          prefix = "<div class='img_center'>"
+          suffix = "</div>"
+        else
+          prefix = ''
+          suffix = ''
+        end
+
+        table, error = get_table_from_json(node.prop[attribute])
+
+        res = prefix + error.to_s
+        if node.can_write?
+          msg = opts[:msg] || _('type to edit')
+          res << "<table data-a='node[#{attribute}]' data-msg='#{msg}' class='grid'>\n<tr>"
+        else
+          res << "<table><tr>"
+        end
+
+
+        if table[1][0]
+          table[1][0].each do |heading|
+            res << "<th>#{ heading }</th>"
+          end
+          res << "</tr>\n"
+          table[1][1..-1].each do |row|
+            res << "<tr>\n"
+            row.each do |td|
+              res << "<td>#{td}</td>\n"
+            end
+            res << "</tr>\n"
+          end
+        end
+        res << "</table>\n"
+        res << suffix
+        res
+      rescue JSON::ParserError
+        "<span class='unknownLink'>could not build table from text</span>"
+      end
+    end
+
+    # New better grid using JS.
+    module ZafuMethods
+      def r_grid
+        attr = @params[:attr]
+        return parser_error("Missing 'attr' parameter") unless attr
+        # Make sure it compiles
+        code = RubyLess.translate(node(Node).klass, attr)
+        msg = RubyLess.translate(self, "t('type to edit')")
+        out "<%= make_table(:attribute => #{attr.inspect}, :node => #{node(Node)}, :msg => #{msg}) %>"
+        if @params[:edit] == 'true'
+          out "<% js_data << %Q{$$('.grid').each(function(e) {Grid.make(e)})} %>"
+        end
+      end
+    end
+  end # Grid
+end # Zena
+

data/bricks/grid/zena/init.rb

@@ -0,0 +1,4 @@
+require 'bricks/grid'
+
+Zena.use Bricks::Grid
+

data/bricks/math/lib/bricks/math.rb

@@ -36,6 +36,7 @@ module Bricks
               FileUtils::mkpath(File.dirname(filepath)) unless File.exist?(File.dirname(filepath))
               begin
                 tempf = Tempfile.new(filename) # TODO: do we need to close this file ?
+                tempf.close
                 base = tempf.path
                 latex_template = %q{
 \documentclass[10pt]{article}

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

@@ -58,6 +58,15 @@ module Bricks
 
     module ControllerMethods
       def render_to_pdf(opts)
+        if opts[:debug]
+          template_path = template_url(opts)
+          result = {
+            :data         => render_to_string(:file => template_path, :layout=>false),
+            :type         => 'text/html',
+          }
+          return result
+        end
+
         # Get zafu template (compile if needed)
         template_path = template_url(opts)
 
@@ -91,7 +100,7 @@ module Bricks
           if query_string == ''
             debug_url = "#{request.path}?debug"
           else
-            debug_url = "#{request.path}?#{query_string}&debug"
+            debug_url = "#{request.path}?#{query_string}&debug"
           end
 
           {

data/bricks/sphinx/zena/tasks.rb

@@ -3,6 +3,7 @@
 require 'tempfile'
 require 'yaml'
 require 'thinking_sphinx'
+require 'zlib'
 
 
 class RenderClass
@@ -64,47 +65,14 @@ namespace :sphinx do
   desc "Create a crontab entry to run the indexer every 30 minutes"
   task :setup_indexer do
     Rake::Task['sphinx:setup'].invoke if !setup_done
-
-    config = YAML.load_file(File.join(RAILS_ROOT, 'config', 'sphinx.yml'))[RAILS_ENV]
-    every  = config['run_indexer_at'] || '10,40'
-    res = `crontab -l 2>&1`
-    if $? != 0 || res =~ /\Acrontab/
-      puts "Sphinx indexer: could not access crontab (#{res.chomp})"
+    unless app = ENV['APP']
+      puts "Please set APP to the app name when running this task."
     else
-      crontab = res.chomp.split("\n")
-      res = []
-      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|
-        if line =~ /sphinx:index/
-          if !job_inserted
-            # update
-            res << job
-            job_inserted = true
-            job_action   = 'update'
-          end
-        else
-          res << line
-        end
-      end
-
-      if !job_inserted
-        # new entry in crontab
-        res << job
-      end
-
-      tmpf = Tempfile.new('crontab')
-      File.open(tmpf.path, 'wb') do |file|
-        file.puts res.join("\n")
-      end
-      user = `whoami`
-      res = `crontab -u #{user.chomp} #{tmpf.path}`
-      if $? == 0
-        puts "Sphinx indexer: cron job #{job_action} ok"
-      else
-        puts "Sphinx indexer: could not #{job_action} cron job\n#{res}"
+      root = "/home/#{app}/app/current"
+      every = [Zlib.crc32(app) % 60, (Zlib.crc32(app)+30) % 60].sort.join(',')
+      File.open("/etc/cron.d/sphinx_#{app}", 'wb') do |f|
+        f.puts "# Generated by $ rake sphinx:setup_indexer APP=#{app}"
+        f.puts "#{every} *  *   *   *     cd #{root} && /usr/bin/env rake RAILS_ENV=production sphinx:index >> #{root}/log/production.log 2>&1"
       end
     end
   end

data/bricks/spreadsheet/README

@@ -0,0 +1,31 @@
+== Presentation
+
+Simple xlsx rendering engine for zena.
+
+== Install
+
+Drop the folder into the "bricks" folder.
+
+== Licence
+
+MIT-LICENCE:
+
+Copyright (c) 2012 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/spreadsheet/lib/bricks/spreadsheet.rb

@@ -0,0 +1,293 @@
+require 'simple_xlsx'
+require 'fileutils'
+=begin rdoc
+  Spreadsheet is module to create spreadsheet documents (csv or xlsx).
+
+=end
+module Bricks
+  module Spreadsheet
+    # Wrappers to expose rendering engine to RubyLess.
+    class Row
+      attr_reader :cells
+      include RubyLess
+      # we use Zafu to declare <r:cell>. See r_cell below.
+
+      def initialize
+        @cells = []
+      end
+
+      def cell(value)
+        if value.kind_of?(Time)
+          tz = visitor.tz
+          value = tz.utc_to_local(value)
+        end
+        @cells << (value || '')
+        "#{value};"
+      end
+    end
+
+    class Head < Row
+    end
+
+    class Sheet
+      attr_reader :rows, :name
+      def initialize(name)
+        @name = name
+        @rows = []
+      end
+
+      def row
+        row = Row.new
+        @rows << row
+        row
+      end
+
+      def head
+        row = Head.new
+        @rows << row
+        row
+      end
+    end
+
+    class Document
+      def initialize
+        @sheets = []
+      end
+
+      def sheet(name = nil)
+        if name.kind_of?(Hash)
+          name = name[:name]
+        end
+        s = Sheet.new(name || 'Sheet1')
+        @sheets << s
+        s
+      end
+
+      def render_xlsx
+        tmpf = Tempfile.new('output.xlsx')
+        tmpf.close
+        # Zip does not want the file to exist beforehand.
+        path = tmpf.path
+        FileUtils.rm(path)
+        SimpleXlsx::Serializer.new(path) do |doc|
+          @sheets.each do |s|
+            doc.add_sheet(s.name) do |sheet|
+              s.rows.each do |r|
+                sheet.add_row r.cells
+              end # each row
+            end
+          end # each @sheet
+        end
+        File.open(path, 'rb') { |file| file.read }
+      end
+
+      def render_html
+        html = []
+        @sheets.each do |s|
+          html << '<table>'
+          s.rows.each do |r|
+            html << '<tr>'
+            r.cells.each do |c|
+              html << "<td>#{escape_html(c)}</td>"
+            end
+            html << '</tr>'
+          end # each row
+          html << '</table>'
+        end # each @sheet
+        html.join("\n")
+      end
+
+      def render_csv
+        csv = ''
+        @sheets.each_with_index do |s, i|
+          if i > 1
+            csv << "\n\n"
+          end
+          s.rows.each do |r|
+            r.cells.each do |c|
+              csv << "#{escape_csv(c)};"
+            end
+            csv << "\n"
+          end # each row
+        end # each @sheet
+        csv
+      end
+
+      def escape_csv(val)
+        if val =~ /[\n;]/
+          val.to_s.inspect
+        else
+          val.to_s
+        end
+      end
+
+      def escape_html(val)
+        val.to_s.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
+      end
+    end
+
+    module ControllerMethods
+      def render_to_csv(opts)
+        render_spreadsheet(opts, :csv)
+      end
+
+      def render_to_xlsx(opts)
+        render_spreadsheet(opts, :xlsx)
+      end
+
+      def render_spreadsheet(opts, type)
+        if opts[:debug]
+          type = :html
+        end
+        # Get zafu template (compile if needed)
+        if opts[:inline]
+          # This is used during testing
+        else
+          template_path = template_url(opts)
+        end
+
+        # temporary file
+        @spreadsheet = Bricks::Spreadsheet::Document.new
+
+        if opts[:inline]
+          err = render_to_string(:inline => opts[:inline])
+        else
+          err = render_to_string(:file => template_path, :layout=>false)
+        end
+
+        if err =~ /parser_error/
+          data = err
+          type = :html
+        end
+
+        begin
+          if type == :xlsx
+            {
+              :data        => @spreadsheet.render_xlsx,
+              :type        => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+              :disposition => 'attachment',
+            }
+          elsif type == :csv
+            {
+              :data        => @spreadsheet.render_csv,
+              :type        => 'text/csv',
+              :disposition => 'attachment',
+            }
+          else
+            data = data || @spreadsheet.render_html
+            {
+              :data        => %Q{
+<html>
+<head>
+</head>
+<style>
+body {padding:10px;}
+table {border-collapse:collapse}
+td{border:1px solid #444; padding:2px;}
+.parser_error {border:1px solid red; background:#fee; color:#333;}
+.parser_error .method { background:#faa; padding:0 2px;}
+</style>
+</head>
+<body>
+<h1>Render as #{type}</h1>
+#{data}
+</body>
+</html>
+              },
+              :type        => 'text/html',
+              :disposition => 'inline',
+            }
+          end
+        rescue => err
+          {
+            :data        => %Q{<html><head></head><body><h1>Could not render #{type}</h1>\n#{data}<pre>#{err}\n#{err.backtrace[0..8].join("\n")}</pre></body></html>},
+            :type        => 'text/html',
+            :disposition => 'inline',
+          }
+        end
+      end
+    end # ControllerMethods
+
+    module ZafuMethods
+      def r_spreadsheet
+        # Enter xlsx context.
+        r = get_var_name('spreadsheet', 'doc')
+        set_context_var('spreadsheet', 'doc', RubyLess::TypedString.new(
+          r,
+          :class => Bricks::Spreadsheet::Document
+        ))
+        expand_if("#{r} = @spreadsheet")
+      end
+
+      def r_sheet(expand = true)
+        if doc = get_context_var('spreadsheet', 'doc')
+          s = get_var_name('spreadsheet', 'sheet')
+          if name = @params[:name]
+            code = RubyLess.translate_string(self, name)
+          else
+            code = ''
+          end
+          out "<% #{s} = #{doc}.sheet(#{code}) %>"
+          set_context_var('spreadsheet', 'sheet', RubyLess::TypedString.new(
+            s,
+            :class => Bricks::Spreadsheet::Sheet
+          ))
+          if expand
+            expand_with
+          end
+        else
+          parser_error("Should only be called in a spreadsheet context.")
+        end
+      end
+
+      def r_row
+        sheet = get_context_var('spreadsheet', 'sheet')
+        if !sheet
+          # Allow sheet to be omitted.
+          r_sheet(false)
+          sheet = get_context_var('spreadsheet', 'sheet')
+        end
+        if sheet
+          r = get_var_name('spreadsheet', 'row')
+          out "<% #{r} = #{sheet}.row %>"
+          set_context_var('spreadsheet', 'row', RubyLess::TypedString.new(
+            r,
+            :class => Bricks::Spreadsheet::Row
+          ))
+          expand_with
+        else
+          parser_error("Should only be called in a spreadsheet/sheet context.")
+        end
+      end
+
+      def r_head
+        if sheet = get_context_var('spreadsheet', 'sheet')
+          r = get_var_name('spreadsheet', 'head')
+          out "<% #{r} = #{sheet}.head %>"
+          set_context_var('spreadsheet', 'row', RubyLess::TypedString.new(
+            r,
+            :class => Bricks::Spreadsheet::Head
+          ))
+          expand_with
+        else
+          parser_error("Should only be called in a spreadsheet/sheet context.")
+        end
+      end
+
+      def r_cell
+        if row = get_context_var('spreadsheet', 'row')
+          code = get_attribute_or_eval
+          if not code
+            code = get_var_name('spreadsheet', 'cell')
+            out "<% #{code} = capture do %>"
+            out expand_with
+            out "<% end %>"
+          end
+          out "<% #{row}.cell(#{code}) %>"
+        else
+          parser_error("Should only be called in a spreadsheet/sheet/row context.")
+        end
+      end
+    end # ZafuMethods
+  end # Spreadsheet
+end # Bricks

data/bricks/spreadsheet/zena/init.rb

@@ -0,0 +1,3 @@
+require 'bricks/spreadsheet'
+
+Zena.use Bricks::Spreadsheet

data/bricks/spreadsheet/zena/test/sites/zena/links.yml

@@ -0,0 +1,11 @@
+status_tagged_blue:
+  source:          status
+  comment:         blue
+
+status_tagged_sky:
+  source:          status
+  comment:         sky
+
+bird_tagged_blue:
+  source:          bird_jpg
+  comment:         blue

data/bricks/spreadsheet/zena/test/unit/xlsx_test.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class XlsxTest < Zena::Unit::TestCase
+  # How to test ?
+end

data/bricks/spreadsheet/zena/test/zafu/README

@@ -0,0 +1,27 @@
+It's not really easy to test xlsx file generation...
+
+<r:spreadsheet>
+  <r:head>
+    <r:cell eval='n.created_at'/>
+    <r:cell eval='n.title'/>
+    <r:cell text='Hello #{n.title}'/>
+  </r:head>
+  <r:row>
+    <r:cell eval='n.created_at'/>
+    <r:cell eval='n.title'/>
+    <r:cell text='Hello #{n.title}'/>
+  </r:row>
+</r:spreadsheet>
+
+<% if x = @spreadsheet %>
+  <% x.head do |h| %>
+  <% h.cell(@node.created_at) %>
+  <% h.cell(@node.prop['title']) %>
+  <% h.cell(%Q{Hello #{@node.prop['title']}}) %>
+  <% end %>
+  <% x.row do |r| %>
+  <% r.cell(@node.created_at) %>
+  <% r.cell(@node.prop['title']) %>
+  <% r.cell(%Q{Hello #{@node.prop['title']}}) %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,19 @@
+# test_file: ../../../../../test/integration/zafu_compiler_test.rb
+default:
+  context:
+    node: 'status'
+    visitor: 'anon'
+    format: 'csv'
+  src: "<r:spreadsheet><r:sheet name='hep #{title}'><r:row><r:cell text='foo'/><r:cell eval='title'/></r:row></r:sheet></r:spreadsheet>"
+  tem: "/if _zdoc = @spreadsheet.*_zsheet = _zdoc.sheet.\"hep #\{@node.*title.*/"
+  res: "foo;status title;\n"
+
+two_lines:
+  src: "<r:spreadsheet><r:sheet name='hep #{title}'><r:row><r:cell text='foo'/><r:cell eval='title'/></r:row><r:row><r:cell text='foo:#{title}'/><r:cell>blah</r:cell></r:row></r:sheet></r:spreadsheet>"
+  tem: "/if _zdoc = @spreadsheet.*_zsheet = _zdoc.sheet.\"hep #\{@node.*title.*/"
+  res: "foo;status title;\nfoo:status title;blah;\n"
+
+empty_cell:
+  src: "<r:spreadsheet><r:sheet name='hep #{title}'><r:row><r:cell text='foo'/><r:cell eval='title'/></r:row><r:row><r:cell text='foo:#{title}'/><r:cell/></r:row></r:sheet></r:spreadsheet>"
+  tem: "/if _zdoc = @spreadsheet.*_zsheet = _zdoc.sheet.\"hep #\{@node.*title.*/"
+  res: "foo;status title;\nfoo:status title;;\n"

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

@@ -1,5 +1,6 @@
 module Bricks
   module Worker
+    # This is only used to display jobs. Job creation is done in Delayed::Job.
     class Job < ActiveRecord::Base
       include RubyLess
       set_table_name :delayed_jobs
@@ -24,14 +25,19 @@ module Bricks
       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 = current_site.jobs
         jobs.empty? ? nil : jobs
       end
     end # ViewMethods
+    
+    module SiteMethods
+      def jobs
+        Bricks::Worker::Job.all(
+          :conditions => ['site_id = ?', self.id],
+          :order => 'run_at ASC'
+        )
+      end
+    end
   end # Worker
 end
 

data/bricks/worker/zena/init.rb

@@ -7,4 +7,12 @@ silence_warnings do
   Delayed::Job.const_set("MAX_RUN_TIME", 5.minutes)
 end
 
+class Delayed::Job
+  before_create :set_site_id
+  private
+    def set_site_id
+      self[:site_id] = current_site[:id]
+    end
+end
+
 Zena.use Bricks::Worker

data/bricks/worker/zena/migrate/20120501091514_add_site_id_to_jobs.rb

@@ -0,0 +1,9 @@
+class AddSiteIdToJobs < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :site_id, :integer
+  end
+
+  def self.down
+    drop_column :delayed_jobs, :site_id
+  end
+end

data/bricks/zena/zena/migrate/01_base.rb

@@ -366,12 +366,6 @@ class Base < ActiveRecord::Migration
 
     add_index "sites", ["host"], :name => "index_sites_on_host"
 
-    create_table "stored_columns", :options => table_options, :force => true do |t|
-      t.integer "stored_role_id"
-      t.string  "name"
-      t.string  "ptype"
-    end
-
     create_table "users", :options => table_options, :force => true do |t|
       t.datetime "created_at"
       t.datetime "updated_at"
@@ -450,7 +444,6 @@ class Base < ActiveRecord::Migration
     drop_table "roles"
     drop_table "sessions"
     drop_table "sites"
-    drop_table "stored_columns"
     drop_table "users"
     drop_table "versions"
     drop_table "zips"