wagn 1.13.0.pre2 → 1.13.0

data/{mods → mod}/standard/lib/card/machine.rb

@@ -100,8 +100,8 @@ class Card
           end
         end
   
-        host_class.event "update_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do  
-          update_machine_output
+        host_class.event "reset_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do  
+          reset_machine_output!
         end
       end
     end
@@ -119,17 +119,45 @@ class Card
       end.select(&:present?).join( joint )
       after_engine output
     end
+    
+    def reset_machine_output!
+      Auth.as_bot do
+        moc = machine_output_card and moc.real? and moc.delete!
+        mic = machine_input_card  and mic.real? and mic.delete!
+      end
+    end
+    
  
-    def update_machine_output updated=[]
-      update_input_card
-      run_machine
+    def update_machine_output
+      if ok? :read and not was_already_locked = locked?
+        Auth.as_bot do
+          lock!
+          update_input_card
+          run_machine
+        end
+      end
+    ensure
+       unlock! unless was_already_locked
+    end
+    
+    def lock_cache_key
+      "UPDATE-LOCK:#{key}"
+    end
+    
+    def locked?
+      Card.cache.read lock_cache_key
+    end
+    
+    def lock!
+      Card.cache.write lock_cache_key, true
+    end
+    
+    def unlock!
+      Card.cache.write lock_cache_key, false
     end
 
     def update_input_card
-      Card::Auth.as_bot do
-        machine_input_card.items = engine_input
-        #machine_input_card.save
-      end
+      machine_input_card.items = engine_input
     end
 
     def input_item_cards

data/{mods → mod}/standard/lib/card/machine_input.rb

@@ -21,7 +21,7 @@ class Card
       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
+          item.reset_machine_output! if item.kind_of? Machine
         end
       end
     
@@ -31,7 +31,7 @@ class Card
     
       host_class.event "after_machine_input_deleted_#{host_class.name.gsub(':','_')}".to_sym, :after=>:store_subcards, :on => :delete do
         @involved_machines.each do |item|
-          item.update_machine_output if item.kind_of? Machine
+          item.reset_machine_output! if item.kind_of? Machine
         end
       end
     end

data/{mods → mod}/standard/lib/javascript/wagn.js.coffee

@@ -23,6 +23,11 @@ $.extend wagn,
         wagn.slotParams value, processed, cgiKey
       else
         processed[cgiKey] = value
+        
+  slotReady: (func)->
+    $('document').ready ->
+      $('body').on 'slotReady', '.card-slot', ->
+        func.call this, $(this)
 
   pingName: (name, success)->
     $.getJSON wagn.rootPath + '/', { format: 'json', view: 'status', 'card[name]': name }, success  
@@ -39,10 +44,10 @@ jQuery.fn.extend {
     else #simple text (not html)
       v = val
     s.replaceWith v
+    v.trigger 'slotReady'
     v
 
   slotSuccess: (data) ->
-    
     if data.redirect
       window.location=data.redirect
     else
@@ -135,7 +140,9 @@ $(window).ready ->
   #  dislike the timeout, but without this forms with multiple TinyMCE editors were failing to load properly
 
   $('body').on 'ajax:success', '.slotter', (event, data, c, d) ->
-    $(this).slotSuccess data
+    unless event.slotSuccessful
+      $(this).slotSuccess data
+      event.slotSuccessful = true
 
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
     $(this).slotError xhr.status, xhr.responseText
@@ -208,15 +215,16 @@ $(window).ready ->
   unless wagn.noDoubleClick
     $('body').on 'dblclick', '.card-slot', (event) ->
       s = $(this)
-      return false if s.find( '.card-editor' )[0]
+      return false if s.closest( '.nodblclick'  )[0]
       return false if s.closest( '.card-header' )[0]
+      return false if s.find( '.card-editor' )[0]
       return false unless s.data('cardId')
       s.addClass 'slotter'
       s.attr 'href', wagn.rootPath + '/card/edit/~' + s.data('cardId')
       $.rails.handleRemote(s)
       false # don't propagate up to next slot
 
-  $('body').on 'dblclick', '.nodblclick', -> false
+#  $('body').on 'dblclick', '.nodblclick', -> false
 
   $('body').on 'submit', 'form.slotter', (event)->
     if (target = $(this).attr 'main-success') and $(this).isMain()
@@ -279,6 +287,7 @@ $(window).ready ->
     msg.show()
 #    msg.dialog()
     event.preventDefault()
+	
 
 # important: this prevents jquery-mobile from taking over everything
 $( document ).on "mobileinit", ->

data/{mods/standard/sets → mod/standard/set}/all/attach.rb

@@ -115,7 +115,7 @@ module Paperclip::Interpolations
   def local at, style_name
     if mod = at.instance.attach_mod
       # generalize this to work with any mod (needs design)
-      "#{Wagn.gem_root}/mods/#{mod}/files"
+      "#{Wagn.gem_root}/mod/#{mod}/file"
     else
       Wagn.paths['files'].existent.first
     end

data/{mods/standard/sets → mod/standard/set}/all/base.rb

@@ -22,8 +22,8 @@ format do
 
   # 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, :perms=>:none do |args| time_ago_in_words card.created_at end
+  view :updated_at, :perms=>:none do |args| time_ago_in_words card.updated_at end
 
 
   # CONTENT VIEWS

data/{mods/standard/sets → mod/standard/set}/all/history.rb

@@ -73,7 +73,7 @@ format :html do
 
   def revision_menu_items
     items = [back_for_revision, forward, see_or_hide_changes_for_revision]
-    items << rollback unless Card::Env.recaptcha_on?
+    items << rollback unless card.recaptcha_on?
     items
   end
 

data/{mods/standard/sets → mod/standard/set}/all/json.rb

@@ -54,9 +54,9 @@ format :json do
   view :atom do |args|
     h = {
       :name    => card.name,
-      :type    => card.type_name,
-      :content => card.raw_content
+      :type    => card.type_name
     }
+    h[:content]  = card.content  unless card.structure
     h[:codename] = card.codename     if card.codename
     h[:value]    = _render_core args if @depth < max_depth
     h

data/{mods/standard/sets → mod/standard/set}/all/rich_html.rb

@@ -14,8 +14,7 @@ format :html do
   end
 
   view :layout, :perms=>:none do |args|
-    layout_content = get_layout_content
-    process_content layout_content
+    process_content get_layout_content, :content_opts=>{ :chunk_list=>:default }
   end
 
   view :content do |args|
@@ -89,6 +88,12 @@ format :html do
       </h1>
     }
   end
