card 1.92.2 → 1.93.0

data/mod/machines/lib/javascript/decko_layout.js.coffee

@@ -6,19 +6,27 @@ wrapDeckoLayout = ->
   if $footer
     $('body').append $footer
 
-wrapSidebarToggle = (toggle) ->
-  "<div class='container'><div class='row'>#{toggle}</div></div>"
+wrapSidebarToggle = (toggle, flex) ->
+  "<div class='container'><div class='row #{flex}'>#{toggle}</div></div>"
 
 containerClass = ->
   if $('body').hasClass('fluid') then "container-fluid" else "container"
 
+toggleButton = (side) ->
+  icon_dir = if side == 'left' then 'right' else 'left'
+  "<button class='offcanvas-toggle btn btn-secondary "+
+    "d-sm-none' data-toggle='offcanvas-#{side}'>" +
+    "<i class='material-icons'>chevron_#{icon_dir}</i></button>"
 
 sidebarToggle = (side) ->
-  icon_dir = if side == 'left' then 'right' else 'left'
-  "<button class='offcanvas-toggle offcanvas-toggle-#{side} btn btn-secondary "+
-    "hidden-sm-up' data-toggle='offcanvas-#{side}'>" +
-    "<i class='material-icons'>chevron-#{icon_dir}</i></button>"
+  if side == "both"
+    wrapSidebarToggle(toggleButton("left") + toggleButton("right"), "flex-row justify-content-between")
+  else if side == "left"
+    wrapSidebarToggle(toggleButton("left"), "flex-row")
+  else
+    wrapSidebarToggle(toggleButton("right"), "flex-row-reverse")
 
+2
 singleSidebar = (side) ->
   $article = $('body > article').first()
   $aside   = $('body > aside').first()
@@ -31,7 +39,7 @@ singleSidebar = (side) ->
   else
     $('body').append($article).append($aside)
   wrapDeckoLayout()
-  $article.prepend(wrapSidebarToggle(sidebarToggle(side)))
+  $article.prepend(sidebarToggle(side))
 
 doubleSidebar = ->
   $article    = $('body > article').first()
@@ -43,7 +51,7 @@ doubleSidebar = ->
   $asideRight.addClass("#{sideClass} sidebar-offcanvas-right")
   $('body').append($asideLeft).append($article).append($asideRight)
   wrapDeckoLayout()
-  toggles = wrapSidebarToggle(sidebarToggle('right') + sidebarToggle('left'))
+  toggles = sidebarToggle('both')
   $article.prepend(toggles)
 
 $.fn.extend toggleText: (a, b) ->

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -1144,3 +1144,12 @@ li.ProseMirror-selectednode:after {
   margin-top: 5px;
   display: none;
 }
+
+._prototype {
+  display: none!important;
+}
+
+._filter_container .input-group-btn .btn {
+  height: 100%;
+}
+

data/mod/machines/set/abstract/machine.rb

@@ -60,7 +60,7 @@ class << self
     host_class.output_config = { filetype: "txt" }
 
     # for compatibility with old migrations
-    return unless  Codename[:machine_output]
+    return unless Codename.exist? :machine_output
 
     host_class.card_accessor :machine_output, type: :file
     host_class.card_accessor :machine_input, type: :pointer
@@ -158,16 +158,19 @@ def run_engine input_card
     return cached.content
   end
 
-  input = if input_card.respond_to? :machine_input
-            input_card.machine_input
-          else
-            input_card.format._render_raw
-          end
-  output = engine(input)
+  output = engine input_from_card(input_card)
   cache_output_part input_card, output
   output
 end
 
+def input_from_card input_card
+  if input_card.respond_to? :machine_input
+    input_card.machine_input
+  else
+    input_card.format._render_raw
+  end
+end
+
 def fetch_cache_card input_card, new=nil
   new &&= { type_id: PlainTextID }
   Card.fetch input_card.name, name, :machine_cache, new: new
@@ -204,8 +207,8 @@ def make_machine_output_coded mod=:machines
   update_machine_output
   Auth.as_bot do
     output_codename =
