RubyGems - spiderfw - Versions diffs - 0.5.9 → 0.5.10 - Mend

spiderfw 0.5.9 → 0.5.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (98) hide show

data/apps/app_server/_init.rb +8 -0
data/apps/app_server/app_server.rb +60 -0
data/apps/app_server/config/options.rb +2 -0
data/apps/app_server/controllers/app_server_controller.rb +20 -0
data/apps/app_server/lib/app.rb +21 -0
data/apps/app_server/lib/git_app.rb +22 -0
data/apps/app_server/views/app_list.shtml +8 -0
data/apps/app_server/views/app_server.layout.shtml +14 -0
data/apps/cas_server/_init.rb +1 -1
data/apps/config_editor/_init.rb +14 -0
data/apps/config_editor/config_editor.appspec +3 -0
data/apps/config_editor/controllers/config_editor_controller.rb +88 -0
data/apps/config_editor/views/config_editor.layout.shtml +20 -0
data/apps/config_editor/views/index.shtml +23 -0
data/apps/config_editor/widgets/edit/edit.rb +13 -0
data/apps/config_editor/widgets/edit/edit.shtml +4 -0
data/apps/core/auth/models/group.rb +2 -2
data/apps/core/components/public/js/jquery/plugins/jtree/jquery.jtree.1.0.js +187 -0
data/apps/core/components/public/js/jquery/plugins/jtree/jquery.jtree.1.0.min.js +1 -0
data/apps/core/components/public/js/jquery/plugins/jtree/jquery.jtree.spider.1.0.js +193 -0
data/apps/core/components/widgets/table/table.rb +19 -9
data/apps/core/components/widgets/table/table.shtml +2 -2
data/apps/core/forms/widgets/inputs/subform/subform.rb +10 -0
data/apps/core/forms/widgets/inputs/subform/subform.shtml +5 -0
data/apps/hippo/script/converti_strutture.rb +335 -0
data/apps/master/_init.rb +12 -0
data/apps/master/controllers/master_controller.rb +110 -0
data/apps/master/master.appspec +5 -0
data/apps/master/models/customer.rb +13 -0
data/apps/master/models/installation.rb +10 -0
data/apps/master/models/resource.rb +10 -0
data/apps/master/models/servant.rb +25 -0
data/apps/master/views/customer.shtml +20 -0
data/apps/master/views/customers.shtml +10 -0
data/apps/master/views/index.shtml +4 -0
data/apps/master/views/installation.shtml +36 -0
data/apps/master/views/master.layout.shtml +14 -0
data/apps/master/views/servant.shtml +26 -0
data/apps/master/views/servants.shtml +7 -0
data/apps/servant/_init.rb +5 -0
data/apps/servant/bin/spider-servant.rb +47 -0
data/apps/servant/lib/resource.rb +11 -0
data/apps/servant/lib/resources/db/mysql.rb +31 -0
data/apps/servant/lib/resources/db.rb +54 -0
data/apps/servant/lib/servant.rb +82 -0
data/apps/servant/servant.appspec +4 -0
data/apps/servant/var/log/error.log +1 -0
data/apps/worker/worker.rb +1 -1
data/blueprints/install/config.ru +12 -0
data/lib/spiderfw/app.rb +8 -0
data/lib/spiderfw/cmd/cmd.rb +4 -2
data/lib/spiderfw/cmd/commands/content.rb +33 -0
data/lib/spiderfw/cmd/commands/{init.rb → create.rb} +4 -4
data/lib/spiderfw/config/options/spider.rb +4 -0
data/lib/spiderfw/controller/controller.rb +11 -1
data/lib/spiderfw/controller/dispatcher.rb +2 -0
data/lib/spiderfw/controller/home_controller.rb +7 -1
data/lib/spiderfw/controller/mixins/static_content.rb +17 -3
data/lib/spiderfw/controller/mixins/visual.rb +2 -2
data/lib/spiderfw/controller/session.rb +2 -0
data/lib/spiderfw/create.rb +2 -2
data/lib/spiderfw/model/base_model.rb +11 -0
data/lib/spiderfw/model/condition.rb +37 -7
data/lib/spiderfw/model/mappers/db_mapper.rb +67 -71
data/lib/spiderfw/model/mappers/mapper.rb +92 -31
data/lib/spiderfw/model/model.rb +1 -0
data/lib/spiderfw/model/query.rb +1 -3
data/lib/spiderfw/model/query_funcs.rb +51 -0
data/lib/spiderfw/model/storage/db/adapters/oci8.rb +4 -1
data/lib/spiderfw/model/storage/db/db_schema.rb +15 -1
data/lib/spiderfw/model/storage/db/db_storage.rb +8 -2
data/lib/spiderfw/static_content.rb +84 -0
data/lib/spiderfw/utils/monkey/date_time.rb +4 -0
data/lib/spiderfw/utils/monkey/hpricot_compat.rb +0 -0
data/lib/spiderfw/utils/monkey/object.rb +25 -0
data/lib/spiderfw/utils/test_case.rb +24 -0
metadata +54 -24
data/apps/cms/models/content.rb +0 -16
data/apps/cms/models/news_item.rb +0 -7
data/apps/cms/models/translation.rb +0 -14
data/apps/cms/views/admin/admin.shtml +0 -16
data/apps/cms/views/admin/content.shtml +0 -4
data/apps/core/acl/_init.rb +0 -10
data/apps/core/acl/controllers/acl_controller.rb +0 -14
data/apps/core/acl/models/permission.rb +0 -11
data/apps/core/acl/views/acl.layout.shtml +0 -8
data/apps/core/acl/views/index.shtml +0 -3
data/apps/git_model_versioning/models/mixins/git_versioned.rb +0 -91
data/apps/master/controllers/git.rb +0 -32
data/apps/saml/_init.rb +0 -13
data/apps/saml/controllers/saml2idp.rb +0 -18
data/apps/saml/lib/bindings/http_redirect_binding.rb +0 -14
data/apps/saml/lib/messages/authn_request.rb +0 -52
data/apps/saml/lib/saml.rb +0 -10
data/apps/soap/soap.gemspec +0 -10
data/blueprints/model.rb +0 -15
/data/blueprints/{install → home}/config/config.yml +0 -0
/data/blueprints/{install → home}/init.rb +0 -0

