card 1.16.1 → 1.16.2

data/mod/02_basic_types/set/all/file.rb

@@ -1,13 +1,36 @@
+# FIXME: these methods should move to type/file.rb but some machine stuff is failing if it's not in a "all" set
+def store_dir
+  if (mod = mod_file?)
+    "#{ Cardio.gem_root}/mod/#{mod}/file/#{codename}"
+  elsif id
+    "#{ Card.paths['files'].existent.first }/#{id}"
+  else
+    tmp_store_dir
+  end
+end
+
+def tmp_store_dir
+  "#{ Card.paths['files'].existent.first }/#{key}"
+end
+
+def mod_file?
+  # when db_content was changed assume that it's no longer a mod file
+  if !db_content_changed? && content.present? && content =~ /^:[^\/]+\/([^.]+)/
+    $1
+  end
+end
+
+
 
 format :file do
 
   view :core do |args|
     'File rendering of this card not yet supported'
   end
-  
-    
+
+
   view :style do |args|
     nil
   end
-  
+
 end

data/mod/02_basic_types/set/type/pointer.rb

@@ -65,7 +65,7 @@ format :html do
 
     extra_css_class = args[:extra_css_class] || 'pointer-list-ul'
 
-    %{
+    <<-HTML
       <ul class="pointer-list-editor #{extra_css_class}" data-options-card="#{options_card_name}">
         #{
           items.map do |item|
@@ -74,7 +74,7 @@ format :html do
         }
       </ul>
       #{ add_item_button }
-    }
+    HTML
   end
 
   def add_item_button
@@ -86,8 +86,8 @@ format :html do
   end
 
   view :list_item do |args|
-    %{
-      <li class="pointer-li">
+   <<-HTML
+    <li class="pointer-li">
       <span class="input-group">
         <span class="input-group-addon handle">
           #{ glyphicon 'option-vertical left' }
@@ -101,7 +101,7 @@ format :html do
         </span>
         </span>
       </li>
-    }
+    HTML
   end
 
 
@@ -111,13 +111,13 @@ format :html do
       label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
       id = "pointer-checkbox-#{option_name.to_name.key}"
       description = pointer_option_description option_name
