card 1.18.3 → 1.18.4

data/lib/card/stage_director.rb

@@ -48,6 +48,7 @@ class Card
 
       @stage = nil
       @running = false
+      @prepared = false
       @parent = opts[:parent]
       # has card to be stored before the supercard?
       @prior_store = opts[:priority]
@@ -72,7 +73,8 @@ class Card
     end
 
     def prepare_for_phases
-      @card.prepare_for_phases
+      @card.prepare_for_phases unless @prepared
+      @prepared = true
       @subdirectors.each(&:prepare_for_phases)
     end
 

data/lib/cardio.rb

@@ -169,7 +169,8 @@ module Cardio
       original_suffix = ActiveRecord::Base.table_name_suffix
       ActiveRecord::Base.table_name_suffix = new_suffix
       ActiveRecord::SchemaMigration.reset_table_name
-      yield
+      paths = Cardio.migration_paths(type)
+      yield(paths)
       ActiveRecord::Base.table_name_suffix = original_suffix
       ActiveRecord::SchemaMigration.reset_table_name
     end

data/mod/01_core/chunk/link.rb

@@ -4,14 +4,15 @@ require_dependency File.expand_path('../reference', __FILE__)
 
 module Card::Content::Chunk
   class Link < Reference
+    CODE = 'L'.freeze # L for "Link"
     attr_reader :link_text
     # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
     Card::Content::Chunk.register_class self,
-                               prefix_re: '\\[',
-                               full_re:   /^\[\[([^\]]+)\]\]/,
-                               idx_char:  '['
+                                        prefix_re: '\\[',
+                                        full_re:   /^\[\[([^\]]+)\]\]/,
+                                        idx_char:  '['
     def reference_code
-      'L' # L for "Link"
+      CODE
     end
 
     def interpret match, _content
@@ -37,7 +38,7 @@ module Card::Content::Chunk
       # point is to find the first pipe that's not inside an nest
       return unless string.index '|'
       string_copy = "#{string}" # had to do this to create new string?!
-      string.scan /\{\{[^\}]*\}\}/ do |incl|
+      string.scan(/\{\{[^\}]*\}\}/) do |incl|
         string_copy.gsub! incl, ('x' * incl.length)
       end
       string_copy.index '|'
@@ -77,7 +78,7 @@ module Card::Content::Chunk
     def replace_reference old_name, new_name
       replace_name_reference old_name, new_name
 
-      if Card::Content === @link_text
+      if @link_text.is_a?(Card::Content)
         @link_text.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
           chunk.replace_reference old_name, new_name
         end

data/mod/01_core/set/all/collection.rb

@@ -253,23 +253,19 @@ format :html do
   end
 
   view :tabs do |args|
-    tab_buttons = ''
-    tab_panes = ''
-    active_tab = true
+    active_name = nil
+    active_content = nil
+    tabs = {}
     each_reference_with_args(item: :content) do |name, nest_args|
-      id         = "#{card.cardname.safe_key}-#{name.to_name.safe_key}"
-      url        = nest_path name, nest_args
-      tab_name   = nest_args[:title] || name
-      tab_buttons += tab_button(
-        "##{id}", tab_name, active_tab, 'data-url' => url.html_safe,
-                                        class: (active_tab ? nil : 'load'))
-
-      # only render the first active tab, other tabs get loaded via ajax
-      tab_content = active_tab ? nest(Card.fetch(name, new: {}), nest_args) : ''
-      tab_panes += tab_pane(id, tab_content, active_tab)
-      active_tab = false
+      tab_name = nest_args[:title] || name
+      tabs[tab_name] = nest_path(name, nest_args).html_safe
+
+      active_name ||= tab_name
+      # warning: nest changes nest_args
+      active_content ||= nest(Card.fetch(name, new: {}), nest_args)
     end
-    tab_panel tab_buttons, tab_panes, args[:tab_type]
+    lazy_loading_tabs tabs, active_name, active_content,
+                      type: args[:tab_type]
   end
   def default_tabs_args args
     args[:tab_type] ||= 'tabs'
@@ -290,15 +286,11 @@ format :html do
   end
 
   view :tabs_static do |args|