data/apps/app_server/_init.rb ADDED Viewed

@@ -0,0 +1,8 @@
+module Spider
+    module AppServer
+        include Spider::App
+        @controller = :AppServerController
+    end
+end
+require 'apps/app_server/controllers/app_server_controller'

data/apps/app_server/app_server.rb ADDED Viewed

@@ -0,0 +1,60 @@
+require 'find'
+require 'apps/app_server/lib/app'
+require 'apps/app_server/lib/git_app'
+module Spider
+    module AppServer
+        def self.apps
+            @apps ||= scan
+        end
+        def self.rescan
+            @apps = scan
+        end
+        def self.scan
+            apps = []
+            self.paths.each do |path|
+                apps += scan_path(path)
+            end
+            apps
+        end
+        def self.scan_path(path)
+            apps = []
+            git_repos = search_git(path)
+            git_repos.each do |p|
+                app = GitApp.new(p)
+                apps << app if app.spec
+            end
+            apps
+        end
+        def self.search_git(path)
+            found = []
+            Find.find(path) do |p|
+                if File.directory?(p)
+                    if File.directory?("#{p}/objects") && File.directory?("#{p}/info") && File.file?("#{p}/HEAD")
+                        found << p
+                        Find.prune
+                    end
+                end
+            end
+            found
+        end
+        def self.search_dirs(path)
+            Dir.glob("#{path}/**/_init.rb").each do |f|
+                found << File.dirname(f)
+            end
+        end
+        def self.paths
+            Spider.conf.get('app_server.search_paths')
+        end
+    end
+end

data/apps/app_server/config/options.rb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ Spider.config_option 'app_server.search_paths', _("Paths to search for apps"), :type => Array
2	+

data/apps/app_server/controllers/app_server_controller.rb ADDED Viewed

@@ -0,0 +1,20 @@
+module Spider; module AppServer
+    class AppServerController < Spider::PageController
+        layout 'app_server'
+        __.html :template => 'app_list'
+        __.json :call => :list_json
+        def list
+            @scene.apps = AppServer.apps
+        end
+        def list_json
+            $out << AppServer.apps.to_json
+        end
+    end
+end; end

data/apps/app_server/lib/app.rb ADDED Viewed

@@ -0,0 +1,21 @@
+module Spider; module AppServer
+    class App
+        attr_accessor :spec
+        attr_reader :last_modified
+        def initialize
+        end
+        def method_missing(name, *args)
+            @spec.send(name, *args) if @spec.respond_to?(name)
+        end
+        def to_json
+            @spec.to_json
+        end
+    end
+end; end

