spiderfw 0.6.1 → 0.6.2

data/lib/spiderfw/templates/template.rb

@@ -85,7 +85,7 @@ module Spider
             def registered?(tag)
                 return true if @@registered[tag]
                 ns, tag = tag.split(':')
-                if (tag) # that is, if there is a ns
+                if tag # that is, if there is a ns
                     return false unless @@namespaces[ns]
                     return @@namespaces[ns].has_tag?(tag)
                 end
@@ -100,11 +100,11 @@ module Spider
             
             # Returns the Class registered for the given tag.
             def get_registered_class(name)
-                if (@@registered[name])
+                if @@registered[name]
                     klass = @@registered[name]
                 else
                     ns, tag = name.split(':')
-                    klass = @@namespaces[ns].get_tag(tag) if (tag && @@namespaces[ns])
+                    klass = @@namespaces[ns].get_tag(tag) if tag && @@namespaces[ns]
                 end
                 return nil unless klass
                 klass = const_get_full(klass) if klass.is_a?(Symbol)
@@ -390,11 +390,17 @@ module Spider
             ass[:app] = owner_class.app 
             # FIXME! @definer_class is not correct for Spider::HomeController
             raise "Asset type not given for #{src}" unless type
-            res = Spider.find_resource(type.to_sym, src, @path, [owner_class, @definer_class])
+            search_classes = [owner_class, @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)
             controller = nil
-            if (res && res.definer)
+            if res && res.definer
                 controller = res.definer.controller
-            elsif (owner_class < Spider::Controller)
+            elsif owner_class < Spider::Controller
                 controller = owner_class
             end
             ass[:path] = res.path if res
@@ -412,7 +418,7 @@ module Spider
             ass[:rel_path] = src
             ass[:src] = base_url + src
             ass_info = self.class.asset_types[type]
-            if (ass_info && ass_info[:processor])
+            if ass_info && ass_info[:processor]
                 processor = TemplateAssets.const_get(ass_info[:processor])
                 ass = processor.process(ass)
             end
@@ -463,7 +469,7 @@ module Spider
             root.search('.to_delete').remove
             add_overrides overrides
             @overrides += orig_overrides
-            if (root.name == 'tpl:extend')
+            if root.name == 'tpl:extend'
 
                 orig_overrides = @overrides
                 @overrides = []
@@ -483,7 +489,7 @@ module Spider
                     ext_app = ext_owner.app
                 end
                 ext_search_paths = nil
-                if (ext_owner && ext_owner.respond_to?(:template_paths))
+                if ext_owner && ext_owner.respond_to?(:template_paths)
                     ext_search_paths = ext_owner.template_paths
                 end 
                 ext = self.class.real_path(ext_src, @path, ext_owner, ext_search_paths)
@@ -503,7 +509,7 @@ module Spider
                     end
                 end
                 @overrides += orig_overrides
-                if (assets && !assets.empty?)
+                if assets && !assets.empty?
                     assets.each do |ass|
                         root.innerHTML += ass.to_html
                     end
@@ -543,11 +549,11 @@ module Spider
         def process_tags(el)
             block = TemplateBlocks.get_block_type(el, true)
             raise "Bad html in #{@path}, can't parse" if el.is_a?(Hpricot::BogusETag)
-            if (block == :Tag)
+            if block == :Tag
                 sp_attributes = {}
                 # FIXME: should use blocks instead
                 el.attributes.to_hash.each do |key, value|
-                    if (key[0..1] == 'sp')
+                    if key[0..1] == 'sp'
                         sp_attributes[key] = value
                         el.remove_attribute(key)
                     end
@@ -583,14 +589,14 @@ module Spider
             @widgets[id.to_sym] ||= widget
             widget.id = id
             widget.id_path = @id_path + [id]
-            if (attributes) # don't use merge to trigger custom []=(k, v) method
+            if attributes # don't use merge to trigger custom []=(k, v) method
                 attributes.each{ |k, v| widget.attributes[k] = v }
             end
             widget.containing_template = self
             widget.template = template if template
             widget.parent = @owner
             widget.parse_runtime_content_xml(content, @path) if content
-            if (@widget_procs[id.to_sym])
+            if @widget_procs[id.to_sym]
                 @widget_procs[id.to_sym].each do |wp|
                     apply_widget_proc(widget, wp)
                 end
@@ -718,9 +724,9 @@ module Spider
         def add_overrides(overrides)
             overrides.each do |ov|
                 w = ov.get_attribute('widget')
-                if (w)
+                if w
                     first, rest = w.split('/', 2)
