zena 1.2.4 → 1.2.5

data/app/models/string_hash.rb

@@ -3,6 +3,8 @@ class StringHash < Hash
   
   def self.from_string(str)
     from_hash(JSON.parse(str))
+  rescue
+    from_hash({})
   end
   
   def self.from_hash(hash)

data/app/models/user.rb

@@ -64,9 +64,10 @@ class User < ActiveRecord::Base
   include RubyLess
 
   safe_attribute          :login, :time_zone, :created_at, :updated_at, :lang, :id
-  safe_method             :initials => String, :status => Number, :status_name => String,
+  safe_method             :status => Number, :status_name => String,
                           :is_anon? => Boolean, :is_admin? => Boolean, :user? => Boolean, :commentator? => Boolean,
-                          :moderated? => Boolean, :asset_host? => Boolean, [:in_group?, String] => Boolean
+                          :moderated? => Boolean, :asset_host? => Boolean, [:in_group?, String] => Boolean,
+                          :group_names => [String]
 
   safe_context            :node => node_user_proc,
                           :to_publish => ['Version'], :redactions => ['Version'], :proposed => ['Version'],
@@ -219,10 +220,14 @@ class User < ActiveRecord::Base
   # This is set on the user during login.
   alias asset_host? asset_host
   
-  def in_group?(name)
+  def group_names
     @group_names ||= begin
       groups.all(:order=>'name').map(&:name)
-    end.include?(name)
+    end
+  end
+  
+  def in_group?(name)
+    group_names.include?(name)
   end
 
   # Return true if the user's status is high enough to start editing nodes.

data/app/models/user_session.rb

@@ -1,4 +1,4 @@
 class UserSession < Authlogic::Session::Base
   self.find_by_login_method = :find_allowed_user_by_login
-
+  consecutive_failed_logins_limit 10
 end

data/app/models/virtual_class.rb

@@ -146,14 +146,17 @@ class VirtualClass < Role
       end
 
       conditions[0] = conditions[0].join(' AND ')
-
+      
+      seen_names = {}
       Node.native_classes.each do |kpath, real_class|
+        seen_names[real_class.name] = true
         load_roles_and_cache(build_vclass_from_real_class(real_class))
       end
 
       VirtualClass.all(
         :conditions => conditions,
         :order      => 'kpath ASC').each do |vclass|
+        next if seen_names[vclass.name]
         load_roles_and_cache(vclass)
       end
 
@@ -184,15 +187,21 @@ class VirtualClass < Role
     end
 
     def build_vclass_from_real_class(real_class)
-      vclass = VirtualClass.new(:name => real_class.name)
+      # Merge virtual class from db if it exists.
+      if vclass = VirtualClass.first(:conditions => {:name => real_class.name, :site_id => current_site.id})
+        # ...
+      else
+        vclass = VirtualClass.new(:name => real_class.name)
+        if real_class <= TextDocument
+          vclass.monolingual = true
+        end
+      end
       vclass.kpath      = real_class.kpath
       vclass.real_class = real_class
       vclass.include_role real_class.schema
       vclass.instance_variable_set(:@is_real_class, true)
       vclass.site_id = current_site.id
-      if real_class <= TextDocument
-        vclass.monolingual = true
-      end
+      
       vclass
     end
 
@@ -405,19 +414,26 @@ class VirtualClass < Role
       nil
     end
   end
+  
+  def defined_in_db?
+    !id.blank?
+  end
 
   # Return safe columns including super class's safe columns
   def defined_safe_columns
-    @defined_safe_columns ||= if real_class?
-      # Get columns from the 'native' schema of the real class (this schema is a Property::Role,
-      # not a VirtualClass or ::Role).
-      #
-      # Only columns explicitly declared safe are safe here
-      real_class.schema.defined_columns.values.select do |col|
-        real_class.safe_method_type([col.name])
-      end.sort {|a,b| a.name <=> b.name}
-    else
-      super
+    @defined_safe_columns ||= begin
+      # If we have 
+      list = defined_in_db? ? super : []
+      if real_class?
+        # Get columns from the 'native' schema of the real class (this schema is a Property::Role,
+        # not a VirtualClass or ::Role).
+        #
+        # Only columns explicitly declared safe are safe here
+        list += real_class.schema.defined_columns.values.select do |col|
+          real_class.safe_method_type([col.name])
+        end
+      end
+      list.sort {|a,b| a.name <=> b.name}
     end
   end
 
@@ -553,6 +569,10 @@ class VirtualClass < Role
 
   protected
     def rebuild_kpath(superclass)
+      if self.name == self.real_class.name
+        return self[:kpath] = self.real_class.kpath
+      end
+      
       index = 0
       kpath = nil
       try_keys = "#{name}ABCDEFGHIJKLMNOPQRSTUCWXYZ1234567890"