-    tab_buttons = ''
-    tab_panes = ''
-    card.item_cards.each_with_index do |item, index|
-      id = "#{card.cardname.safe_key}-#{item.cardname.safe_key}"
-      tab_buttons += tab_button("##{id}", item.name, index == 0)
-      tab_content = nest item, item_args(args)
-      tab_panes += tab_pane(id, tab_content, index == 0)
+    tabs = {}
+    card.item_cards.each do |item|
+      tabs[item.name] = nest item, item_args(args)
     end
-    tab_panel tab_buttons, tab_panes, args[:tab_type]
+    static_tabs tabs, args[:tab_type]
   end
   def default_tabs_static_args args
     args[:tab_type] ||= 'tabs'
@@ -308,33 +300,4 @@ format :html do
   def default_tabs_static_args args
     args[:tab_type] ||= 'pills'
   end
-
-  def tab_panel tab_buttons, tab_panes, tab_type='tabs'
-    wrap_with :div, role: 'tabpanel' do
-      [
-        content_tag(:ul, tab_buttons.html_safe, class: "nav nav-#{tab_type}",
-                                                role: 'tablist'),
-        content_tag(:div, tab_panes.html_safe, class: 'tab-content')
-      ]
-    end
-  end
-
-  def tab_button target, text, active=false, link_attr={}
-    link = link_to(
-      fancy_title(text),
-      target,
-      link_attr.merge('role' => 'tab', 'data-toggle' => 'tab'))
-    li_args = { role: :presentation }
-    li_args[:class] = 'active' if active
-    content_tag :li, link, li_args
-  end
-
-  def tab_pane id, content, active=false
-    div_args = {
-      role: :tabpanel,
-      id: id,
-      class: "tab-pane #{'active' if active}"
-    }
-    content_tag :div, content.html_safe, div_args
-  end
 end

data/mod/01_core/set/all/fetch.rb

@@ -10,11 +10,12 @@ module ClassMethods
   #   - database
   #   - virtual cards
   #
-  # "mark" here means one of three unique identifiers
+  # @param [Integer, String, Card::Name, Symbol] mark one of three unique
+  #   identifiers
   #    1. a numeric id (Integer)
   #    2. a name/key (String or Card::Name)
   #    3. a codename (Symbol)
-  #
+  # @param [Hash] opts ({})
   #   Options:
   #     :skip_virtual               Real cards only
   #     :skip_modules               Don't load Set modules
@@ -38,6 +39,25 @@ module ClassMethods
     standard_fetch_results card, mark, opts
   end
 
+  # #fetch converts String to Card::Name. That can break in some cases.
+  # For example if you fetch "Siemens" by its key "siemen", you won't get
+  # "Siemens" because "siemen".to_name.key == "sieman"
+  # If you have a key of a real card use this method.
+  def fetch_real_by_key key, opts={}
+    raise Card::Error, 'fetch_real_by_key called with new args' if opts[:new]
+
+    # look in cache
+    card = fetch_from_cache_by_key key, opts[:local_only]
+    # look in db if needed
+    if retrieve_from_db?(card, opts)
+      card = fetch_from_db :key, key, opts
+      write_to_cache card, opts if !card.nil? && !card.trash
+    end
+    return if card.nil?
+    card.include_set_modules unless opts[:skip_modules]
+    card
+  end
+
   def standard_fetch_results card, mark, opts
     if card.new_card?
       case
@@ -174,8 +194,8 @@ module ClassMethods
 
   def new_for_cache card, name, opts
     return if name.is_a? Integer
-    return if !name.present? && !opts[:new]
-    return unless !card || (card.type_unknown? && !skip_type_lookup?(opts))
+    return if name.blank? && !opts[:new]
+    return if card && (card.type_known? || skip_type_lookup?(opts))
     new name: name,
         skip_modules: true,
         skip_type_lookup: skip_type_lookup?(opts)
@@ -294,8 +314,8 @@ def eager_renew? opts
   opts[:skip_virtual] && new_card? && opts[:new].present?
 end
 
-def type_unknown?
-  type_id.nil?
+def type_known?
+  type_id.present?
 end
 
 def name_from_mark! mark, opts

data/mod/01_core/set/all/references.rb

@@ -65,9 +65,8 @@ end
 # insert entries in reference table
 def create_references_out
   ref_hash = {}
