zena 1.0.0 → 1.1.0

data/config/selenium.yml

@@ -0,0 +1,38 @@
+# Please read as our directions have changed:
+# Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin
+
+#
+# General settings
+#
+
+environments:
+  - test
+#  - development # Uncomment this line to enable in development environment. N.B. your development database will likely be altered/destroyed/abducted
+
+#selenium_path: 'c:\selenium' #path to selenium installation. only needed if you for some reason don't want to use the bundled version of selenium core
+
+#
+# rake test:acceptance settings
+#
+
+browsers:
+  # Windows
+  #firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+  #ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+  # Mac OS X
+  firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+  safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+  chrome: '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+
+host: 'test.host'
+#port_start: 3000
+#port_end: 3005
+#base_url_path: '/'
+#max_browser_duration: 120
+#multi_window: false
+
+#result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run
+
+#fixtures_path: <%= "#{RAILS_ROOT}/spec/fixtures" %>
+#selenium_tests_path: <%= "#{RAILS_ROOT}/spec/selenium" %>

data/lib/bricks/requirements_validation.rb

@@ -23,8 +23,14 @@ module Bricks
             end
           end
         when 'adapter'
-          config = YAML.load_file(File.join(RAILS_ROOT, 'config', 'database.yml'))
-          adapter = config[RAILS_ENV]['adapter']
+          db_config = File.join(RAILS_ROOT, 'config', 'database.yml')
+          if File.exist?(db_config)
+            config = YAML.load_file(db_config)
+            adapter = config[RAILS_ENV]['adapter']
+          else
+            puts "No config/database.yml file, using 'mysql' as adapter to validate bricks"
+            adapter = 'mysql'
+          end
           unless v.split(',').map(&:strip).include?(adapter)
             errors << "'#{adapter}' not supported"
           end

data/lib/gettext_strings.rb

@@ -115,7 +115,8 @@ module Zena
     N_('Sunday')
 
     N_('datetime')          # Same as %Y-%m-%d %H:%M
-    N_('%Y-%m-%d %H:%M')
+    N_(Zena::Use::Dates::DATETIME)
+    N_('%Y-%m-%d %H:%M')    # marked as not needed if we use the above constant...
     N_('news_date')         # calendar day (event list view)
 
     N_('Mon')

data/lib/tasks/zena.rake

@@ -441,6 +441,11 @@ namespace :zena do
   end
   Rake::Task['zena:test'].comment = "Run the tests in test/helpers and test/unit"
 
+  desc 'Start server for Selenium testing'
+  task :test_server => ["zena:test:prepare", "zena:build_fixtures"] do
+    exec('script/server -e test')
+  end
+
   desc 'Analyse code coverage by tests (needs rcov)'
   task :coverage do
     cmd = "rcov -I 'lib:test' --rails --exclude 'var/*,gems/*,/Library/*'"

data/lib/zena/app.rb

@@ -61,6 +61,18 @@ module Zena
           include mod
         end
       end
+
+      ::Site.class_eval do
+        Zena::Use.each_module_for('Site') do |mod|
+          include mod
+        end
+      end
+      
+      ::Skin.class_eval do
+        Zena::Use.each_module_for('Skin') do |mod|
+          include mod
+        end
+      end
     end
   end
 end

data/lib/zena/console.rb

@@ -15,7 +15,13 @@ module Zena
       end
     end
 
+    # FIXME: DOCUMENT
+    def create(attrs)
+      secure(Node) { Node.create_node(Node.transform_attributes(attrs)) }
+    end
+
     def rename_prop(list, old_key, new_key)
+      list = find(list) if list.kind_of?(String)
       if list.first.kind_of?(Node)
         list = list.map(&:visible_versions).flatten
       end
@@ -32,6 +38,7 @@ module Zena
     end
 
     def field_to_prop(list, native_key, prop_key)
