wagn 1.13.0.pre1 → 1.13.0.pre2

data/mods/core/sets/right/structure.rb

@@ -0,0 +1,13 @@
+
+format :html do
+  view :core do |args|
+    with_inclusion_mode :template do
+      super args
+    end
+  end
+  
+  view :closed_content do |args|
+    "#{_render_type} : #{_render_raw}"
+  end
+  
+end

data/mods/standard/formats/email_html_format.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 class Card::EmailHtmlFormat < Card::HtmlFormat
-  @@aliases[:email] = :email_html
+  @@aliases['email'] = 'email_html'
   
   def internal_url relative_path
     wagn_url relative_path

data/mods/standard/lib/card/machine.rb

@@ -62,26 +62,27 @@ class Card
           # collect all item cards as input 
           items = [self]
           new_input = []
-          already_extended = [] # avoid loops
+          already_extended = {} # avoid loops
+          loop_limit = 5
           while items.size > 0
             item = items.shift
-            if item.trash or already_extended.include? item 
+            if item.trash or ( already_extended[item.id] and already_extended[item.id] > loop_limit)
               next
             elsif item.item_cards == [item]  # no pointer card
               new_input << item
-              already_extended << item
             else
               items.insert(0, item.item_cards)
               items.flatten!
-              already_extended << item
+              new_input << item if item != self
+              already_extended[item] = already_extended[item] ? already_extended[item] + 1 : 1
             end
           end
           new_input
         end
+
         host_class.prepare_machine_input {}
         host_class.machine_engine { |input| input }
-        host_class.store_machine_output do |output|
-          tmp_path =     
+        host_class.store_machine_output do |output| 
           file = Tempfile.new [ id, ".#{host_class.output_config[:filetype]}" ]
           file.write output
           Card::Auth.as_bot do
@@ -99,7 +100,7 @@ class Card
           end
         end
   
-        host_class.event "update_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store, :on => :save do  
+        host_class.event "update_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do  
           update_machine_output
         end
       end
@@ -108,10 +109,12 @@ class Card
     def run_machine joint="\n"
       before_engine
       output = input_item_cards.map do |input|
-        if input.respond_to? :machine_input
-          engine( input.machine_input ) 
-        else
-          engine( input.format._render_raw )
+        unless input.kind_of? Card::Set::Type::Pointer
+          if input.respond_to? :machine_input
+            engine( input.machine_input ) 
+          else
+            engine( input.format._render_raw )
+          end
         end
       end.select(&:present?).join( joint )
       after_engine output
@@ -125,6 +128,7 @@ class Card
     def update_input_card
       Card::Auth.as_bot do
         machine_input_card.items = engine_input
+        #machine_input_card.save
       end
     end
 
@@ -134,7 +138,7 @@ class Card
 
     def machine_output_url
       ensure_machine_output
-      machine_output_card.attach.url
+      machine_output_card.attach.url #(:default, :timestamp => false)   # to get rid of additional number in url
     end 
 
     def machine_output_path

data/mods/standard/lib/card/machine_input.rb

@@ -18,7 +18,7 @@ class Card
       host_class.machine_input do
         format._render_raw
       end
-      host_class.event "after_machine_input_updated_#{host_class.name.gsub(':','_')}".to_sym, :after=>:store_subcards, :on => :save do
+      host_class.event "after_machine_input_updated_#{host_class.name.gsub(':','_')}".to_sym, :after=>:extend, :on => :save do
         machines = Card.search( {:right_plus => [{:codename => "machine_input"}, {:link_to => name}]}.merge(host_class.machines_wql) )  
         machines.each do |item|
           item.update_machine_output if item.kind_of? Machine

data/mods/standard/sets/all/attach.rb

@@ -47,7 +47,7 @@ def attachment_format(ext)
   return nil unless exts
   return ext if exts.find {|mt| mt.extensions.member? ext }
   return exts[0].extensions[0]