@@ -588,14 +608,25 @@ class VirtualClass < Role
       end
 
       return if !errors.empty?
-      @superclass ||= self.superclass
+      
+      if native = Node.native_classes_by_name[name]
+        self[:real_class] = native.name
+        up = native.superclass
+        if up != ActiveRecord::Base
+          @superclass = VirtualClass[up.name]
+        else
+          # superclass of 'Node' virtual class is Node ruby class.
+          @superclass = Node
+        end
+      else
+        @superclass ||= self.superclass
+        self[:real_class] = get_real_class(@superclass)
+      end
 
       if real_class? || name_changed? || @superclass != old.superclass
         rebuild_kpath(@superclass)
       end
 
-      self[:real_class] = get_real_class(@superclass)
-
       unless (secure!(Group) { Group.find(self[:create_group_id]) } rescue nil)
         errors.add('create_group_id', 'invalid group')
       end

data/app/views/sites/_form.erb

@@ -14,21 +14,24 @@
   <% end %>
   <table cellspacing='0' class='edit_site'>
     <tr><td class='label'><%= _('host') %></td><td><%= @site[:host] %></td></tr>
-    <% Site.attributes_for_form[:text].each do |name| -%>
+    <tr><td class='label'><%= _('root') %></td><td><%= text_field('site', :root_zip, :size=>15, :value => @site.root_zip) %></td></tr>
+    <% Site.attributes_for_form(@site.is_alias?)[:text].each do |name| -%>
     <tr><td class='label'><%= _(name) %></td><td><%= text_field('site', name, :size=>nil) %></td></tr>
     <% end -%>
+    <% if !@site.is_alias? %>
     <tr><td class='label'><%= _('redit_time') %></td><td><%= text_field('site', :redit_time, :size=>15, :value => @site.redit_time) %></td></tr>
     <tr><td class='label'><%= _('public group') %></td><td><%= @site.public_group.name %></td></tr>
     <tr><td class='label'><%= _('site group') %></td><td><%= @site.site_group.name %></td></tr>
     <tr><td class='label'><%= _('API group') %></td><td><%= select('site', 'api_group_id',  visitor.all_groups.map{|g| [g.name, g.id]}, {:include_blank => true, :selected => @site.api_group_id} ) %></td></tr>
-
+    <% end %>
+    
     <tr><td class='label'><%= _('options') %></td><td>
-    <% Site.attributes_for_form[:bool].each do |sym| -%>
+    <% Site.attributes_for_form(@site.is_alias?)[:bool].each do |sym| -%>
     <input type='hidden' name='site[<%= sym %>]' value=''/>
     <input type='checkbox' name='site[<%= sym %>]' value='1'<%= @site.send(sym) ? " checked='checked'" : '' %>/> <%= _(sym.to_s) %><br/>
     <% end -%>
     </td></tr>
-    <% if !@site.new_record? %>
+    <% if !@site.new_record? && !@site.is_alias? %>
     <tr><td class='label'><%= _('action') %></td><td id='messages<%= @site[:id] %>'>
       <ul>
         <% Site::ACTIONS.each do |action| %>

data/app/views/sites/_li.erb

@@ -1,14 +1,20 @@
 <tr id='site<%= li[:id] %>'>
