wagn 1.14.4 → 1.14.5

data/mod/03_machines/lib/javascript/theme-textmate.js

@@ -0,0 +1,130 @@
+define("ace/theme/textmate",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
+"use strict";
+
+exports.isDark = false;
+exports.cssClass = "ace-tm";
+exports.cssText = ".ace-tm .ace_gutter {\
+background: #f0f0f0;\
+color: #333;\
+}\
+.ace-tm .ace_print-margin {\
+width: 1px;\
+background: #e8e8e8;\
+}\
+.ace-tm .ace_fold {\
+background-color: #6B72E6;\
+}\
+.ace-tm {\
+background-color: #FFFFFF;\
+color: black;\
+}\
+.ace-tm .ace_cursor {\
+color: black;\
+}\
+.ace-tm .ace_invisible {\
+color: rgb(191, 191, 191);\
+}\
+.ace-tm .ace_storage,\
+.ace-tm .ace_keyword {\
+color: blue;\
+}\
+.ace-tm .ace_constant {\
+color: rgb(197, 6, 11);\
+}\
+.ace-tm .ace_constant.ace_buildin {\
+color: rgb(88, 72, 246);\
+}\
+.ace-tm .ace_constant.ace_language {\
+color: rgb(88, 92, 246);\
+}\
+.ace-tm .ace_constant.ace_library {\
+color: rgb(6, 150, 14);\
+}\
+.ace-tm .ace_invalid {\
+background-color: rgba(255, 0, 0, 0.1);\
+color: red;\
+}\
+.ace-tm .ace_support.ace_function {\
+color: rgb(60, 76, 114);\
+}\
+.ace-tm .ace_support.ace_constant {\
+color: rgb(6, 150, 14);\
+}\
+.ace-tm .ace_support.ace_type,\
+.ace-tm .ace_support.ace_class {\
+color: rgb(109, 121, 222);\
+}\
+.ace-tm .ace_keyword.ace_operator {\
+color: rgb(104, 118, 135);\
+}\
+.ace-tm .ace_string {\
+color: rgb(3, 106, 7);\
+}\
+.ace-tm .ace_comment {\
+color: rgb(76, 136, 107);\
+}\
+.ace-tm .ace_comment.ace_doc {\
+color: rgb(0, 102, 255);\
+}\
+.ace-tm .ace_comment.ace_doc.ace_tag {\
+color: rgb(128, 159, 191);\
+}\
+.ace-tm .ace_constant.ace_numeric {\
+color: rgb(0, 0, 205);\
+}\
+.ace-tm .ace_variable {\
+color: rgb(49, 132, 149);\
+}\
+.ace-tm .ace_xml-pe {\
+color: rgb(104, 104, 91);\
+}\
+.ace-tm .ace_entity.ace_name.ace_function {\
+color: #0000A2;\
+}\
+.ace-tm .ace_heading {\
+color: rgb(12, 7, 255);\
+}\
+.ace-tm .ace_list {\
+color:rgb(185, 6, 144);\
+}\
+.ace-tm .ace_meta.ace_tag {\
+color:rgb(0, 22, 142);\
+}\
+.ace-tm .ace_string.ace_regex {\
+color: rgb(255, 0, 0)\
+}\
+.ace-tm .ace_marker-layer .ace_selection {\
+background: rgb(181, 213, 255);\
+}\
+.ace-tm.ace_multiselect .ace_selection.ace_start {\
+box-shadow: 0 0 3px 0px white;\
+border-radius: 2px;\
+}\
+.ace-tm .ace_marker-layer .ace_step {\
+background: rgb(252, 255, 0);\
+}\
+.ace-tm .ace_marker-layer .ace_stack {\
+background: rgb(164, 229, 101);\
+}\
+.ace-tm .ace_marker-layer .ace_bracket {\
+margin: -1px 0 0 -1px;\
+border: 1px solid rgb(192, 192, 192);\
+}\
+.ace-tm .ace_marker-layer .ace_active-line {\
+background: rgba(0, 0, 0, 0.07);\
+}\
+.ace-tm .ace_gutter-active-line {\
+background-color : #dcdcdc;\
+}\
+.ace-tm .ace_marker-layer .ace_selected-word {\
+background: rgb(250, 250, 255);\
+border: 1px solid rgb(200, 200, 250);\
+}\
+.ace-tm .ace_indent-guide {\
+background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
+}\
+";
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+});

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -1,3 +1,4 @@
+
 window.wagn ||= {} #needed to run w/o *head.  eg. jasmine
 
 
