spiderfw 0.5.19 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 0.6.0
+== 20 April, 2011
+* Test support
+* JRuby support
+* Document storage
+* Many bugfixes
+
 = 0.5.19
 == 23 December, 2010
 * Made Ripl an optional dependency, since Bond can't be build on JRuby

data/VERSION

@@ -1 +1 @@
-0.5.19
+0.6.0

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

@@ -5,7 +5,12 @@ module RBAC
     def self.define_context(name, permissions=nil, options={})
         permissions ||= Spider::OrderedHash[]
         @contexts ||= {}
-        @contexts[name] = permissions 
+        permissions.clone.each do |k, v|
+            unless v.is_a?(Hash)
+               permissions[k] = {:label => v}
+            end
+        end
+        @contexts[name] = permissions
         @options ||= {}
         @options[name] = options
     end
@@ -13,7 +18,7 @@ module RBAC
     def self.context(name)
         @contexts[name]
     end
-    
+        
     def self.context?(name)
         @contexts[name] != nil
     end

data/apps/core/auth/models/mixins/rbac_provider.rb

@@ -6,8 +6,14 @@ module Spider; module Auth
             model.extend(ClassMethods)
         end
         
-        def can?(permission, context=nil)
+        # If the second argument is a symbol, it will be interpreted as the context
+        def can?(permission, obj=nil, context=nil)
+            if obj.is_a?(Symbol)
+                context = obj
+                obj = nil
+            end
             context ||= self.class.rbac_contexts.first
+            permission = permission.to_sym
             el = self.class.rbac_provider_elements[context]
             options = RBAC.options(context)
             if options[:superuser]
@@ -15,14 +21,28 @@ module Spider; module Auth
                 return true if val
             end
             val = self.get(el)
+            has_perm = false
             val.each do |v|
-                return true if v.id.to_sym == permission.to_sym
+                if v.id.to_sym == permission
+                    has_perm = true
+                    break
+                end
+            end
+            perm_details = RBAC.context(context)[permission]
+            if has_perm
+                return true unless perm_details[:with_models] && obj
+                model_el = self.class.elements_array.select{ |el| 
+                    el.attributes[:rbac] == [context, permission] && el.type == obj.class
+                }.first
+                return false unless model_el
+                return true if self.get(model_el).include?(obj)
+                return false
             end
             self.class.rbac_inherit_from.each do |element|
                 val = self.get(element)
                 val = [val] unless val.is_a?(Enumerable)
                 val.each do |v|
-                    return true if v.can?(permission, context)
+                    return true if v.can?(permission, obj, context)
                 end
             end
             return false
@@ -37,9 +57,51 @@ module Spider; module Auth
             def rbac_provider_for(context)
                 @rbac_provider_elements ||= {}
                 @rbac_provider_elements[context] = :"#{context}_permissions"
-                self.multiple_choice @rbac_provider_elements[context], RBAC.context(context),
+                inline_data = Spider::OrderedHash.new
+                permissions = RBAC.context(context)
+                permissions.each do |k, v|
+                    inline_data[k] = v[:label]
+                end
+                
+                self.multiple_choice @rbac_provider_elements[context], inline_data,
                     :label => _("%s permissions") % context.to_s.gsub(/_+/, ' ').capitalize,
                     :inline_model => [[:id, String, {:primary_key => true}], [:desc, String]]
+                permissions.each do |k, v|
+                    if models = v[:with_models]
+                        models.each do |model_h|
+                            unless model_h.is_a?(Hash)
+                                model_h = {:model => model_h}
+                            end
+                            model = model_h[:model]
+                            model_name = model.name
+                            parts = model_name.split('::')
+                            self_parts = self.name.split('::')
+                            el_name = model_h[:element]
+                            reverse_name = model_h[:reverse]
+                            unless el_name && reverse_name
+                                model_name = ""
+                                self_name = ""
+                                0.upto(parts.length-1) do |i|
+                                    next if parts[i] == self_parts[i]
+                                    if i < parts.length - 2
+                                        model_name = parts[i..-2].join('_')+'_'
+                                        self_name = self_parts[i..-2].join('_')+'_'
+                                    end
+                                    model_name += model.label_plural
+                                    self_name += self.label_plural
+                                    model_name.downcase!
+                                    self_name.downcase!
+                                    break
+                                end
+                                el_name ||= "#{context}_#{k}_#{model_name}".to_sym
+                                reverse_name ||= "#{context}_#{k}_#{self_name}".to_sym
+                            end
+                            self.many el_name, model, :add_multiple_reverse => {
+                                :name => reverse_name, :rbac_reverse => [context, k], :version_content => false
+                            }, :delete_cascade => true, :rbac => [context, k], :version_content => false
+                        end
+                    end
+                end
                 self.elements[@rbac_provider_elements[context]].type.translate = true
             end
             

