zena 0.15.2 → 0.16.0

data/script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

data/script/process/reaper

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'

data/script/process/spawner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'

data/script/runner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

data/script/server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

data/script/set_revision

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+root     = File.join(File.dirname(__FILE__), '..')
+svn_info = `svn info #{root.inspect} 2>&1 || svk info #{root.inspect} 2>&1`
+if svn_info =~ %r{Repository Root: [^\n]*zenadmin.org.*Revision: (\d+)}m
+  rev = $1
+else
+  svk_info = `svk info #{root.inspect} 2>&1`
+  if svk_info =~ %r{zenadmin.org/zena, Rev. (\d+)}
+    rev = $1
+  elsif svk_info =~ %r{(Merged|Copied) From: (.*?), Rev}
+    svk_info = `svk info /#{$2} 2>&1`
+    if svk_info =~ %r{zenadmin.org/zena(/trunk|), Rev. (\d+)}
+      rev = $2
+    else
+      puts "revision number could not be found using svn or svk"
+    end
+  end
+end
+
+if rev
+  version_file = File.read(File.join(root, 'config', 'version.rb'))
+  File.open(File.join(root, 'config', 'version.rb'), 'wb') do |f|
+    f.print  version_file.sub(/(REV *)=.*$/, "\\1= #{rev}")
+  end
+  puts "revision number updated to #{rev}"
+else
+  puts "could not find revision number through svn info"
+end

data/spec/controllers/versions_controller_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe VersionsController do
+
+  it { should route(:get, "/nodes/11/versions/0/edit",    :controller => :versions, :action => :edit, :node_id => 11, :id => 0)    }
+  it { should route(:get, "/nodes/11/versions/2/preview", :controller => :versions, :action => :preview, :node_id => 11, :id => 2)    }
+
+  it "should publish the previous version" do
+    # TODO: login, etc
+  end
+end

data/test/fixtures/files/Node-test.zafu

@@ -190,7 +190,7 @@ This filter updates the "distant filter block test"
 <ul do='tags in site'>
   <li style='border:1px solid #400; min_width:100px; min_height:100px;' do='each' do='drop' set='set_tag'>
     <b do='[v_title]'/>
-    <ul do='tagged'><li do='each' do='unlink' do='img' mode='tiny'/></ul>
+    <ul do='context' select='tagged'><li do='each' do='unlink' do='img' mode='tiny'/></ul>
   </li>
 </ul>
 

data/test/functional/nodes_controller_test.rb

@@ -171,6 +171,9 @@ END:VCALENDAR
 
       assert zafu = nodes['Node']
       assert_kind_of Template, zafu
+      assert_equal 'html', zafu.version.content.format
+      assert_equal 'Node', zafu.version.content.klass
+      assert_equal 'N', zafu.version.content.tkpath
       assert style = nodes['style']
       assert_kind_of TextDocument, style
       assert navBar = nodes['navBar']
@@ -313,6 +316,28 @@ END:VCALENDAR
     get 'show', 'prefix'=>'oo', 'path'=>["page#{nodes_zip(:projects)}_test.html"]
     assert_response :success
   end
+
+  def test_create_from_url
+    login(:tiger)
+    if Zena::Use::Upload.has_network?
+      preserving_files('test.host/data') do
+        assert_difference('Node.count', 1) do
+          post 'create', 'attachment_url' => 'http://zenadmin.org/fr/blog/image5.jpg', 'node' => {'parent_id' => nodes_zip(:zena)}
+        end
+        document = assigns(:node)
+        assert_equal 73633, document.version.content.size
+        assert_equal 298, document.version.content.width
+        assert_equal 243, document.version.content.height
+      end
+    end
+  end
+
+  def test_search
+    login(:anon)
+    get 'search', 'q' => 'bird'
+    assert nodes = assigns(:nodes)
+    assert_equal [nodes_id(:bird_jpg)], nodes.map {|r| r.id}
+  end
 end
 
 =begin