@@ -14,7 +15,7 @@ $.extend wagn,
 
   editorInitFunctionMap: {
     '.date-editor'           : -> @datepicker { dateFormat: 'yy-mm-dd' }
-    'textarea'               : -> $(this).autosize()
+    'textarea'               : -> wagn.initAce $(this)#$(this).autosize()
     '.tinymce-textarea'      : -> wagn.initTinyMCE @[0].id
     '.pointer-list-editor'   : -> @sortable(); wagn.initPointerList @find('input')
     '.file-upload'           : -> @fileupload( add: wagn.chooseFile )#, forceIframeTransport: true )
@@ -32,7 +33,46 @@ $.extend wagn,
       catch
         {}
     wagn.tinyMCEConfig = setter()
+  
+  initAce: (textarea) ->
+    type_code = textarea.slot().attr "data-card-type-code"
+    hash = {}
+    hash["java_script"] = "javascript"
+    hash["coffee_script"] = "coffee"
+    hash["css"] = "css"
+    hash["scss"] = "scss"
+    hash["html"] = "html"
+    hash["search_type"] = "json"
+    mode = hash[type_code]
+    unless mode
+      textarea.autosize()
+      return
+    editDiv = $("<div>",
+      position: "absolute"
+      width: textarea.width()
+      height: textarea.height()
+      class: textarea.attr("class")
+    ).insertBefore(textarea)
+    textarea.css "visibility", "hidden"
+    textarea.css "height", "0px"
+    ace.config.set('basePath','/assets/ace')
+    editor = ace.edit(editDiv[0])
+    editor.renderer.setShowGutter true
+    editor.getSession().setValue textarea.val()
+    editor.setTheme "ace/theme/github"
+    editor.getSession().setMode "ace/mode/" + mode
+    editor.setOption "showPrintMargin", false
+    editor.getSession().setTabSize 2
+    editor.getSession().setUseSoftTabs true
+    editor.setOptions maxLines: 30 
     
+    textarea.closest("form").submit ->
+      textarea.val editor.getSession().getValue()
+      return
+
+    return
+
+
   initTinyMCE: (el_id) ->
     # verify_html: false -- note: this option needed for empty paragraphs to add space.
     conf = {
@@ -315,15 +355,15 @@ navbox_results = (request, response) ->
   formData = f.serialize() + '&view=complete'
   
   this.xhr = $.ajax {
-		url: wagn.prepUrl wagn.rootPath + '/:search.json'
-		data: formData
-		dataType: "json"
-		wagReq: ++reqIndex
-		success: ( data, status ) ->
-			response navboxize(request.term, data) if this.wagReq == reqIndex
-		error: () ->
-		  response [] if this.wagReq == reqIndex
-	  }
+    url: wagn.prepUrl wagn.rootPath + '/:search.json'
+    data: formData
+    dataType: "json"
+    wagReq: ++reqIndex
+    success: ( data, status ) ->
+      response navboxize(request.term, data) if this.wagReq == reqIndex
+    error: () ->
+      response [] if this.wagReq == reqIndex
+  }
 
 navboxize = (term, results)->
   items = []

data/mod/03_machines/set/self/script_ace.rb

@@ -0,0 +1,8 @@
+
+view :raw do |args|
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/ace.js"
+end
+
+view :editor do |args|
+  "Content is stored in file and can't be edited."
+end

data/mod/03_machines/set/type/coffee_script.rb

@@ -12,7 +12,7 @@ rescue =>e
 end
 
 machine_input do 
-  Uglifier.compile( compile_coffee format(:format=>:js)._render_raw )
+  Uglifier.compile( compile_coffee format(:js)._render_raw )
 end
 
 store_machine_output :filetype => "js"

data/mod/03_machines/set/type/css.rb

@@ -36,8 +36,6 @@ format :html do
   end
   
   view :content_changes, :mod=>CoffeeScript::HtmlFormat
-
-  
 end
 
 def diff_args

data/mod/03_machines/set/type/java_script.rb

@@ -7,7 +7,7 @@ include MachineInput
 store_machine_output :filetype => "js"
 
 machine_input do 
-  Uglifier.compile(format(:format=>:js)._render_core)
+  Uglifier.compile(format(:js)._render_core)
 end
 
 

data/mod/03_machines/spec/set/type/scss_spec.rb

@@ -21,11 +21,11 @@ describe Card::Set::Type::Scss do
   
   
   it 'should highlight code in html' do
-    assert_view_select @scss_card.format(:format=>:html).render_core, 'div[class=CodeRay]'
+    assert_view_select @scss_card.format(:html).render_core, 'div[class=CodeRay]'
   end
   
   it 'should not highlight code in css' do
-    expect(@scss_card.format(:format=>:css).render_core).not_to match(/CodeRay/)
+    expect(@scss_card.format(:css).render_core).not_to match(/CodeRay/)
   end
   
   it_should_behave_like "machine input"  do

data/mod/04_settings/set/right/comment.rb

@@ -33,7 +33,7 @@ format :html do
               %{
                 <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>
+                  <label>#{ card_link option.name, :target=>'wagn_role' }</label>
                 </div>
               }
             end * "\n"
@@ -71,7 +71,7 @@ format :html do
         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]