+      list = find(list) if list.kind_of?(String)
       list.each do |rec|
         next unless value = rec[native_key]
         if rec.kind_of?(Node)
@@ -48,6 +55,7 @@ module Zena
     end
 
     def set_prop(list, key, value)
+      list = find(list) if list.kind_of?(String)
       list.each do |rec|
         if rec.kind_of?(Node)
           elems = rec.visible_versions
@@ -100,7 +108,7 @@ module Zena
       if count_or_query.kind_of?(Hash)
         query = count_or_query
       elsif count_or_query.kind_of?(Fixnum)
-        query = {:qb => "node in site where id = #{count_or_query}", :_find => :first}
+        query = {:qb => "node where id = #{count_or_query} in site", :_find => :first}
       elsif pseudo_sql.nil?
         query = {:qb => count_or_query}
       else

data/lib/zena/core_ext/string.rb

@@ -16,9 +16,9 @@ class String
   ALLOWED_CHARS_IN_URL      = " a-zA-Z0-9\\."
   # in filename, allow '-' and '_' because it does not represent a space and we do
   # not have the mode confusion thing.
-  ALLOWED_CHARS_IN_FILENAME = "#{ALLOWED_CHARS_IN_URL}_\\-"
+  ALLOWED_CHARS_IN_FILENAME = "#{ALLOWED_CHARS_IN_URL}_\\-\\+$"
   # Everything apart from a-zA-Z0-9_.-/$ are not allowed in template paths