-      machine_output_card.cardname.parts.map do |part|
-        Card[part].codename.to_s || Card[part].cardname.safe_key
+      machine_output_card.name.parts.map do |part|
+        Card[part].codename.to_s || Card[part].name.safe_key
       end.join "_"
     machine_output_card.update_attributes! codename: output_codename,
                                            storage_type: :coded,

data/mod/machines/set/abstract/script.rb

@@ -50,6 +50,10 @@ format do
   def chunk_list  # turn off autodetection of uri's
     :nest_only
   end
+
+  # def default_nest_view
+  #   :raw
+  # end
 end
 
 format :html do

data/mod/machines/set/self/script_slot.rb

@@ -1,7 +1,8 @@
 include_set Abstract::CodeFile
 
 def source_files
-  %w[decko_mod decko_editor decko_layout decko_navbox decko_upload decko].map do |n|
+  %w[decko_mod decko_editor decko_layout decko_navbox decko_upload
+     decko_filter decko].map do |n|
     "#{n}.js.coffee"
   end
 end

data/mod/machines/set/type/css.rb

@@ -30,6 +30,10 @@ def clean_html?
 end
 
 format do
+  # def default_nest_view
+  #   :raw
+  # end
+
   def chunk_list # turn off autodetection of uri's
     :references
   end

data/mod/machines/spec/set/type/skin_spec.rb

@@ -52,7 +52,7 @@ describe Card::Set::Type::Skin do
                             type: :pointer, content: "[[test skin supplier]]"
       skin << item
       skin.putty
-      updated_machine = Card.gimme machine.cardname
+      updated_machine = Card.gimme machine.name
       path = updated_machine.machine_output_path
       expect(File.read(path)).to eq(compressed_css)
     end
@@ -72,7 +72,7 @@ describe Card::Set::Type::Skin do
         machine.machine_output_url
         Card["skin_item"].update_attributes content: new_css
       end
-      updated_machine = Card.gimme machine.cardname
+      updated_machine = Card.gimme machine.name
       path = updated_machine.machine_output_path
       expect(File.read(path)).to eq(compressed_new_css)
       expect(updated_machine.machine_input_card.content)

data/mod/machines/spec/shared_examples/machine_input.rb

@@ -32,7 +32,7 @@ shared_examples_for "machine input" do
       Card::Auth.as_bot do
         input.delete!
       end
-      f = Card.gimme machine.cardname
+      f = Card.gimme machine.name
       path = f.machine_output_path
       expect(File.read(path)).to eq("")
     end
@@ -45,7 +45,7 @@ shared_examples_for "machine input" do
   context "when updated" do
     it "updates output of related machine card" do
       input.putty content: card_content[:changed_in]
-      updated_machine = Card.gimme machine.cardname
+      updated_machine = Card.gimme machine.name
       path = updated_machine.machine_output_path
       expect(File.read(path)).to eq(card_content[:changed_out])
     end
@@ -56,7 +56,7 @@ shared_examples_for "machine input" do
       if machine.is_a? Card::Set::Type::Pointer
         machine << more_input
         machine.putty
-        updated_machine = Card.gimme machine.cardname
+        updated_machine = Card.gimme machine.name
         path = updated_machine.machine_output_path
         out = if card_content[:added_out]
                 card_content[:added_out]

data/mod/notifications/format/email_html_format.rb

@@ -8,6 +8,10 @@ class Card
       def internal_url relative_path
         card_url relative_path
       end
+
+      def self.view_caching?
+        false
+      end
     end
   end
 end

data/mod/notifications/set/all/follow.rb

@@ -67,7 +67,7 @@ format :html do
       title:           hash[:title],
       "data-path"      => hash[:path],
       "data-toggle"    => "modal",
-      "data-target"    => "#modal-#{card.cardname.safe_key}"
+      "data-target"    => "#modal-#{card.name.safe_key}"
     )
     opts[:class] = "follow-link #{opts[:class]}"
     opts[:path] = hash[:path]

data/mod/notifications/set/all/send_notifications.rb

