spiderfw 0.6.27 → 0.6.28

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.6.28
+* Visualizzazione in core:table dei dati collegati, eliminazione dipendenze circolari in uow
+* Bugfixes
+
 == 0.6.27
 * Clear caches when tmp/clear.txt touched
 * Bugfixes

data/VERSION

@@ -1 +1 @@
-0.6.27
+0.6.28

data/apps/core/admin/admin.rb

@@ -10,7 +10,7 @@ module Spider
             @apps[mod.short_name] = {
                 :module => mod,
                 :controller => controller,
-                :options => options
+                :options => options || {}
             }
 
             Admin::AdminController.route mod.short_name, controller, :do => lambda{ |app_name|
@@ -23,9 +23,13 @@ module Spider
             @apps.each do |name, app|
                 users += app[:options][:users] if app[:options][:users]
             end
-            users << Spider::Auth::SuperUser
+            users += self.base_allowed_users
             users.uniq
         end
+
+        def self.base_allowed_users
+            [Spider::Auth::SuperUser]
+        end
         
         
     end

data/apps/core/admin/controllers/admin_controller.rb

@@ -30,7 +30,13 @@ module Spider; module Admin
         include StaticContent
 
         def self.auth_require_users
-            [[Spider::Admin.allowed_users, {:unless => [:login], :redirect => 'login'}]]
+            users = super
+            params = {:unless => [:login], :redirect => 'login'}
+            if users.empty?
+                [[Spider::Admin.allowed_users, params]]
+            else
+                users.map{ |u| [u[0], params.merge(u[1])]}
+            end
         end
         
         route 'login', LoginController
@@ -44,8 +50,9 @@ module Spider; module Admin
             @scene.username = @request.user.username
             @scene.apps = []
             Admin.apps.each do |short_name, app|
-                unless @request.user.superuser?
-                    next if app[:options][:users] && !app[:options][:users].include?(@request.user.class)
+                unless @request.users.any?{ |u| u.superuser? }
+                    next if app[:options][:users] && (app[:options][:users] & (@request.users.map{ |u| u.class})).empty?
+                    next if app[:options][:check] && !@request.users.any?{ |u| app[:options][:check].call(u) }
                 end
                 url = self.class.http_url(short_name)
                 @scene.apps << {

data/apps/core/admin/controllers/app_admin_controller.rb

@@ -1,6 +1,7 @@
 module Spider; module Admin
 
     class AppAdminController < Spider::PageController
+        include Spider::Auth::AuthHelper
 
         def before(action='', *params)
             @scene.admin_breadcrumb ||= []
@@ -9,6 +10,20 @@ module Spider; module Admin
             end
             @_did_breadcrumb = true
             super
+            unless check_action(action, :login)
+                our_app = Spider::Admin.apps[self.class.app.short_name]
+                raise "Admin #{self.class.app.short_name} not configured" unless our_app
+                user_classes = our_app[:options][:users] || []
+                user_classes += Spider::Admin.base_allowed_users
+                if (user_classes & (@request.users.map{ |u| u.class})).empty?
+                    raise Spider::Auth::Unauthorized.new(_("User not authorized to access this application"))
+                end
+                if our_app[:options][:check]
+                    unless @request.users.any?{ |u| our_app[:options][:check].call(u) }
+                        raise Spider::Auth::Unauthorized.new(_("User not authorized to access this application"))
+                    end
+                end
+            end
         end
 
     end

data/apps/core/admin/public/css/sass/admin.css

@@ -13,12 +13,12 @@ body:after {
   clear: both;
 }
 
-/* line 27, icons */
+/* line 42, icons/*.png */
 .icons-sprite, .icons-logout, #header #admin_controls .logout_link {
-  background: url('../../img/icons-s845a69dd9f.png') no-repeat;
+  background: url('../../img/icons-s8b18557db6.png') no-repeat;
 }
 
-/* line 60, ../../../../../../../../../../Users/cerebus/.rbenv/versions/1.8.7-p352/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss */
+/* line 60, ../../../../../../../../rvm/gems/ruby-1.9.3-p327/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss */
 .icons-logout, #header #admin_controls .logout_link {
   background-position: 0 0;
 }
