zena 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,10 @@
+== 1.1.3 2011-11-09
+
+* Major changes
+ * Does not expire compiled templates when working in dev mode by default.
+ * Added 'monolingual' option for virtual classes. All TextDocuments are monolingual
+   by default.
+
 == 1.1.2 2011-11-09
 
 * Minor changes

data/app/controllers/nodes_controller.rb

@@ -23,7 +23,6 @@ class NodesController < ApplicationController
   before_filter :find_node, :except => [:index, :create, :not_found, :catch_all, :search]
   before_filter :check_can_drive, :only => [:edit]
   before_filter :check_path,      :only => [:index, :show]
-  after_filter  :change_lang,     :only => [:create, :update, :save_text]
   layout :popup_layout,           :only => [:edit, :import]
 
   include Zena::Use::Grid::ControllerMethods
@@ -356,7 +355,9 @@ class NodesController < ApplicationController
     params['node'] ||= {}
     file, file_error = get_attachment
     params['node']['file'] = file if file
-
+    # Make sure we load the correct version for edited v_lang
+    lang = params['node']['v_lang'] || visitor.lang
+    @node.version(lang)
     @v_status_before_update = @node.v_status
     @node.update_attributes_with_transformation(params['node'])
     # What is this 'extfile' thing ?
@@ -576,8 +577,6 @@ class NodesController < ApplicationController
       if params[:link_id]
         @link = Link.find_through(@node, params[:link_id])
       end
-
-      @title_for_layout = title_for_layout
     end
 
     def set_format(format)
@@ -659,10 +658,6 @@ class NodesController < ApplicationController
       end
     end
 
-    def change_lang
-      set_visitor_lang(params[:node]['v_lang']) if params[:node] && params[:node]['v_lang']
-    end
-
     def do_search
       if @node
         default_scope = 'self'

data/app/models/cached_page.rb

@@ -68,13 +68,12 @@ class CachedPage < ActiveRecord::Base
     end
 
     # Remove cached pages related to the given node.
-    def expire_with(node, node_ids = nil)
-      if node_ids && node_ids != []
-        direct_pages = CachedPage.find(:all, :conditions => "node_id IN (#{node_ids.join(',')})")
+    def expire_with(node, opts = {})
+      if opts
+        expire(node.cached_pages.find(:all, opts))
       else
-        direct_pages = []
+        expire(node.cached_pages)
       end
-      expire(node.cached_pages + [])
     end
 
     private

data/app/models/node.rb

@@ -1327,11 +1327,8 @@ class Node < ActiveRecord::Base
   end
 
   # TODO: test
-  def sweep_cache
+  def sweep_cache(opts = {})
     return if current_site.being_created?
-    # zafu 'erb' rendering cache expire
-    # TODO: expire only 'dev' rendering if version is a redaction
-    CachedPage.expire_with(self) if self.kind_of?(Template)
 
     # Clear element cache
     Cache.sweep(:visitor_id=>self[:user_id], :visitor_groups=>[rgroup_id, wgroup_id, dgroup_id], :kpath=>self.vclass.kpath)
@@ -1343,9 +1340,7 @@ class Node < ActiveRecord::Base
     # FIXME: use self + modified relations instead of parent/project
     [self, self.real_project(false), self.real_section(false), self.parent(false)].compact.uniq.each do |obj|
       # destroy all pages in project, parent and section !
-      CachedPage.expire_with(obj)
-      # this destroys less cache but might miss things like 'changes in project' that are displayed on every page.
-      # CachedPage.expire_with(self, [self[:project_id], self[:section_id], self[:parent_id]].compact.uniq)
+      CachedPage.expire_with(obj, opts)
     end
 
     # clear assets

data/app/models/site.rb

@@ -187,9 +187,11 @@ class Site < ActiveRecord::Base
   end
 
   property.string 'usr_prototype_attributes'
+  property.boolean 'expire_in_dev'
 
   Site.attributes_for_form[:text] << 'usr_prototype_attributes'