@@ -13,7 +13,7 @@ class FollowerStash
       notify_direct_followers card
       return if !(left_card = card.left) || @visited.include?(left_card.key) ||
                 !(follow_field_rule = left_card.rule_card(:follow_fields))
-      follow_field_rule.item_names(context: left_card.cardname).each do |item|
+      follow_field_rule.item_names(context: left_card.name).each do |item|
         if @visited.include? item.to_name.key
           add_affected_card left_card
           break
@@ -82,10 +82,10 @@ def notable_change?
 end
 
 def current_act_card?
-  return false unless current_act
-  current_act.card_id.nil? || current_act.card_id == id
+  return false unless (act_card = ActManager.act_card)
+  act_card.id.nil? || act_card.id == id
   # FIXME: currently card_id is nil for deleted acts (at least
-  # in the store phase when it's tested).  This nil test was needed
+  # in the store phase when it's tested).  The nil test was needed
   # to make this work.
 end
 
@@ -105,22 +105,16 @@ event :stash_followers, :store,
 end
 
 event :notify_followers_after_delete, :integrate,
-      on: :delete, when: proc { |ca| ca.notable_change? } do
+      on: :delete, when: proc { |ca|  ca.notable_change? } do
   notify_followers
 end
 
 def notify_followers
-  @current_act.reload
-  @follower_stash ||= FollowerStash.new
-  @current_act.actions.each do |a|
-    next if !a.card || a.card.silent_change?
-    @follower_stash.add_affected_card a.card
-  end
-  @follower_stash.each_follower_with_reason do |follower, reason|
-    if follower.account && follower != @current_act.actor
-      follower.account.send_change_notice @current_act, reason[:set_card].name,
-                                          reason[:option]
-    end
+  act = ActManager.act
+  act.reload
+  act_followers(act).each_follower_with_reason do |follower, reason|
+    next if !follower.account || (follower == act.actor)
+    follower.account.send_change_notice act, reason[:set_card].name, reason[:option]
   end
 # this error handling should apply to all extend callback exceptions
 rescue => e
@@ -129,7 +123,14 @@ rescue => e
   notable_exception_raised
 end
 
-
+def act_followers act
+  @follower_stash ||= FollowerStash.new
+  act.actions.each do |a|
+    next if !a.card || a.card.silent_change?
+    @follower_stash.add_affected_card a.card
+  end
+  @follower_stash
+end
 
 format do
   view :list_of_changes, denial: :blank, cache: :never do |args|

data/mod/notifications/set/right/bcc.rb

@@ -20,7 +20,7 @@ end
 format :email_text do
   view :email_addresses, cache: :never do |args|
     context = args[:context] || self
-    card.item_names(context: context.cardname).map do |item_name|
+    card.item_names(context: context.name).map do |item_name|
       # note that context is processed twice here because pointers absolutize
       # item_names by default while other types can return relative names.
       # That's poor default behavior and should be fixed!

data/mod/notifications/set/right/follow.rb

@@ -41,7 +41,7 @@ format :html do
 
   def follow_item_button condition
     action = add_follow_item?(condition) ? :add : :delete
-    _optional_render "#{action}_follow_rule_button"
+    _render "#{action}_follow_rule_button"
   end
 
   def follow_item_link condition
@@ -50,7 +50,7 @@ format :html do
 
   def follow_item_link_target
     set = card.rule_set
-    setname = set.cardname
+    setname = set.name
     set.tag.codename == :self ? setname.left : setname.field("by name")
   end
 
@@ -68,7 +68,7 @@ format :html do
 
   view :follow_status do |args|
     ["<h4>Get notified about changes</h4>",
-     render(:follow_status_delete_options),
+     render!(:follow_status_delete_options),
      follow_status_link(card.name, args[:card_key])].join "\n\n"
   end
 

data/mod/notifications/set/right/followers.rb

@@ -18,7 +18,7 @@ format :html do
   end
 end
 
-def raw_content
+def content
   return "" unless left
   items =
     if (left.type_id == SetID) || (left.type_id == CardtypeID)

