spiderfw 0.5.7 → 0.5.9

data/Rakefile

@@ -1,18 +1,28 @@
 require 'rake'
 require 'rake/testtask'
+require 'pathname'
 
-desc "Update pot/po files."
-task :updatepo do
+def check_app_path(full, partial)
+    p = Pathname.new(full)
+    rel = p.relative_path_from(Pathname.new(Spider.paths[:core_apps]))
+    return rel.to_s == partial
+end
+
+desc "Update pot/po files. To update a single app, call rake updatepo[app_relative_path], where app_relative_path is the path relative to the apps folder (or 'spider')."
+task :updatepo, [:app] do |t, args|
     require 'spiderfw'
     require 'spiderfw/i18n/shtml_parser'
     require 'gettext/tools'
-    GetText.update_pofiles("spider", Dir.glob("{lib,bin,views}/**/*.{rb,rhtml,shtml}"), "Spider #{Spider::VERSION}")
+    require 'ruby-debug'
+    GetText.update_pofiles("spider", Dir.glob("{lib,bin,views}/**/*.{rb,rhtml,shtml}"), "Spider #{Spider::VERSION}") if !args[:app] || args[:app] == 'spider'
     apps = Spider.find_all_apps
     apps.each do |path|
+        next if args[:app] && !check_app_path(path, args[:app])
         require path+'/_init.rb' if File.directory?(path+'/po')
     end
     Spider.apps.each do |name, mod|
         next unless File.directory?(mod.path+'/po')
+        next if args[:app] && !check_app_path(mod.path, args[:app])
         Dir.chdir(mod.path)
         GetText.update_pofiles(mod.short_name, Dir.glob("{lib,bin,controllers,models,views,widgets}/**/*.{rb,rhtml,shtml}"), "#{mod.name} #{mod.version}")
         print "\n"
@@ -20,13 +30,14 @@ task :updatepo do
 
 end
 
-desc "Create mo-files"
-task :makemo do
+desc "Create mo-files. To create for a single app, call rake makemo[app_relative_path], where app_relative_path is the path relative to the apps folder (or 'spider')."
+task :makemo, [:app] do |t, args|
     require 'gettext/tools'
-    GetText.create_mofiles(:verbose => true)
+    GetText.create_mofiles(:verbose => true) if !args[:app] || args[:app] == 'spider'
     require 'spiderfw'
     apps = Spider.find_all_apps
     apps.each do |path|
+        next if args[:app] && !check_app_path(path, args[:app])
         if File.directory?(path+'/po')
             Dir.chdir(path)
             GetText.create_mofiles(:verbose => true, :po_root => './po', :mo_root => $SPIDER_PATH+'/data/locale')

data/apps/cas_server/controllers/mixins/cas_login_mixin.rb

@@ -10,7 +10,7 @@ module Spider; module CASServer
         def self.included(controller)
             controller.route 'proxyValidate', :proxy_validate
             controller.route 'serviceValidate', :service_validate
-            controller.route 'login', :index
+            #controller.route 'login', :index
         end
 
         def before(action='', *arguments)
@@ -33,7 +33,7 @@ module Spider; module CASServer
                 }
             end
             begin
-                if @service
+                if @service #&& cas_service_allowed?(@service)
                     if !@renew && tgt && !tgt_error
                         st = generate_service_ticket(@service, tgt.username, tgt)
                         service_with_ticket = service_uri_with_ticket(@service, st)
@@ -72,6 +72,10 @@ module Spider; module CASServer
             return {}
         end
         
+        def cas_service_allowed?(service, user)
+            return true
+        end
+        
         def authenticate
             if error = validate_login_ticket(@request.params['lt'])
                 @scene.message = error
@@ -79,6 +83,10 @@ module Spider; module CASServer
             end
             user = super
             return nil unless user
+            if @service && !@service.empty? && !cas_service_allowed?(@service, user)
+                @scene.message = {:type => 'error', :message => _("The user is not allowed to acces this service.")}
+                return nil
+            end
             cas_user_authenticated(user)
             return user
         end
@@ -120,12 +128,17 @@ module Spider; module CASServer
         
         __.html
         def login
-            if (@request.user)
-                return cas_user_authenticated(@request.user)
+            @service = clean_service_url(@request.params['service'] || @request.params['destination'])
+            if @request.user && !@request.params.key?('renew')
+                if !@service || @service.empty? || cas_service_allowed?(@service, @request.user)
+                    return cas_user_authenticated(@request.user)
+                else
+                    raise Forbidden
+                end
             end 
             index
         end
-
+        
         __.html
         def logout
             @service = clean_service_url(@request.params['service'] || @request.params['destination'])

data/apps/cas_server/lib/cas.rb