-  attr_accessible :usr_prototype_attributes
+  Site.attributes_for_form[:bool] << 'expire_in_dev'
+  attr_accessible :usr_prototype_attributes, :expire_in_dev
 
   # Return path for static/cached content served by proxy: RAILS_ROOT/sites/_host_/public
   # If you need to serve from another directory, we do not store the path into the sites table

data/app/models/text_document.rb

@@ -163,6 +163,16 @@ class TextDocument < Document
     (super + (content_type == 'text/css' ? ['text'] : [])).uniq
   end
 
+  # Do not sweep TextDocument cache in dev mode unless expire_in_dev.
+  def sweep_cache
+    if visitor.dev_mode? && !current_site.expire_in_dev?
+      # Only expire templates built for dev mode
+      super(:conditions => ['path like ?', "%/dev_#{visitor.lang}/%"])
+    else
+      super
+    end
+  end
+
   private
     class AssetHelper
       attr_accessor :visitor

data/app/models/user.rb

@@ -342,6 +342,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def dev_mode?
+    !dev_skin_id.blank?
+  end
+
   private
 
     def user_site

data/app/models/version.rb

@@ -70,7 +70,13 @@ class Version < ActiveRecord::Base
     def set_defaults
       # set author
       self[:user_id] = visitor.id
-      self[:lang]    = visitor.lang unless lang_changed?
+      if lang.blank? || !lang_changed?
+        if node && node.vclass.monolingual?
+          self[:lang] = current_site.default_lang
+        else
+          self[:lang] = visitor.lang
+        end
+      end
       self[:site_id] = current_site.id
     end
 

data/app/models/virtual_class.rb

@@ -34,7 +34,7 @@ class VirtualClass < Role
     attr_accessor :export_attributes
   end
 
-  self.export_attributes = %w{auto_create_discussion icon}
+  self.export_attributes = %w{auto_create_discussion icon monolingual}
 
   attr_accessor :import_result
   belongs_to    :create_group, :class_name => 'Group', :foreign_key => 'create_group_id'
@@ -51,12 +51,15 @@ class VirtualClass < Role
   include Zena::Use::PropEval::VirtualClassMethods
   include Zena::Use::ScopeIndex::VirtualClassMethods
 
+  property.boolean 'monolingual'
+  safe_method  :monolingual? => Boolean
   safe_method  :roles     => {:class => ['Role'], :method => 'sorted_roles'}
   safe_method  :relations => {:class => ['RelationProxy'], :method => 'all_relations'}
   safe_method  [:relations, String] => {:class => ['RelationProxy'], :method => 'filtered_relations'}
   # All columns defined for a VirtualClass (kpath based).
   safe_method :all_columns => {:class => ['Column'], :method => 'safe_columns'}
 
+
   class Cache
     def initialize
       clear_cache!
@@ -165,6 +168,9 @@ class VirtualClass < Role
       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
 

data/app/views/templates/edit_tabs/_title.rhtml

@@ -5,7 +5,16 @@
 <%= text_field 'node', 'tag_list', :size=>nil, :class => 'full_width' %>
 
 <label for='v_lang'><%= _("language") %></label>
-<%= select 'node', 'v_lang', current_site.lang_list.map {|l| [_(l), l]} %>
+<% if @node.vclass.monolingual?
+  if @node.new_record?
+	selected = current_site.default_lang
+  else
+    selected = @node.v_lang == visitor.lang ? @node.v_lang : current_site.default_lang
+  end
+else
+  selected = visitor.lang
+end -%>
+<%= select 'node', 'v_lang', current_site.lang_list.map {|l| [_(l), l]}, :selected => selected %>
 
 <label><%= _('publication date') %></label>
 <%= date_box(@node, 'v_publish_from') %>

data/app/views/virtual_classes/_form.erb

@@ -41,6 +41,7 @@
 
     <tr><td class='label'><%= _('create group')%></td><td><%= select('virtual_class', 'create_group_id',  visitor.all_groups.map{|g| [g.name, g.id]} ) %></td></tr>
     <tr><td class='label'><%= _('auto create discussion')%></td><td><%= check_box('virtual_class', 'auto_create_discussion') %></td></tr>