-  content_obj = Card::Content.new raw_content, self
-  content_obj.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
-    interpret_reference ref_hash, chunk.referee_name, chunk.reference_code
+  each_reference_out do |referee_name, ref_type|
+    interpret_reference ref_hash, referee_name, ref_type
   end
   return if ref_hash.empty?
   Card::Reference.mass_insert reference_values_array(ref_hash)
@@ -121,6 +120,15 @@ def reference_values_array ref_hash
   values
 end
 
+# invokes the given block for each reference in raw_content with
+# the reference name and reference type
+def each_reference_out
+  content_obj = Card::Content.new raw_content, self
+  content_obj.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
+    yield(chunk.referee_name, chunk.reference_code)
+  end
+end
+
 protected
 
 # test for updating referer content & preload referer list

data/mod/01_core/set/all/subcards.rb

@@ -1,5 +1,5 @@
-def field tag
-  Card[cardname.field(tag)]
+def field tag, opts={}
+  Card.fetch cardname.field(tag), opts
 end
 
 def subcard card_name

data/mod/01_core/set/all/tracked_attributes.rb

@@ -1,7 +1,6 @@
 def assign_attributes args={}
   if args
     args = args.stringify_keys
-
     @set_specific = {}
     Card.set_specific_attributes.each do |key|
       @set_specific[key] = args.delete(key) if args[key]
@@ -31,6 +30,11 @@ protected
 
 def extract_subcard_args! args
   subcards = args.delete('subcards') || {}
+  if (subfields = args.delete('subfields'))
+    subfields.each_pair do |key, value|
+      subcards[cardname.field(key)] = value
+    end
+  end
   args.keys.each do |key|
     subcards[key] = args.delete(key) if key =~ /^\+/
   end

data/mod/01_core/set/all/utils.rb

@@ -93,7 +93,7 @@ module ClassMethods
 end
 
 def debug_type
-  "#{type_code || 'no code'}:#{type_id}"
+  "#{type_code || ''}:#{type_id}"
 end
 
 def to_s

data/mod/01_core/spec/set/all/collection_spec.rb

@@ -142,9 +142,9 @@ describe Card::Set::All::Collection do
       tabs = render_card :tabs, name: 'tab_test', type_id: Card::PlainTextID,
                                 content: '{{A|type;title:my tab title}}'
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'li > a[data-toggle=tab][href="#tab_test-a"]',
+        assert_select 'li > a[data-toggle=tab][href="#tab_test-my_tab_title"]',
                       'my tab title'
-        assert_select 'div.tab-pane#tab_test-a', 'Basic'
+        assert_select 'div.tab-pane#tab_test-my_tab_title', 'Basic'
       end
     end
 

data/mod/01_history/set/all/content_history.rb

@@ -28,21 +28,20 @@ def save_content_draft content
 end
 
 def last_change_on field, opts={}
-  where_sql = 'card_actions.card_id = :card_id AND field = :field '
-  where_sql += 'AND (draft is not true) ' unless opts[:including_drafts]
-  where_sql += if opts[:before]
-                 'AND card_action_id < :action_id'
-               elsif opts[:not_after]
-                 'AND card_action_id <= :action_id'
-               else
-                 ''
-               end
+  where_sql = 'card_actions.card_id = :card_id AND field = :field'
+  where_sql += ' AND (draft is not true)' unless opts[:including_drafts]
+  if opts[:before]
+    where_sql += ' AND card_action_id < :action_id'
+  elsif opts[:not_after]
+    where_sql += ' AND card_action_id <= :action_id'
+  end
 
   action_arg = opts[:before] || opts[:not_after]
   action_id = action_arg.is_a?(Card::Action) ? action_arg.id : action_arg
-  field_index = Card::TRACKED_FIELDS.index(field.to_s)
   Change.joins(:action).where(
-    where_sql, card_id: id, field: field_index, action_id: action_id
+    where_sql, card_id: id,
+               field: Card::Change.field_index(field),
+               action_id: action_id
   ).order(:id).last
 end
 

data/mod/02_basic_types/set/abstract/code_file.rb