@@ -133,7 +133,7 @@ module Spider; module CASServer::CAS
       if lt.consumed
         error = "The login ticket you provided has already been used up. Please try logging in again."
         $LOG.warn("Login ticket '#{ticket}' previously used up")
-      elsif (DateTime.now - lt.obj_created) < Spider.conf.get('cas.login_ticket_expiry')
+      elsif lt.obj_created && (DateTime.now - lt.obj_created) < Spider.conf.get('cas.login_ticket_expiry')
         $LOG.info("Login ticket '#{ticket}' successfully validated")
       else
         error = "Your login ticket has expired. Please try logging in again."

data/apps/cms/models/content.rb

@@ -0,0 +1,16 @@
+module Spider; module CMS
+    
+    class Content < Spider::Model::Managed
+        include Versioning::Git, MultiLanguage, ACL, RowACL
+        
+        element :title, String
+        element :html, SHTML
+        tree :contained, :reverse => :container
+        element :status, CMS::Status
+        
+        
+        
+        
+    end
+    
+end

data/apps/cms/models/news_item.rb

@@ -0,0 +1,7 @@
+module Spider; module CMS
+    
+    class NewsItem < Content
+        link :more
+    end
+    
+end; end

data/apps/cms/models/translation.rb

@@ -0,0 +1,14 @@
+module Spider; module CMS
+    
+    module Translation
+        
+        module ClassMethods
+            attr_accessor :original
+            
+            element :lang, Language
+            element :original, Content
+            
+        end
+    end
+    
+end

data/apps/cms/views/admin/admin.shtml

@@ -0,0 +1,16 @@
+<div class="admin">
+    <sp:tree id="content_menu" qs="@qs" >
+        <tpl:wrap-content search=".label">
+            <a href="{ @actions[child] }">{ $1 }</a>
+        </tpl:wrap-content>
+    </sp:tree>
+    <sp:run obj="@content" />
+</div>
+
+
+<ol>
+    <li sp:each="@children |child|">
+        <span id="label">{ @labels[child] }</span>
+        <sp:tree id="$child.id" if="child.children" src="@child.children" />
+    </li>
+</ol>

data/apps/cms/views/admin/content.shtml

@@ -0,0 +1,4 @@
+<div id="content">
+    <forms:form model="@content" />
+    <admin:page src="@content">
+</div>

data/apps/core/acl/_init.rb

@@ -0,0 +1,10 @@
+#require 'apps/acl/controllers/acl_controller.rb'
+
+module Acl
+    @description = ""
+    @version = 0.1
+    @path = File.dirname(__FILE__)
+    @controller = :AclController
+    include Spider::App
+end
+

data/apps/core/acl/controllers/acl_controller.rb

@@ -0,0 +1,14 @@
+module Acl
+    
+    class AclController < Spider::PageController
+        
+        layout 'acl'
+    
+        __.html :template => 'index'
+        def index
+            @scene.msg = 'Hello!'
+        end
+    
+    end
+    
+end

data/apps/core/acl/models/permission.rb

@@ -0,0 +1,11 @@
+module ACL
+    
+    def self.Permission(user, model)
+        klass = Class.new(Spider::Model::Managed)
+        const_set("#{ACL}#{user}#{model} booh", klass)
+        klass.element :user, :add_multiple_reverse => :"permissions_on_#{model}"
+        klass.element :obj, :add_multiple_reverse => :"permitted_#{user}"
+        klass.element :permission, String
+    end
+    
+end

data/apps/core/acl/views/acl.layout.shtml

@@ -0,0 +1,8 @@
+<html>
+    <head></head>
+    <body>
+        <div id="content">
+            <sp:yield />
+        </div>
+    </body>
+</html>

data/apps/core/acl/views/index.shtml

@@ -0,0 +1,3 @@
+<div id="message">
+    { @msg }
+</div>

data/apps/core/auth/controllers/mixins/auth_helper.rb

@@ -40,7 +40,7 @@ module Spider; module Auth
                 requested_class = nil
                 klasses.each do |klass|
                     requested_class = klass
-                    user = klass.restore_from_session(@request.session)
+                    user = klass.restore(@request)
                     if user
                         @request.security[:users] << user
                         if (params[:authentication])
@@ -69,7 +69,7 @@ module Spider; module Auth
         
         def try_rescue(exc)
             if (exc.is_a?(Unauthorized))
-                base = @current_require[:redirect] ? @current_require[:redirect] : '/'+Spider::Auth.route_url+'/login/'
+                base = @current_require[:redirect] ? @current_require[:redirect] : Spider::Auth.request_url+'/login/'
                 base = request_path+'/'+base unless base[0].chr == '/'
                 base += '?'
                 redir_url = base + 'redirect='+URI.escape(@request.path)
@@ -111,4 +111,4 @@ module Spider; module Auth
 
     end
 