data/apps/core/components/assets.rb

@@ -1,5 +1,5 @@
 Spider::Template.define_named_asset 'jquery', [
-     [:js, 'js/jquery/jquery-1.4.3.js', Spider::Components, {:cdn => 'https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js'}]
+     [:js, 'js/jquery/jquery-1.5.2.js', Spider::Components, {:cdn => 'https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js'}]
  ]
 
 Spider::Template.define_named_asset 'spider', [
@@ -22,8 +22,10 @@ Spider::Template.define_named_asset 'spider-utils', [
     [:js, 'js/utils.js', Spider::Components, {:gettext => true}]
 ], :depends => ['spider']
 
+# jQuery UI
+
 Spider::Template.define_runtime_asset 'jquery-ui-datepicker-locale' do |request, response, scene|
-    Spider::Components.pub_url+"/js/jquery/jquery-ui-1.8.4/development-bundle/ui/i18n/jquery.ui.datepicker-#{request.locale.language}.js"
+    Spider::Components.pub_url+"/js/jquery/jquery-ui-1.8.11/ui/i18n/jquery.ui.datepicker-#{request.locale.language}.js"
 end
 
 Spider::Template.define_named_asset 'jquery-ui', [
@@ -36,78 +38,106 @@ Spider::Template.define_named_asset 'jquery-ui', [
 
 
 Spider::Template.define_named_asset 'jquery-ui-core', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.core.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.widget.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.mouse.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.position.js', Spider::Components],
-    [:css, 'js/jquery/jquery-ui-1.8.4/css/Aristo/jquery-ui.custom.css', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.core.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.widget.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.mouse.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.position.js', Spider::Components],
+    [:css, 'js/jquery/jquery-ui-1.8.11/css/Aristo/jquery-ui.custom.css', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'jquery-ui-draggable', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.draggable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.draggable.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-droppable', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.droppable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.droppable.js', Spider::Components]
 ], :depends => ['jquery-ui-draggable']
 
 Spider::Template.define_named_asset 'jquery-ui-resizable', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.resizable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.resizable.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-selectable', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.selectable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.selectable.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-sortable', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.sortable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.sortable.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-accordion', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.accordion.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.accordion.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-autocomplete', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.autocomplete.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.autocomplete.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-button', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.button.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.button.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-dialog', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.dialog.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.dialog.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-slider', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.slider.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.slider.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-tabs', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.tabs.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.tabs.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-datepicker', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.datepicker.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.datepicker.js', Spider::Components],
     [:js, 'jquery-ui-datepicker-locale', :runtime]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-progressbar', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.ui.progressbar.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.progressbar.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-effects', [
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.core.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.blind.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.bounce.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.clip.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.drop.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.explode.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.fold.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.highlight.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.pulsate.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.scale.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.shake.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.slide.js', Spider::Components],
-    [:js, 'js/jquery/jquery-ui-1.8.4/development-bundle/ui/jquery.effects.transfer.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.core.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.blind.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.bounce.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.clip.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.drop.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.explode.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.fold.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.highlight.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.pulsate.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.scale.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.shake.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.slide.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.effects.transfer.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
+
+# jQuery Tools (http://flowplayer.org/tools/)
+
+Spider::Template.define_named_asset 'jquery-tools-overlay', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/overlay/overlay.js', Spider::Components]
+], :depends => ['jquery']
+
+Spider::Template.define_named_asset 'jquery-tools-overlay-apple', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/overlay/overlay.apple.js', Spider::Components]
+], :depends => ['jquery-tools-overlay']
+
+Spider::Template.define_named_asset 'jquery-tools-scrollable', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/scrollable/scrollable.js', Spider::Components]
+], :depends => ['jquery']
+
+Spider::Template.define_named_asset 'jquery-tools-tabs', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/tabs/tabs.js', Spider::Components],
+    [:css, 'js/jquery/jquery-tools-1.2.5/tabs/tabs.css', Spider::Components]
+], :depends => ['jquery']
+
+Spider::Template.define_named_asset 'jquery-tools-expose', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/toolbox/toolbox.expose.js', Spider::Components]
+], :depends => ['jquery']
+
+Spider::Template.define_named_asset 'jquery-tools-tooltip', [
+    [:js, 'js/jquery/jquery-tools-1.2.5/tooltip/tooltip.js', Spider::Components],
+    [:js, 'js/jquery/jquery-tools-1.2.5/tooltip/tooltip.dynamic.js', Spider::Components]
+], :depends => ['jquery']