wagn 1.13.0.pre1 → 1.13.0.pre2

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

@@ -1,3 +1,92 @@
-view :core,           :right=>:create
-view :editor,         :right=>:create
-view :closed_content, :right=>:create
+
+format :html do
+  view :editor do |args|
+    set_name = card.cardname.trunk_name
+    set_card = Card.fetch(set_name)
+    not_set = set_card && set_card.type_id != SetID
+
+    group_options = Auth.as_bot { Card.search(:type_id=>RoleID, :sort=>'name') }
+
+    inheritable = not_set ? false : set_card.inheritable?
+    inheriting = inheritable && card.content=='_left'
+
+    item_names = inheriting ? [] : card.item_names
+
+    %{     
+      #{ form.hidden_field :content, :class=>'card-content' }
+      <div class="perm-editor">
+    
+        #{ if inheritable; %{
+          <div class="perm-inheritance perm-section">
+            #{ check_box_tag 'inherit', 'inherit', inheriting }
+            <label>
+              #{ core_inherit_content args.merge(:target=>'wagn_role') }
+              #{ content_tag( :a, :title=>"use left's #{card.cardname.tag} rule") { '?' } }
+            </label>
+          </div>
+        } end }
+    
+        <div class="perm-group perm-vals perm-section">
+          <h5>Groups</h5>
+          #{
+            group_options.map do |option|
+              checked = !!item_names.delete(option.name)
+              %{
+                <div class="group-option">
+                  #{ check_box_tag( "#{option.key}-perm-checkbox", option.name, checked, :class=>'perm-checkbox-button'  ) }
+                  <label>#{ link_to_page option.name, nil, :target=>'wagn_role' }</label>
+                </div>
+              }
+            end * "\n"
+          }
+        </div>
+      
+        <div class="perm-indiv perm-vals perm-section">
+          <h5>Individuals</h5>
+          #{ _render_list :item_list=>item_names, :extra_css_class=>'perm-indiv-ul' }
+        </div>
+                
+      </div>
+    }
+  end
+
+
+  view :pointer_core, :view=>:core, :mod=>Type::Pointer::HtmlFormat
+
+  view :core do |args|
+    args[:item] ||= :link
+    card.content=='_left' ? core_inherit_content(args) : render( :pointer_core, args )
+  end  
+
+  view :closed_content do |args|
+    card.content=='_left' ? core_inherit_content(args) : render( :pointer_core, args )
+  end
+
+
+  private
+
+  def core_inherit_content args={}
+    sc = args[:set_context]
+    text = if sc && sc.tag_name.key == Card[:self].key
+      begin
+        task = card.tag.codename
+        ancestor = Card[sc.trunk_name.trunk_name]
+        links = ancestor.who_can( task.to_sym ).map do |card_id|
+          link_to_page Card[card_id].name, nil, :target=>args[:target]
+        end*", "
+        "Inherit ( #{links} )"
+      rescue
+        'Inherit'
+      end
+    else
+      'Inherit from left card'
+    end
+    %{<span class="inherit-perm">#{text}</span>}
+  end
+end
+
+
+def standardize_items
+  # noop to override default behavior, which wouldn't let '_left' through and would therefore break
+end
+

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

@@ -1,88 +1,3 @@
 
-format do
-  view :editor do |args|
-    set_name = card.cardname.trunk_name
-    set_card = Card.fetch(set_name)
-    not_set = set_card && set_card.type_id != SetID
-
-    group_options = Auth.as_bot { Card.search(:type_id=>RoleID, :sort=>'name') }
-
-    inheritable = not_set ? false : set_card.inheritable?
-    inheriting = inheritable && card.content=='_left'
-
-    item_names = inheriting ? [] : card.item_names
-
-    %{     
-      #{ form.hidden_field :content, :class=>'card-content' }
-      <div class="perm-editor">
-    
-        #{ if inheritable; %{
-          <div class="perm-inheritance perm-section">
-            #{ check_box_tag 'inherit', 'inherit', inheriting }
-            <label>
-              #{ core_inherit_content args.merge(:target=>'wagn_role') }
-              #{ content_tag( :a, :title=>"use left's #{card.cardname.tag} rule") { '?' } }
-            </label>
-          </div>
-        } end }
-    
-        <div class="perm-group perm-vals perm-section">
-          <h5>Groups</h5>
-          #{
-            group_options.map do |option|
-              checked = !!item_names.delete(option.name)
-              %{
-                <div class="group-option">
-                  #{ check_box_tag( "#{option.key}-perm-checkbox", option.name, checked, :class=>'perm-checkbox-button'  ) }
-                  <label>#{ link_to_page option.name, nil, :target=>'wagn_role' }</label>
-                </div>
-              }
-            end * "\n"
-          }
-        </div>
-      
-        <div class="perm-indiv perm-vals perm-section">
-          <h5>Individuals</h5>
-          #{ _render_list :item_list=>item_names, :extra_css_class=>'perm-indiv-ul' }
-        </div>
-                
-      </div>
-    }
-  end
-
-  view :core do |args|
-    args[:item] ||= :link
-    card.content=='_left' ? core_inherit_content(args) : _final_pointer_type_core(args)
-  end
-
-  view :closed_content do |args|
-    card.content=='_left' ? core_inherit_content(args) : _final_pointer_type_closed_content(args)
-  end
-
-
-  private
-
-  def core_inherit_content args={}
-    sc = args[:set_context]
-    text = if sc && sc.tag_name.key == Card[:self].key
-      begin
-        task = card.tag.codename
-        ancestor = Card[sc.trunk_name.trunk_name]
-        links = ancestor.who_can( task.to_sym ).map do |card_id|
-          link_to_page Card[card_id].name, nil, :target=>args[:target]
-        end*", "
-        "Inherit ( #{links} )"
-      rescue
-        'Inherit'
-      end
-    else
-      'Inherit from left card'
-    end
-    %{<span class="inherit-perm">#{text}</span>}
-  end
-end
-
-
-def standardize_items
-  # noop to override default behavior, which wouldn't let '_left' through and would therefore break
-end
+include Comment
+format :html do include Comment::HtmlFormat end

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

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

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

@@ -1,5 +1,2 @@
-include Right::Create
-
-view :core,           :right=>:create
-view :editor,         :right=>:create
-view :closed_content, :right=>:create
+include Create
+format :html do include Create::HtmlFormat end

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

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

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

@@ -1,12 +1,14 @@
-
 format do
   view :not_found do |args|
-    if card.left.kind_of? Machine
-      card.left.update_machine_output
-      self.error_status = 302
-      wagn_path card.left.machine_output_card.attach.url(:default, :timestamp => false)  # to get rid of additional number in url
+    srid = card.selected_revision_id
+    if card.left.kind_of? Machine and (card.new_card? or !srid or srid == card.current_revision_id)
+      # only regenerate output if it's really warranted 
+      # (not when someone requests a specific old version that has been removed)
+      card.left.update_machine_output   
+      root.error_status = 302
+      wagn_path card.left.machine_output_url
     else
-      _final_not_found args
+      super args
     end
   end
-end
+end

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

@@ -1,5 +1,2 @@
-include Right::Create
-
-view :core,           :right=>:create
-view :editor,         :right=>:create
-view :closed_content, :right=>:create
+include Create
+format :html do include Create::HtmlFormat end

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

@@ -7,7 +7,8 @@ def chunk_list  #turn off autodetection of uri's
                 #TODO with the new format pattern this should be handled in the js format
     :inclusion_only
 end
-    
+
+=begin
 format :file do
   view :core do |args|
     if params[:explicit_file] and r = controller.response
@@ -18,4 +19,4 @@ format :file do
         :x_sendfile=>true, :type=>'text/css', :disposition=>'inline' } ]
   end
 end
