card 1.20.1 → 1.20.2

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

@@ -21,7 +21,7 @@ format do
   end
 
   def source_url
-    card.attachment.url
+    internal_url card.attachment.url
   end
 
   view :core do

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

@@ -16,7 +16,7 @@ format do
 
   def source_url
     return card.raw_content if card.web?
-    selected_version.url
+    internal_url selected_version.url
   end
 
   def selected_version
@@ -90,8 +90,15 @@ format :html do
   end
 end
 
+format do
+  view :inline do
+    _render_core
+  end
+end
+
 format :email_html do
-  view :core do
+  view :inline do
+    determine_image_size
     url_generator = voo.closest_live_option(:inline_attachment_url)
     path = selected_version.path
     return _render_source unless url_generator && ::File.exist?(path)

data/mod/core/chunk/reference.rb

@@ -32,7 +32,7 @@ class Card
               chunk.replace_reference old_name, new_name
             end
           else
-            @name = name.to_name.replace_part(old_name, new_name)
+            @name = name.to_name.replace(old_name, new_name)
           end
         end
 

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

@@ -17,6 +17,19 @@ def assign_set_specific_attributes
   end
 end
 
+def extract_subcard_args! args
+  subcards = args.delete("subcards") ||  args.delete(:subcards) || {}
+  if (subfields = args.delete("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
+  subcards
+end
+
 protected
 
 def prepare_assignment_params args
@@ -67,26 +80,13 @@ def normalize_type_attributes args
   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"))
-    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
-  subcards
-end
-
 def extract_type_id! args={}
   type_id =
     case
     when args["type_id"]
       id = args.delete("type_id").to_i
       # type_id can come in as 0,'' or nil
-      id == 0 ? nil : id
+      id.zero? ? nil : id
     when args["type_code"]
       Card.fetch_id args.delete("type_code").to_sym
     when args["type"]

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

@@ -136,7 +136,7 @@ end
 
 def with_context card
   old_context = @context_card
-  @context_card = card
+  @context_card = card if card
   result = yield
   @context_card = old_context
   result

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

@@ -91,6 +91,10 @@ module ClassMethods
     end
   end
 
+  def fetch_type_id mark
+    (card = quick_fetch(mark)) && card.type_id
+  end
+
   def quick_fetch mark
     fetch mark, skip_virtual: true, skip_modules: true
   end

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

@@ -1,7 +1,86 @@
 format do
-  def render_haml locals={}, template=nil, a_binding=nil, &block
-    template ||= yield
+  # Renders haml templates. The haml template can be passed as string or
+  # block or a symbol that refers to a view template.
+  # @param  template_or_locals [Hash, String, Symbol]
+  #   If a symbol is given then a template is expected in the corresponding view
+  #   directory. Note that {view_template_path} needs to be overridden in
+  #   that case to get the right path to the template.
+  # @return [String] rendered haml as HTML
+  # @example render a view template
+  #   # view/type/basic/my_template.haml:
+  #   %p
+  #     Hi
+  #     = name
+  #
+  #   # set/type/basic.rb:
+  #   view :my_view do
+  #     render_haml :my_template, name: "Joe:  # => "<p>Hi Joe<p/>"
+  #   end
+  # @example use a block to pass haml
+  #   render_haml name: "Joe" do
+  #     <<-HAML.strip_heredoc
+  #       %p
+  #         Hi
+  #         = name
+  #     HAML
+  #   # => <p>Hi Joe</p>
+  # @example create a slot in haml code
+  #   - haml_wrap do
+  #     %p
+  #       some haml
+  def render_haml template_or_locals={}, locals_or_binding=nil, a_binding=nil
+    if template_or_locals.is_a?(Symbol)
+      return render_haml_template template_or_locals, locals_or_binding || {}
+    end
+    if block_given?
+      haml_to_html yield, template_or_locals, locals_or_binding
+    else
+      haml_to_html template_or_locals, locals_or_binding, a_binding
+    end
+  end
+
+  # @todo Make this more like Rails a implicit feature of a view.
+  #   For a start use a different view command. Example
+  #   # view/type/basic/my_view.haml:
+  #   = name
+  #
+  #   # set/type/basic.rb:
+  #   haml_view :myview do
+  #     @name = "Joe"
+  #   end
+  def render_haml_template view, locals={}
+    template = ::File.read view_template_path(view)
+    voo = View.new self, view, locals, @voo
+    with_voo voo do
+      haml_to_html template, locals
+    end
+  end
+
+  # @todo This is a hack to make haml view templates work.
+  #       Needs a general automatic solution.
+  # This method must be overridden in every set that uses haml templates
+  # so that `__FILE__` points to the right file.
+  # @return [String] path to haml view template
+  # @example
+  #   def view_template_path view
+  #     super(view, __FILE__)
+  #   end
+  def view_template_path view, tmp_set_path=__FILE__
+    basename = ::File.basename(tmp_set_path, ".rb")
+    try_view_template_path("../#{view}", tmp_set_path) ||
+      try_view_template_path("../#{basename}/#{view}", tmp_set_path) ||
+      raise(Card::Error, "can't find haml template for #{view}")
+  end
+
+  def try_view_template_path template_path, tmp_set_path, ext="haml"
+    path = ::File.expand_path("#{template_path}.#{ext}", tmp_set_path)
+      .gsub(%r{/tmp/set/mod\d+-([^/]+)/}, '/mod/\1/view/')
+    ::File.exist?(path) && path
+  end
+
+  def haml_to_html haml, locals, a_binding=nil
     a_binding ||= binding
-    ::Haml::Engine.new(template).render(a_binding, locals)
+    ::Haml::Engine.new(haml).render a_binding, locals || {}
   end
 end
+

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

@@ -46,23 +46,24 @@ def key= newkey
   newkey
 end
 
-def update_subcard_names cardname
+def update_subcard_names new_name, name_to_replace=nil
   return unless @subcards
   subcards.each do |subcard|
     # if subcard has a relative name like +C
     # and self is a subcard as well that changed from +B to A+B then
-    # +C should change to A+B+C. #replace_part doesn't work in this case
+    # +C should change to A+B+C. #replace doesn't work in this case
     # because the old name +B is not a part of +C
-    name_to_replace =
+    name_to_replace ||=
       if subcard.cardname.junction? &&
          subcard.cardname.parts.first.empty? &&
-         cardname.parts.first.present?
+         new_name.parts.first.present?
         # replace the empty part
         "".to_name
       else
         name
       end
-    subcard.name = subcard.cardname.replace_part name_to_replace, cardname.s
+    subcard.name = subcard.cardname.replace name_to_replace, new_name.s
+    subcard.update_subcard_names new_name, name
   end
 end
 
@@ -265,7 +266,7 @@ event :cascade_name_changes, :finalize, on: :update, changed: :name do
     # cards, have to go this low level to avoid callbacks.
     Rails.logger.info "cascading name: #{de.name}"
     Card.expire de.name # old name
-    newname = de.cardname.replace_part name_was, name
+    newname = de.cardname.replace name_was, name
     Card.where(id: de.id).update_all name: newname.to_s, key: newname.key
     de.update_referers = update_referers
     de.refresh_references_in

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

@@ -46,7 +46,7 @@ def replace_reference_syntax old_name, new_name
   obj_content = Card::Content.new raw_content, self
   obj_content.find_chunks(Card::Content::Chunk::Reference).select do |chunk|
     next unless (old_ref_name = chunk.referee_name)
-    next unless (new_ref_name = old_ref_name.replace_part old_name, new_name)
+    next unless (new_ref_name = old_ref_name.replace old_name, new_name)
     chunk.referee_name = chunk.replace_reference old_name, new_name
     refs = Card::Reference.where referee_key: old_ref_name.key
     refs.update_all referee_key: new_ref_name.key

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

@@ -49,6 +49,10 @@ def clear_subcards
   subcards.clear
 end
 
+def subfield_present? field_name
+  (field_card = subfield(field_name)) && field_card.content.present?
+end
+
 def deep_clear_subcards
   subcards.deep_clear
 end

data/mod/core/set_pattern/07_type_plus_right.rb

@@ -16,7 +16,7 @@ def prototype_args anchor
 end
 
 def anchor_name card
-  left = card.left
+  left = card.left new: {}
   type_name = (left && left.type_name) || Card[Card.default_type_id].name
   "#{type_name}+#{card.cardname.tag}"
 end

data/mod/core/spec/set/all/{tracked_attributes_spec.rb → assign_attributes_spec.rb}

@@ -29,7 +29,7 @@ module RenameMethods
   end
 end
 
-describe Card::Set::All::AssignAttributes do
+RSpec.describe Card::Set::All::AssignAttributes do
   include RenameMethods
 
   describe "set_name" do

data/mod/email/set/abstract/test_context.rb

@@ -0,0 +1,26 @@
+format :html do
+  view :core do
+    return super() if voo.hide? :test_context
+    card.with_context test_context_card do
+      super()
+    end
+  end
+
+  def test_context_card
+    (tc = card.left.fetch(trait: :test_context)) && tc.item_cards.first
+  end
+end
+
+format :email_html do
+  view :core do
+    voo.hide! :test_context
+    super()
+  end
+end
+
+format :email_text do
+  view :core do
+    voo.hide! :test_context
+    super()
+  end
+end

data/mod/email/set/all/notify.rb

@@ -184,7 +184,7 @@ format do
        (option_card = follow_option_card)
       option_card.description set_card
     else
-      "followed card"
+      "*followed set of cards*"
     end
   end
 
@@ -258,17 +258,22 @@ format do
   end
 end
 
-format :email_text do
-  view :last_action, perms: :none do |args|
+format do
+  view :last_action_verb do |args|
     act = get_act(args)
     "#{act.main_action.action_type}d"
   end
 end
 
+format :email_text do
+  view :last_action, perms: :none do |args|
+    _render_last_action_verb args
+  end
+end
+
 format :email_html do
   view :last_action, perms: :none do |args|
-    act = get_act(args)
-    "#{act.main_action.action_type}d"
+    _render_last_action_verb args
   end
 
   def wrap_list list

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

@@ -1,3 +1,5 @@
+include_set Abstract::TestContext
+
 def clean_html?
   false
 end

data/mod/email/set/right/subject.rb

@@ -0,0 +1 @@
+include_set Abstract::TestContext

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

@@ -0,0 +1 @@
+include_set Abstract::TestContext

data/mod/history/set/all/content_history.rb

@@ -164,5 +164,6 @@ end
 def edit_conflict?
   last_action_id_before_edit &&
     last_action_id_before_edit.to_i != last_action_id &&
-    last_action.act.actor_id != Auth.current_id
+    (la = last_action) &&
+    la.act.actor_id != Auth.current_id
 end

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

@@ -17,6 +17,6 @@ format do
   def compile_coffee script
     ::CoffeeScript.compile script
   rescue => e
-    raise Card::Error, "CoffeeScript::Error (#{name}): #{e.message}"
+    raise Card::Error, "CoffeeScript::Error (#{card.name}): #{e.message}"
   end
 end

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

@@ -79,7 +79,7 @@ format :html do
       id = "pointer-checkbox-#{option_name.to_name.key}"
       <<-HTML
         <div class="pointer-checkbox">
-          #{check_box_tag 'pointer_checkbox', option_name, checked,
+          #{check_box_tag "pointer_checkbox-#{unique_id}", option_name, checked,
                           id: id, class: 'pointer-checkbox-button'}
           #{option_label option_name, id}
           #{option_description 'checkbox', option_name}
@@ -92,7 +92,7 @@ format :html do
 
   view :multiselect do |_args|
     select_tag(
-      "pointer_multiselect",
+      "pointer_multiselect-#{unique_id}",
       options_for_select(card.option_names, card.item_names),
       multiple: true, class: "pointer-multiselect form-control"
     )
@@ -117,9 +117,12 @@ format :html do
   end
 
   def option_label option_name, id
+    %(<label for="#{id}">#{option_label_text option_name}</label>)
+  end
+
+  def option_label_text option_name
     o_card = Card.fetch(option_name)
-    label = (o_card && o_card.label) || option_name
-    %(<label for="#{id}">#{label}</label>)
+    (o_card && o_card.label) || option_name
   end
 
   # @param option_type [String] "checkbox" or "radio"
@@ -130,7 +133,7 @@ format :html do
 
   view :select do |_args|
     options = [["-- Select --", ""]] + card.option_names.map { |x| [x, x] }
-    select_tag("pointer_select",
+    select_tag("pointer_select-#{unique_id}",
                options_for_select(options, card.item_names.first),
                class: "pointer-select form-control")
   end
@@ -161,8 +164,8 @@ def << item
   add_item newname
 end
 
-def add_item name
-  return if include_item? name
+def add_item name, allow_duplicates=false
+  return if !allow_duplicates && include_item?(name)
   self.content = "[[#{(item_names << name).reject(&:blank?) * "]]\n[["}]]"
 end
 

data/mod/pointer/spec/set/type/pointer_spec.rb

@@ -150,10 +150,10 @@ describe Card::Set::Type::Pointer do
       option_html =
         'input[class="pointer-checkbox-button"]'\
         '[checked="checked"]'\
-        '[name="pointer_checkbox"][type="checkbox"]'\
+        '[type="checkbox"]'\
         '[value="nonexistingcardmustnotexistthisistherule"]'\
         '[id="pointer-checkbox-nonexistingcardmustnotexistthisistherule"]'
-      assert_view_select @pointer.format.render_checkbox, option_html
+      debug_assert_view_select @pointer.format.render_checkbox, option_html
       assert_view_select @inherit_pointer.format.render_checkbox, option_html
     end
 

data/mod/standard/set/abstract/wql_search.rb

@@ -18,7 +18,7 @@ def wql_hash
 end
 
 def query args={}
-  query_args = wql_hash.merge! args
+  query_args = wql_hash.merge args
   query_args = standardized_query_args query_args
   Query.new query_args, name
 end