data/test/functional/pings_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class PingsControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/test/functional/user_sessions_controller_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+class UserSessionsControllerTest < Zena::Controller::TestCase
+
+  context "Controller actions" do
+
+    should "get login page" do
+      get :new
+      assert_not_nil assigns(:node)
+    end
+
+    should "create a session" do
+      post 'create', :login=>'ant', :password=>'ant'
+      assert assigns(:user_session).persisting?
+      assert_response 302
+    end
+
+    should "redirect to login page if login failed" do
+      post 'create', :login=>'ant', :password=>'boom'
+      assert !assigns(:user_session).persisting?
+      assert_redirected_to login_url
+    end
+
+  end
+
+  context "with login Test Case" do
+
+    setup do
+      login('su')
+    end
+
+    should "visitor be accessible" do
+      assert_equal 'su', visitor.login
+    end
+
+    should "site be accessible" do
+      assert_equal 'zena', $_test_site
+    end
+
+    should "check if visitor is admin" do
+      assert visitor.is_admin?
+    end
+
+  end
+
+  context 'a visitor on the wrong site' do
+    setup do
+      @request.host = 'ocean.host'
+    end
+
+    should 'not be allowed to login' do
+      post 'create', :login => 'ant', :password => 'ant'
+      assert !assigns(:user_session).persisting?
+      assert_redirected_to login_url
+    end
+  end
+
+end
+

data/test/functional/users_controller_test.rb

@@ -2,27 +2,89 @@ require 'test_helper'
 
 class UsersControllerTest < Zena::Controller::TestCase
 
-  def test_update_preferences
-    login(:lion)
-    put 'update', 'id' => users_id(:lion), 'user'=>{'name'=>'Leo Verneyi', 'lang'=>'en', 'time_zone'=>'Africa/Algiers', 'first_name'=>'Panthera', 'login'=>'lion', 'email'=>'lion@zenadmin.info'}
-    assert_response :success
-    user = assigns['user']
-    assert_equal 'Africa/Algiers', user[:time_zone]
+  context "on GET index" do
+    context " if visitor is admin" do
+      setup do
+        login(:su)
+        get :index
+      end
+
+      should_assign_to :users
+      should_render_with_layout :_main
+      should_respond_with :success
+    end
+
+    context " if visitor is not admin" do
+      setup do
+        login(:ant)
+        get :index
+      end
+
+      should_not_assign_to :users
+      should_render_without_layout
+      should_respond_with 404
+    end
+
+    context " if layout is invalid" do
+      setup do
+        login(:lion)
+        Version.connection.execute "UPDATE #{Version.table_name} SET text = 'empty' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
+        without_files('test.host/zafu') do
+          get 'index'
+        end
+      end
+
+      should_respond_with :success
+      should_render_with_layout :_main
+    end
+
   end
 
-  def test_render_invalid_adminLayout
-    login(:lion)
-    Version.connection.execute "UPDATE #{Version.table_name} SET text = 'empty' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
-    without_files('test.host/zafu') do
-      get 'index'
-      assert_response :success
-      assert_no_match %r{empty}, @response.body
-      # The assertion below passes alone but fails when we pass all tests.
-      # Tracked the problem all the way to default rendering and all seems ok:
-      # Maybe the problem is related to ruby not evaluating the erb. No idea.
-      # We'll make it a pending for the safety of our minds.
-      # assert_match %r{Using default '\+adminLayout' template}, @response.body
-      print 'P'
+  context "on GET show" do
+    setup do
+      login(:su)
+      get(:show, {'id'=>visitor.id})
     end
+
+    should_respond_with :success
+    should_render_without_layout
   end
+
+  context 'on GET preferences' do
+    setup do
+      login(:su)
+      get(:preferences, {'id'=>visitor.id})
+    end
+
+    should_respond_with :success
+    should_render_with_layout :_main
+  end
+
+  context 'on GET swap_dev' do
+    setup do
+      login(:su)
+      get(:swap_dev, {'id'=> visitor.id})
+    end
+
+    should_set_session(:dev) {true}
+    should_redirect_to("the user profile") { user_url(visitor.id) }
+  end
+
+
+
+  context "on PUT" do
+    context "in order to update parameters" do
+      setup do
+        login(:lion)
+        put 'update', 'id' => users_id(:lion), 'user'=>{'name'=>'Leo Verneyi', 'lang'=>'en', 'time_zone'=>'Africa/Algiers', 'first_name'=>'Panthera', 'login'=>'lion', 'email'=>'lion@zenadmin.info'}
+      end
+      should_assign_to :user
+      should_respond_with :success
+      should "be able to set timezone" do
+        assert_equal 'Africa/Algiers', assigns(:user)[:time_zone]
+      end
+    end
+  end
+
+
 end