-rescue Exception => e
+rescue => e
   Rails.logger.info "attachment_format issue: #{e.message}"
   nil
 end

data/mods/standard/sets/all/base.rb

@@ -4,141 +4,139 @@ format do
     view ||= :core
     render view, args
   end
-end
 
-# NAME VIEWS
+  # NAME VIEWS
                                                                               
-view :name,     :perms=>:none  do |args|  card.name                    end
-view :codename, :perms=>:none  do |args|  card.codename.to_s           end  
-view :key,      :perms=>:none  do |args|  card.key                     end
-view :id,       :perms=>:none  do |args|  card.id                      end
-view :type,     :perms=>:none  do |args|  card.type_name               end
-view :linkname, :perms=>:none  do |args|  card.cardname.url_key        end
-view :url,      :perms=>:none  do |args|  wagn_url _render_linkname    end
-
-view :link, :perms=>:none  do |args|
-  card_link card.name, showname( args[:title] ), card.known?, args[:type]
-end
+  view :name,     :perms=>:none  do |args|  card.name                    end
+  view :codename, :perms=>:none  do |args|  card.codename.to_s           end  
+  view :key,      :perms=>:none  do |args|  card.key                     end
+  view :id,       :perms=>:none  do |args|  card.id                      end
+  view :type,     :perms=>:none  do |args|  card.type_name               end
+  view :linkname, :perms=>:none  do |args|  card.cardname.url_key        end
+  view :url,      :perms=>:none  do |args|  wagn_url _render_linkname    end
+
+  view :link, :perms=>:none  do |args|
+    card_link card.name, showname( args[:title] ), card.known?, args[:type]
+  end
 
 
-# DATE VIEWS
+  # DATE VIEWS
 
-view :created_at do |args| time_ago_in_words card.created_at end
-view :updated_at do |args| time_ago_in_words card.updated_at end
+  view :created_at do |args| time_ago_in_words card.created_at end
+  view :updated_at do |args| time_ago_in_words card.updated_at end
 
 
-# CONTENT VIEWS
+  # CONTENT VIEWS
 
-view :raw do |args|
-  scard = args[:structure] ? Card[ args[:structure] ] : card
-  scard ? scard.raw_content : _render_blank
-end
+  view :raw do |args|
+    scard = args[:structure] ? Card[ args[:structure] ] : card
+    scard ? scard.raw_content : _render_blank
+  end
 
-view :core do |args|
-  process_content _render_raw(args)
-end
+  view :core do |args|
+    process_content _render_raw(args)
+  end
 
-view :content do |args|
-  _render_core args
-end
+  view :content do |args|
+    _render_core args
+  end
 
-view :open_content do |args|
-  _render_core args
-end
+  view :open_content do |args|
+    _render_core args
+  end
 
-view :closed_content do |args|
-  Card::Content.truncatewords_with_closing_tags _render_core(args) #{ yield }
-end
+  view :closed_content do |args|
+    Card::Content.truncatewords_with_closing_tags _render_core(args) #{ yield }
+  end
 
 
-# note: content and open_content may look like they should be aliased to core, but it's important that they render
-# core explicitly so that core view overrides work.  the titled and labeled views below, however, are not intended
-# for frequent override, so this shortcut is fine.
+  # note: content and open_content may look like they should be aliased to core, but it's important that they render
+  # core explicitly so that core view overrides work.  the titled and labeled views below, however, are not intended
+  # for frequent override, so this shortcut is fine.
 
 
-# NAME + CONTENT VIEWS
+  # NAME + CONTENT VIEWS
 
-view :titled do |args|
-  "#{ card.name }\n\n#{ _render_core args }"
-end
-view :open, :titled
+  view :titled do |args|
+    "#{ card.name }\n\n#{ _render_core args }"
+  end
+  view :open, :titled
 