-                    if (rest)
+                    if rest
                         ov.set_attribute('widget', rest)
                     else
                         ov.remove_attribute('widget')
@@ -744,13 +750,13 @@ module Spider
             end
             search_string = override.get_attribute('search')
             override.name = 'tpl:override-content' if override.name == 'tpl:inline-override'
-            if (search_string)
+            if search_string
                 # # Fix Hpricot bug!
                 # search_string.gsub!(/nth-child\((\d+)\)/) do |match|
                 #     "nth-child(#{$1.to_i-2})"
                 # end
                 found = el.parent.search(search_string)
-            elsif (override.name == 'tpl:content')
+            elsif override.name == 'tpl:content'
                 found = el.search("tpl:placeholder[@name='#{override.get_attribute('name')}']")
             else
                 if ['sp:pass', 'tpl:pass', 'sp:template'].include?(el.name)
@@ -760,12 +766,12 @@ module Spider
                 end
             end
             
-            if (override.name == 'tpl:delete')
+            if override.name == 'tpl:delete'
                 found.remove
             else
                 found.each do |f|
                     o_doc = nil
-                    if (override.name == 'tpl:override-content')
+                    if override.name == 'tpl:override-content'
                         overridden = f.innerHTML
                         f.innerHTML = override.innerHTML
                         f.search('tpl:overridden').each do |o| 
@@ -776,7 +782,7 @@ module Spider
                             end 
                             o.swap(ovr)
                         end
-                    elsif (override.name == 'tpl:override' || override.name == 'tpl:content')
+                    elsif override.name == 'tpl:override' || override.name == 'tpl:content'
                         overridden = f.to_html
                         parent = f.parent
                         f.swap(override.innerHTML)
@@ -788,18 +794,18 @@ module Spider
                             end
                             o.swap(ovr)
                         end
-                    elsif (override.name == 'tpl:override-attr')
+                    elsif override.name == 'tpl:override-attr'
                         f.set_attribute(override.get_attribute("name"), override.get_attribute("value"))
-                    elsif (override.name == 'tpl:append-attr')
+                    elsif override.name == 'tpl:append-attr'
                         f.set_attribute(override.get_attribute("name"), \
                         (f.get_attribute(override.get_attribute("name")) || '')+override.get_attribute("value")) 
-                    elsif (override.name == 'tpl:append')
+                    elsif override.name == 'tpl:append'
                         f.innerHTML += override.innerHTML
-                    elsif (override.name == 'tpl:prepend')
+                    elsif override.name == 'tpl:prepend'
                         f.innerHTML = override.innerHTML + f.innerHTML
-                    elsif (override.name == 'tpl:before')
+                    elsif override.name == 'tpl:before'
                         f.before(override.innerHTML)
-                    elsif (override.name == 'tpl:after')
+                    elsif override.name == 'tpl:after'
                         f.after(override.innerHTML)
                     end
                 end
@@ -812,13 +818,13 @@ module Spider
             @widget_procs[first.to_sym] ||= []
             wp = {:target => rest, :proc => proc }
             @widget_procs[first.to_sym] << wp
-            if (@widgets[first.to_sym])
+            if @widgets[first.to_sym]
                 apply_widget_proc(@widgets[first.to_sym], wp)
             end
         end
         
         def apply_widget_proc(widget, wp)
-            if (wp[:target])
+            if wp[:target]
                 widget.with_widget(wp[:target], &wp[:proc])
             else
                 widget.instance_eval(wp[:proc])

data/lib/spiderfw/templates/template_blocks.rb

@@ -14,6 +14,8 @@ module Spider
                 block = :Text
             elsif el.class == ::Hpricot::Comment
                 block = :Comment
+            elsif !skip_attributes && el.has_attribute?('sp:lambda')
+                block = :Lambda
             elsif !skip_attributes && (el.has_attribute?('sp:if') || el.has_attribute?('sp:run-if'))
                 block = :If
             elsif !skip_attributes && el.has_attribute?('sp:tag-if')
@@ -39,6 +41,8 @@ module Spider
                 block = :Debugger
             elsif el.name == 'sp:parent-context'
                 block = :ParentContext
+            elsif el.name == 'sp:recurse'
+                block = :Recurse
             elsif Spider::Template.registered?(el.name)
                 klass = Spider::Template.get_registered_class(el.name)
                 if klass < ::Spider::Widget
@@ -208,5 +212,7 @@ require 'spiderfw/templates/blocks/debugger'
 require 'spiderfw/templates/blocks/parent_context'
 require 'spiderfw/templates/blocks/output'
 require 'spiderfw/templates/blocks/layout_assets'