-  ALLOWED_CHARS_IN_FILEPATH = "#{ALLOWED_CHARS_IN_FILENAME}+/$"
+  ALLOWED_CHARS_IN_FILEPATH = "#{ALLOWED_CHARS_IN_FILENAME}/"
   TO_FILENAME_REGEXP = %r{([^ #{ALLOWED_CHARS_IN_FILENAME}]+)}n
   TO_URL_NAME_REGEXP = %r{([^ #{ALLOWED_CHARS_IN_URL}])}
 
@@ -29,6 +29,11 @@ class String
     end.tr(' ', '-')
   end
 
+  # Change a string into something that can be inserted in an url.
+  def urlencode
+    URI.escape(self)
+  end
+
   # Retrieve original title from an url_name
   def self.from_url_name(str)
     CGI.unescape(str.tr('-', ' '))

data/lib/zena/deploy.rb

@@ -27,7 +27,6 @@ require 'erb'
 require File.join(File.dirname(__FILE__), 'info')
 require File.join(File.dirname(__FILE__), '..', 'bricks')
 
-
 Capistrano::Configuration.instance(:must_exist).load do
 
   set :templates, File.join(File.dirname(__FILE__), 'deploy')
@@ -196,6 +195,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       vhost = render("#{templates}/vhost.rhtml", :config => self)
       put(vhost, "#{vhost_root}/#{self[:host]}")
 
+      # directory setup for log
+      run "test -e #{sites_root}/#{self[:host]}/log || mkdir #{sites_root}/#{self[:host]}/log"
+      run "chown www-data:www-data #{sites_root}/#{self[:host]}/log"
+
       run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
 
       unless self[:host] =~ /^www/
@@ -297,10 +300,6 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "Apache2 initial setup"
   task :apache2_setup, :roles => :web do
-    # TODO: can we move this into the mongrel brick?
-    if self[:mongrel_port]
-      self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
-    end
     httpd_conf = render("#{templates}/httpd.rhtml", :config => self)
     log_rotate = render("#{templates}/logrotate_app.rhtml", :config => self)
     if debian_host
@@ -384,6 +383,61 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end # db
 
+  #========================== INIT (start/stop init scripts)   ===============================#
+
+  namespace :debian do
+
+    desc "create Start/stop scripts and installs rc.d defaults"
+    task :setup, :roles => :app do
+      unless debian_host
+        puts "skipping 'logrotate' (debian specific)"
+      else
+        # Create /usr/local/bin/zena_[app] script
+        app_init = render("#{templates}/app_init.rhtml", :config => self)
+        put(app_init, "/usr/local/bin/zena_#{db_name}")
+        run "chmod 700 /usr/local/bin/zena_#{db_name}"
+        if db_name == 'zena'
+          init_name = 'zapp'
+        else
+          init_name = db_name
+        end
+        run "cd /usr/local/bin && test -e /usr/local/bin/#{init_name} || ln -sf /usr/local/bin/zena_#{db_name} /usr/local/bin/#{init_name}"
+
+        if self[:rvm_ruby_string]
+          run "rvm wrapper #{self[:rvm_ruby_string]} init zena_#{db_name}"
+          init_script = "/usr/local/rvm/bin/init_zena_#{db_name}"
+        else
+          init_script = "/usr/local/bin/zena_#{db_name}"
+        end
+
+        start_stop = render("#{templates}/start_stop.rhtml", :config => self, :init_script => init_script)
+        put(start_stop, "/etc/init.d/zena_#{db_name}")
+        run "chmod 755 /etc/init.d/zena_#{db_name}"
+        # Install defaults
+        run "cd /etc/init.d && update-rc.d zena_#{db_name} defaults"
+      end
+    end
+
+    # FIXME: We now have the on_stop, on_start callbacks that do not handle haproxy and the
+    # init script which is some sort of hack but useful on the server... A better solution
+    # would be to use a directory config/start and config/stop with scripts that are run on
+    # start/stop/restart.... Then each service just writes what it needs there and that's it.
+    desc "Use init script to start all services"
+    task :restart, :roles => :app do
+      run "/usr/local/bin/zena_#{db_name} start"
+    end
+
+    desc "Use init script to stop all services"
+    task :stop, :roles => :app do
+      run "/usr/local/bin/zena_#{db_name} stop"
+    end
+
+    desc "Use init script to restart all services"
+    task :start, :roles => :app do
+      run "/usr/local/bin/zena_#{db_name} restart"
+    end
+  end # debian
+
   # Would need to be fixed before being used
   #
   # desc "Get backup file back"
@@ -457,5 +511,5 @@ Capistrano::Configuration.instance(:must_exist).load do
       app.stop
     end
 
-  end # mongrel/deploy
+  end # deploy
 end

data/lib/zena/deploy/app_init.rhtml

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+#
+# Zena Startup script (automatically generated by 'cap debian:app_setup')
+#
+# chkconfig: - 85 15
+# description: zena_<%= config[:db_name] %> starts and stop services for <%= config[:db_name] %> Zena application.
+#
+ROOT = "<%= config[:deploy_to] %>"
+APP_ROOT = "#{ROOT}/current"
+
+cmd = ARGV.first
+
+def run(cmd)
+  puts cmd
+  system(cmd)
+end
+
+operations = [
+  'ruby lib/upload_progress_server.rb ',
+  'rake worker:',
+<% if config[:app_type] == :mongrel %>
+  'mongrel_rails cluster::',
+<% end %>
+]
+
+if %w{stop restart}.include?(cmd)
+  puts "Stopping #{APP_ROOT}..."
+  operations.each do |op|
+    run "cd #{APP_ROOT} && #{op}stop"
+  end
+
+  <% if config[:haproxy_port] %>
+  # Stop haproxy
+  pid_file = "#{ROOT}/shared/pids/haproxy.pid"
+  if File.exist?(pid_file) && pid = File.read("#{ROOT}/shared/pids/haproxy.pid")
+    run "kill #{pid}"
+  end
+  <% end %>
+end
+
+if %w{start restart}.include?(cmd)
+  puts "Starting #{APP_ROOT}..."
+  operations.each do |op|
+    run "cd #{APP_ROOT} && #{op}start"
+  end
+
+  <% if config[:haproxy_port] %>
+  # Start haproxy
+  run "cd #{APP_ROOT} && haproxy -D -f config/haproxy.cnf"
+  <% end %>
+end
+
+unless %w{start stop restart}.include?(cmd)
+  puts "Usage: zena_<%= config[:db_name] %> {start|stop|restart}"
+  exit
+end

data/lib/zena/deploy/haproxy.cnf.rhtml

@@ -0,0 +1,34 @@
+# Start haproxy with
+# > haproxy -d -f config/haproxy.cnf
+
+global
+  maxconn 1024
+  pidfile <%= config[:deploy_to] %>/shared/pids/haproxy.pid
+  log 127.0.0.1 local0 info
+
+defaults
+  balance roundrobin
+  mode http
+  retries 3
+  option redispatch
+  contimeout 300000
+  clitimeout 300000
+  srvtimeout 300000
+
+# [<%= config[:balancer] %>]
+listen <%= config[:balancer] %>_haproxy 127.0.0.1:<%= config[:haproxy_port] %>
+  option httplog
+  log global
+<% if config[:haproxy_password] %>
+  stats enable
+  stats uri /_haproxy
+  stats auth admin:<%= config[:haproxy_password] %>
+<% end %>
+<% config[:ports].each do |port| %>
+  server worker_<%= port %> localhost:<%= port %> check inter 20000 maxconn 1<% end %>
+# [/<%= config[:balancer] %>]
+
+# Beware of /etc/apache2/conf.d/<%= config[:balancer] %>
+# <Proxy balancer://<%= config[:balancer] %>>
+#   BalancerMember http://127.0.0.1:<%= config[:haproxy_port] %>
+# </Proxy>

data/lib/zena/deploy/httpd.rhtml

@@ -10,10 +10,16 @@ PassengerDefaultUser www-data
   Order allow,deny
   Allow from all
 </Proxy>
+<% if config[:haproxy_port] %>
+<Proxy balancer://<%= config[:balancer] %>>
+  BalancerMember http://127.0.0.1:<%= config[:haproxy_port] %>
+</Proxy>
+<% else %>
 <Proxy balancer://<%= config[:balancer] %>><% config[:ports].each do |port| %>
   BalancerMember http://127.0.0.1:<%= port %><% end %>
 </Proxy>
 <% end %>
+<% end %>
 
 <IfModule mod_expires.c>
   ExpiresActive on

data/lib/zena/deploy/start_stop.rhtml

@@ -0,0 +1,35 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          zena
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: launch <%= init_script %>
+### END INIT INFO
+
+# Author: Gaspard Bucher <gaspard@teti.ch>
+#
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Zena server"
+
+case "$1" in
+  start)
+        # launch all services for <%= config[:db_name] %>
+        <%= init_script %> start
+	;;
+  stop)
+        # stop all services for <%= config[:db_name] %>
+        <%= init_script %> stop
+	;;
+  restart)
+        # restart all services for <%= config[:db_name] %>
+        <%= init_script %> restart
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
+	exit 3
+	;;
+esac

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.0.0'
+  VERSION        = '1.1.0'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/remote/connection.rb

@@ -1,4 +1,4 @@
-require 'HTTParty'
+require 'httparty'
 
 module Zena
   module Remote

data/lib/zena/site_worker.rb

@@ -22,12 +22,16 @@ module Zena
         Thread.current[:visitor] = site.any_admin
       end
 
-      if nodes = get_nodes
-        # Register next one (if we are lucky and have many workers, we can parallelize work)
-        Zena::SiteWorker.perform(site, action, page + 1)
+      if page.nil?
+        site.send(action)
+      else
+        if nodes = get_nodes
+          # Register next one (if we are lucky and have many workers, we can parallelize work)
+          Zena::SiteWorker.perform(site, action, page + 1)
 
-        # do action on nodes
-        site.send(action, nodes, page, page_count)
+          # do action on nodes
+          site.send(action, nodes, page, page_count)
+        end
       end
     end