-view :labeled do |args|
-  "#{ card.name }: #{ _render_closed_content args }"
-end
-view :closed, :labeled
+  view :labeled do |args|
+    "#{ card.name }: #{ _render_closed_content args }"
+  end
+  view :closed, :labeled
 
 
-# SPECIAL VIEWS
+  # SPECIAL VIEWS
 
-view :array do |args|
-  card.item_cards(:limit=>0).map do |item_card|
-    subformat(item_card)._render_core(args)
-  end.inspect
-end
+  view :array do |args|
+    card.item_cards(:limit=>0).map do |item_card|
+      subformat(item_card)._render_core(args)
+    end.inspect
+  end
 
 
 
-# ERROR VIEWS
+  # ERROR VIEWS
 
 
-view :blank,          :perms=>:none do |args| '' end
-view :closed_missing, :perms=>:none do |args| '' end
-view :missing,        :perms=>:none do |args| '' end
+  view :blank,          :perms=>:none do |args| '' end
+  view :closed_missing, :perms=>:none do |args| '' end
+  view :missing,        :perms=>:none do |args| '' end
 
-view :not_found, :perms=>:none, :error_code=>404 do |args|
-  %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
-end
+  view :not_found, :perms=>:none, :error_code=>404 do |args|
+    %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
+  end
 