data/apps/app_server/lib/git_app.rb ADDED Viewed

@@ -0,0 +1,22 @@
+require 'grit'
+module Spider; module AppServer
+    class GitApp < App
+        def initialize(path)
+            repo = Grit::Repo.new(path)
+            spec = nil
+            repo.tree.blobs.each do |blob|
+                next unless blob.basename =~ /\.appspec$/
+                spec = blob.data
+                @spec = Spider::App::AppSpec.eval(spec)
+                @last_modified = repo.commits.first.authored_date # FIXME
+                break
+            end
+        end
+    end
+end; end

data/apps/app_server/views/app_list.shtml ADDED Viewed

@@ -0,0 +1,8 @@
+<ul>
+    <li sp:each="@apps |app|">
+        <h5>{ app.name } ({ app.version })</h5>
+        <div class="description">
+            { app.description }
+        </div>
+    </li>
+</ul>

data/apps/app_server/views/app_server.layout.shtml ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Spider AppServer</title>
+        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
+        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
+    </head>
+    <body>
+        <div id="content">
+            <sp:yield />
+        </div>
+    </body>
+</html>

data/apps/cas_server/_init.rb CHANGED Viewed

@@ -18,6 +18,6 @@ end
 ['mixins/consumable', 'ticket', 'login_ticket',
 'ticket_granting_ticket', 'proxy_granting_ticket', 'proxy_ticket'].each do |mod|
-    require Spider::CASServer.path+'/models/'+mod
+    require 'apps/cas_server/models/'+mod
 end
 require 'apps/cas_server/controllers/mixins/cas_login_mixin'

data/apps/config_editor/_init.rb ADDED Viewed

@@ -0,0 +1,14 @@
+module Spider
+    module ConfigEditor
+        include Spider::App
+        @controller = :ConfigEditorController
+    end
+end
+Spider::Template.register_namespace('config_editor', Spider::ConfigEditor)
+require 'apps/config_editor/controllers/config_editor_controller'
+require 'apps/config_editor/widgets/edit/edit'

data/apps/config_editor/config_editor.appspec ADDED Viewed

@@ -0,0 +1,3 @@
+name 'Configuration Editor'
+version '0.1'
+author 'Ivan Pirlik'

data/apps/config_editor/controllers/config_editor_controller.rb ADDED Viewed

@@ -0,0 +1,88 @@
+module Spider; module ConfigEditor
+    class ConfigEditorController < Spider::PageController
+        layout 'config_editor'
+        def conf
+            Spider.conf
+        end
+        def index
+            redirect 'options'
+        end
+        def before(action='', *arguments)
+            super
+            @scene.required = []
+            self.conf.each do |key, val|
+                if !val && self.conf.option(key)[:params][:required]
+                    @scene.required << key
+                end
+            end
+        end
+        __.html :template => 'index'
+        def options(action='')
+            @scene.prefix = action
+            @scene.prefix += '/' unless @scene.prefix.empty?
+            @scene.parts = []
+            conf = self.conf.options
+            unless action.empty?
+                parts = action.split('/')
+                tmp_cur_part = ''
+                @scene.parts = parts.map{ |p| tmp_cur_part = "#{tmp_cur_part}/#{p}"}
+                @scene.parts.pop
+                parts.each do |part|
+                    conf = conf[part]
+                end
+            end
+            @scene.subconfs = []
+            @scene.options = {}
+            @scene.edit_widgets = {}
+            if conf[:params] && conf[:params][:type] == :conf
+                @scene.multiple = true
+                conf = conf['x']
+            end
+            conf.each do |key, val|
+                if val.key?(:description) && val.key?(:params) && val[:params][:type] != :conf
+                    next if val[:description] == "__auto__"
+                    @scene.options[key] = val
+                    w = create_edit_widget(key, val)
+                    @scene.edit_widgets[key] = w
+                else
+                    @scene.subconfs << key
+                end
+            end
+        end
+        __.html :template => 'index'
+        def required
+            @scene.parts = []
+            @scene.subconfs = []
+            @scene.options = {}
+            @scene.edit_widgets = {}
+            self.conf.each do |key, val|
+                next unless self.conf.option(key)
+                if self.conf.option(key)[:params][:required]
+                    @scene.options[req] = self.conf.option(key)
+                    w = create_edit_widget(req, self.conf.option(key))
+                    @scene.edit_widgets[key] = w
+                end
+            end
+        end
+        def create_edit_widget(key, option)
+            w = Edit.new(@request, @response, @scene)
+            w.attributes[:name] = key
+            w.attributes[:option] = option
+            w.widget_init
+            w.prepare
+            w
+        end
+    end
+end; end