+    <tr><td class='label'><%= _('monolingual')%></td><td><%= check_box('virtual_class', 'monolingual') %></td></tr>
 <% end -%>
     <tr><td class='label'><%= _('icon')%>      </td><td><%= text_field('virtual_class', 'icon',        :size=>15 ) %></td></tr>
     <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>

data/config/environments/production.rb

@@ -1,5 +1,5 @@
 # Settings specified here will take precedence over those in config/environment.rb
-config.log_level = :info
+config.log_level = :debug
 
 # The production environment is meant for finished, "live" apps.
 # Code is not reloaded between requests

data/lib/zena/info.rb

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

data/lib/zena/use/i18n.rb

@@ -136,9 +136,6 @@ module Zena
           chosen_lang = nil
           [
             params[:lang],
-# FIXME: This is good to protect templates and other documents but is *NOT* nice when translating a website !!
-#        What should we do ?
-            params[:node] ? params[:node][:v_lang] : nil,
             # Avoid redirects for static assets (cached documents).
             request.format == Mime::HTML ? params[:prefix] : nil,
             visitor.is_anon? ? session[:lang] : visitor.lang,

data/lib/zena/use/rendering.rb

@@ -115,6 +115,9 @@ module Zena
         end
 
         def render_and_cache(options={})
+          # FIXME: maybe we can remove this.
+          @title_for_layout = title_for_layout
+
           opts = {:skin => @node[:skin], :cache => true}.merge(options)
           opts[:mode  ] ||= params[:mode]
           opts[:format] ||= params[:format].blank? ? 'html' : params[:format]
@@ -299,7 +302,7 @@ module Zena
             out "<% set_headers(#{headers.join(', ')}) %>"
           end
         end
-        
+
         def r_style
           @markup.tag = 'style'
           expand_with

data/lib/zena/use/version_hash.rb

@@ -47,9 +47,9 @@ module Zena
       end
 
       module ModelMethods
-        def version
+        def version(lang = nil)
           @version ||= begin
-            if v_id = version_id
+            if v_id = version_id(lang)
               version = ::Version.find(v_id)
             else
               version = ::Version.new
@@ -59,9 +59,10 @@ module Zena
           end
         end
 
-        def version_id
+        def version_id(lang = nil)
+          lang ||= visitor.lang
           access = can_see_redactions? ? vhash['w'] : vhash['r']
-          access[visitor.lang] || access[self[:ref_lang]] || access.values.first
+          access[lang] || access[self[:ref_lang]] || access.values.first
         end
 
         # Return the list of versions that are stored in the vhash and could be loaded depending

data/lib/zena/use/zafu_templates.rb

@@ -336,7 +336,7 @@ module Zena
 
         # Return true if the current rendering should include a dev box.
         def dev_mode?
-          !visitor.dev_skin_id.blank?
+          visitor.dev_mode?
         end
 
         # Return true if we should display the dev box

data/locale/de/zena.po

@@ -711,7 +711,7 @@ msgstr "persönliche Informationen ändern"
 
 #: app/views/relations/_form.erb:17 app/views/nodes/_parent.rhtml:7
 msgid "class"
-msgstr "<img src='/images/lock.png' title='Klasse'/>"
+msgstr "Klasse"
 
 #: app/views/templates/document_create_tabs/_import.rhtml:7
 msgid "class of first element"

data/test/unit/cached_page_test.rb

@@ -162,4 +162,44 @@ class CachedPageTest < Zena::Unit::TestCase
       end
     end
   end
+
+  def test_no_expire_in_dev
+    without_files('test.host/zafu') do
+      preserving_files('/test.host/data') do
+        login(:lion)
+        visitor.dev_skin_id = nodes_id(:default)
+        assert visitor.dev_mode?
+        template_ids = [nodes_id(:Node_index_zafu), nodes_id(:Project_zafu), nodes_id(:Node_zafu), nodes_id(:notes_zafu)]
+        path = SITES_ROOT + visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"
+        dev_path = SITES_ROOT + visitor.site.zafu_path + "/default/Node_index.html/dev_en/main.erb"
+
+        assert !File.exists?(path), "No cached file yet"
+        cache = secure!(CachedPage) { CachedPage.create(
+          :path            => (visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"),
+          :expire_after    => nil,
+          :expire_with_ids => template_ids,
+          :content_data    => "public cache") }
+
+        cache = secure!(CachedPage) { CachedPage.create(
+          :path            => (visitor.site.zafu_path + "/default/Node_index.html/dev_en/main.erb"),
+          :expire_after    => nil,
+          :expire_with_ids => template_ids,
+          :content_data    => "dev cache") }
+        assert File.exists?(path), "Cache file created"  
+        assert File.exists?(dev_path), "Cache file created"
+        
+        # test expire
+        node = secure!(Node) { nodes(:Node_zafu) }
+        assert node.update_attributes(:title=>'hey'), "Can save"
+        assert File.exists?(path), "Public cache not removed"
+        assert !File.exists?(dev_path), "Dev cache removed"
+        
+        # expire all
+        assert current_site.update_attributes(:expire_in_dev => true)
+        node = secure!(Node) { nodes(:Node_zafu) }
+        assert node.update_attributes(:title=>'hey boy'), "Can save"
+        assert !File.exists?(path), "Public cache removed"
+      end
+    end
+  end
 end

data/test/unit/site_test.rb

@@ -172,6 +172,10 @@ class SiteTest < Zena::Unit::TestCase
       assert_kind_of User, subject.any_admin
       assert_equal users(:lion), subject.any_admin
     end
+    
+    should 'respond to expire_in_dev' do
+      assert !subject.expire_in_dev?
+    end
   end # A site
 
 
@@ -350,7 +354,7 @@ class SiteTest < Zena::Unit::TestCase
     end
   end
 
-
+  
   private
     def fullpath(*args)
       args.map {|sym| nodes_zip(sym).to_s}.join('/')

data/test/unit/virtual_class_test.rb

@@ -647,6 +647,12 @@ class VirtualClassTest < Zena::Unit::TestCase
       should 'return real_class name on get_real_class' do
         assert_equal 'Page', subject.send(:get_real_class, subject)
       end
+      
+      should 'respond to monolingual' do
+        assert_nothing_raised do
+          assert_nil subject.monolingual
+        end
+      end
 
       context 'that is a Node' do
         subject do

data/test/unit/workflow_test.rb

@@ -398,6 +398,21 @@ class WorkflowTest < Zena::Unit::TestCase
         assert_equal 'de', subject.version.lang
       end
 
+      context 'with a text document' do
+        subject do
+          secure(Node) { nodes(:Node_zafu) }
+        end
+
+        should 'create versions in the default language' do
+          visitor.lang = 'de'
+          assert subject.vclass.monolingual?
+          assert_difference('Version.count', 1) do
+            subject.update_attributes('text' => 'Die Antwoord')
+            assert_equal 'en', subject.version.lang
+          end
+        end
+      end
+
       should 'not be allowed to propose' do
         assert !subject.can_propose?
         assert !subject.propose # does nothing
@@ -623,25 +638,25 @@ class WorkflowTest < Zena::Unit::TestCase
           end
         end # setting v_status to autopublish
       end # that she owns
-      
+
       # Basic tests for property integration in Node.
       context 'changing attributes' do
         should 'mark version as edited' do
           subject.attributes = {'title' => 'foo'}
           assert subject.version.edited?
         end
-        
+
         should 'mark properties as changed' do
           subject.attributes = {'title' => 'foo'}
           assert subject.prop.changed?
         end
-        
+
         should 'show property changes on chages' do
           subject.attributes = {'title' => 'foo'}
           assert_equal Hash['title'=> ['status title', 'foo']], subject.changes
         end
       end # changing attributes
-      
+
     end # A visitor with drive access on a publication
 
 

data/zena.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Gaspard Bucher