-end; end
+end; end

data/apps/core/auth/lib/authenticable.rb

@@ -69,6 +69,10 @@ module Spider; module Auth
                 end
                 return obj
             end
+            
+            def restore(request)
+                restore_from_session(request.session)
+            end
         
             def restore_session_hash(saved)
                 if (self.subclass_of?(Spider::Model::BaseModel))

data/apps/core/auth/models/super_user.rb

@@ -2,6 +2,7 @@ module Spider; module Auth
     
     class SuperUser < LoginUser
         extend_model superclass, :add_polymorphic => true
+        label _('Superuser'), _('Superusers')
         include LoginAuthenticator
     end
     

data/apps/core/auth/po/it/spider_auth.po

@@ -3,26 +3,25 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
-"PO-Revision-Date: 2009-06-30 16:58+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
+"PO-Revision-Date: 2010-03-24 16:28+0100\n"
+"Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: controllers/mixins/auth_helper.rb:63
+msgid "Please login first"
+msgstr "Per favore, esegui il login"
+
 #: models/digest_user.rb:17
-msgid ""
-"You must always supply the password to a DigestUser when updating username "
-"or realm"
-msgstr ""
-"È necessario sempre specificare la password di un DigestUser quando si "
-"modifica lo username o il realm"
+msgid "You must always supply the password to a DigestUser when updating username or realm"
+msgstr "È necessario sempre specificare la password di un DigestUser quando si modifica lo username o il realm"
 
 #: models/mixins/authentication_tracking.rb:6
 msgid "Last login"
@@ -31,3 +30,12 @@ msgstr "Ultima login"
 #: models/mixins/authentication_tracking.rb:7
 msgid "Login count"
 msgstr "Numero login"
+
+#: models/super_user.rb:5
+msgid "Superuser"
+msgstr "Amministratore"
+
+#: models/super_user.rb:5
+msgid "Superusers"
+msgstr "Amministratori"
+

data/apps/core/auth/po/spider_auth.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
 "PO-Revision-Date: 2009-06-30 16:58+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: controllers/mixins/auth_helper.rb:63
+msgid "Please login first"
+msgstr ""
+
 #: models/digest_user.rb:17
 msgid ""
 "You must always supply the password to a DigestUser when updating username "
@@ -29,3 +33,11 @@ msgstr ""
 #: models/mixins/authentication_tracking.rb:7
 msgid "Login count"
 msgstr ""
+
+#: models/super_user.rb:5
+msgid "Superuser"
+msgstr ""
+
+#: models/super_user.rb:5
+msgid "Superusers"
+msgstr ""

data/apps/core/components/_init.rb

@@ -18,4 +18,5 @@ require 'apps/core/components/widgets/admin/admin'
 require 'apps/core/components/widgets/confirm/confirm'
 # require 'apps/core/components/widgets/tabs/tabs'
 require 'apps/core/components/widgets/list/list'
-require 'apps/core/components/widgets/switcher/switcher'
+require 'apps/core/components/widgets/switcher/switcher'
+require 'apps/core/components/widgets/month_calendar/month_calendar'

data/apps/core/components/po/it/spider_components.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
 "PO-Revision-Date: 2009-10-07 19:35+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,11 +23,11 @@ msgstr "Amministrazione"
 msgid "guest"
 msgstr "ospite"
 
-#: widgets/crud/crud.rb:65
+#: widgets/crud/crud.rb:94
 msgid "Cancel"
 msgstr "Annulla"
 
-#: widgets/crud/crud.rb:66
+#: widgets/crud/crud.rb:95
 msgid "Ok"
 msgstr "Ok"
 

data/apps/core/components/po/spider_components.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-03-24 16:27+0100\n"
 "PO-Revision-Date: 2009-06-30 16:58+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: widgets/crud/crud.rb:65
+#: widgets/crud/crud.rb:94
 msgid "Cancel"
 msgstr ""
 
-#: widgets/crud/crud.rb:66
+#: widgets/crud/crud.rb:95
 msgid "Ok"
 msgstr ""
 

data/apps/core/components/public/css/month_calendar.css

@@ -0,0 +1,24 @@
+/* @override http://localhost:8989/spider/components/public/css/month_calendar.css */
+
+.spider.components.month-calendar{
+	border-collapse: collapse;
+}
+
+.spider.components.month-calendar td, .spider.components.month-calendar th{
+	padding: 0.3em;
+	text-align: center;
+	border: 1px solid #cecece;
+}
+
+.spider.components.month-calendar td{
+	color: #555555;
+}
+
+.spider.components.month-calendar td.prev-month, .spider.components.month-calendar td.next-month{
+	background-color: #E4E4E4;
+	color: #999999;
+} 
+
+.spider.components.month-calendar td.busy{
+	font-weight: bold;
+}