@@ -50,7 +50,7 @@ body:after {
 /* line 44, ../../sass/admin.scss */
 #header {
   padding-bottom: 10px;
-  background: url('../../img/css/header_bg.png?1321971233') repeat-x scroll center top;
+  background: url('../../img/css/header_bg.png?1354531644') repeat-x scroll center top;
   background-color: #417690;
   position: relative;
   border-bottom: 2px solid #555555;
@@ -103,26 +103,21 @@ body:after {
   min-width: 200px;
   margin-left: 60px;
   background-color: #f4f5f6;
-  -moz-box-shadow: 0px 0px 5px #333333;
   -webkit-box-shadow: 0px 0px 5px #333333;
-  -o-box-shadow: 0px 0px 5px #333333;
+  -moz-box-shadow: 0px 0px 5px #333333;
   box-shadow: 0px 0px 5px #333333;
-  -moz-border-radius: 1px;
   -webkit-border-radius: 1px;
-  -o-border-radius: 1px;
+  -moz-border-radius: 1px;
   -ms-border-radius: 1px;
-  -khtml-border-radius: 1px;
+  -o-border-radius: 1px;
   border-radius: 1px;
   overflow: hidden;
   *zoom: 1;
-  display: -moz-inline-box;
-  -moz-box-orient: vertical;
+  display: -moz-inline-stack;
   display: inline-block;
   vertical-align: middle;
   *vertical-align: auto;
-}
-/* line 7, ../../../../../../../../../../Users/cerebus/.rbenv/versions/1.8.7-p352/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
-#header #app_buttons {
+  zoom: 1;
   *display: inline;
 }
 /* line 104, ../../sass/admin.scss */
@@ -131,15 +126,16 @@ body:after {
 }
 /* line 108, ../../sass/admin.scss */
 #header #app_buttons div {
-  width: 55px;
+  min-width: 55px;
+  padding: 2px;
   height: 55px;
   margin: 5px;
-  border: 1px solid #BBBBBB;
+  border: 1px solid #bbbbbb;
   text-align: center;
   float: left;
   background-color: #EEEEEE;
 }
-/* line 117, ../../sass/admin.scss */
+/* line 118, ../../sass/admin.scss */
 #header #app_buttons div img {
   margin-left: auto;
   margin-right: auto;
@@ -147,52 +143,52 @@ body:after {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   opacity: 0.8;
 }
-/* line 124, ../../sass/admin.scss */
+/* line 125, ../../sass/admin.scss */
 #header #app_buttons div span.name {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
   opacity: 0.9;
   display: block;
   font-size: 0.8em;
 }
-/* line 131, ../../sass/admin.scss */
+/* line 132, ../../sass/admin.scss */
 #header #app_buttons a.active div {
-  border: 1px solid #DDDD00;
+  border: 1px solid #dddd00;
 }
-/* line 133, ../../sass/admin.scss */
+/* line 134, ../../sass/admin.scss */
 #header #app_buttons a.active div img {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
   opacity: 0.7;
 }
-/* line 136, ../../sass/admin.scss */
+/* line 137, ../../sass/admin.scss */
 #header #app_buttons a.active div span.name {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   opacity: 0.8;
 }
 
-/* line 144, ../../sass/admin.scss */
+/* line 145, ../../sass/admin.scss */
 #admin-switcher-menu .section_title {
   font-size: 14px;
   line-height: 36px;
 }
 
-/* line 154, ../../sass/admin.scss */
+/* line 155, ../../sass/admin.scss */
 #spider-admin .container-fluid .content {
   background-color: white;
 }
 
-/* line 161, ../../sass/admin.scss */
+/* line 162, ../../sass/admin.scss */
 #container, .spider-admin-container {
-  background: url('../../img/css/side_bg.png?1321971233') repeat-y;
+  background: url('../../img/css/side_bg.png?1354531644') repeat-y;
   position: relative;
   min-width: 940px;
   padding-left: 20px;
   padding-right: 20px;
-  border-bottom: 1px solid #CCCCCC;
+  border-bottom: 1px solid #cccccc;
   min-height: 500px;
   overflow: hidden;
   *zoom: 1;
 }
-/* line 171, ../../sass/admin.scss */
+/* line 172, ../../sass/admin.scss */
 #container #sidebar, #container > .spider-admin-sidebar, .spider-admin-container #sidebar, .spider-admin-container > .spider-admin-sidebar {
   position: absolute;
   top: 0;
