card 1.96.8 → 1.97.0

data/mod/carrierwave/spec/set/type/image_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-require 'image_spec'
 
-describe Card::Set::Type::Image do
+RSpec.describe Card::Set::Type::Image do
   it "has special editor" do
     assert_view_select render_editor("Image"), 'div[class="choose-file"]' do
       assert_select 'input[class~="file-upload slotter"]'
@@ -96,17 +96,17 @@ describe Card::Set::Type::Image do
     end
   end
 
-  describe "*logo mod image" do
-    subject { Card[:logo] }
+  describe "mod image" do
+    subject { Card[:cerulean_skin_image] }
 
     it "exists" do
       expect(subject.image.size).to be > 0
     end
     it "has correct url" do
-      expect(subject.image.url).to eq "/files/:logo/standard-original.png"
+      expect(subject.image.url).to eq "/files/:cerulean_skin_image/bootstrap-original.png"
     end
     it "has correct url as content" do
-      expect(subject.content).to eq ":#{subject.codename}/standard.png"
+      expect(subject.content).to eq ":#{subject.codename}/bootstrap.png"
     end
 
     it "becomes a regular file when changed" do
@@ -129,7 +129,7 @@ describe Card::Set::Type::Image do
     describe "source view" do
       it "renders url with original version" do
         expect(subject.format.render_source)
-          .to eq "/files/:#{subject.codename}/standard-medium.png"
+          .to eq "/files/:#{subject.codename}/bootstrap-medium.png"
       end
     end
   end

data/mod/core/chunk/nest.rb

@@ -56,7 +56,7 @@ class Card
             if key == :item
               options_hash[:items] ||= {}
               options_hash[:items][:view] = value
-            elsif Card::View::Options.ruler_keys.include? key
+            elsif Card::View::Options.shark_keys.include? key
               options_hash[key] = value
               # else
               # handle other keys
@@ -92,6 +92,14 @@ class Card
           end
         end
 
+        def main?
+          nest_name == "_main"
+        end
+
+        def nest_name
+          options&.dig :nest_name
+        end
+
         private
 
         def each_option attr_string

data/mod/core/format/html_format.rb

@@ -4,20 +4,18 @@ require_dependency "card/content/diff"
 
 class Card
   class Format
+    # Main Format class for formatting card views in HTML
     class HtmlFormat < Format
       register :html
 
       attr_accessor :options_need_save, :start_time, :skip_autosave
 
-      # TODO: use CodeFile cards for these
-      # builtin layouts allow for rescue / testing
-      LAYOUTS = Mod::Loader.load_layouts.merge "none" => "{{_main}}"
-
       def main?
         !@main.nil?
       end
 
-      def focal? # meaning the current card is the requested card
+      # is the current card the requested card?
+      def focal?
         show_layout? ? main? : depth.zero?
       end
 
@@ -27,51 +25,17 @@ class Card
       end
 
       def default_item_view