-      %{
+      <<-HTML
         <div class="pointer-checkbox">
           #{ check_box_tag "pointer_checkbox", option_name, checked, :id=>id, :class=>'pointer-checkbox-button' }
           <label for="#{id}">#{label}</label>
           #{ %{<div class="checkbox-option-description">#{ description }</div>} if description }
         </div>
-      }
+      HTML
     end.join "\n"
 
     %{<div class="pointer-checkbox-list">#{options}</div>}
@@ -137,13 +137,13 @@ format :html do
       id = "pointer-radio-#{option_name.to_name.key}"
       label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
       description = pointer_option_description option_name
-      %{
+      <<-HTML
         <li class="pointer-radio radio">
           #{ radio_button_tag input_name, option_name, checked, :id=>id, :class=>'pointer-radio-button' }
           <label for="#{id}">#{ label }</label>
           #{ %{<div class="radio-option-description">#{ description }</div>} if description }
         </li>
-      }
+      HTML
     end.join("\n")
 
     %{<ul class="pointer-radio-list">#{options}</ul>}
@@ -211,14 +211,13 @@ format :data do
   end
 end
 
-# while a card's card type and content are updated in the same request, 
+# while a card's card type and content are updated in the same request,
 # the new module will override the old module's events and functions.
 # this event is only on pointer card. Other type cards do not have this event,
-# so it is not overridden and will be run while updating type and content in the same request. 
-event :standardize_items, :before=>:approve, :on=>:save, :when=>proc{  |c| c.type_id == Card::PointerID  } do
-  if db_content_changed?
+# so it is not overridden and will be run while updating type and content in the same request.
+event :standardize_items, :before=>:approve, :on=>:save, :changed=>:content,
+    :when=>proc{  |c| c.type_id == Card::PointerID  } do
     self.content = item_names(:context=>:raw).map { |name| "[[#{name}]]" }.join "\n"
-  end
 end
 
 

data/mod/02_basic_types/spec/set/all/file_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::File do
-  # these are basically just fallback views
 end

data/mod/03_machines/lib/card/machine.rb

@@ -83,12 +83,12 @@ class Card
         host_class.prepare_machine_input {}
         host_class.machine_engine { |input| input }
         host_class.store_machine_output do |output|
-          file = Tempfile.new [ id, ".#{host_class.output_config[:filetype]}" ]
+          file = Tempfile.new [ id.to_s, ".#{host_class.output_config[:filetype]}" ]
           file.write output
           file.rewind
           Card::Auth.as_bot do
             p = machine_output_card
-            p.attach = file
+            p.file = file
             p.save!
           end
           file.close
@@ -169,12 +169,12 @@ class Card
 
     def machine_output_url
       ensure_machine_output
-      machine_output_card.attach.url #(:default, :timestamp => false)   # to get rid of additional number in url
+      machine_output_card.file.url #(:default, :timestamp => false)   # to get rid of additional number in url
     end
 
     def machine_output_path
       ensure_machine_output
-      machine_output_card.attach.path
+      machine_output_card.file.path
     end
 
     def ensure_machine_output

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

@@ -18,7 +18,8 @@ $.extend wagn,
 
   editorInitFunctionMap: {
     '.date-editor'           : -> @datepicker { dateFormat: 'yy-mm-dd' }
-    'textarea'               : -> wagn.initAce $(this)#$(this).autosize()
+    'textarea'               : -> $(this).autosize()
+    '.ace-editor-textarea'   : -> wagn.initAce $(this)
     '.tinymce-textarea'      : -> wagn.initTinyMCE @[0].id
     '.pointer-list-editor'   : -> @sortable({handle: '.handle', cancel: ''}); wagn.initPointerList @find('input')
     '.file-upload'           : -> @fileupload( add: wagn.chooseFile )#, forceIframeTransport: true )
@@ -53,7 +54,7 @@ $.extend wagn,
       return
     editDiv = $("<div>",
       position: "absolute"
-      width: textarea.width()
+      width: "auto"
       height: textarea.height()
     ).insertBefore(textarea)
     textarea.css "visibility", "hidden"
@@ -180,21 +181,6 @@ $(window).ready ->
 
 
   # toolbar mod
-  $('body').on 'click', '.edit-toolbar-pin.active > a', (e) ->
-    e.preventDefault()
-    $(this).blur()
-    $('.edit-toolbar-pin').removeClass('active').addClass('inactive')
-    $.ajax '/*edit_toolbar_pinned',
-      type : 'PUT'
-      data : 'card[content]=false'
-
-  $('body').on 'click', '.edit-toolbar-pin.inactive > a', (e) ->
-    e.preventDefault()
-    $('.edit-toolbar-pin').removeClass('inactive').addClass('active')
-    $.ajax '/*edit_toolbar_pinned',
-      type : 'PUT'
-      data : 'card[content]=true'
-
   $('body').on 'click', '.toolbar-pin.active', (e) ->
     e.preventDefault()
     $(this).blur()
@@ -205,6 +191,7 @@ $(window).ready ->
 
   $('body').on 'click', '.toolbar-pin.inactive', (e) ->
     e.preventDefault()
+    $(this).blur()
     $('.toolbar-pin').removeClass('inactive').addClass('active')
     $.ajax '/*toolbar_pinned',
       type : 'PUT'

data/mod/03_machines/lib/stylesheets/style_cards.scss

@@ -137,6 +137,11 @@ Choosing (b) will mean your CSS will not be affected by automated updates.
   }
 }
 
+.navbar .btn.btn-toolbar-control {
+  padding: 5px;
+  border: none;
+}
+
 .navbar-divide {
   margin-left: 30px;
   border-left: 1px solid;

data/mod/03_machines/set/right/machine_input.rb

@@ -0,0 +1,3 @@
+def followable?
+  false
+end

data/mod/03_machines/set/right/machine_output.rb

@@ -1,3 +1,7 @@
+def followable?
+  false
+end
+
 format do
   view :not_found do |args|
     if update_machine_output_live?

data/mod/04_settings/lib/card/setting.rb

@@ -1,8 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-# Used to extend setting modules like Card::Set::Self::Create in the settings mod
 
 class Card
+
+  # Used to extend setting modules like Card::Set::Self::Create in the settings mod
   module Setting
     # Let M = Card::Setting           (module)
     #     E = Card::Set::Self::Create (module extended with M)

data/mod/04_settings/set/abstract/permission.rb

@@ -0,0 +1,95 @@
+def standardize_items
+  # noop to override default behavior, which wouldn't let '_left' through and would therefore break
+end
+
+format :html do
+
+  view :pointer_core do |args| #, :view=>:core, :mod=>Type::Pointer::HtmlFormat
+    %{<div class="pointer-list">#{ render_pointer_items args }</div>}
+  end
+
+  view :core do |args|
+    card.content=='_left' ? core_inherit_content(args) : render( :pointer_core, args )
+  end
+
+  view :closed_content do |args|
+    args[:item] ||= :link
+    render_core args
+  end
+
+  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
+
+    %{
+      #{ 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>#{ card_link option.name, :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
+
+
+
+
+  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|
+          card_link Card[card_id].name, :target=>args[:target]
+        end*", "
+        "Inherit ( #{links} )"
+      rescue
+        'Inherit'
+      end
+    else
+      'Inherit from left card'
+    end
+    %{<span class="inherit-perm">#{text}</span>}
+  end
+end
+
+

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

@@ -1,91 +1,3 @@
-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
-
-    %{     
-      #{ 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>#{ card_link option.name, :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|
-    card.content=='_left' ? core_inherit_content(args) : render( :pointer_core, args )
-  end  
-
-  view :closed_content do |args|
-    args[:item] ||= :link
-    render_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|
-          card_link Card[card_id].name, :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 Abstract::Permission
 
+format :html do include Abstract::Permission::HtmlFormat end

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

@@ -1,3 +1,3 @@
-include Comment
+include Abstract::Permission
 
-format :html do include Comment::HtmlFormat end
+format :html do include Abstract::Permission::HtmlFormat end