@@ -0,0 +1,57 @@
+def self.included host_class
+  # extract the mod name from the path of the set's tmp file
+  # the caller that included the set file is set.rb
+  # seems like the actual set file is in fourth position in
+  # the backtrace but I'm not 100% sure if that is always the case
+  path, = caller[4].partition(':')
+  path_parts = path.split(File::SEPARATOR)
+  mod_dir = path_parts[path_parts.index('set') + 1]
+  raise Card::Error, "not a set path: #{path}" unless mod_dir
+  match = mod_dir.match(/^mod\d+-(?<mod_name>.+)$/)
+  host_class.mattr_accessor :file_content_mod_name
+  host_class.file_content_mod_name = match[:mod_name]
+end
+
+# @return [Array<String>, String] the name of file(s) to be loaded
+def source_files
+  case type_id
+  when CoffeeScriptID then "#{codename}.js.coffee"
+  when JavaScriptID then "#{codename}.js"
+  when CssID then "#{codename}.css"
+  when ScssID then "#{codename}.scss"
+  end
+end
+
+def source_dir
+  case type_id
+  when CoffeeScriptID, JavaScriptID then 'javascript'
+  when CssID, ScssID then 'stylesheets'
+  end
+end
+
+def find_file filename
+  Card.paths['mod'].to_a.each do |mod_path|
+    file_path =
+      File.join(mod_path, file_content_mod_name, 'lib', source_dir, filename)
+    return file_path if File.exist? file_path
+  end
+  nil
+end
+
+view :raw do |_args|
+  Array.wrap(card.source_files).map do |filename|
+    if (source_path = card.find_file(filename))
+      Rails.logger.info "reading file: #{source_path}"
+      File.read source_path
+    else
+      Rails.logger.info "couldn't locate file: #{filename}"
+      nil
+    end
+  end.compact.join "\n"
+end
+
+format :html do
+  view :editor do |_args|
+    "Content is stored in file and can't be edited."
+  end
+end

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

@@ -240,17 +240,21 @@ end
 # 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, :prepare_to_validate, on: :save, changed: :content,
-                                                when: proc {  |c| c.type_id == Card::PointerID  } do
-  self.content = item_names(context: :raw).map { |name| "[[#{name}]]" }.join "\n"
+# so it is not overridden and will be run while updating type and content in
+# the same request.
+event :standardize_items, :prepare_to_validate,
+      on: :save,
+      changed: :content,
+      when: proc { |c| c.type_id == Card::PointerID  } do
+  self.content = item_names(context: :raw).map do |name|
+    "[[#{name}]]"
+  end.join "\n"
 end
 
 def diff_args
   { format: :pointer }
 end
 
-
 def item_cards args={}
   if args[:complete]
     query = args.reverse_merge referred_to_by: name

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