-        :closed
-      end
-
-      # helper methods for layout view
-      def get_layout_content requested_layout
-        Auth.as_bot do
-          if requested_layout
-            layout_from_card_or_code requested_layout
-          else
-            layout_from_rule
-          end
-        end
-      end
-
-      def layout_from_rule
-        if (rule = card.rule_card :layout) &&
-           (rule.type_id == Card::PointerID) &&
-           (layout_name = rule.item_name)
-          layout_from_card_or_code layout_name
-        end
-      end
-
-      def layout_from_card_or_code name
-        layout_card = Card.quick_fetch name
-        if layout_card && layout_card.ok?(:read)
-          layout_card.content
-        elsif (hardcoded_layout = LAYOUTS[name])
-          hardcoded_layout
-        else
-          content_tag(:h1, I18n.t(:unknown_layout, scope: "mod.core.format.html_format",
-                                                   name: name)) +
-            I18n.t(:built_in, scope: "mod.core.format.html_format",
-                              built_in_layouts: LAYOUTS.keys.join(', '))
-        end
-      end
-
-      def html_escape_except_quotes s
-        # to be used inside single quotes (makes for readable json attributes)
-        s.to_s.gsub(/&/, "&amp;").gsub(/\'/, "&apos;")
-         .gsub(/>/, "&gt;").gsub(/</, "&lt;")
+        :mini_bar
       end
 
       def mime_type
         "text/html"
       end
+
+      def final_render_call method
+        rendered = super
+        rendered.is_a?(Array) ? output(rendered) : rendered
+      end
     end
   end
 end

data/mod/core/layout/blank.html

@@ -1,5 +1,5 @@
-<!DOCTYPE HTML>
-<html>
-  <head> {{*head|core}} </head>
-  <body id="wagn"> {{_main}} </body>
-</html>
+<body>
+  {{_main}}
+</body>
+
+

data/mod/core/layout/default.html

@@ -1,10 +1,12 @@
-<!DOCTYPE HTML>
 <html>
-  <head>{{*head|core}}</head>
-  <body>
-    <header>{{*header|core}}</header>
-    <article>{{_main|open}}</article>
-    <aside>{{*sidebar|core}}</aside>
-    <footer>{{*footer|core}}</footer>
-  </body>
+<head>
+  myhead
+</head>
+
+<body class="right-sidebar">
+  <header>{{*header|core}}</header>
+  <article>{{_main|open}}</article>
+  <aside>{{*sidebar|core}}</aside>
+  <footer>{{*footer|core}}</footer>
+</body>
 </html>

data/mod/core/layout/noside.html

@@ -1,9 +1,6 @@
-<!DOCTYPE HTML>
-<html>
-  <head>{{*head|core}}</head>
-  <body>
-    <header>{{*header|core}}</header>
-    <article>{{_main|open}}</article>
-    <footer>{{*footer|core}}</footer>
-  </body>
-</html>
+<body>
+  <header>{{*header|core}}</header>
+  <article>{{_main|open}}</article>
+  <footer>{{*footer|core}}</footer>
+</body>
+

data/mod/core/layout/pre.html

@@ -1,2 +1 @@
-<!DOCTYPE HTML>
-<html> <body><pre>{{_main|raw}}</pre></body> </html>
+<body><pre>{{_main|raw}}</pre></body>

data/mod/core/layout/simple.html

@@ -1,5 +1 @@
-<!DOCTYPE HTML>
-<html>
-  <head> {{*head|core}} </head>
-  <body> {{_main}} </body>
-</html>
+<body> {{_main}} </body>

data/mod/core/set/abstract/code_file.rb

@@ -63,7 +63,7 @@ format :html do
     "#{card.name}: #{number_to_human_size card.content.bytesize}"
   end
 
-  view :bar_middle do
+  def short_content
     fa_icon("exclamation-circle", class: "text-muted pr-2") +
       wrap_with(:span, "file", class: "text-muted")
   end

data/mod/core/set/all/cache.rb

@@ -1,6 +1,4 @@
 module ClassMethods
-
-
   def retrieve_from_cache cache_key, local_only=false
     return unless cache
     local_only ? cache.soft.read(cache_key) : cache.read(cache_key)

data/mod/core/set/all/codename.rb

@@ -8,6 +8,8 @@ event :validate_codename, :validate, on: :update, changed: :codename do
 end
 
 event :reset_codename_cache, :integrate, changed: :codename do
+  return if @action == :create && codename.nil?
+
   Card::Codename.reset_cache
 end
 

data/mod/core/set/all/collection.rb

@@ -38,11 +38,13 @@ def collection?
   item_cards != [self]
 end
 
-format :html do
+format do
   view :count do
     card.item_names.size
   end
+end
 
+format :html do
   view :carousel do
     bs_carousel unique_id, 0 do
       nest_item_array.each do |rendered_item|

data/mod/core/set/all/event_conditions.rb

@@ -1,5 +1,5 @@
 def event_applies? event
-  return unless set_condition_applies? event.set_module
+  return unless set_condition_applies? event.set_module, event.opts.key?(:changing)
 
   Card::Set::Event::CONDITIONS.all? do |key|
     send "#{key}_condition_applies?", event, event.opts[key]
@@ -8,9 +8,14 @@ end
 
 private
 
-def set_condition_applies? set_module
-  # events on Card are used for testing
-  set_module == Card || singleton_class.include?(set_module)
+# existing card is being changed in a way that alters its sets
+def updating_sets?
+  @action == :update && real? && (type_id_is_changing? || name_is_changing?)
+end
+
+def set_condition_applies? set_module, old_sets
+  return true if set_module == Card
+  set_condition_card(old_sets).singleton_class.include? set_module
 end
 
 def on_condition_applies? _event, actions
@@ -19,12 +24,39 @@ def on_condition_applies? _event, actions
   actions.include? @action
 end
 
+# if changing name/type, the old card has no-longer-applicable set modules, so we create
+# a new card to determine whether events apply.
+# (note: cached condition card would ideally be cleared after all
+# conditions are reviewed)
+# @param old_sets [True/False] whether to use the old_sets
+def set_condition_card old_sets
+  return self if old_sets || no_current_action?
+  @set_condition_card ||=
+    updating_sets? ? set_condition_card_with_new_set_modules : self
+end
+
+# prevents locking in set_condition_card
+def no_current_action?
+  return false if @current_action
+
+  @set_condition_card = nil
+  true
+end
+
+def set_condition_card_with_new_set_modules
+  cc = Card.find id
+  cc.name = name
+  cc.type_id = type_id
+  cc.include_set_modules
+end
+
 def changed_condition_applies? _event, db_columns
   return true unless @action == :update
   db_columns = Array(db_columns).compact
   return true if db_columns.empty?
   db_columns.any? { |col| single_changed_condition_applies? col }
 end
+alias_method :changing_condition_applies?, :changed_condition_applies?
 
 def when_condition_applies? _event, block
   case block

data/mod/core/set/all/export.rb

@@ -51,7 +51,7 @@ format :json do
 
   def items_for_export
     nest_chunks.map do |chunk|
-      next if main_nest_chunk? chunk
+      next if chunk.try :main?
       chunk.referee_card
     end.compact
   end
@@ -65,13 +65,4 @@ format :json do
   def valid_export_card? ecard
     ecard.real? && !@exported_keys.include?(ecard.key)
   end
-
-  def main_nest_chunk? chunk
-    chunk_nest_name(chunk) == "_main"
-  end
-
-  def chunk_nest_name chunk
-    return unless chunk.respond_to? :options
-    chunk.options&.dig :nest_name
-  end
 end

data/mod/core/set/all/haml.rb

@@ -58,10 +58,11 @@ format do
     haml_to_html(*args)
   end
 
-  def process_haml_template template_name, locals={}
+  def process_haml_template template_name, *args
+    locals = args.first || {}
     path = identify_template_path template_name, locals
     with_template_path path do
-      haml_to_html ::File.read(path), locals
+      haml_to_html ::File.read(path), *args
     end
     # rescue => e
     #   raise Card::Error, "HAML error #{template_name}: #{e.message}\n#{e.backtrace}"

data/mod/core/set/all/layouts.rb

@@ -0,0 +1,34 @@
+format :html do
+  attr_reader :interior
+
+  def layout_nest
+    wrap_main { interior }
+  end
+
+  layout :pre do  # {{_main|raw}}
+    wrap_with :pre do
+      layout_nest
+    end
+  end
+
+  layout :simple do
+    layout_nest
+  end
+
+  layout :no_side do # {{_main|open}}
+    <<-HTML.strip_heredoc
+      <header>#{nest :header, view: :core}</header>
+      <article>#{layout_nest}</article>
+      <footer>{nest :footer, view: :core}</footer>
+    HTML
+  end
+
+  layout :default do
+    <<-HTML.strip_heredoc
+      <header>#{nest :header, view: :core}</header>
+      <article>#{layout_nest}</article>
+      <aside>#{nest :sidebar, view: :core}</aside>
+      <footer>{nest :footer, view: :core}</footer>
+    HTML
+  end
+end

data/mod/core/set/all/name_events.rb

@@ -82,7 +82,7 @@ def changing_existing_tag_to_junction?
 end
 
 def name_in_use_as_tag?
-  Auth.as_bot { Card.count_by_wql right_id: id }.positive?
+  !Card.where(right_id: id, trash: false).take.nil?
 end
 
 def changing_name_to_junction?

data/mod/core/set/all/pattern.rb

@@ -16,17 +16,12 @@ def reset_patterns
   true
 end
 
-def reset_patterns_if_rule saving=false
-  if !new_card? && is_rule?
-    set = left
-    set.reset_patterns
-    set.include_set_modules
-
-    # FIXME: should be in right/read.rb
-    if saving && right.id == Card::ReadID
-      add_to_read_rule_update_queue set.item_cards(limit: 0)
-    end
-  end
+def reset_patterns_if_rule _saving=false
+  return unless real? && is_rule? && (set = left)
+
+  set.reset_patterns
+  set.include_set_modules
+  set
 end
 
 def safe_set_keys

data/mod/core/set/all/subcards.rb

@@ -10,6 +10,10 @@ def subfield field_name
   subcards.field field_name
 end
 
+def field? tag
+  field(tag) || subfield(tag)
+end
+
 def subcards
   @subcards ||= Card::Subcards.new self
 end

data/mod/core/set/all/utils.rb

@@ -32,6 +32,7 @@ module ClassMethods
     # puts "merging #{name}"
     card = fetch name, new: {}
     return unless mergeable? card, opts[:pristine]
+
     resolve_file_attributes! attribs
     card.safe_update! attribs
   end
@@ -41,17 +42,19 @@ module ClassMethods
   def resolve_file_attributes! attribs
     %i[image file].each do |attach|
       next unless attribs[attach] && attribs[attach].is_a?(String)
+
       attribs[attach] = ::File.open(attribs[attach])
     end
   end
 
   def mergeable? card, pristine_only
     return true unless pristine_only
+
     !card.pristine?
   end
 end
 
-# sepaarte name and other attributes
+# separate name and other attributes
 def safe_update! attribs
   separate_name_update! attribs.delete("name") unless new?
   update! attribs if attribs.present?
@@ -62,3 +65,20 @@ def separate_name_update! new_name
 
   update! name: new_name
 end
+
+# rubocop:disable Style/GlobalVars
+def measure desc
+  $times ||= {}
+  res = nil
+  t = Benchmark.measure do
+    res = yield
+  end
+  $times[desc] = $times.key?(desc) ? t + $times[desc] : t
+  puts "#{desc}: #{t}".red
+  res
+end
+# rubocop:enable Style/GlobalVars
+
+format do
+  delegate :measure, to: :card
+end