zena 0.16.3 → 0.16.4

data/db/migrate/047_change_default_link_id_to_zero.rb

@@ -3,7 +3,7 @@
 class ChangeDefaultLinkIdToZero < ActiveRecord::Migration
   def self.up
     Link.connection.execute "UPDATE #{Link.table_name} SET id = 0 WHERE id = -1"
-    NodeQuery.insert_zero_link(Link)
+    Zena::Use::QueryNode.insert_zero_link(Link)
   end
 
   def self.down

data/db/migrate/20090825201159_insert_zero_link.rb

@@ -1,6 +1,6 @@
 class InsertZeroLink < ActiveRecord::Migration
   def self.up
-    NodeQuery.insert_zero_link(Link)
+    Zena::Use::QueryNode.insert_zero_link(Link)
   end
 
   def self.down

data/lib/bricks.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), '/bricks/requirements_validation')
-require File.join(File.dirname(__FILE__), '/bricks/loader')
+require 'bricks/requirements_validation'
+require 'bricks/loader'
 
 module Bricks
   extend Bricks::RequirementsValidation

data/lib/bricks/requirements_validation.rb

@@ -3,17 +3,20 @@ require 'yaml'
 module Bricks
   module RequirementsValidation
     def requirement_errors(brick, requirements)
+      current_stderr = $stderr
+      $stderr = StringIO.new
       errors = []
       requirements.each do |k,v|
         case k
-        when 'gem'
-          v.split(',').each do |name|
-            begin
-              require name.strip
-            rescue LoadError => err
-              errors << "'#{name}' missing"
-            end
-          end
+        # bad idea, this is run before gem version configuration
+        # when 'gem'
+        #   v.split(',').each do |name|
+        #     begin
+        #       require name.strip
+        #     rescue LoadError => err
+        #       errors << "'#{name}' missing"
+        #     end
+        #   end
         when 'file'
           v.split(',').each do |name|
             unless File.exist?("#{RAILS_ROOT}/#{name}")
@@ -28,6 +31,7 @@ module Bricks
           end
         end
       end
+      $stderr = current_stderr
       errors.empty? ? nil : errors
     end
 
@@ -37,6 +41,7 @@ module Bricks
       else
         raw_config = YAML.load_file("#{Zena::ROOT}/config/bricks.yml")[RAILS_ENV] || {}
       end
+
       config = {}
 
       raw_config.each do |brick, opts|

data/lib/gettext_strings.rb

@@ -35,6 +35,7 @@ module Zena
     N_('site group')
     N_('btn_relation_add')
     N_('virtual_class_img')
+    N_('virtual_class_error_img')
     N_('btn_virtual_class_add')
 
     N_('posted by')

data/lib/tasks/zena.rake

@@ -30,14 +30,14 @@ def symlink_assets(from, to)
           if File.exist?(trg) || File.symlink?(trg)
             File.unlink(trg)
           end
-          FileUtils.ln_s(src, trg)
+          FileUtils.symlink_or_copy(src, trg)
         end
       else
         # ignore
         puts "Cannot install assets in #{to}/public/#{dir} (not a directory)"
       end
     else
-      FileUtils.ln_s("#{from}/public/#{dir}", "#{to}/public/#{dir}")
+      FileUtils.symlink_or_copy("#{from}/public/#{dir}", "#{to}/public/#{dir}")
     end
   end
 end
@@ -440,11 +440,20 @@ namespace :zena do
     puts cmd
     system(cmd)
 
-    system("#{Gem.win_platform? ? 'start' : 'open'} #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html')}")
+    if RUBY_PLATFORM =~ /mswin32/
+      puts "\n\nOnce the server has started, you can open your web browser at:\n\n\n           ====> http://localhost:3000 <====\n\n\n"
+      cmd = "ruby script/server -e #{ENV['RAILS_ENV']} -p 3000"
+      puts cmd
+      system cmd
+    else
+      cmd = "open #{File.join(Zena::ROOT, 'lib/zena/deploy/start.html').inspect}"
+      puts cmd
+      system(cmd)
 
-    cmd = "script/server -e #{ENV['RAILS_ENV']} -p 3211"
-    puts cmd
-    exec cmd
+      cmd = "ruby script/server -e #{ENV['RAILS_ENV']} -p 3000"
+      puts cmd
+      exec cmd
+    end
   end
 
 end