data/test/helpers/node_query/filters.yml

@@ -103,3 +103,8 @@ filter_through_links:
   src: "nodes where (set_tag_id eq 33 and hot_id eq 22) in site"
   sql: "/jnode\.zip = 33 AND jn1\.zip = 22/"
   res: "cleanWater"
+
+filter_with_fullpath:
+  src: "nodes where fullpath like '[node:fullpath]/%' in site order by fullpath"
+  sql: "[\"SELECT nodes.* FROM nodes WHERE nodes.fullpath LIKE ? AND (#{@node.secure_scope('nodes')}) ORDER BY nodes.fullpath ASC\", @node.safe_read(\"fullpath\").to_s+ \"/%\"]"
+  res: 'crocodiles, lake, lakeAddress, opening, status, track, water'

data/test/helpers/node_query_test.rb

@@ -57,7 +57,7 @@ class NodeQueryTest < Zena::Unit::TestCase
     node = secure!(Node) { Node.new }
     assert_equal nil, node.find(:all,'set_tags')
     node = secure!(Node) { Node.get_class('Tag').new_instance }
-    assert_equal nil, node.find(:all,'tagged')
+    assert_equal nil, node.find(:all,'tagged', :skip_rubyless => true)
   end
 
   def test_do_find_in_new_node
@@ -85,7 +85,7 @@ class NodeQueryTest < Zena::Unit::TestCase
   def test_l_status
     login(:lion)
     node = secure!(Node) { nodes(:art) }
-    tagged = node.find(:all, 'tagged')
+    tagged = node.find(:all, 'tagged', :skip_rubyless => true)
     # cleanWater, opening
     assert_equal [10, 5], tagged.map{|t| t.l_status}
   end
@@ -101,7 +101,7 @@ class NodeQueryTest < Zena::Unit::TestCase
   def test_l_comment_empty
     login(:lion)
     node = secure!(Node) { nodes(:art) }
-    tagged = node.find(:all, 'tagged')
+    tagged = node.find(:all, 'tagged', :skip_rubyless => true)
     # cleanWater, opening
     assert_equal [nil, "cold"], tagged.map{|t| t.l_comment}
   end

data/test/integration/multiple_hosts_test.rb