-  <td class='icon'><%= link_to_remote(_('site_img'),
+  <td class='icon'><%= link_to_remote(li.master_id ? _('alias_img') : _('site_img'),
           :update =>"site#{li[:id]}",
           :url    => edit_site_path(li),
           :method => :get) %></td>
-  <% [:host, :name, :languages, :default_lang].each do |sym| -%>
-  <td class="<%= sym %>"><%= li[sym] %></td>
-  <% end -%>
-  <td class='public_group'><%= li.public_group.name %></td>
-  <td class='site_group'  ><%= li.site_group.name   %></td>
-  <td class='api_group'   ><%= li.api_group ? li.api_group.name : _('no API')    %></td>
-  <td class='redit_time'  ><%= li.redit_time %></td>
-  <td class='options'><%= Site.attributes_for_form[:bool].reject{|sym| !li.send(sym)}.join(', ') %></td>
+  <td class="name"><%= li.host %></td>
+  <% if !li.master_id %>
+    <td class='root'><%= li.root_node.title.limit(10) %></td>
+    <% [:languages, :default_lang].each do |sym| -%>
+      <td class="<%= sym %>"><%= li[sym] %></td>
+    <% end -%>
+    <td class='public_group'><%= li.public_group.name %></td>
+    <td class='site_group'  ><%= li.site_group.name   %></td>
+    <td class='api_group'   ><%= li.api_group ? li.api_group.name : _('no API')    %></td>
+    <td class='redit_time'  ><%= li.redit_time %></td>
+    <td class='options'><%= Site.attributes_for_form(li.is_alias?)[:bool].reject{|sym| !li.send(sym)}.join(', ') %></td>
+  <% else %>
+    <td colspan='8' class='root'><%= li.root_node.title %></td>
+  <% end -%>  
 </tr>

data/app/views/users/_li.rhtml

@@ -12,5 +12,8 @@ end %>
   <td class="login"><%= li.is_anon? ? '<i>public</i>' : li.login %></td>
   <td class="fullname" ><a href='<%= zen_path(li.node) %>'><%= li.node ? li.node.title : '' %></a></td>
   <td class="login"><%= _(User::Num_to_status[li.status].to_s) %></td>
+  <% if Bricks::CONFIG['activity'] %>
+  <td class="seen_at"><%= format_date(li.seen_at, :format =>_(Zena::Use::Dates::DATETIME)) %></td>
+  <% end %>
   <td class="groups"><%= li.groups.map {|g| g.name }.join(', ') %></td>
 </tr>

data/app/views/users/index.rhtml

@@ -1,7 +1,7 @@
 <h2 class='title'><%= _('users') %></h2>
 
 <table id='user_list' class='admin' cellspacing="0">
-  <tr><th class='nav' colspan='5'><%= will_paginate @users %></th></tr>
+  <tr><th class='nav' colspan='6'><%= will_paginate @users %></th></tr>
   <%= render :partial=>'users/li',  :collection=>@users %>
   <%= render :partial=>'users/add', :locals=>{:groups=>@groups} %>
 </table>

data/app/views/virtual_classes/_form.erb

@@ -28,7 +28,7 @@
       <td class='label'><%= _('kpath') %></td>
       <td><b><%= @virtual_class.kpath %></b></td>
     </tr>
-    <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass',  Node.classes_for_form(:without => ((@virtual_class.new_record? || @virtual_class.kind_of?(Role)) ? nil : @virtual_class.to_s)), :selected => @virtual_class.superclass.to_s ) %></td></tr>
+    <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass',  ['']+Node.classes_for_form(:without => ((@virtual_class.new_record? || @virtual_class.kind_of?(Role)) ? nil : @virtual_class.to_s)), :selected => (@virtual_class.superclass.kind_of?(VirtualClass) ? @virtual_class.superclass.to_s : '') ) %></td></tr>
 
 <% if @virtual_class.kind_of?(VirtualClass) -%>
 <% Zena::Use::Fulltext::FULLTEXT_FIELDS.reverse_each do |fld| -%>

data/bricks/acls/zena/init.rb

@@ -1,2 +1 @@
-Zena.use Bricks::Acls
-Site::CLEANUP_SQL.unshift ['acls', 'site_id = ?']
+Site::CLEANUP_SQL.unshift ['acls', 'site_id = ?']

data/bricks/acls/zena/test/sites/erebus/roles.yml

@@ -10,3 +10,7 @@ Reference:
 Contact:
   kpath:           NRC
   real_class:      Node
+  
+Note:
+  kpath:           NN
+  real_class:      Note

data/bricks/activity/lib/bricks/activity.rb

@@ -0,0 +1,24 @@
+module Bricks
+  module Activity
+    module ControllerMethods
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :set_visitor, :activity
+        end
+      end
+
+      def set_visitor_with_activity
+        set_visitor_without_activity
+        Zena::Db.set_attribute(visitor, 'seen_at', Time.now.utc)
+      end
+    end # ControllerMethods
+
+    module UserMethods
+      def self.included(base)
+        base.class_eval do
+          safe_method :seen_at => Time
+        end
+      end
+    end # UserMethods
+  end
+end

data/bricks/activity/zena/migrate/20130711135905_add_activity_to_user.rb

@@ -0,0 +1,9 @@
+class AddActivityToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :seen_at, :datetime
+  end
+
+  def self.down
+    remove_column :users, :seen_at
+  end
+end

data/bricks/activity/zena/test/integration/activity_integration_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class ActivityIntegrationTest < Zena::Integration::TestCase
+
+  context 'A visitor' do
+    setup do
+      $_test_site = 'test.host'
+    end
+
+    context 'with normal access' do
+      setup do
+        post 'http://test.host/session', :login=>'ant', :password=>'ant'
+        assert_redirected_to 'http://test.host/oo'
+      end
+
+      should 'not set seen_at on login' do
+        assert_equal nil, users(:ant).seen_at
+      end
+      
+      should 'set seen_at on get' do
+        before = Time.now.utc.to_i
+        get 'http://test.host/oo'
+        after = Time.now.utc.to_i
+        seen_at = users(:ant).seen_at.to_i
+        assert (before <= seen_at) && (seen_at <= after)
+      end
+    end # with normal access
+  end # a visitor
+end

data/bricks/captcha/zena/init.rb

@@ -1,6 +1,3 @@
-require 'bricks/captcha'
-Zena.use Bricks::Captcha
-
 # TODO change 'asset_method' to Zena::Use.zazen_tag 'email' => :zazen_email
 Zena::Use::Zazen::ViewMethods.asset_method 'email' => :email_asset
 

data/bricks/fs_skin/lib/bricks/fs_skin.rb

@@ -1,5 +1,5 @@
 module Bricks
-  module Fs_skin
+  module FsSkin
     ELEM = "([a-zA-Z_]+)"
     ELEM_REGEXP = %r{^#{ELEM}$}
     SECURE_PATH_REGEXP = %r{^[a-zA-Z_/\-\+]+$}
@@ -74,7 +74,7 @@ module Bricks
         end
         
         # We move this method here so that we do not need to reference
-        # Bricks::Fs_skin in I18n when fs_skin brick is disabled.
+        # Bricks::FsSkin in I18n when fs_skin brick is disabled.
         def base.text_from_fs_skin(brick_name, skin_name, path, opts)
           if path =~ SECURE_PATH_REGEXP
             fullpath = "$#{brick_name}-#{skin_name}/#{path}"
@@ -186,5 +186,5 @@ module Bricks
           end
         end
     end # SiteMethods
-  end # Fs_skin
+  end # FsSkin
 end # Bricks

data/bricks/fs_skin/zena/skins/blog/Node.zafu

@@ -59,7 +59,7 @@
     <div style="clear: both;"> </div>
 
     <div id="footer">
-      &copy; Copyright <a href="#">Fs_skin blog</a> | <r:zena type='made'/> | <r:login_link/>
+      &copy; Copyright <a href="#">FsSkin blog</a> | <r:zena type='made'/> | <r:login_link/>
     </div>
   </div>
 </body>

data/bricks/fs_skin/zena/tasks.rb

@@ -9,11 +9,11 @@ namespace :fs_skin do
     if ENV['HOST']
       sites = [Site.find_by_host(ENV['HOST'])]
     else
-      sites = Site.all
+      sites = Site.master_sites
     end
     
     sites.each do |site|
-      Thread.current[:visitor] = site.any_admin
+      setup_visitor(site.any_admin, site)
       if ENV['WORKER'] == 'false' || RAILS_ENV == 'test'
         # We avoid SiteWorker.
         site.rebuild_fs_skin_index

data/bricks/fs_skin/zena/test/integration/fs_skin_integration_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 
-class Fs_skinIntegrationTest < Zena::Integration::TestCase
+class FsSkinIntegrationTest < Zena::Integration::TestCase
 
   context 'A page using a fs_skin Skin' do
     subject do
@@ -23,7 +23,7 @@ class Fs_skinIntegrationTest < Zena::Integration::TestCase
       should 'use fs_skin template' do
         get "http://test.host/en/blog#{subject.zip}.html"
         assert_response :success
-        assert_match %r{Copyright <a href="#">Fs_skin blog</a>}, response.body
+        assert_match %r{Copyright <a href="#">FsSkin blog</a>}, response.body
       end
     end # with normal access
   end # A page using a fs_skin Skin

data/bricks/fs_skin/zena/test/unit/fs_skin_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 
-class Fs_skinTest < Zena::Unit::TestCase
+class FsSkinTest < Zena::Unit::TestCase
 
   context 'A Skin' do
     setup do

data/bricks/math/zena/init.rb

@@ -1,4 +1 @@
-require 'bricks/math'
-
-Zena.use Bricks::Math
 Zena::Use::Zazen::ViewMethods.asset_method 'math' => :math_asset

data/bricks/pdf/zena/init.rb

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

data/bricks/worker/zena/init.rb

@@ -14,5 +14,3 @@ class Delayed::Job
       self[:site_id] = current_site[:id]
     end
 end
-
-Zena.use Bricks::Worker

data/bricks/zena/zena/migrate/20130617164527_add_master_id_to_site.rb

@@ -0,0 +1,13 @@
+class AddMasterIdToSite < ActiveRecord::Migration
+  def self.up
+    add_column :sites, :master_id, :integer
+    # The id of the node without parent
+    add_column :sites, :orphan_id, :integer
+    execute "UPDATE sites SET orphan_id = root_id"
+  end
+
+  def self.down
+    remove_column :sites, :master_id
+    remove_column :sites, :orphan_id
+  end
+end