@@ -200,27 +196,27 @@ body:after {
   width: 220px;
   padding: 20px 10px;
 }
-/* line 178, ../../sass/admin.scss */
+/* line 179, ../../sass/admin.scss */
 #container #sidebar li.active a, #container > .spider-admin-sidebar li.active a, .spider-admin-container #sidebar li.active a, .spider-admin-container > .spider-admin-sidebar li.active a {
   text-decoration: underline;
 }
-/* line 182, ../../sass/admin.scss */
+/* line 183, ../../sass/admin.scss */
 #container #sidebar li, #container > .spider-admin-sidebar li, .spider-admin-container #sidebar li, .spider-admin-container > .spider-admin-sidebar li {
   margin-bottom: 1px;
 }
-/* line 187, ../../sass/admin.scss */
+/* line 188, ../../sass/admin.scss */
 #container #content, #container > .spider-admin-content, .spider-admin-container #content, .spider-admin-container > .spider-admin-content {
   margin-left: 240px;
 }
 
-/* line 192, ../../sass/admin.scss */
+/* line 193, ../../sass/admin.scss */
 .crud .table {
   width: auto;
   min-width: 400px;
 }
 
 @media screen and (max-width: 500px) {
-  /* line 201, ../../sass/admin.scss */
+  /* line 202, ../../sass/admin.scss */
   #header #main_title {
     font-size: 10px;
   }

data/apps/core/admin/public/css/sass/grid.css

@@ -0,0 +1,14 @@
+/* line 33, ../../sass/grid.scss */
+body {
+  width: 100%;
+  *zoom: 1;
+}
+/* line 20, ../../sass/grid.scss */
+body:before, body:after {
+  content: "";
+  display: table;
+}
+/* line 24, ../../sass/grid.scss */
+body:after {
+  clear: both;
+}

data/apps/core/admin/public/sass/admin.scss