+require 'spiderfw/templates/blocks/lambda'
+require 'spiderfw/templates/blocks/recurse'
 
 

data/lib/spiderfw/widget/widget.rb

@@ -117,7 +117,7 @@ module Spider
             def template_path
                 return @template_path if @template_path
                 @template_path = @widget_path
-                @template_path += '/templates' if ::File.directory?(@template_path+'/templates')
+                @template_path += '/templates' if @template_path && ::File.directory?(@template_path+'/templates')
                 @template_path
             end
             
@@ -554,6 +554,7 @@ module Spider
         end
         
         def create_widget(klass, id,  *params)
+            klass = Spider::Template.get_registered_class(klass) unless klass.is_a?(Class)
             params.unshift(@response)
             params.unshift(@request)
             obj = klass.new(*params)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-06-10 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -593,8 +593,15 @@ files:
 - apps/core/forms/po/it/spider_forms.po
 - apps/core/forms/po/spider_forms.pot
 - apps/core/forms/public/ckeditor/adapters/jquery.js
+- apps/core/forms/public/ckeditor/CHANGES.html
 - apps/core/forms/public/ckeditor/ckeditor.js
+- apps/core/forms/public/ckeditor/ckeditor_basic.js
+- apps/core/forms/public/ckeditor/ckeditor_basic_source.js
+- apps/core/forms/public/ckeditor/ckeditor_source.js
+- apps/core/forms/public/ckeditor/config.js
+- apps/core/forms/public/ckeditor/contents.css
 - apps/core/forms/public/ckeditor/images/spacer.gif
+- apps/core/forms/public/ckeditor/INSTALL.html
 - apps/core/forms/public/ckeditor/lang/_languages.js
 - apps/core/forms/public/ckeditor/lang/_translationstatus.txt
 - apps/core/forms/public/ckeditor/lang/af.js
@@ -630,6 +637,7 @@ files:
 - apps/core/forms/public/ckeditor/lang/is.js
 - apps/core/forms/public/ckeditor/lang/it.js
 - apps/core/forms/public/ckeditor/lang/ja.js
+- apps/core/forms/public/ckeditor/lang/ka.js
 - apps/core/forms/public/ckeditor/lang/km.js
 - apps/core/forms/public/ckeditor/lang/ko.js
 - apps/core/forms/public/ckeditor/lang/lt.js
@@ -655,16 +663,24 @@ files:
 - apps/core/forms/public/ckeditor/lang/vi.js
 - apps/core/forms/public/ckeditor/lang/zh-cn.js
 - apps/core/forms/public/ckeditor/lang/zh.js
+- apps/core/forms/public/ckeditor/LICENSE.html
 - apps/core/forms/public/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
 - apps/core/forms/public/ckeditor/plugins/a11yhelp/lang/en.js
 - apps/core/forms/public/ckeditor/plugins/a11yhelp/lang/he.js
 - apps/core/forms/public/ckeditor/plugins/about/dialogs/about.js
 - apps/core/forms/public/ckeditor/plugins/about/dialogs/logo_ckeditor.png
+- apps/core/forms/public/ckeditor/plugins/adobeair/plugin.js
+- apps/core/forms/public/ckeditor/plugins/ajax/plugin.js
 - apps/core/forms/public/ckeditor/plugins/autogrow/plugin.js
+- apps/core/forms/public/ckeditor/plugins/bbcode/plugin.js
 - apps/core/forms/public/ckeditor/plugins/clipboard/dialogs/paste.js
 - apps/core/forms/public/ckeditor/plugins/colordialog/dialogs/colordialog.js
+- apps/core/forms/public/ckeditor/plugins/devtools/lang/en.js
+- apps/core/forms/public/ckeditor/plugins/devtools/plugin.js
 - apps/core/forms/public/ckeditor/plugins/dialog/dialogDefinition.js
 - apps/core/forms/public/ckeditor/plugins/div/dialogs/div.js
+- apps/core/forms/public/ckeditor/plugins/docprops/dialogs/docprops.js
+- apps/core/forms/public/ckeditor/plugins/docprops/plugin.js
 - apps/core/forms/public/ckeditor/plugins/find/dialogs/find.js
 - apps/core/forms/public/ckeditor/plugins/flash/dialogs/flash.js
 - apps/core/forms/public/ckeditor/plugins/flash/images/placeholder.png
@@ -677,6 +693,8 @@ files:
 - apps/core/forms/public/ckeditor/plugins/forms/dialogs/textarea.js
 - apps/core/forms/public/ckeditor/plugins/forms/dialogs/textfield.js
 - apps/core/forms/public/ckeditor/plugins/forms/images/hiddenfield.gif