@@ -39,7 +39,7 @@ class MultipleHostsTest < ActionController::IntegrationTest
         node = nodes(:zena_status)
         assert_equal 1, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
         assert_not_equal 0, Zena::Db.fetch_row("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i
-        node.visitor = Thread.current.visitor
+        node.visitor = Thread.current[:visitor]
         node.sweep_cache
         assert_equal 0, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
         assert_equal 0, Zena::Db.fetch_row("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i

data/test/integration/navigation_test.rb

@@ -1,7 +1,7 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class NavigationTest < ActionController::IntegrationTest
-  include Zena::Test::Base
+  #include Zena::Test::Base
 
   def test_authorize
     get 'http://test.host/'

data/test/sites/complex/users.yml

@@ -13,7 +13,7 @@ complex_anon:
 complex_admin:
   login:           admin
   first_name:      admin
-  password:        <%= User.hash_password('admin') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('admin') %>
   status:          admin
   contact:         admin
 

data/test/sites/ocean/users.yml

@@ -13,14 +13,14 @@ ocean_su:
   first_name:      Hyper
   name:            Super
   login:           ocean_su
-  password:        <%= User.hash_password('ocean_su') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('ocean_su') %>
   status:          su
 
 whale:
   first_name:      Miss
   name:            Whale
   login:           whale
-  password:        <%= User.hash_password('whale') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('whale') %>
   groups:          public, aqua, masters
   status:          admin
 
@@ -28,6 +28,6 @@ messy:
   first_name:      Very
   name:            Messy
   login:           messy
-  password:        <%= User.hash_password('messy') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('messy') %>
   groups:          aqua, masters
   status:          reader

data/test/sites/zena/users.yml

@@ -12,18 +12,19 @@ anon:
 
 su:
   login:           su
-  password:        <%= User.hash_password('su') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('su') %>
   first_name:      Super
   name:            User
   status:          su
   contact:         anonymous
+  single_access_token: HORIZONS
 
 ant:
   first_name:      Solenopsis
   name:            Invicta
   email:           ant@zenadmin.info
   login:           ant
-  password:        <%= User.hash_password('ant') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('ant') %>
   time_zone:       Europe/Zurich
   groups:          public, workers
   status:          user
@@ -34,7 +35,7 @@ tiger:
   name:            Tigris Sumatran
   email:           tiger@zenadmin.info
   login:           tiger
-  password:        <%= User.hash_password('tiger') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('tiger') %>
   groups:          public, workers, managers
   status:          user
 
@@ -43,6 +44,6 @@ lion:
   name:            Leo Verneyi
   email:           lion@zenadmin.info
   login:           lion
-  password:        <%= User.hash_password('lion') %>
+  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('lion') %>
   groups:          public, workers, admin
   status:          admin

data/test/test_zena.rb

@@ -7,43 +7,43 @@ module Zena
   module Test
 
     # functional tests
-    module TestController
-      include Zena::Use::Fixtures
-      include Zena::Use::TestHelper
-
-      def init_controller
-        $_test_site ||= 'zena'
-        @request    ||= ActionController::TestRequest.new
-        @response   ||= ActionController::TestResponse.new
-        @request.host = sites_host($_test_site)
-        @controller.instance_eval { @params = {}; @url = ActionController::UrlRewriter.new( @request, {} )}
-        @controller.instance_variable_set(:@response, @response)
-        @controller.send(:request=, @request)
-        @controller.instance_variable_set(:@session, @request.session)
-      end
-
-      def logout
-        reset_session
-      end
-
-      def session
-        @controller.send(:session)
-      end
-
-      def flash
-        session['flash']
-      end
-
-      def err(obj)
-        obj.errors.each_error do |er,msg|
-          puts "[#{er}] #{msg}"
-        end
-      end
-
-      def method_missing(meth,*args, &block)
-        @controller.send(meth, *args, &block)
-      end
-    end
+    # module TestController
+    #       include Zena::Use::Fixtures
+    #       include Zena::Use::TestHelper
+    #
+    #       def init_controller
+    #         $_test_site ||= 'zena'
+    #         @request    ||= ActionController::TestRequest.new
+    #         @response   ||= ActionController::TestResponse.new
+    #         @request.host = sites_host($_test_site)
+    #         @controller.instance_eval { @params = {}; @url = ActionController::UrlRewriter.new( @request, {} )}
+    #         @controller.instance_variable_set(:@response, @response)
+    #         @controller.send(:request=, @request)
+    #         @controller.instance_variable_set(:@session, @request.session)
+    #       end
+    #
+    #       def logout
+    #         reset_session
+    #       end
+    #
+    #       def session
+    #         @controller.send(:session)
+    #       end
+    #
+    #       def flash
+    #         session['flash']
+    #       end
+    #
+    #       def err(obj)
+    #         obj.errors.each_error do |er,msg|
+    #           puts "[#{er}] #{msg}"
+    #         end
+    #       end
+    #
+    #       def method_missing(meth,*args, &block)
+    #         @controller.send(meth, *args, &block)
+    #       end
+    #     end
 
     module Integration
       include Zena::Acts::Secure
@@ -132,7 +132,7 @@ class ZenaTestHelper < ActionView::TestCase
 end
 
 class ZenaTestController < ActionController::TestCase
-  include Zena::Test::TestController
+  #include Zena::Test::TestController
 end
 
 NodeQuery.insert_zero_link(Link)