@@ -106,8 +106,9 @@ $sidebar_color: #DFDFDF;
         }
 
         div{
-            width: 55px;
-            height: 55px;
+            min-width: 55px;
+            padding: 2px;
+	    height: 55px;
             margin: 5px;
             border: 1px solid #BBBBBB;
             text-align: center;

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

@@ -8,6 +8,7 @@
         </title>
         <tpl:output-assets type="css" />
         <tpl:output-assets type="js" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     </head>
     <body id="spider-admin">
         <div id="header">

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

@@ -40,11 +40,16 @@ module Spider; module Auth
                 user = nil
                 unauthorized_exception = nil
                 requested_class = nil
+                users = {} 
+                klasses.uniq.each do |klass|
+                    user = klass.restore(@request)
+                    @request.security[:users] << user if user
+                    users[klass] = user
+                end
                 klasses.each do |klass|
                     requested_class = klass
-                    user = klass.restore(@request)
+                    user = users[klass]
                     if user
-                        @request.security[:users] << user
                         if params[:authentication]
                             user = nil unless user.authenticated?(params[:authentication])
                         elsif (params[:check])
@@ -74,10 +79,11 @@ module Spider; module Auth
         
         def try_rescue(exc)
             if (exc.is_a?(Unauthorized))
-                base = @current_require[:redirect] ? @current_require[:redirect] : Spider::Auth.request_url+'/login/'
+                base = (@current_require && @current_require[:redirect]) ? @current_require[:redirect] : Spider::Auth.request_url+'/login/'
                 base = self.class.url+'/'+base unless base[0].chr == '/'
-                base += '?'
-                redir_url = base + 'redirect='+URI.escape(@request.path)
+                base += (base.include?("?") ? "&" : "?")
+                get_params = @request.params.map{|k,v| "#{k}=#{v}"}.join('&')+"&" || ""
+                redir_url = base + get_params +'redirect='+URI.escape(@request.path)
                 @request.session.flash[:unauthorized_exception] = {:class => exc.class.name, :message => exc.message}
                 redirect(redir_url, Spider::HTTP::TEMPORARY_REDIRECT)
             else
@@ -95,6 +101,10 @@ module Spider; module Auth
             def user=(val)
                 @user = val
             end
+
+            def users
+                security[:users]
+            end
             
             def auth(user_class)
                 return user_class.restore_from_session(self.session)

data/apps/core/components/assets.rb

@@ -1,5 +1,6 @@
 Spider::Template.define_named_asset 'jquery', [
-     [:js, 'js/jquery/jquery-1.5.2.js', Spider::Components, {:cdn => 'https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/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'}]
+    [:js, 'js/jquery/jquery-1.8.3.js', Spider::Components, {:cdn => 'https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js'}]
  ]
 
 Spider::Template.define_named_asset 'spider', [
@@ -25,7 +26,7 @@ Spider::Template.define_named_asset 'spider-utils', [
 # 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.11/ui/i18n/jquery.ui.datepicker-#{request.locale.language}.js"
+    Spider::Components.pub_url+"/js/jquery/jquery-ui-1.9.2/ui/i18n/jquery.ui.datepicker-#{request.locale.language}.js"
 end
 
 Spider::Template.define_named_asset 'jquery-ui', [
@@ -38,80 +39,93 @@ Spider::Template.define_named_asset 'jquery-ui', [
 
 
 Spider::Template.define_named_asset 'jquery-ui-core', [
-    [: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]
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.core.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.widget.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.mouse.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.position.js', Spider::Components],
+    [:css, 'js/jquery/jquery-ui-1.9.2/css/Aristo/jquery-ui.custom.css', Spider::Components]
 ], :depends => ['jquery']
 
 Spider::Template.define_named_asset 'jquery-ui-draggable', [
-    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.draggable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.droppable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.resizable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.selectable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.sortable.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.accordion.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.autocomplete.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.button.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.dialog.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.slider.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.tabs.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.datepicker.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/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.11/ui/jquery.ui.progressbar.js', Spider::Components]
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.progressbar.js', Spider::Components]
+], :depends => ['jquery-ui-core']
+
+Spider::Template.define_named_asset 'jquery-ui-menu', [
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.menu.js', Spider::Components]
+], :depends => ['jquery-ui-core']
+
+Spider::Template.define_named_asset 'jquery-ui-spinner', [
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.spinner.js', Spider::Components]
+], :depends => ['jquery-ui-core']
+
+Spider::Template.define_named_asset 'jquery-ui-tooltip', [
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.tooltip.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-effects', [
-    [: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]
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-blind.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-bounce.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-clip.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-drop.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-explode.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-fade.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-fold.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-highlight.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-pulsate.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-scale.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-shake.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-slide.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.9.2/ui/jquery.ui.effect-transfer.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
 # jQuery Tools (http://flowplayer.org/tools/)
@@ -151,33 +165,38 @@ Spider::Template.define_named_asset 'bootstrap-sass', [
 ]
 
 Spider::Template.define_named_asset 'bootstrap-alerts', [
-    [:js, 'bootstrap/js/bootstrap-alerts.js']
+    [:js, 'bootstrap/js/bootstrap-alerts.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-buttons', [
-    [:js, 'bootstrap/js/bootstrap-buttons.js']
+    [:js, 'bootstrap/js/bootstrap-buttons.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-dropdown', [
-    [:js, 'bootstrap/js/bootstrap-dropdown.js']
+    [:js, 'bootstrap/js/bootstrap-dropdown.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-modal', [
-    [:js, 'bootstrap/js/bootstrap-modal.js']
+    [:js, 'bootstrap/js/bootstrap-modal.js', Spider::Components]
+]
+
+Spider::Template.define_named_asset 'bootstrap-tooltip', [
+    [:js, 'bootstrap/js/bootstrap-tooltip.js', Spider::Components]
 ]
 
+
 Spider::Template.define_named_asset 'bootstrap-popover', [
-    [:js, 'bootstrap/js//bootstrap-popover.js']
+    [:js, 'bootstrap/js/bootstrap-popover.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-scrollspy', [
-    [:js, 'bootstrap/js//bootstrap-scrollspy.js']
+    [:js, 'bootstrap/js/bootstrap-scrollspy.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-tabs', [
-    [:js, 'bootstrap/js//bootstrap-tabs.js']
+    [:js, 'bootstrap/js/bootstrap-tabs.js', Spider::Components]
 ]
 
 Spider::Template.define_named_asset 'bootstrap-twipsy', [
-    [:js, 'bootstrap/js//bootstrap-twipsy.js']
+    [:js, 'bootstrap/js/bootstrap-twipsy.js', Spider::Components]
 ]