-
+=end

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

@@ -1,5 +1,2 @@
-include Right::Create
-
-view :core,           :right=>:create
-view :editor,         :right=>:create
-view :closed_content, :right=>:create
+include Create
+format :html do include Create::HtmlFormat end

data/mods/standard/sets/rstar/rules.rb

@@ -231,8 +231,6 @@ end
 
 =begin
 
-These are commented because they are not currently included (see notes in lib/card/set.rb re anchorless sets)
-
 def repair_set
   @set_repair_attempted = true
   if real?

data/mods/standard/sets/self/head.rb

@@ -1,4 +1,3 @@
-
 format :html do
 
   view :raw do |args|
@@ -45,7 +44,7 @@ format :html do
       # RSS # move to mods!
       if root.card.type_id == SearchTypeID
         opts = { :format => :rss }
-        search_params[:vars].each { |key, val| opts["_#{key}"] = val }
+        root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
         bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{page_path root.card.name, opts} />}
       end
     end
@@ -77,7 +76,7 @@ format :html do
     c=Card[:double_click] and !Card.toggle c.content and varvals << 'wagn.noDoubleClick=true'
     @css_path                                        and varvals << "wagn.cssPath='#{@css_path}'"
     
-    script_card = card.rule_card :script
+    script_card = root.card.rule_card :script
     ie9_card    = Card[:script_html5shiv_printshiv]
     %(#{ javascript_tag do varvals * ';' end  }      
       #{ javascript_include_tag script_card.machine_output_url if script_card }

data/mods/standard/sets/self/navbox.rb

@@ -18,10 +18,3 @@ format :html do
 
   view :core, :raw
 end
-
-format do
-  #hacky.  here for override
-  def goto_wql(term)
-   { :complete=>term, :limit=>8, :sort=>'name', :return=>'name' }
-  end
-end

data/mods/standard/sets/self/recent.rb

@@ -1,6 +1,6 @@
 
 view :title do |args|
-   _final_title args.merge( :title=>'Recent Changes' )
+   super args.merge( :title=>'Recent Changes' )
 end
 
 format :html do
@@ -13,7 +13,7 @@ format :html do
       begin
         stamp = card.updated_at
         day = Date.new(stamp.year, stamp.month, stamp.day)
-      rescue Exception=>e
+      rescue =>e
         day = Date.today
         card.content = "(error getting date)"
       end

data/mods/standard/sets/self/search.rb

@@ -2,10 +2,11 @@
 format :html do
   
   view :title do |args|
-    if vars = search_params[:vars] and keyword = vars[:keyword]
-       args.merge! :title=> %{Search results for: <span class="search-keyword">#{keyword}</span>}
+    vars = root.search_params[:vars]
+    if vars && vars[:keyword]
+       args.merge! :title=> %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
     end
-    _final_title args
+    super args
   end
 end
 
@@ -33,4 +34,10 @@ format :json do
     }
   
   end
+  
+  #hacky.  here for override
+  def goto_wql(term)
+   { :complete=>term, :limit=>8, :sort=>'name', :return=>'name' }
+  end
+  
 end

data/mods/standard/sets/self/signin.rb

@@ -3,7 +3,7 @@ format :html do
 
   view :open do |args|
     args.merge! :title=>'Sign In', :optional_help=>:show
-    _final_open args
+    super args
   end
 
   view :open_content do |args|
@@ -22,7 +22,7 @@ format :html do
     account = card.fetch :trait=>:account, :new=>{}
   
     form_args = {
-      :hidden => { :success=>'REDIRECT: /' },
+      :hidden => { :success=>'REDIRECT: *previous' },
       :recaptcha => :off
     }
   
@@ -51,7 +51,7 @@ format :html do
       }
     } )
     
