spiderfw 0.6.22 → 0.6.23

data/lib/spiderfw/templates/template.rb

@@ -389,25 +389,32 @@ module Spider
                 return [ass]
             end
             if attributes[:app]
-                owner_class = attributes[:app]
-                owner_class = Spider.apps_by_path[owner_class] unless owner_class.is_a?(Module)
+                asset_owner = attributes[:app]
+                asset_owner = Spider.apps_by_path[asset_owner] unless asset_owner.is_a?(Module)
+            elsif attributes[:home]
+                asset_owner = Spider.home
             else
-                owner_class = (@owner ? @owner.class : @owner_class )
+                asset_owner = (@owner ? @owner.class : @owner_class )
             end
-            ass[:app] = owner_class.app 
+            ass[:app] = asset_owner.app if asset_owner.respond_to?(:app)
             # FIXME! @definer_class is not correct for Spider::HomeController
             raise "Asset type not given for #{src}" unless type
-            search_classes = [owner_class, @definer_class]
+            search_classes = [asset_owner, @definer_class]
             dfnr = @definer_class.superclass if @definer_class && @definer_class.respond_to?(:superclass)
             while dfnr && dfnr < Spider::Widget
                 search_classes << dfnr
                 dfnr = dfnr.respond_to?(:superclass) ? dfnr.superclass : nil
             end
             res = Spider.find_resource(type.to_sym, src, @path, search_classes)
+            raise "Resource #{src} of type #{type} not found" unless res.path
             controller = nil
             if res && res.definer
                 controller = res.definer.controller
-                ass[:app] = res.definer unless res.definer.is_a?(Spider::Home)
+                if res.definer.is_a?(Spider::Home)
+                    ass[:app] = :home
+                else
+                    ass[:app] = res.definer
+                end
             elsif owner_class < Spider::Controller
                 controller = owner_class
             end
@@ -505,7 +512,7 @@ module Spider
                 ext_search_paths = nil
                 if ext_owner && ext_owner.respond_to?(:template_paths)
                     ext_search_paths = ext_owner.template_paths
-                end 
+                end
                 ext = self.class.real_path(ext_src, path, ext_owner, ext_search_paths)
                 raise "Extended template #{ext_src} not found (search path #{path}, owner #{ext_owner}, search paths #{ext_search_paths.inspect}" unless ext
                 assets = []
@@ -545,8 +552,12 @@ module Spider
                         ass.set_attribute('class', 'to_delete')
                         ass_src = ass.get_attribute('src')
                         if ass_src && ass_src[0].chr != '/'
+                            if resource.definer.is_a?(Spider::Home)
+                                ass.set_attribute('home', 'true')
+                            else
                             # ass.set_attribute('src', "/#{resource.definer.relative_path}/#{ass_src}")
-                            ass.set_attribute('app', resource.definer.relative_path)
+                                ass.set_attribute('app', resource.definer.relative_path)
+                            end
                         end
                         assets_html += ass.to_html 
                     }
@@ -774,9 +785,18 @@ module Spider
         end
 
         def apply_overrides(el)
+            info_els = nil
+            if el.children
+                info_els = Hpricot::Elements[*(el.children_of_type('tpl:asset')+
+                    el.children_of_type('tpl:assets'))]
+                info_els.remove
+            end
             if @overrides
                 @overrides.each{ |o| apply_override(el, o) }
             end
+            if info_els
+                el.innerHTML = info_els.to_s + el.innerHTML
+            end
             el
         end
         

data/lib/spiderfw/utils/logger.rb

@@ -56,7 +56,7 @@ module Spider
             def send_to_loggers(action, *args, &proc)
                 return if $SAFE > 1
                 return unless @loggers
-                return if thread_level && !check_thread_level(action)
+                return if request_level && !check_request_level(action)
                 @loggers.each do |dest, logger| 
                     begin
                         logger.send(action, *args, &proc) 
@@ -135,21 +135,21 @@ module Spider
                 send_to_loggers(method, *args, &proc)
             end
 
-            def set_thread_level(level)
-                prev = Thread.current[:spider_logger_level]
-                Thread.current[:spider_logger_level] = @@levels.index(level)
+            def set_request_level(level)
+                prev = Spider.current[:spider_logger_level]
+                Spider.current[:spider_logger_level] = @@levels.index(level)
                 return prev
             end
 