+- apps/core/forms/public/ckeditor/plugins/iframe/dialogs/iframe.js
+- apps/core/forms/public/ckeditor/plugins/iframe/images/placeholder.png
 - apps/core/forms/public/ckeditor/plugins/iframedialog/plugin.js
 - apps/core/forms/public/ckeditor/plugins/image/dialogs/image.js
 - apps/core/forms/public/ckeditor/plugins/link/dialogs/anchor.js
@@ -686,6 +704,11 @@ files:
 - apps/core/forms/public/ckeditor/plugins/pagebreak/images/pagebreak.gif
 - apps/core/forms/public/ckeditor/plugins/pastefromword/filter/default.js
 - apps/core/forms/public/ckeditor/plugins/pastetext/dialogs/pastetext.js
+- apps/core/forms/public/ckeditor/plugins/placeholder/dialogs/placeholder.js
+- apps/core/forms/public/ckeditor/plugins/placeholder/lang/en.js
+- apps/core/forms/public/ckeditor/plugins/placeholder/lang/he.js
+- apps/core/forms/public/ckeditor/plugins/placeholder/placeholder.gif
+- apps/core/forms/public/ckeditor/plugins/placeholder/plugin.js
 - apps/core/forms/public/ckeditor/plugins/scayt/dialogs/options.js
 - apps/core/forms/public/ckeditor/plugins/scayt/dialogs/toolbar.css
 - apps/core/forms/public/ckeditor/plugins/showblocks/images/block_address.png
@@ -722,7 +745,9 @@ files:
 - apps/core/forms/public/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
 - apps/core/forms/public/ckeditor/plugins/smiley/images/wink_smile.gif
 - apps/core/forms/public/ckeditor/plugins/specialchar/dialogs/specialchar.js
+- apps/core/forms/public/ckeditor/plugins/specialchar/lang/en.js
 - apps/core/forms/public/ckeditor/plugins/styles/styles/default.js
+- apps/core/forms/public/ckeditor/plugins/stylesheetparser/plugin.js
 - apps/core/forms/public/ckeditor/plugins/table/dialogs/table.js
 - apps/core/forms/public/ckeditor/plugins/tableresize/plugin.js
 - apps/core/forms/public/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -746,6 +771,7 @@ files:
 - apps/core/forms/public/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
 - 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/kama/dialog.css
 - apps/core/forms/public/ckeditor/skins/kama/editor.css
 - apps/core/forms/public/ckeditor/skins/kama/icons.png
@@ -763,6 +789,7 @@ files:
 - apps/core/forms/public/ckeditor/themes/default/theme.js
 - apps/core/forms/public/css/file_input.css
 - apps/core/forms/public/css/form.css
+- apps/core/forms/public/css/html_area.css
 - apps/core/forms/public/date_time.js
 - apps/core/forms/public/file_input.js
 - apps/core/forms/public/form.js
@@ -836,6 +863,7 @@ files:
 - apps/master/plugins/resources/mysql/mysql.rb
 - apps/master/plugins/site_types/spider/spider.rb
 - apps/master/po/it/spider_master.po
+- apps/master/po/master.pot
 - apps/master/po/spider_master.pot
 - apps/master/public/css/img/web.png
 - apps/master/public/css/login.css
@@ -941,7 +969,7 @@ files:
 - blueprints/app/views/__APP__.layout.shtml
 - blueprints/app/views/index.shtml
 - blueprints/home/config/config.yml
-- blueprints/home/Gemfile
+- blueprints/home/Gemfile.disabled
 - blueprints/home/init.rb
 - blueprints/home/spider.gemfile
 - blueprints/install/config.ru
@@ -1099,10 +1127,12 @@ files:
 - lib/spiderfw/templates/blocks/each.rb
 - lib/spiderfw/templates/blocks/html.rb
 - lib/spiderfw/templates/blocks/if.rb
+- lib/spiderfw/templates/blocks/lambda.rb
 - lib/spiderfw/templates/blocks/layout_assets.rb
 - lib/spiderfw/templates/blocks/output.rb
 - lib/spiderfw/templates/blocks/parent_context.rb
 - lib/spiderfw/templates/blocks/pass.rb
+- lib/spiderfw/templates/blocks/recurse.rb
 - lib/spiderfw/templates/blocks/render.rb
 - lib/spiderfw/templates/blocks/run.rb
 - lib/spiderfw/templates/blocks/tag.rb