data/apps/config_editor/views/config_editor.layout.shtml ADDED Viewed

@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>_(Spider Configuration Editor)</title>
+        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
+        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
+    </head>
+    <body>
+        <div id="content">
+            <div id="menu">
+                <a href="{ ConfigEditor.url }/options">_(Configuration options)</a>
+                <a href="{ ConfigEditor.url }/required">
+                    _(Required)<span sp:if="!@required.empty?">!</span>
+                </a>
+            </div>
+            <sp:yield />
+        </div>
+    </body>
+</html>

data/apps/config_editor/views/index.shtml ADDED Viewed

@@ -0,0 +1,23 @@
+<div>
+    <div>
+        <a sp:if="!@parts.empty?" href="{ ConfigEditor.url }/options">_(Start)</a>
+        <tpl:pass sp:each="@parts |part|">
+            <a href="{ ConfigEditor.url }/options{ part }">{ part.split('/').last }</a>
+        </tpl:pass>
+    </div>
+    <form action='' method="post">
+        <div sp:if="@multiple">
+            Multiple (fixme)
+        </div>
+        <ul>
+            <li sp:each="@subconfs |key|">
+                <a href="{ ConfigEditor.url }/options/{ @prefix }{ key }">{ key }</a>
+            </li>
+        </ul>
+        <ul>
+            <li sp:each="@options |key, option|">
+                <sp:run obj="@edit_widgets[key]" />
+            </li>
+        </ul>
+    </form>
+</div>

data/apps/config_editor/widgets/edit/edit.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module Spider; module ConfigEditor
+    class Edit < Spider::Widget
+        tag 'edit'
+        is_attribute :name, :type => String
+        is_attribute :option
+    end
+end; end

data/apps/config_editor/widgets/edit/edit.shtml ADDED Viewed

@@ -0,0 +1,4 @@
+<div>
+    <label>{ @name }</label>
+    <input type="text" name="options[{ @name }]">
+</div>

data/apps/core/auth/models/group.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require 'spiderfw/model/mixins/tree'
 require 'apps/core/auth/models/mixins/access_control'
-require 'uuid'
+require 'uuidtools'
 module Spider; module Auth
@@ -13,7 +13,7 @@ module Spider; module Auth
         with_mapper_subclasses do
             def assign_primary_keys(obj)
-                obj.set(:gid, UUID.new.generate)
+                obj.set(:gid, UUIDTools::UUID.random_create.to_s)
             end
         end

data/apps/core/components/public/js/jquery/plugins/jtree/jquery.jtree.1.0.js ADDED Viewed