-            def thread_level
-                Thread.current[:spider_logger_level]
+            def request_level
+                Spider.current[:spider_logger_level]
             end
 
-            def check_thread_level(action)
-                tl = thread_level
+            def check_request_level(action)
+                tl = request_level
                 return unless tl
                 action_i = @@levels.index(action.to_s.upcase.to_sym)
-                return action_i > tl
+                return action_i >= tl
             end
 
 

data/views/errors/error.layout.shtml

@@ -16,7 +16,7 @@
             <sp:yield />
         </div>
 		<div id="footer">
-			<div id="contact">
+			<div id="contact" sp:if="!@admin_email.blank?">
 				_(If you need to contact the administrator to provide additional information, you may send an e-mail to) 
 				<a href="mailto:{ @admin_email }?subject={ @email_subject }">{ @admin_email }</a>.
 			</div>
@@ -33,7 +33,7 @@
 			</div>
 			<div id="session">
 				Session:
-				<pre>{ @session }</pre>
+				<pre>{ CGI::escapeHTML(@session) }</pre>
 			</div>
 			<div id="exception_details">
 				Exception: <pre id="exception_message">{ @exception }</pre>
@@ -43,7 +43,9 @@
 				<ul>
 					<li sp:each="@backtrace |line|">
 						<a href="{ line[:link] }">{ line[:text] }</a>
-						<pre class="backtrace_info" sp:if="line[:info]">{ CGI.escapeHTML(line[:info]) }</pre>
+						<a name="{ line[:self] }" sp:tag-if="line[:first_seen]">
+							<pre class="backtrace_info" sp:if="line[:info]">{ CGI.escapeHTML(line[:info]) }</pre>
+						</a>
 						<div class="locals" sp:if="line[:locals] && !line[:locals].empty?">
 							Locals:
 							<div>
@@ -52,7 +54,7 @@
 								</span>
 							</div>
 						</div>
-						<div class="instance_vars" sp:if="line[:instance_variables] && !line[:instance_variables].empty?" class="instance_variables">
+						<div class="instance_vars" sp:if="line[:first_seen] && line[:instance_variables] && !line[:instance_variables].empty?" class="instance_variables">
 							Instance variables:
 							<div>
 								<span sp:each="line[:instance_variables] |name, val|"><span class="var-name iv-name">{ name }</span>
@@ -60,6 +62,9 @@
 								</span>
 							</div>
 						</div>
+						<div class="instance_vars" sp:if="!line[:first_seen]">
+							<a href="#{ line[:self] }">Instance variables</a>
+						</div>
 
 						
 					</li>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 6
-  - 22
-  version: 0.6.22
+  - 23
+  version: 0.6.23
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 +01:00
+date: 2012-02-06 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -328,17 +328,9 @@ files:
 - apps/core/admin/public/js/bootstrap-tabs.js
 - apps/core/admin/public/js/bootstrap-twipsy.js
 - apps/core/admin/public/sass/admin.scss
-- apps/core/admin/public/sass/bootstrap/bootstrap.scss
-- apps/core/admin/public/sass/bootstrap/forms.scss
-- apps/core/admin/public/sass/bootstrap/mixins.scss
-- apps/core/admin/public/sass/bootstrap/patterns.scss
-- apps/core/admin/public/sass/bootstrap/reset.scss
-- apps/core/admin/public/sass/bootstrap/scaffolding.scss
-- apps/core/admin/public/sass/bootstrap/tables.scss
-- apps/core/admin/public/sass/bootstrap/type.scss
-- apps/core/admin/public/sass/bootstrap/variables.scss
 - apps/core/admin/public/sass/grid.scss
 - apps/core/admin/views/_app_info.shtml
+- apps/core/admin/views/_breadcrumb.shtml
 - apps/core/admin/views/admin.layout.shtml
 - apps/core/admin/views/index.shtml
 - apps/core/admin/views/login.layout.shtml
@@ -371,6 +363,79 @@ files:
 - apps/core/components/data/locale/it/LC_MESSAGES/spider_components.mo
 - apps/core/components/po/it/spider_components.po
 - apps/core/components/po/spider_components.pot