+  
+=begin  
+  view :anchor, :perms=>:none, :tags=>:unknown_ok do |args|
+    %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
+  end
+=end  
 
   view :menu, :tags=>:unknown_ok do |args|
     disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
@@ -158,7 +163,7 @@ format :html do
     hidden[:success] ||= card.rule(:thanks) || '_self'
     hidden[:card   ] ||={}
     
-    args[:optional_help] = :show
+    args[:optional_help] ||= :show
 
     # name field / title
     if !params[:name_prompt] and !card.cardname.blank?
@@ -215,7 +220,7 @@ format :html do
     args[:optional_help] = :show
     
     args[:buttons] = %{
-      #{ button_tag 'Submit', :class=>'submit-button' }
+      #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting' }
       #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
     }
   end
@@ -256,8 +261,8 @@ format :html do
       :card     => { :update_referencers => false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Rename and Update', :class=>'renamer-updater' }
-      #{ button_tag 'Rename', :class=>'renamer' }
+      #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater' }
+      #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }
     
@@ -285,7 +290,7 @@ format :html do
   
 
   view :missing do |args|
-    return '' unless card.ok? :create  #this should be moved into ok_view
+    return '' unless card.ok? :create  # should this be moved into ok_view?
     new_args = { :view=>:new, 'card[name]'=>card.name }
     new_args['card[type]'] = args[:type] if args[:type]
 

data/{mods/standard/sets → mod/standard/set}/right/account.rb

@@ -12,13 +12,25 @@ def blocked?  ; status=='blocked' end
 def built_in? ; status=='system'  end
 def pending?  ; status=='pending' end
 
+
+def authenticate_by_token val
+  tcard = token_card                               or return :token_not_found
+  token == val                                     or return :incorrect_token
+  tcard.updated_at > Wagn.config.token_expiry.ago  or return :token_expired  # > means "after"
+  left and left.accountable?                       or return :illegal_account  #(overkill?)
+  Auth.as_bot { tcard.delete! }
+  left.id
+end
+
+
+
 format :html do
 
   view :raw do |args|
-    %{
-      {{+#{Card[:email   ].name}|titled;title:email}}
-      {{+#{Card[:password].name}|titled;title:password}}
-    }
+    content = []
+    content << "{{+#{Card[:email   ].name}|titled;title:email}}"    unless args[:no_email]
+    content << "{{+#{Card[:password].name}|titled;title:password}}" unless args[:no_password]
+    content * ' '
   end
 
   view :edit do |args|
@@ -60,14 +72,11 @@ event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :w
   subcards["+#{Card[:token].name}"] = {:content => generate_token }
 end
 
-event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do
-  result = Auth.authenticate_by_token @env_token
-  case result
+event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do  
+  case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
-    Env.params[:success] = { :id=>left.name, :view=>:related,
-      :related=>{:name=>"+#{Card[:account].name}", :view=>'edit'}
-    }
+    Env.params[:success] = edit_password_success_args
     abort :success
   when :token_expired
     send_reset_password_token
@@ -82,6 +91,14 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
   end
 end
 
+def edit_password_success_args
+  { 
+    :id=>left.name,
+    :view=>:related,
+    :related=>{ :name=>"+#{Card[:account].name}", :view=>'edit' }
+  }
+end
+
 def has_reset_token?
   @env_token = Env.params[:reset_token]
 end

data/{mods/standard/sets → mod/standard/set}/right/comment.rb

@@ -54,12 +54,12 @@ format :html do
   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 )
+    args[:item] ||= :link
+    render_core args
   end
 
 

data/mod/standard/set/right/help.rb

@@ -0,0 +1,3 @@
+format :html do
+#  include Structure::HtmlFormat
+end

data/mod/standard/set/right/machine_output.rb

@@ -0,0 +1,19 @@
+format do
+  view :not_found do |args|
+    if update_machine_output_live?
+      root.error_status = 302      
+      card.left.update_machine_output
+      wagn_path card.left.machine_output_url
+    else
+      super args
+    end
+  end
+  
+  def update_machine_output_live?
+    srid = card.selected_revision_id
+    card.left.kind_of? Machine and                                  # must be a machine
+    !card.left.locked?         and                                  # machine must not already be running    
+    ( card.new_card? or !srid or srid == card.current_revision_id ) # must want current output (won't re-output old stuff)
+  end
+  
+end