-    Auth.as_bot { _final_edit args }
+    Auth.as_bot { super args }
   end
   
   view :raw do |args|

data/mods/standard/sets/type/cardtype.rb

@@ -3,14 +3,14 @@ format :html do
 
   view :type do |args|
     args.merge!(:type_class=>'no-edit') if card.cards_of_type_exist?
-    _final_type args
+    super args
   end
 
   view :type_fieldset do |args|
     if card.cards_of_type_exist?
       %{<div>Sorry, this card must remain a Cardtype so long as there are <strong>#{ card.name }</strong> cards.</div>}
     else
-      _final_type_fieldset args
+      super args
     end  
   end
 

data/mods/standard/sets/type/coffee_script.rb

@@ -6,13 +6,13 @@ include Machine
 include MachineInput
 
 def compile_coffee script
-  Uglifier.compile(::CoffeeScript.compile script)
-rescue Exception=>e
+  ::CoffeeScript.compile script
+rescue =>e
   e
 end
 
 machine_input do 
-  compile_coffee format(:format=>:js)._render_raw
+  Uglifier.compile( compile_coffee format(:format=>:js)._render_raw )
 end
 
 store_machine_output :filetype => "js"
@@ -28,7 +28,7 @@ end
 
 
 format :html do
-  view :editor, :type=>:plain_text
+  view :editor, :mod=>PlainText::HtmlFormat
   
   view :core do |args|
     js = card.compile_coffee _render_raw

data/mods/standard/sets/type/css.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+require 'sass'
 include Machine
 include MachineInput
 
@@ -10,19 +12,25 @@ end
 def compress_css input
   begin
     Sass.compile input, :style=>:compressed
-  rescue Exception=>e
+  rescue => e
     raise Card::Oops, "Stylesheet Error:\n#{ e.message }"
   end
 end 
 
-format :html do
+def clean_html?
+  false
+end
+
+def chunk_list  #turn off autodetection of uri's 
+  :inclusion_and_link
+end
 
-  view :editor, :type=>:plain_text
+format :html do
+  view :editor, :mod=>PlainText::HtmlFormat
   
   view :core do |args|
     # FIXME: scan must happen before process for inclusion interactions to work, but this will likely cause
     # problems with including other css?
     process_content ::CodeRay.scan( _render_raw, :css ).div, :size=>:icon
   end
-  
 end