card 1.18.0 → 1.18.1

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

@@ -31,11 +31,13 @@ describe Card::Set::All::Type do
       Card::Auth.as_bot do
         Card.create! name: 'Topic', type: 'Cardtype'
         Card.create! name: 'Topic+*type+*structure', content: '{{+results}}'
-        Card.create! name: 'Topic+results+*type plus right+*structure', type: 'Search', content: '{}'
+        Card.create! name: 'Topic+results+*type plus right+*structure',
+                     type: 'Search', content: '{}'
       end
     end
 
     it 'should clear cache of structured nested card after saving' do
+      pending 'need new mechanism to replace #reset_type_specific_fields'
       Card::Auth.as_bot do
         expect(Card.fetch('t1+results', new: {}).type_name).to eq('Basic')
 

data/mod/01_history/lib/card/action.rb

@@ -150,11 +150,11 @@ class Card
     end
 
     def red?
-      content_diff_builder.red?
+      content_diff_object.red?
     end
 
     def green?
-      content_diff_builder.green?
+      content_diff_object.green?
     end
 
     # def diff
@@ -174,18 +174,16 @@ class Card
     def content_diff diff_type=:expanded, opts=nil
       return unless new_content?
       if diff_type == :summary
-        content_diff_builder(opts).summary
+        content_diff_object(opts).summary
       else
-        content_diff_builder(opts).complete
+        content_diff_object(opts).complete
       end
     end
 
-    def content_diff_builder opts=nil
-      @content_diff_builder ||= begin
+    def content_diff_object opts=nil
+      @diff ||= begin
         diff_args = opts || card.include_set_modules.diff_args
-        Card::Diff::DiffBuilder.new(
-          old_values[:content], new_values[:content], diff_args
-        )
+        Card::Diff.new old_values[:content], new_values[:content], diff_args
       end
     end
 

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

@@ -53,7 +53,8 @@ end
 
 event :finalize_act,
       after: :finalize_action,
-      when: proc { |c| !c.supercard } do
+      when: proc { |c|  c.act_card? } do
+  # removed subcards can leave behind actions without card id
   if @current_act.actions(true).empty?
     @current_act.delete
     @current_act = nil
@@ -62,6 +63,10 @@ event :finalize_act,
   end
 end
 
+def act_card?
+  self == DirectorRegister.act_card
+end
+
 event :rollback_actions, :prepare_to_validate,
       on: :update,
       when: proc { |c| c.rollback_request? } do

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

@@ -32,7 +32,7 @@ format :csv  do
         ''
       else
         titles = parsed_content.map do |chunk|
-          next if chunk.class != Card::Chunk::Include
+          next if chunk.class != Card::Content::Chunk::Include
           opts = chunk.options
           if %w(name link).member? opts[:view]
             opts[:view]

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

@@ -1,5 +1,4 @@
 
-
 event :add_and_drop_items, :prepare_to_validate, on: :save do
   adds = Env.params['add_item']
   drops = Env.params['drop_item']
@@ -129,7 +128,8 @@ format :html do
   view :checkbox do |_args|
     options = card.option_names.map do |option_name|
       checked = card.item_names.include?(option_name)
-      label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
+      o_card = Card.fetch option_name
+      label = (o_card && o_card.label) || option_name
       id = "pointer-checkbox-#{option_name.to_name.key}"
       description = pointer_option_description option_name
       <<-HTML
@@ -250,18 +250,29 @@ def diff_args
   { format: :pointer }
 end
 
+
 def item_cards args={}
   if args[:complete]
-    query = { referred_to_by: name }.merge args
+    query = args.reverse_merge referred_to_by: name
     Card::Query.run query
+  elsif args[:known_only]
+    known_item_cards args
   else
+    fetch_or_initialize_item_cards args
+  end
+end
 
-    itype = args[:type] || item_type
-    # warn "item_card[#{inspect}], :complete"
-    item_names(args).map do |name|
-      new_args = itype ? { type: itype } : {}
-      Card.fetch name, new: new_args
-    end.compact # compact?  can't be nil, right?
+def known_item_cards args={}
+  item_names(args).map do |name|
+    Card.fetch name
+  end.compact
+end
+
+def fetch_or_initialize_item_cards args
+  itype = args[:type] || item_type
+  new_args = itype ? { type: itype } : {}
+  item_names(args).map do |name|
+    Card.fetch name, new: new_args
   end
 end
 

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

@@ -232,7 +232,7 @@ $(window).ready ->
     $(this).closest('form').submit()
 
   $('body').on 'click', '.renamer-updater', ->
-    $(this).closest('form').find('#card_update_referencers').val 'true'
+    $(this).closest('form').find('#card_update_referers').val 'true'
 
   $('body').on 'submit', '.edit_name-view .card-form', ->
     confirmer = $(this).find '.alert'

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

