card 1.19.6 → 1.20.0

data/mod/carrierwave/set/type/image.rb

@@ -5,69 +5,94 @@ include File::SelectedAction
 format do
   include File::Format
 
-  view :closed_content do |_args|
+  view :closed_content do
     _render_core size: :icon
   end
 
-  view :source do |args|
+  view :source, cache: :never do
+    determine_image_size
+    source_url
+  end
+
+  def source_url
     return card.raw_content if card.web?
-    style =
-      case
-      when @mode == :closed then :icon
-      when args[:size]    then args[:size].to_sym
-      when main?          then :large
-      else :medium
-      end
-    style = :original if style.to_sym == :full
-    if style == :original
+    if voo.size == :original
       card.image.url
     else
-      card.image.versions[style].url
+      card.image.versions[voo.size.to_sym].url
+    end
+  end
+
+  def default_core_args _args={}
+    determine_image_size
+  end
+
+  def determine_image_size
+    voo.size =
+      case
+      when @mode == :closed   then :icon
+      when voo.size           then voo.size.to_sym
+      when main?              then :large
+      else                         :medium
     end
+    voo.size = :original if voo.size == :full
   end
 end
 
+
 format :html do
   include File::HtmlFormat
 
-  view :core do |args|
-    handle_source args do |source|
+  view :core, cache: :never do
+    handle_source do |source|
       if source == "missing"
         "<!-- image missing #{@card.name} -->"
       else
-        image_tag(source)
+        image_tag source
       end
     end
   end
 
-  def preview args
-    if !card.new_card? || card.preliminary_upload?
-      content_tag :div, _render_core(args.merge(size: :medium)).html_safe,
-                  class: "attachment-preview",
-                  id: "#{card.attachment.filename}-preview"
+  def preview
+    return unless card.new_card? && !card.preliminary_upload?
+    voo.size = :medium
+    wrap_with :div, class: "attachment-preview",
+                    id: "#{card.attachment.filename}-preview" do
+      _render_core
     end
   end
 
+  def show_action_content_toggle? action, view_type
+    true
+  end
+
   view :content_changes do |args|
-    out = ""
-    size = args[:diff_type] == :summary ? :icon : :medium
-    if !args[:hide_diff] && args[:action] &&
-       (last_change = card.last_change_on(:db_content, before: args[:action]))
-      card.selected_action_id = last_change.card_action_id
-      out << Card::Content::Diff.render_deleted_chunk(_render_core(size: size))
+    action = args[:action]
+    voo.size = args[:diff_type] == :summary ? :icon : :medium
+    [old_image(action, args), new_image(action)].compact.join
+  end
+
+  def old_image action, args
+    return if args[:hide_diff] || !action
+    return unless (last_change = card.last_change_on(:db_content, before: action))
+    card.with_selected_action_id last_change.card_action_id do
+      Card::Content::Diff.render_deleted_chunk _render_core
+    end
+  end
+
+  def new_image action
+    card.with_selected_action_id action.id do
+      Card::Content::Diff.render_added_chunk _render_core
     end
-    card.selected_action_id = args[:action].id
-    out << Card::Content::Diff.render_added_chunk(_render_core(size: size))
-    out
   end
 end
 
 format :css do
-  view :core do |_args|
+  view :core do
     render_source
   end
 
-  view :content do |_args|  # why is this necessary?
+  view :content do  # why is this necessary?
     render_core
   end
 end
@@ -75,12 +100,12 @@ end
 format :file do
   include File::FileFormat
 
-  view :style do |args|  # should this be in model?
-    ["", "full"].member?(args[:style].to_s) ? :original : args[:style]
+  def image_style
+    ["", "full"].member?(params[:size].to_s) ? :original : params[:size].to_sym
   end
 
   def selected_file_version
-    style = _render_style(style: params[:size]).to_sym
+    style = voo.size = image_style.to_sym
     if style && style != :original
       card.attachment.versions[style]
     else

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

@@ -66,10 +66,10 @@ describe Card::Set::Type::Image do
       end
     end
 
-    describe "view: act_expanded" do
+    describe "view: content changes" do
       it "gets image url" do