@@ -0,0 +1,187 @@
+// JavaScript Document
+(function($) {
+	$.fn.jTree = function(options) {
+		var opts = $.extend({}, $.fn.jTree.defaults, options);
+		var cur = 0, curOff = 0, off =0, h =0, w=0, hover = 0;
+		var str='<li class="jTreePlacement" style="background:'+opts.pBg+';border:'+opts.pBorder+';color:'+opts.pColor+';height:'+opts.pHeight+'"></li>';
+		var container = this;
+		//events are written here
+		$(this).find("li").mousedown(function(e){
+			if ($("#jTreeHelper").is(":not(:animated)") && e.button !=2) {
+				// append jTreePlacement to body and hides
+				$("body").append(str);
+				$(".jTreePlacement").hide();
+				//get the current li and append to helper
+				$(this).clone().appendTo("#jTreeHelper");
+				// get initial state, cur and offset
+				cur = this;
+				curOff = $(cur).offset();
+				$(cur).hide();
+				// show initial helper
+				$("#jTreeHelper").css ({
+					position: "absolute",
+					top: e.pageY + 5,
+					left: e.pageX + 5,
+					background: opts.hBg,
+					opacity: opts.hOpacity
+				}).show();
+				$("#jTreeHelper *").css ({
+					color: opts.hColor,
+					background: opts.hBg,
+				});
+				// start binding events to use
+				// prevent text selection
+				$(document).bind("selectstart", doNothing);
+				// doubleclick is destructive, better disable
+				$(container).find("li").bind("dblclick", doNothing);
+				// in single li calculate the offset, width height of hovered block
+				$(container).find("li").bind("mouseover", getInitial);
+				// in single li put placement in correct places, also move the helper around
+				$(container).find("li").bind("mousemove", putPlacement);
+				// handle mouse movement outside our container
+				$(document).bind("mousemove", helperPosition);
+			}
+			//prevent bubbling of mousedown
+			return false;
+		});
+		// in single li or in container, snap into placement if present then destroy placement
+		// and helper then show snapped in object/li
+		// also destroys events
+		$(this).find("li").andSelf().mouseup(function(e){
+			// if placementBox is detected
+			if ($(".jTreePlacement").is(":visible")) {
+				$(cur).insertBefore(".jTreePlacement").show();
+			}
+			$(cur).show();
+			// remove helper and placement box
+			$(container).find("ul:empty").remove();
+			$("#jTreeHelper").empty().hide();
+			$(".jTreePlacement").remove();
+			// remove bindings
+			destroyBindings();
+			return false;
+		});
+		$(document).mouseup(function(e){
+			if (cur!=0) {
+				$("#jTreeHelper").animate({
+					top: curOff.top,
+					left: curOff.left
+						}, opts.snapBack, function(){
+							$("#jTreeHelper").empty().hide();
+							$(".jTreePlacement").remove();
+							$(cur).show();
+						}
+				);
+				destroyBindings();
+			}
+			cur = 0;
+			return false;
+		});
+		//functions are written here
+		var doNothing = function(){
+			return false;
+		};
+		var destroyBindings = function(){
+			$(document).unbind("selectstart", doNothing);
+			$(container).find("li").unbind("dblclick", doNothing);
+			$(container).find("li").unbind("mouseover", getInitial);
+			$(container).find("li").unbind("mousemove", putPlacement);
+			$(document).unbind("mousemove", helperPosition);
+		};
+		var helperPosition = function(e) {
+			$("#jTreeHelper").css ({
+				top: e.pageY + 5,
+				left: e.pageX + 5
+			});
+			$(".jTreePlacement").remove();
+		};
+		var getInitial = function(e){
+			off = $(this).offset();
+			h = $(this).height();
+			w = $(this).width();
+			hover = this;
+			return false;
+		};
+		var putPlacement = function(e){
+			$(cur).hide();
+			$("#jTreeHelper").css ({
+				top: e.pageY + 5,
+				left: e.pageX + 5
+			});
+			//inserting before
+			if ( e.pageY >= off.top && e.pageY < (off.top + h/2 - 1) ) {
+				if (!$(this).prev().hasClass("jTreePlacement")) {
+					$(".jTreePlacement").remove();
+					$(this).before(str);
+				}
+			}
+			//inserting after
+			else if (e.pageY >(off.top + h/2) &&  e.pageY <= (off.top + h) ) {
+				// as a sibling
+				if (e.pageY > off.left && e.pageX < off.left + opts.childOff) {
+					if (!$(this).next().hasClass("jTreePlacement")) {
+						$(".jTreePlacement").remove();
+						$(this).after(str);
+					}
+				}
+				// as a child
+				else if (e.pageX > off.left + opts.childOff) {
+					$(".jTreePlacement").remove();
+					if ($(this).find("ul").length == 0)
+						$(this).append('<ul>'+str+'</ul>');
+					else
+						$(this).find("ul").prepend(str);
+				}
+			}
+			return false;
+		}
+		var lockIn = function(e) {
+			// if placement box is present, insert before placement box
+			if ($(".jTreePlacement").length==1) {
+				$(cur).insertBefore(".jTreePlacement");
+			}
+			$(cur).show();
+			// remove helper and placement box
+			$("#jTreeHelper").empty().hide();
+			$(".jTreePlacement").remove();;
+		}
+	}; // end jTree
+	$.fn.jTree.defaults = {
+		showHelper: false,
+		hOpacity: 0.5,
+		hBg: "#FCC",
+		hColor: "#222",
+		pBorder: "1px dashed #CCC",
+		pBg: "#EEE",
+		pColor: "#222",
+		pHeight: "20px",
+		childOff: 20,
+		snapBack: 1000
+	};
+})(jQuery);

data/apps/core/components/public/js/jquery/plugins/jtree/jquery.jtree.1.0.min.js ADDED Viewed

@@ -0,0 +1 @@