@@ -17,6 +17,12 @@ event :update_structurees_references, :integrate,
   end
 end
 
+event :reset_cache_to_use_new_structure,
+      before: :update_structurees_references do
+  Card::Cache.reset_hard
+  Card::Cache.reset_soft
+end
+
 event :update_structurees_type, :finalize,
       changed: :type_id, when: proc { |c| c.assigns_type? } do
   update_structurees type_id: type_id
@@ -25,7 +31,7 @@ end
 def structuree_names
   if (wql = structuree_statement)
     Auth.as_bot do
-      Card::Query.run(wql.merge return: :name)
+      Card::Query.run wql.merge(return: :name)
     end
   else
     []

data/mod/05_email/set/right/follow.rb

@@ -8,7 +8,7 @@ def options_rule_card
   Card.new(
     name: 'follow_options_card',
     type_code: :pointer,
-    content: option_cards.map { |oc| "[[#{oc.title}]]" }.join("\n")
+    content: option_cards.map { |oc| "[[#{oc.name}]]" }.join("\n")
   )
 end
 
@@ -54,29 +54,29 @@ format :html do
   end
 
   view :follow_status do |args|
-    %(
-      <h4>Get notified about changes</h4>
+    delete_options =
+      wrap_with(:ul, class: 'delete-list list-group') do
+        card.item_names.map do |option|
+          content_tag :li, class: 'list-group-item' do
+            condition = option == '*never' ? '*always' : option
+            subformat(card).render_follow_item condition: condition
+          end
+        end.join "\n"
+      end
+
+    follow_link =
+      card_link args[:card_key],
+                text: 'more options',
+                path_opts: {
+                  view: :related,
+                  related: { name: card.name, view: :edit_single_rule }
+                },
+                class: 'btn update-follow-link',
+                'data-card_key' => args[:card_key]
 
-      #{wrap_with(:ul, class: 'delete-list list-group') do
-          card.item_names.map do |option|
-            content_tag :li, class: 'list-group-item' do
-              condition = option == '*never' ? '*always' : option
-              subformat(card).render_follow_item condition: condition
-            end
-          end.join "\n"
-        end}
+    header = '<h4>Get notified about changes</h4>'
 
-      #{card_link(args[:card_key],                     text: 'more options',
-                                                       path_opts: {
-                                                         view: :related,
-                                                         related: {
-                                                           name: card.name,
-                                                           view: :related_edit_rule
-                                                         }
-                                                       },
-                                                       class: 'btn update-follow-link',
-                                                       'data-card_key' => args[:card_key])}
-    )
+    [header, delete_options, follow_link].join "\n\n"
   end
 
   view :delete_follow_rule_button do |_args|

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -1,16 +1,19 @@
 include Card::Set::Type::Pointer
 
 def raw_content
-  @raw_content ||=
-    if left
-      items = if left.type_id == Card::UserID
-                user = left
-                follow_rules = Card.preference_cards left.name, 'follow'
-                follow_rules.map { |card| "[[#{card.name}]]" }
-              end.join "\n"
-    else
-      ''
-    end
+  item_names.map { |name| "[[#{name}]]" }
+end
+
+def item_names
+  if (user = left)
+    Card.preference_names user.name, 'follow'
+  else
+    []
+  end
+end
+
+def item_cards
+  item_names.map { |name| Card.fetch name }
 end
 
 def virtual?
@@ -61,28 +64,24 @@ format :html do
   end
 
   def each_suggestion
-    if (suggestions = Card['follow suggestions'])
-      suggestions.item_names.each do |sug|
-        if (set_card = Card.fetch sug.to_name.left) &&
-          set_card.type_code == :set
-          option_card = Card.fetch(sug.to_name.right) ||
-            Card[sug.to_name.right.to_sym]
-          option = if option_card.follow_option?
-                     option_card.name
-                   else
-                     '*always'
-                   end
-          yield(set_card, option)
-        elsif (set_card = Card.fetch sug) && set_card.type_code == :set
-          yield(set_card, '*always')
-        end
+    return unless (suggestions = Card['follow suggestions'])
+    suggestions.item_names.each do |sug|
+      set_card = Card.fetch sug.to_name.left
+      if set_card && set_card.type_code == :set
+        sugtag = sug.to_name.right
+        option_card = Card.fetch(sugtag) || Card[sugtag.to_sym]
+        option = option_card.follow_option? ? option_card.name : '*always'
+        yield(set_card, option)
+      elsif (set_card = Card.fetch sug) && set_card.type_code == :set
+        yield(set_card, '*always')
       end
     end
   end
 
   # returns hashes with existing and suggested follow options
   # structure:
-  # set_pattern_class => [ {card: rule_card, options: ['*always', '*created'] },.... ]
+  # set_pattern_class =>
+  #  [ {card: rule_card, options: ['*always', '*created'] },.... ]
   def followed_by_set
     res = Hash.new { |h, k| h[k] = [] }
     never = Card[:never].name

data/mod/05_standard/set/all/rich_html/wrapper.rb

@@ -1,6 +1,6 @@
 format :html do
   def slot_options args
-    @@slot_option_keys ||= Card::Chunk::Include.options.reject { |k| k == :view }.unshift :home_view
+    @@slot_option_keys ||= Card::Content::Chunk::Include.options.reject { |k| k == :view }.unshift :home_view
     options_hash = {}
 
     if @context_names.present?
@@ -112,11 +112,17 @@ format :html do
     css_class = "alert alert-#{alert_type} "
     css_class += 'alert-dismissible ' if args[:dismissible]
     css_class += args[:alert_class] if args[:alert_class]
-    close_button = args[:dismissible] ? %(
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      ) : ''
+    close_button =
+      if args[:dismissible]
+        %(
+          <button type="button" class="close" data-dismiss="alert"
+                  aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        )
+      else
+        ''
+      end
     content_tag :div, class: css_class, role: 'alert' do
       close_button + output(yield args)
     end

data/mod/05_standard/set/rstar/rules_editor.rb

@@ -133,7 +133,9 @@ format :html do
     end
   end
 
-  view :related_edit_rule, view: :edit_rule
+  view :edit_single_rule do |args|
+    %(<div class="edit-single-rule panel-body">#{render_edit_rule args}</div>)
+  end
 
   def default_edit_rule_args args
     args[:remote] ||= true
@@ -162,7 +164,7 @@ format :html do
       end
   end
 
-  def default_related_edit_rule_args args
+  def default_edit_single_rule_args args
     args[:remote] ||= false
     args[:success] ||= {
       card: args[:parent] || card,
@@ -172,10 +174,10 @@ format :html do
       item: nil
     }
     default_edit_rule_args args
-    related_edit_rule_button_args args
+    edit_single_rule_button_args args
   end
 
-  def related_edit_rule_button_args args
+  def edit_single_rule_button_args args
     args[:delete_button] = delete_button args, '.card-slot.related-view'
     args[:cancel_button] = card_link(
       args[:success][:id],

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

@@ -8,7 +8,6 @@ event :admin_tasks, :initialize, on: :update do
       when :empty_trash          then Card.empty_trash
       when :clear_view_cache     then Card::ViewCache.reset
       when :delete_old_revisions then Card::Action.delete_old
-      when :delete_old_sessions  then Card.delete_old_sessions
       when :repair_permissions   then Card.repair_all_permissions
       end
       Env.params[:success] = Card[:stats].name
@@ -18,12 +17,3 @@ event :admin_tasks, :initialize, on: :update do
     end
   end
 end
-
-module ClassMethods
-  def delete_old_sessions
-    return unless (months = Env.params[:months].to_i) && months > 0
-    ActiveRecord::SessionStore::Session.delete_all(
-      ['updated_at < ?', months.months.ago]
-    )
-  end
-end

data/mod/05_standard/set/self/stats.rb

@@ -29,26 +29,17 @@ format :html do
           <td>#{Card::Reference.count}</td>
           <td>#{link_to 'repair all', card_path('update/:all?task=repair_references')}</td>
         </tr>
-        <tr>
-          <td>sessions</td>
-          <td>#{ActiveRecord::SessionStore::Session.count}</td>
-          <td>
-            delete older than
-            #{delete_sessions_link 1}
-            #{delete_sessions_link 2}
-            #{delete_sessions_link 3}
-            months
-          </td>
-        </tr>
-        #{if Card.config.view_cache
-            %(
+        #{
+          if Card.config.view_cache
+            %{
               <tr>
                 <td>view cache</td>
                 <td>#{Card::ViewCache.count}</td>
                 <td>#{link_to 'clear view cache',  card_path('update/:all?task=clear_view_cache')}</td>
               </tr>
-            )
-          end}
+            }
+          end
+        }
 
         <tr>
           <td>memory now</td>

data/mod/05_standard/set/type/set.rb

@@ -228,12 +228,6 @@ def junction_only?
   end
 end
 
-def reset_set_patterns
-  Card.cached_set_members(key).each do |mem|
-    Card.expire mem
-  end
-end
-
 def label
   if (klass = subclass_for_set)
     klass.label cardname.left

data/mod/05_standard/spec/chunk/include_spec.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Chunk::Include, 'Inclusion' do
+describe Card::Content::Chunk::Include, 'Inclusion' do
   context 'syntax parsing' do
     before do
-      @class = Card::Chunk::Include
+      @class = Card::Content::Chunk::Include
     end
 
     let :instance do