@@ -43,7 +43,7 @@ jQuery.fn.extend {
         target_slot = $(parent_slot).find(@data('slot-selector'))
         parent_slot = $(parent_slot).parent().closest '.card-slot'
       if target_slot.length == 0
-        $('body').find(@data('slot-selector'))
+        $(@data('slot-selector'))
       else
         target_slot
     else
@@ -167,11 +167,14 @@ $(window).ready ->
     unless event.slotSuccessful
       slot_top_pos = $(this).slot().offset().top
       $(this).slotSuccess data
+      if $(this).hasClass "close-modal"
+        $(this).closest('.modal').modal('hide')
       # should scroll to top after clicking on new page
       if $(this).hasClass "card-paging-link"
         $("body").scrollTop slot_top_pos
       event.slotSuccessful = true
 
+
   $('body').on 'loaded.bs.modal', null, (event) ->
     unless event.slotSuccessful
       wagn.initializeEditors $(event.target)

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

@@ -4,35 +4,34 @@ window.wagn ||= {} #needed to run w/o *head.  eg. jasmine
 
 $.extend wagn,
   editorContentFunctionMap: {
-    '.ace-editor-textarea' : -> ace_editor_content this[0]
-    '.tinymce-textarea' : -> tinyMCE.get(@[0].id).getContent()
-    '.pointer-select' : -> pointerContent @val()
-    '.pointer-multiselect' : -> pointerContent @val()
-    '.pointer-radio-list' : -> pointerContent @find('input:checked').val()
-    '.pointer-list-ul' : -> 
+    '.ace-editor-textarea': -> ace_editor_content this[0]
+    '.tinymce-textarea': -> tinyMCE.get(@[0].id).getContent()
+    '.pointer-select': -> pointerContent @val()
+    '.pointer-multiselect': -> pointerContent @val()
+    '.pointer-radio-list': -> pointerContent @find('input:checked').val()
+    '.pointer-list-ul': ->
       pointerContent @find('input').map( -> $(this).val() )
-    '.pointer-checkbox-list' : -> 
+    '.pointer-checkbox-list': ->
       pointerContent @find('input:checked').map( -> $(this).val() )
-    '.pointer-select-list' : -> 
+    '.pointer-select-list': ->
       pointerContent @find('.pointer-select select').map( -> $(this).val() )
-    '.pointer-mixed' : -> 
+    '.pointer-mixed': ->
       element = '.pointer-checkbox-sublist input:checked,\
                 .pointer-sublist-ul input'
       pointerContent @find(element).map( -> $(this).val() )
     # must happen after pointer-list-ul, I think
-    '.perm-editor' : -> permissionsContent this 
+    '.perm-editor': -> permissionsContent this
   }
-
   editorInitFunctionMap: {
-    '.date-editor' : -> @datepicker { dateFormat : 'yy-mm-dd' }
-    'textarea' : -> $(this).autosize()
-    '.ace-editor-textarea' : -> wagn.initAce $(this)
-    '.tinymce-textarea' : -> wagn.initTinyMCE @[0].id
-    '.pointer-list-editor' : -> 
+    '.date-editor': -> @datepicker { dateFormat: 'yy-mm-dd' }
+    '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' : -> wagn.upload_file(this)
-    '.etherpad-textarea' : ->
+    '.file-upload': -> wagn.upload_file(this)
+    '.etherpad-textarea': ->
       $(this).closest('form')
       .find('.edit-submit-button')
       .attr('class', 'etherpad-submit-button')
@@ -48,8 +47,8 @@ $.extend wagn,
       card_name = $_this.siblings(".attachment_card_name:first").attr("name")
       type_id = $_this.siblings("#attachment_type_id").val()
       data.formData = {
-        "card[type_id]" : type_id,
-        "attachment_upload" : card_name
+        "card[type_id]": type_id,
+        "attachment_upload": card_name
       }
     $_fileupload = $(fileupload)
     if $_fileupload.closest("form").attr("action").indexOf("update") > -1
@@ -177,8 +176,11 @@ $.extend wagn,
 # sidebars
 
 wrapDeckoLayout = () ->
-  $('body > article, body > aside, body > footer').wrapAll('<div class="container"/>')
+  $footer  = $('body > footer').first()
+  $('body > article, body > aside').wrapAll('<div class="container"/>')
   $('div.container > article, div.container > aside').wrapAll('<div class="row row-offcanvas">')
+  if $footer
+    $('body').append $footer
 
 wrapSidebarToggle = (toggle) ->
   "<div class='container'><div class='row'>#{toggle}</div></div>"
@@ -210,6 +212,7 @@ doubleSidebar = ->
   $('body').append($asideLeft).append($article).append($asideRight)
 
   wrapDeckoLayout()
+
   $article.prepend(wrapSidebarToggle("#{sidebarToggle('right')}#{sidebarToggle('left')}"))
 
 $(window).ready ->
@@ -316,15 +319,15 @@ $(window).ready ->
 
   # modal mod
 
-  $('body').on 'hide.bs.modal', (event) ->
-    $(event.target).find('.modal-dialog > .modal-content').empty()
+  $('body').on 'hidden.bs.modal', (event) ->
+    modal_content = $(event.target).find('.modal-dialog > .modal-content')
     if $(event.target).attr('id') != 'modal-main-slot'
       slot = $( event.target ).slot()
       menu_slot = slot.find '.menu-slot:first'
       url  = wagn.rootPath + '/~' + slot.data('card-id')
       params = { view: 'menu' }
       params['is_main'] = true if slot.isMain()
-
+      modal_content.empty()
       $.ajax url, {
         type : 'GET'
         data: params
@@ -332,6 +335,8 @@ $(window).ready ->
           menu_slot.replaceWith data
       }
 
+
+
 #     for slot in $('.card-slot')
 #       menu_slot = $(slot).find '.menu-slot:first'
 #       if menu_slot.size() > 0