-view :server_error, :perms=>:none, :error_code=>500 do |args|
-  %{ Wagn Hitch!  Server Error. Yuck, sorry about that.\n}+
-  %{ To tell us more and follow the fix, add a support ticket at http://wagn.org/new/Support_Ticket }
-end
+  view :server_error, :perms=>:none, :error_code=>500 do |args|
+    %{ Wagn Hitch!  Server Error. Yuck, sorry about that.\n}+
+    %{ To tell us more and follow the fix, add a support ticket at http://wagn.org/new/Support_Ticket }
+  end
 
-view :denial, :perms=>:none, :error_code=>403 do |args|
-  focal? ? 'Permission Denied' : ''
-end
+  view :denial, :perms=>:none, :error_code=>403 do |args|
+    focal? ? 'Permission Denied' : ''
+  end
 
-view :bad_address, :perms=>:none, :error_code=>404 do |args|
-  %{ 404: Bad Address }
-end
+  view :bad_address, :perms=>:none, :error_code=>404 do |args|
+    %{ 404: Bad Address }
+  end
 
-view :too_deep, :perms=>:none do |args|
-  %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
-end
+  view :too_deep, :perms=>:none do |args|
+    %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
+  end
 
-view :too_slow, :perms=>:none do |args|
-  %{ Timed out! #{ showname } took too long to load. }
-end
+  view :too_slow, :perms=>:none do |args|
+    %{ Timed out! #{ showname } took too long to load. }
+  end
 
 
-#none of the below belongs here!!
+  #none of the below belongs here!!
 
 
-view :template_rule, :tags=>:unknown_ok do |args|
-  #FIXME - relativity should be handled in smartname
+  view :template_rule, :tags=>:unknown_ok do |args|
+    #FIXME - relativity should be handled in smartname
   
-  name = args[:inc_name]
-  regexp = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
-  absolute = name !~ regexp && name !~ /^\+/
+    name = args[:inc_name] or return ''
+    regexp = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
+    absolute = name !~ regexp && name !~ /^\+/
     
-  tname = name.gsub regexp, ''
-  if tname !~ /^\+/ and !absolute
-    "{{#{args[:inc_syntax]}}}"
-  else
-    set_name = if absolute # find the most appropriate set to use as prototype for inclusion
-      "#{name}+#{Card[:self].name}"
+    tname = name.gsub regexp, ''
+    if tname !~ /^\+/ and !absolute
+      "{{#{args[:inc_syntax]}}}"
     else
-      tmpl_set_name = parent.card.cardname.trunk_name
-      if tmpl_set_class_name = tmpl_set_name.tag_name and Card[tmpl_set_class_name].codename == 'type'
-        "#{tmpl_set_name.left_name}#{name}+#{Card[:type_plus_right].name}"  # *type plus right
+      set_name = if absolute # find the most appropriate set to use as prototype for inclusion
+        "#{name}+#{Card[:self].name}"
       else
-        "#{tname.gsub /^\+/,''}+#{Card[:right].name}"                                      # *right
+        tmpl_set_name = parent.card.cardname.trunk_name
+        if tmpl_set_class_name = tmpl_set_name.tag_name and Card[tmpl_set_class_name].codename == 'type'
+          "#{tmpl_set_name.left_name}#{name}+#{Card[:type_plus_right].name}"  # *type plus right
+        else
+          "#{tname.gsub /^\+/,''}+#{Card[:right].name}"                                      # *right
+        end
       end
-    end
     
-    subformat( Card.fetch(set_name) ).render_template_link args
+      subformat( Card.fetch(set_name) ).render_template_link args
+    end
   end
 end
-
-

data/mods/standard/sets/all/follow.rb

@@ -64,7 +64,7 @@ event :notify_followers, :after=>:extend do
         Mailer.change_notice( watcher, self.left, 'updated', watched.to_s, [[name, action]], self ).send_if :deliver
       end
     end
-  rescue Exception=>e  #this error handling should apply to all extend callback exceptions
+  rescue =>e  #this error handling should apply to all extend callback exceptions
     Airbrake.notify e if Airbrake.configuration.api_key
     Rails.logger.info "\nController exception: #{e.message}"
     Rails.logger.debug "BT: #{e.backtrace*"\n"}"

data/mods/standard/sets/all/rich_html.rb

@@ -9,7 +9,7 @@ format :html do
     else
       args.merge! :view=>view if view
       @main_opts = args
-      self.render_layout
+      self.render :layout
     end
   end
 
@@ -389,7 +389,8 @@ format :html do
       rcard = Card.fetch rcardname, :new=>{}
 
       nest_args = {
-        :view          => ( rparams[:view] || :titled ),
+        :view          => ( rparams[:view] || :open ),
+        :optional_toggle => :hide,
         :optional_help => :show,
         :optional_menu => :show
       }
@@ -410,7 +411,8 @@ format :html do
 
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do
-          _final_core args.merge( :structure=>help_card.name )
+          process_content _render_raw( args.merge :structure=>help_card.name )
+          # render help card with current card's format so current card's context is used in help card inclusions
         end
       end
     end

data/mods/standard/sets/all/rss.rb

@@ -1,5 +1,12 @@
 
 format :rss do
+  
+  attr_accessor :xml
+  
+  def initialize card, args
+    super
+    @xml = @parent.xml if @parent
+  end
 
   def show view, args
     @xml = Builder::XmlMarkup.new
@@ -19,7 +26,7 @@ format :rss do
           render_feed_item_list
         end
       end
-    rescue Exception=>e
+    rescue =>e
       @xml.error "\n\nERROR rendering RSS: #{e.inspect}\n\n #{e.backtrace}"
     end
   end
@@ -57,9 +64,9 @@ format :rss do
   view :menu            do |args| '' end
     
   
-  view :open, :titled
-  view :content, :core
-  view :open_content, :core
-  view :closed, :link
+  view :open,         { :view=>:titled, :mod=>All::Base::Format }
+  view :content,      { :view=>:core,   :mod=>All::Base::Format }
+  view :open_content, { :view=>:core,   :mod=>All::Base::Format }
+  view :closed,       { :view=>:link,   :mod=>All::Base::Format }
 
 end

data/mods/standard/sets/right/account.rb

@@ -23,7 +23,7 @@ format :html do
 
   view :edit do |args|
     args[:structure] = true
-    _final_edit args
+    super args
   end
 end
 

data/mods/standard/sets/right/add_help.rb

@@ -1 +1,3 @@
-view :core, :right=>:structure
+format :html do
+  include Structure::HtmlFormat
+end