data/lib/zena.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require File.join(File.dirname(__FILE__), 'zena', 'info')
 
 def has_executable(*list)
+  return false if RUBY_PLATFORM =~ /mswin32/
   list.inject(true) do |s,e|
     s && !(`which #{e} || echo 'no #{e}'` =~ /^no #{e}/)
   end
@@ -50,7 +51,7 @@ module Zena
       end
 
       # FIXME: make this explicit in models
-      ActiveRecord::Base.send :include, Zena::Use::NodeQueryFinders::AddUseNodeQueryMethod
+      ActiveRecord::Base.send :include, Zena::Use::QueryNodeFinders::AddUseQueryNodeMethod
       ActiveRecord::Base.send :include, Zena::Acts::Secure
       ActionController::Base.send :include, Zena::Acts::Secure
 
@@ -87,6 +88,11 @@ module Zena
       gem_configuration.each do |gem_name, gem_config|
         if gem_config
           if gem_config['optional']
+            if brick_name = gem_config['brick']
+              unless Bricks::CONFIG[brick_name]
+                next
+              end
+            end
             begin
               gem gem_name, gem_config['version']
             rescue LoadError
@@ -132,7 +138,7 @@ module Zena
 
     def load_custom_extensions
       #FIXME: cleanup all these hacks !
-      lib_path = File.join(Zena::ROOT, 'lib')
+      lib_path = File.join(Zena::ROOT, 'lib/zena')
       Dir.foreach(File.join(lib_path, 'core_ext')) do |f|
         next unless f =~ /\.rb\Z/
         require File.join(lib_path, 'core_ext', f)
@@ -178,7 +184,6 @@ module Zena
       add_load_paths(config)
       config_gems(config)
       load_plugins if RAILS_ROOT != Zena::ROOT
-      load_custom_extensions
       include_modules
       load_bricks
       set_default_timezone(config)
@@ -407,4 +412,5 @@ end
 Zena::EXT_TO_TYPE, Zena::TYPE_TO_EXT = make_hashes(EXT_TYPE)
 Zena.add_load_paths
 Zena.gems_setup
+Zena.load_custom_extensions
 require 'rubyless'

data/lib/zena/core_ext/file_utils.rb

@@ -0,0 +1,13 @@
+# This file provides a portable way to symlink, reverting to copy if symlinks are not supported.
+
+FileUtils
+
+if RUBY_PLATFORM =~ /mswin32/
+  class << FileUtils
+    alias symlink_or_copy cp_r
+  end
+else
+  class << FileUtils
+    alias symlink_or_copy ln_s
+  end
+end

data/lib/zena/deploy.rb

@@ -121,7 +121,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   #========================== MANAGE HOST   =========================#
-  desc "create a new site"
+  desc "create a new site [-s host='...' -s pass='...' -s lang='...']"
   task :mksite, :roles => :app do
     run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' LANG='#{self[:lang] || 'en'}'"
     create_vhost

data/lib/zena/deploy/start.html

@@ -32,7 +32,7 @@ new PeriodicalExecuter(function(pe) {
   counter -= 1;
   if (counter == 0) {
     pe.stop();
-    window.location.href = 'http://localhost:3211';
+    window.location.href = 'http://localhost:3000';
   } else {
     $('counter').update(counter);
     $('counter').show();

data/lib/zena/deploy/template.rb

@@ -2,7 +2,11 @@ require 'digest/sha1'
 require 'zena/info'
 # This is a rails template to generate a basic zena application
 
-run 'rm public/index.html'
+if RUBY_PLATFORM =~ /mswin32/
+  run "del public\\index.html"
+else
+  run "rm public/index.html"
+end
 
 gem 'zena', :version => Zena::VERSION
 route 'map.zen_routes'

data/lib/zena/info.rb

@@ -5,11 +5,11 @@ end
 
 AUTHENTICATED_PREFIX = "oo"
 PASSWORD_SALT = "jf93jfnvnas09093nas0923" # type anything here (but change this line !)
-ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing files
+ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from existing files
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/routes.rb

@@ -52,7 +52,7 @@ module Zena
                                 :member     => { :crop_form => :get }
 
       resources :relations
-      resources :virtual_classes
+      resources :virtual_classes, :collection => {:import => :post}
       resources :sites,
         :member     => { :clear_cache => :post }
       resources :comments,

data/lib/zena/use/fixtures.rb

@@ -131,7 +131,7 @@ module Zena
         unless File.exist?("#{SITES_ROOT}/test.host/public")
           FileUtils::mkpath("#{SITES_ROOT}/test.host/public")
           ['images', 'calendar', 'stylesheets', 'javascripts'].each do |dir|
-            FileUtils.ln_s("../../../public/#{dir}", "#{SITES_ROOT}/test.host/public/#{dir}")
+            FileUtils.symlink_or_copy("../../../public/#{dir}", "#{SITES_ROOT}/test.host/public/#{dir}")
           end
         end
 

data/lib/zena/use/html_tags.rb

@@ -163,7 +163,7 @@ module Zena
 
           if opts[:mode] && (format = Iformat[opts[:mode]]) && format[:size] != :keep
             # resize image
-            img = ImageBuilder.new(:path=>"#{RAILS_ROOT}/public#{res[:src]}", :width=>32, :height=>32)
+            img = Zena::Use::ImageBuilder.new(:path=>"#{RAILS_ROOT}/public#{res[:src]}", :width=>32, :height=>32)
             img.transform!(format)
             if (img.width == res[:width] && img.height == res[:height])
               # ignore mode
@@ -377,10 +377,10 @@ module Zena
             #  else
             #    "<a href='/login'>#{_('login')}</a>"
             #  end
-            link_to "login", login_url
+            link_to _("login"), login_url
           else
             # "<a href='/logout'>#{_('logout')}</a>"
-            link_to "logout", logout_url
+            link_to _("logout"), logout_url
           end
         end
 

data/lib/zena/use/image_builder.rb

@@ -0,0 +1,329 @@
+require 'tempfile'
+require 'digest/sha1'
+unless defined?(Magick)
+  begin
+    # this works on the deb box
+    require 'RMagick'
+  rescue LoadError
+    begin
+      # this works on my Mac
+      require 'rmagick'
+    rescue LoadError
+      puts "ImageMagick not found. Using dummy."
+      require 'ftools'
+      # Create a dummy magick module
+      module Magick
+        CenterGravity = OverCompositeOp = MaxRGB = NorthGravity = SouthGravity = nil
+        class << self
+        end
+        class ZenaDummy
+          def initialize(*a)
+          end
+          def method_missing(meth, *args)
+            # do nothing
+          end
+        end
+        class Image < ZenaDummy
+        end
+        class ImageList < ZenaDummy
+        end
+      end
+    end
+  end
+end
+
+module Zena
+  module Use
+    class ImageBuilder
+      DEFAULT_FORMATS = {
+        'tiny' =>   { :name=>'tiny', :size=>:force, :width=>16,  :height=>16 , :gravity=>Magick::CenterGravity   },
+        'mini' =>   { :name=>'mini', :size=>:force, :width=>32,  :height=>32 , :gravity=>Magick::CenterGravity   },
+        'square' => { :name=>'square', :size=>:limit, :width=>180, :height=>180, :gravity=>Magick::CenterGravity },
+        'med'  =>   { :name=>'med',  :size=>:limit, :width=>280, :height=>186, :gravity=>Magick::CenterGravity   },
+        'top'  =>   { :name=>'top',  :size=>:force, :width=>280, :height=>186, :gravity => Magick::NorthGravity  },
+        'low'  =>   { :name=>'low',  :size=>:force, :width=>280, :height=>186, :gravity => Magick::SouthGravity  },
+        'side' =>   { :name=>'side', :size=>:force, :width=>220, :height=>500, :gravity=>Magick::CenterGravity   },
+        'std'  =>   { :name=>'std',  :size=>:limit, :width=>600, :height=>400, :gravity=>Magick::CenterGravity   },
+        'pv'   =>   { :name=>'pv',   :size=>:force, :width=>70,  :height=>70 , :gravity=>Magick::CenterGravity   },
+        'edit' =>   { :name=>'edit', :size=>:limit, :width=>400, :height=>400, :gravity=>Magick::CenterGravity   },
+        'full' =>   { :name=>'full', :size=>:keep                            , :gravity=>Magick::CenterGravity   },
+        nil    =>   { :name=>'full', :size=>:keep                            , :gravity=>Magick::CenterGravity   },
+      }.freeze
+      # 'sepia'=>   { :size=>:limit, :width=>280, :ratio=>2/3.0, :post=>Proc.new {|img| img.sepiatone(Magick::MaxRGB * 0.8)}},
+
+      class << self
+        def image_content_type?(content_type)
+          content_type =~ /image/
+        end
+
+        def dummy?
+          Magick.const_defined?(:ZenaDummy)
+        end
+
+        def hash_id(format)
+          Digest::SHA1.hexdigest("#{format[:name]}#{format[:size]}#{format[:width]}#{format[:height]}#{format[:gravity]}")[0..9].to_i(16)
+        end
+
+        DEFAULT_FORMATS.each do |k, v|
+          v[:hash_id] = Zena::Use::ImageBuilder.hash_id(v)
+          v.freeze
+        end
+      end
+
+      def initialize(h)
+        params = {:height=>nil, :width=>nil, :path=>nil, :file=>nil, :actions=>[]}.merge(h)
+
+        params.each do |k,v|
+          case k
+          when :height
+            @height = v if v
+          when :width
+            @width = v if v
+          when :path
+            @path = v if v
+          when :file
+            @file = v if v
+          when :actions
+            if v.kind_of?(Array)
+              @actions = v
+            else
+              raise StandardError, "Bad actions format"
+            end
+          else
+            raise StandardError, "Bad parameter (#{k})"
+          end
+        end
+        unless @width && @height || dummy?
+          if @img = build_image_from_file_or_path
+            @width  = @img.columns
+            @height = @img.rows
+          end
+        end
+      end
+
+      def dummy?
+        Zena::Use::ImageBuilder.dummy? || (!@path && !@img && !@file)
+      end
+
+      def read
+        return nil if dummy?
+        render_img
+        @img.to_blob
+      end
+
+      def write(path)
+        return false if dummy?
+        render_img
+        @img.write(path)
+      end
+
+      def rows
+        return nil unless @height || !dummy?
+        (@height ||= render_img.rows).round
+      end
+
+      def columns
+        return nil unless @width || !dummy?
+        (@width ||= render_img.columns).round
+      end
+
+      alias height rows
+      alias width columns
+
+      def resize!(s)
+        # we do not zoom pixels
+        return unless s < 1.0
+        @img = nil # reset current rendered image
+        @width  *= s
+        @height *= s
+        @actions << Proc.new {|img| img.resize!(s) }
+      end
+
+      def crop!(x,y,w,h)
+        @img = nil # reset current rendered image
+        @width  = [@width -x, w].min
+        @height = [@height-y, h].min
+        @actions << Proc.new {|img| img.crop!(x,y,[@img.columns-x, w].min,[@img.rows-y, h].min, true) }
+      end
+
+      def format=(fmt)
+        return unless !dummy? && Magick.formats[fmt.upcase] =~ /w/
+        @actions << Proc.new {|img| img.format = fmt.upcase; img }
+      end
+
+      def format
+        render_img.format
+      end
+
+      def exif
+        @exif ||= ExifData.new(render_img.get_exif_by_entry)
+      end
+
+      def max_filesize=(size)
+        @actions << Proc.new {|img| do_limit!(size) }
+      end
+
+      def do_limit!(size)
+        return @img if @filesize <= size
+
+        # Check real size
+        tmp_path = Tempfile.new('tmp_img').path
+        @img.write('jpeg:' + tmp_path)
+
+        return @img if File.stat(tmp_path).size <= size
+
+        # Change type to JPG and quality to 80
+        if (@img.format == 'JPG' || @img.format == 'JPEG') && @img.quality > 80
+          @img.write('jpeg:' + tmp_path) { self.quality = 80 }
+        else
+          @img.format = 'JPG'
+          @img.write('jpeg:' + tmp_path) { self.quality = 80 }
+        end
+        ratio = File.stat(tmp_path).size.to_f / size
+
+        return @img = Magick::ImageList.new(tmp_path) if ratio <= 1.0
+
+        # Not enough ? Resize.
+        ratio   = 1.0 / Math.sqrt(ratio)
+        @width  *= ratio
+        @height *= ratio
+        @img.resize!(ratio)
+        @img
+      end
+
+      def crop_min!(w,h,gravity=Magick::CenterGravity)
+        @img = nil # reset current rendered image
+        @width  = [@width ,w].min
+        @height = [@height,h].min
+        @actions << Proc.new {|img| img.crop!(gravity,[@img.columns,w].min,[@img.rows,h].min, true) }
+      end
+
+      def set_background!(opacity,w,h)
+        @img = nil # reset current rendered image
+        @width  = [@width ,w].max
+        @height = [@height,h].max
+        @actions << Proc.new do |img|
+          bg = Magick::Image.new(w,h)
+          bg.opacity = opacity
+          bg.format = img.format
+          img = bg.composite(img, Magick::CenterGravity, Magick::OverCompositeOp)
+        end
+      end
+
+      # Transform into another format. If nil : do nothing.
+      def transform!(tformat=nil)
+        return self unless tformat
+        @img = nil
+        format = { :size=>:limit, :gravity=>Magick::CenterGravity }.merge(tformat)
+        @pre, @post = format[:pre], format[:post]
+
+        if format[:size] == :keep
+          h,w = @height, @width
+        else
+          h,w = format[:height], format[:width]
+        end
+        if format[:scale]
+          if h || w
+            # scale is a pre-zoom before crop
+            scale = format[:scale]
+          else
+            # we resize to scale
+            h,w = @height*format[:scale], @width*format[:scale]
+            # but we do not zoom
+            scale = 1.0
+            # ignore ':size' format if not height nor width was given
+            format[:size] = :force
+          end
+        else
+          scale = 1.0
+        end
+        if format[:ratio] && h && !w
+          w = h / format[:ratio]
+        elsif format[:ratio] && w && !h
+          h = w * format[:ratio]
+        end
+
+        pw,ph = @width, @height
+        if [w,h,pw,ph].include?(nil) || [w,h,pw,ph].min <= 0
+          # image size or thumb size is null (no image processing tool used, no idea on image size)
+          if format[:size] == :keep
+            @height, @width = nil, nil
+          else
+            @height, @width = h, w
+          end
+          return self
+        end
+
+        case format[:size]
+        when :force
+          crop_scale = [w.to_f/pw, h.to_f/ph].max
+          if crop_scale > 1.0
+            # we do not zoom. Fill with transparent background.
+            crop_min!(w,h,format[:gravity])
+            set_background!(Magick::MaxRGB, w, h)
+          else
+            resize!(crop_scale * scale)
+            crop_min!(w, h,format[:gravity])
+          end
+        when :force_no_crop
+          crop_scale = [w.to_f/pw, h.to_f/ph].min
+          resize!(crop_scale * scale)
+          crop_min!(w, h,format[:gravity])
+          set_background!(Magick::MaxRGB, w, h)
+        when :limit
+          crop_scale = [w.to_f/pw, h.to_f/ph].min
+          resize!(crop_scale * scale)
+          crop_min!(w, h,format[:gravity])
+        when :keep
+        end
+        self
+      end
+
+      def render_img
+        raise IOError, 'MagickDummy cannot render image' if Zena::Use::ImageBuilder.dummy?
+        unless @img
+          unless @img = build_image_from_file_or_path
+            raise IOError, 'Cannot render image without path or file'
+          end
+          if @pre
+            @pre = [@pre].flatten
+            @pre.each do |a|
+              @img = a.call(@img)
+            end
+          end
+
+          if @actions
+            @actions.each do |a|
+              @img = a.call(@img)
+            end
+          end
+
+          if @post
+            @post = [@post].flatten
+            @post.each do |a|
+              @img = a.call(@img)
+            end
+          end
+        end
+        @img
+      end
+
+      def build_image_from_file_or_path
+        if @file || @path
+          if @file.kind_of?(StringIO)
+            img = Magick::ImageList.new
+            @file.rewind
+            img.from_blob(@file.read)
+            @file.rewind
+            @filesize = @file.size
+            img
+          else
+            img = Magick::ImageList.new(@file ? @file.path : @path)
+            @filesize = img.filesize
+            img
+          end
+        end
+      end
+    end # ImageBuilder
+  end # Use
+end # Zena