+- apps/core/components/public/bootstrap/img/glyphicons-halflings-white.png
+- apps/core/components/public/bootstrap/img/glyphicons-halflings.png
+- apps/core/components/public/bootstrap/js/bootstrap-alert.js
+- apps/core/components/public/bootstrap/js/bootstrap-button.js
+- apps/core/components/public/bootstrap/js/bootstrap-carousel.js
+- apps/core/components/public/bootstrap/js/bootstrap-collapse.js
+- apps/core/components/public/bootstrap/js/bootstrap-dropdown.js
+- apps/core/components/public/bootstrap/js/bootstrap-modal.js
+- apps/core/components/public/bootstrap/js/bootstrap-popover.js
+- apps/core/components/public/bootstrap/js/bootstrap-scrollspy.js
+- apps/core/components/public/bootstrap/js/bootstrap-tab.js
+- apps/core/components/public/bootstrap/js/bootstrap-tooltip.js
+- apps/core/components/public/bootstrap/js/bootstrap-transition.js
+- apps/core/components/public/bootstrap/js/bootstrap-typeahead.js
+- apps/core/components/public/bootstrap/js/README.md
+- apps/core/components/public/bootstrap/js/tests/index.html
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-alert.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-button.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-collapse.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-dropdown.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-modal.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-popover.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-scrollspy.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-tab.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-tooltip.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-transition.js
+- apps/core/components/public/bootstrap/js/tests/unit/bootstrap-typeahead.js
+- apps/core/components/public/bootstrap/js/tests/vendor/jquery.js
+- apps/core/components/public/bootstrap/js/tests/vendor/qunit.css
+- apps/core/components/public/bootstrap/js/tests/vendor/qunit.js
+- apps/core/components/public/bootstrap/LICENSE
+- apps/core/components/public/bootstrap/README.md
+- apps/core/components/public/bootstrap/scss/_accordion.scss
+- apps/core/components/public/bootstrap/scss/_alerts.scss
+- apps/core/components/public/bootstrap/scss/_breadcrumbs.scss
+- apps/core/components/public/bootstrap/scss/_button-groups.scss
+- apps/core/components/public/bootstrap/scss/_buttons.scss
+- apps/core/components/public/bootstrap/scss/_carousel.scss
+- apps/core/components/public/bootstrap/scss/_close.scss
+- apps/core/components/public/bootstrap/scss/_code.scss
+- apps/core/components/public/bootstrap/scss/_component-animations.scss
+- apps/core/components/public/bootstrap/scss/_custom.css
+- apps/core/components/public/bootstrap/scss/_dropdowns.scss
+- apps/core/components/public/bootstrap/scss/_forms.scss
+- apps/core/components/public/bootstrap/scss/_grid.scss
+- apps/core/components/public/bootstrap/scss/_hero-unit.scss
+- apps/core/components/public/bootstrap/scss/_labels.scss
+- apps/core/components/public/bootstrap/scss/_layouts.scss
+- apps/core/components/public/bootstrap/scss/_mixins.scss
+- apps/core/components/public/bootstrap/scss/_modals.scss
+- apps/core/components/public/bootstrap/scss/_navbar.scss
+- apps/core/components/public/bootstrap/scss/_navs.scss
+- apps/core/components/public/bootstrap/scss/_pager.scss
+- apps/core/components/public/bootstrap/scss/_pagination.scss
+- apps/core/components/public/bootstrap/scss/_patterns.scss
+- apps/core/components/public/bootstrap/scss/_popovers.scss
+- apps/core/components/public/bootstrap/scss/_print.scss
+- apps/core/components/public/bootstrap/scss/_progress-bars.scss
+- apps/core/components/public/bootstrap/scss/_reset.scss
+- apps/core/components/public/bootstrap/scss/_scaffolding.scss
+- apps/core/components/public/bootstrap/scss/_sprites.scss
+- apps/core/components/public/bootstrap/scss/_tables.scss
+- apps/core/components/public/bootstrap/scss/_thumbnails.scss
+- apps/core/components/public/bootstrap/scss/_tooltip.scss
+- apps/core/components/public/bootstrap/scss/_type.scss
+- apps/core/components/public/bootstrap/scss/_utilities.scss
+- apps/core/components/public/bootstrap/scss/_variables.scss
+- apps/core/components/public/bootstrap/scss/_wells.scss
+- apps/core/components/public/bootstrap/scss/bootstrap-responsive.css
+- apps/core/components/public/bootstrap/scss/bootstrap-responsive.scss
+- apps/core/components/public/bootstrap/scss/bootstrap.css
+- apps/core/components/public/bootstrap/scss/bootstrap.scss
+- apps/core/components/public/bootstrap/scss/config.rb
 - apps/core/components/public/css/admin.css
 - apps/core/components/public/css/crud.css
 - apps/core/components/public/css/grid/1140.css