+          card_link Card[card_id].name, :target=>args[:target]
         end*", "
         "Inherit ( #{links} )"
       rescue

data/mod/04_settings/set/type/setting.rb

@@ -26,7 +26,7 @@ view :core do |args|
         klasses.map do |klass, rules|
           %{ 
             <tr class="klass-row anchorless-#{ klass.anchorless? }">
-              <td class="setting-klass">#{ klass.anchorless? ? link_to_page( klass.pattern ) : klass.pattern }</td>
+              <td class="setting-klass">#{ klass.anchorless? ? card_link( klass.pattern ) : klass.pattern }</td>
               <td class="rule-content-container">
                 <span class="closed-content content">#{ subformat(rules[0])._render_closed_content if klass.anchorless? }</span>
               </td>
@@ -41,7 +41,7 @@ view :core do |args|
                   previous_content = current_content
                   %{
                     <tr class="#{ 'rule-changeover' if changeover }">
-                    <td class="rule-anchor">#{ link_to_page rule.cardname.trunk_name.trunk_name, rule.cardname.trunk_name }</td>
+                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, :text=> rule.cardname.trunk_name.trunk_name }</td>
                     
                       #{
                         if duplicate

data/mod/04_settings/spec/set/right/structure_spec.rb

@@ -4,14 +4,14 @@ describe Card::Set::Right::Structure do
   it "closed_content is rendered as type + raw" do
     template = Card.new(:name=>'A+*right+*structure', :content=>'[[link]] {{inclusion}}')
     expect(template.format._render(:closed_content)).to eq(
-      '<a href="/Basic" class="cardtype">Basic</a> : [[link]] {{inclusion}}'
+      '<a class="cardtype known-card" href="/Basic">Basic</a> : [[link]] {{inclusion}}'
     )
   end
 
   it "closed_content is rendered as type + raw" do
     template = Card.new(:name=>'A+*right+*structure', :type=>'Html', :content=>'[[link]] {{inclusion}}')
     expect(template.format._render(:closed_content)).to eq(
-      '<a href="/HTML" class="cardtype">HTML</a> : [[link]] {{inclusion}}'
+      '<a class="cardtype known-card" href="/HTML">HTML</a> : [[link]] {{inclusion}}'
     )
   end
 end

data/mod/04_settings/spec/set/right/style_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require File.expand_path('../../../../../03_machines/spec/lib/machine_spec.rb', __FILE__)
+require File.expand_path('../../../../../03_machines/spec/lib/shared_machine_examples.rb', __FILE__)
 
 describe Card::Set::Right::Style do
 #  describe "#delet"

data/mod/05_email/set/type/email_template.rb

@@ -1,3 +1,4 @@
+
 def clean_html?
   false
 end
@@ -5,7 +6,7 @@ end
 def deliver args={}
   begin
     mail = format.render_mail(args)
-    mail.deliver 
+    mail.deliver
   rescue Net::SMTPError => exception
     Rails.logger.info "sending email: #{args}\nprocessed args: #{email_config(args)}"
     errors.add :exception, exception.message 
@@ -66,7 +67,7 @@ end
 
 
 format do     
-  view :mail do |args|
+  view :mail, :perms=>:none do |args|
     args = card.email_config(args)
     text_message = args.delete(:text_message)
     html_message = args.delete(:html_message)

data/mod/05_standard/set/all/all_css.rb

@@ -28,7 +28,7 @@ format :css do
   end
   
   view :url, :perms=>:none do |args|
-    page_path card.name, :format=>:css, :item=>args[:item]
+    page_path card.cardname, :format=>:css, :item=>args[:item]
 #    wagn_url _render_linkname
   end
 

data/mod/05_standard/set/all/all_js.rb

@@ -1,7 +1,7 @@
     
 format :js do
   view :include_tag do |args|
-    %{\n#{javascript_include_tag page_path(card.name) }\n }
+    %{\n#{javascript_include_tag page_path(card.cardname) }\n }
   end
   
 end

data/mod/05_standard/set/all/attach.rb

@@ -54,15 +54,16 @@ end
 # FIXME: test extension matches content type
 
 
-def attachment_symlink_to(previous_action_id) # create filesystem links to files from previous action
-  if styles = case type_code
-        when :file; ['']
-        when :image; STYLES
-      end
+def attachment_symlink_to(prior_action_id) # create filesystem links to files from prior action
+  styles = case type_code
+    when :file; ['']
+    when :image; STYLES
+  end
+  if styles and prior_action_id != last_action_id
     save_action_id = selected_action_id
     links = {}
     
-    self.selected_action_id = previous_action_id
+    self.selected_action_id = prior_action_id
     styles.each { |style|  links[style] = ::File.basename(attach.path(style))          }
 
     self.selected_action_id = last_action_id
@@ -108,7 +109,7 @@ end
 
 module Paperclip::Interpolations
   
-  extend Wagn::Location
+  extend Card::Format::Location
 
   def local at, style_name
     if mod = at.instance.attach_mod

data/mod/05_standard/set/all/base.rb

@@ -14,9 +14,11 @@ format do
   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 :title,    :perms=>:none  do |args|  args[:title] || card.name    end
+  view :url_link, :perms=>:none  do |args|  web_link wagn_url(_render_linkname) end
 
   view :link, :perms=>:none do |args|
-    card_link card.name, showname( args[:title] ), card.known?, args[:type]
+    card_link card.name, :text=>showname( args[:title] ), :known=>card.known?, :path_opts=>{:type=>args[:type]}
   end
 
 
@@ -79,39 +81,9 @@ format do
   end
 
 
-
-  # 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 :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 :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 :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 :blank, :perms=>:none do |args| '' end
+    
+  
 
   #none of the below belongs here!!