data/mod/notifications/set/right/following.rb

@@ -8,7 +8,7 @@ format :html do
     if card.left && Auth.signed_in?
       render_rule_editor args
     else
-      fname = "#{card.cardname.left}+#{Card[:followers].name}"
+      fname = "#{card.name.left}+#{Card[:followers].name}"
       fcard = Card.fetch fname
       nest fcard, view: :titled, items: { view: :link }
     end
@@ -40,7 +40,7 @@ format :html do
       card.left.default_follow_set_card.name,
       Auth.current.name,
       Card[:follow].name
-    ].join("+")
+    ].join Card::Name.joint
     rule_context = Card.fetch preference_name, new: { type_id: PointerID }
 
     wrap_with :div, class: "edit-rule" do

data/mod/notifications/set/right/html_message.rb

@@ -4,8 +4,3 @@ def clean_html?
   false
 end
 
-format :email_html do
-  def view_caching?
-    false
-  end
-end

data/mod/notifications/set/right/text_message.rb

@@ -1,7 +1,2 @@
 include_set Abstract::TestContext
 
-format :text do
-  def view_caching?
-    false
-  end
-end

data/mod/notifications/set/self/follow_defaults.rb

@@ -34,9 +34,9 @@ format :html do
     frame_and_form :update, hidden: { success: "_self",
                                       card: { update_all_users: false } } do
       [
-        _optional_render_content_formgroup,
-        _optional_render_confirm_update_all,
-        _optional_render_edit_buttons
+        _render_content_formgroup,
+        _render_confirm_update_all,
+        _render_edit_buttons
       ]
     end
   end

data/mod/notifications/set/type_plus_right/user/follow.rb

@@ -1,6 +1,6 @@
 include Card::Set::Type::Pointer
 
-def raw_content
+def content
   item_names.map { |name| "[[#{name}]]" }
 end
 

data/mod/notifications/spec/set/right/followers_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Followers do
-  describe "#raw_content" do
+  describe "#content" do
     it "returns a pointer list of followers" do
       card = Card.fetch "All Eyes on me"
       expect(card.followers_card.item_names.sort)

data/mod/pointer/set/abstract/01_paging.rb

@@ -20,7 +20,7 @@ end
 
 format :html do
   def with_paging path_args={}
-    output [yield( paging_path_args(path_args)), _optional_render_paging]
+    output [yield( paging_path_args(path_args)), _render_paging]
   end
 
   view :paging, cache: :never do

data/mod/pointer/set/abstract/02_pointer.rb

@@ -180,8 +180,8 @@ def item args={}
 end
 
 def item_names args={}
-  context = args[:context] || context_card.cardname
-  content = args[:content] || raw_content
+  context = args[:context] || context_card.name
+  content = args[:content] || self.content
   raw_items = content.to_s.split(/\n+/)
   if args[:limit].present? && args[:limit].to_i > 0
     offset = args[:offset] || 0

data/mod/pointer/set/abstract/02_pointer/edit.rb

@@ -49,7 +49,7 @@ format :html do
   end
 
   def options_card_name
-    (oc = card.options_rule_card) ? oc.cardname.url_key : ":all"
+    (oc = card.options_rule_card) ? oc.name.url_key : ":all"
   end
 
   def add_item_button
@@ -86,13 +86,15 @@ format :html do
   def autocomplete_input
     items = @item_list || card.item_names(context: :raw)
     items = [""] if items.empty?
-    <<-HTML
-      <div class="pointer-list-editor pointer-list-ul"
-          data-options-card="#{options_card_name}">
-        #{text_field_tag 'pointer_item', items.first,
-                         class: 'pointer-item-text form-control'}
-      </div>
-    HTML
+    raw(
+      <<-HTML
+        <div class="pointer-list-editor pointer-list-ul"
+            data-options-card="#{options_card_name}">
+          #{text_field_tag 'pointer_item', items.first,
+                           class: 'pointer-item-text form-control'}
+        </div>
+      HTML
+    )
   end
 
   view :checkbox do |_args|