@@ -396,9 +461,11 @@ files:
 - apps/core/components/public/css/list.css
 - apps/core/components/public/css/menu.css
 - apps/core/components/public/css/month_calendar.css
+- apps/core/components/public/css/sass/bootstrap/bootstrap.css
 - apps/core/components/public/css/spider.css
 - apps/core/components/public/css/switcher.css
 - apps/core/components/public/css/table.css
+- apps/core/components/public/css/table_base.css
 - apps/core/components/public/js/inheritance.js
 - apps/core/components/public/js/jquery/jquery-1.5.2.js
 - apps/core/components/public/js/jquery/jquery-tools-1.2.5/overlay/overlay.apple.js
@@ -641,6 +708,7 @@ files:
 - apps/core/components/public/js/spider.js
 - apps/core/components/public/js/utils.i18n.json
 - apps/core/components/public/js/utils.js
+- apps/core/components/public/widgets/month_calendar.js
 - apps/core/components/public/widgets/search_table.js
 - apps/core/components/public/widgets/table.js
 - apps/core/components/widgets/admin/admin.rb
@@ -852,6 +920,20 @@ files:
 - apps/core/forms/public/ckeditor/plugins/wsc/dialogs/wsc.css
 - apps/core/forms/public/ckeditor/plugins/wsc/dialogs/wsc.js
 - apps/core/forms/public/ckeditor/plugins/xml/plugin.js
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/dialog.css
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/editor.css
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/icons.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides.gif
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/dialog_sides_rtl.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/mini.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/noimage.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/sprites.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/sprites_ie6.png
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/images/toolbar_start.gif
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/README.md
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/skin.js
+- apps/core/forms/public/ckeditor/skins/BootstrapCK-Skin/templates.css
 - apps/core/forms/public/ckeditor/skins/kama/dialog.css
 - apps/core/forms/public/ckeditor/skins/kama/editor.css
 - apps/core/forms/public/ckeditor/skins/kama/icons.png
@@ -1009,6 +1091,8 @@ files:
 - apps/messenger/views/admin/_admin.layout.shtml
 - apps/messenger/views/admin/index.shtml
 - apps/messenger/views/admin/queue.shtml
+- apps/messenger/views/admin/view_email.shtml
+- apps/messenger/views/admin/view_sms.shtml
 - apps/messenger/views/index.shtml
 - apps/messenger/views/list.shtml
 - apps/messenger/views/messenger.layout.shtml
@@ -1057,6 +1141,7 @@ files:
 - blueprints/app/controllers/__APP___controller.rb
 - blueprints/app/models/.gitignore
 - blueprints/app/public/.gitignore
+- blueprints/app/test/features/support/env.rb
 - blueprints/app/views/__APP__.layout.shtml
 - blueprints/app/views/index.shtml
 - blueprints/app/widgets/.gitignore

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

@@ -1,29 +0,0 @@
-/*!
- * Bootstrap v1.3.0
- *
- * Copyright 2011 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- *
- * Converted to Sass by @johnwlong.
- *
- * Date: @DATE
- */
-
-// CSS Reset
-@import "reset.scss";
-
-// Core
-@import "variables.scss";
-@import "mixins.scss";
-
-// Grid system and page structure
-@import "scaffolding.scss";
-
-// Styled patterns and elements
-@import "type.scss";
-@import "forms.scss";
-@import "tables.scss";
-@import "patterns.scss";