-        render_args = { act: subject.last_act, action_view: :expanded }
-        act_summary = subject.format.render :act, render_args
+        render_args = { action: subject.last_action, diff_type: :expanded }
+        act_summary = subject.format.render :content_changes, render_args
         current_url = subject.image.versions[:medium].url
         expect(act_summary).to match(/#{Regexp.quote current_url}/)
       end

data/mod/core/chunk/link.rb

@@ -44,6 +44,11 @@ module Card::Content::Chunk
       string_copy.index "|"
     end
 
+    # view options
+    def options
+      link_text ? { title: link_text } : {}
+    end
+
     def objectify raw
       return unless raw
       raw.strip!

data/mod/core/chunk/{include.rb → nest.rb}

@@ -6,19 +6,7 @@ class Card
   class Content
     module Chunk
       # Handler for nest chunks: {{example}}
-      class Include < Reference
-        cattr_reader :options
-        @@options = ::Set.new [
-          :inc_name,   # name as used in nest
-          :inc_syntax, # full nest syntax
-          :items,      # handles pipe-based recursion
-
-          # _conventional options_
-          :view, :type, :title, :params, :variant,
-          :size,        # images only
-          :hide, :show, # affects optional rendering
-          :structure    # override raw_content
-        ]
+      class Nest < Reference
         attr_reader :options
         DEFAULT_OPTION = :view # a value without a key is interpreted as view
 
@@ -33,8 +21,8 @@ class Card
           if name =~ /^\#/
             @process_chunk = name =~ /^\#\#/ ? "" : visible_comment(in_brackets)
           else
-            @options = interpret_options.merge inc_name: name,
-                                               inc_syntax: in_brackets
+            @options = interpret_options.merge nest_name: name,
+                                               nest_syntax: in_brackets
             @name = name
           end
         end
@@ -58,33 +46,24 @@ class Card
 
         def interpret_piped_options list_string, items
           options_hash = items.nil? ? {} : { items: items }
-          style_hash = {}
-          option_string_to_hash list_string, options_hash, style_hash
-          style_hash_to_string options_hash, style_hash
+          option_string_to_hash list_string, options_hash
           options_hash
         end
 
-        def option_string_to_hash list_string, options_hash, style_hash
+        def option_string_to_hash list_string, options_hash
           each_option(list_string) do |key, value|
             key = key.to_sym
             if key == :item
               options_hash[:items] ||= {}
               options_hash[:items][:view] = value
-            elsif @@options.include? key
+            elsif Card::View::Options.nest_keys.include? key
               options_hash[key] = value
-            else
-              style_hash[key] = value
+              # else
+              # handle other keys
             end
           end
         end
 
-        def style_hash_to_string options_hash, style_hash
-          return if style_hash.empty?
-          options_hash[:style] = style_hash.map do |key, value|
-            CGI.escapeHTML "#{key}:#{value};"
-          end * ""
-        end
-
         def inspect
           "<##{self.class}:n[#{@name}] p[#{@process_chunk}] txt:#{@text}>"
         end

data/mod/core/chunk/reference.rb

@@ -7,12 +7,11 @@ class Card
 
         def referee_name
           return if name.nil?
-          @referee_name ||=
-            begin
-              rendered_name = render_obj(name)
-              ref_card = fetch_referee_card rendered_name
-              ref_card ? ref_card.cardname : rendered_name.to_name
-            end
+          @referee_name ||= begin
+            rendered_name = render_obj(name)
+            ref_card = fetch_referee_card rendered_name
+            ref_card ? ref_card.cardname : rendered_name.to_name
+          end
           @referee_name = @referee_name.to_absolute(card.cardname).to_name
         end
 

data/mod/core/chunk/view_stub.rb

@@ -0,0 +1,42 @@
+class Card
+  class Content
+    module Chunk
+      class ViewStub < Abstract
+        Chunk.register_class(
+          self,
+          prefix_re: Regexp.escape("<card-view>"),
+          full_re: /\<card-view\>([^\<]*)\<\/card-view\>/,
+          idx_char: "<"
+        )
+
+        def interpret match, _content
+          @options_json = match[1]
+          @stub_hash = JSON.parse(@options_json).symbolize_keys
+          interpret_hash_values
+        end
+
+        def interpret_hash_values
+          @stub_hash.keys.each do |key|
+            send "interpret_#{key}"
+          end
+        end
+
+        def interpret_cast
+          @stub_hash[:cast].symbolize_keys!
+        end
+
+        def interpret_options
+          @stub_hash[:options].symbolize_keys!
+        end
+
+        def interpret_mode
+          @stub_hash[:mode] = @stub_hash[:mode].to_sym
+        end
+
+        def process_chunk
+          @processed = yield @stub_hash
+        end
+      end
+    end
+  end
+end

data/mod/core/format/html_format.rb

@@ -12,10 +12,31 @@ class Card
       # 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
+        show_layout? ? main? : @depth.zero?
+      end
+
+      def first_head?
+        @first_head ? false : (@first_head = true)
+      end
+
+      def default_nest_view
+        # FIXME: not sure this makes sense as a rule...
+        card.rule(:default_html_view) || :titled
+      end
+
+      def default_item_view
+        :closed
+      end
+
       # helper methods for layout view
-      def get_layout_content
+      def get_layout_content requested_layout
         Auth.as_bot do
-          if (requested_layout = params[:layout])
+          if requested_layout
             layout_from_card_or_code requested_layout
           else
             layout_from_rule
@@ -44,35 +65,11 @@ class Card
         end
       end
 
-      def get_nest_defaults nested_card
-        { view: (nested_card.rule(:default_html_view) || :titled) }
-      end
-
-      def default_item_view
-        :closed
-      end
-
       def html_escape_except_quotes s
         # to be used inside single quotes (makes for readable json attributes)
         s.to_s.gsub(/&/, "&").gsub(/\'/, "'")
          .gsub(/>/, "&gt;").gsub(/</, "&lt;")
       end
-
-      def main?
-        if show_layout?
-          @depth == 1 && @mainline # assumes layout includes {{_main}}
-        else
-          @depth.zero? && params[:is_main]
-        end
-      end
-
-      def focal? # meaning the current card is the requested card
-        if show_layout?
-          main?
-        else
-          @depth.zero?
-        end
-      end
     end
   end
 end

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

@@ -46,7 +46,7 @@ view :raw do |_args|
 end
 
 format :html do
-  view :editor do |_args|
+  view :editor do
     "Content is stored in file and can't be edited."
   end
 end

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

@@ -102,7 +102,7 @@ rescue Card::Error::Abort => e
     if @supercard
       @supercard.subcards.delete key
       @supercard.director.subdirectors.delete self
-      expire_soft
+      expire :soft
     end
     true
   end

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

@@ -30,6 +30,5 @@ end
 # FIXME: -this needs a better home!
 def format opts={}
   opts = { format: opts.to_sym } if [Symbol, String].member? opts.class
-
   Card::Format.new self, opts
 end

data/mod/core/set/all/{tracked_attributes.rb → assign_attributes.rb}

@@ -1,22 +1,13 @@
+
 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]
-    end
+  args = prepare_assignment_args args
 
-    new_type_id = extract_type_id! args unless args.delete("skip_type_lookup")
-    subcard_args = extract_subcard_args! args
-    args["type_id"] = new_type_id if new_type_id
-    reset_patterns
+  assign_with_subcards args do
+    assign_with_set_modules args do
+      params = prepare_assignment_params args
+      super params
+    end
   end
-  params = ActionController::Parameters.new(args)
-  params.permit!
-  super params
-  return unless args && subcard_args.present?
-  # name= must come before process subcards
-  subcards.add subcard_args
 end
 
 def assign_set_specific_attributes
@@ -28,6 +19,54 @@ end
 
 protected
 
+def prepare_assignment_params args
+  params = ActionController::Parameters.new(args)
+  params.permit!
+  params
+end
+
+def prepare_assignment_args args
+  return {} unless args
+  args = args.stringify_keys
+  normalize_type_attributes args
+  stash_set_specific_attributes args
+  args
+end
+
+def assign_with_set_modules args
+  set_changed = args["name"] || args["type_id"]
+  return yield unless set_changed
+
+  refresh_set_modules { yield }
+end
+
+def assign_with_subcards args
+  subcard_args = extract_subcard_args! args
+  yield
+  # name= must come before process subcards
+  return unless subcard_args.present?
+  subcards.add subcard_args
+end
+
+def refresh_set_modules
+  reload_set_modules = @set_mods_loaded
+  yield
+  reset_patterns
+  include_set_modules if reload_set_modules
+end
+
+def stash_set_specific_attributes args
+  @set_specific = {}
+  Card.set_specific_attributes.each do |key|
+    @set_specific[key] = args.delete(key) if args[key]
+  end
+end
+
+def normalize_type_attributes args
+  new_type_id = extract_type_id! args unless args.delete("skip_type_lookup")
+  args["type_id"] = new_type_id if new_type_id
+end
+
 def extract_subcard_args! args
   subcards = args.delete("subcards") || {}
   if (subfields = args.delete("subfields"))
@@ -61,11 +100,3 @@ def extract_type_id! args={}
   end
   type_id
 end
-
-event :set_content, :store, on: :save do
-  self.db_content = content || "" # necessary?
-  self.db_content = Card::Content.clean!(db_content) if clean_html?
-  @selected_action_id = @selected_content = nil
-  clear_drafts
-  reset_patterns_if_rule true
-end