card 1.92.2 → 1.93.0

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

@@ -62,7 +62,7 @@ describe Card::Set::Type::Image do
 
     describe "view: source" do
       it "renders url" do
-        expect(subject.format.render(:source))
+        expect(subject.format.render!(:source))
           .to eq("/files/~#{subject.id}/#{subject.last_action_id}-medium.jpg")
       end
     end
@@ -70,7 +70,7 @@ describe Card::Set::Type::Image do
     describe "view: content changes" do
       it "gets image url" do
         render_args = { action: subject.last_action, diff_type: :expanded }
-        act_summary = subject.format.render :content_changes, render_args
+        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
@@ -128,7 +128,7 @@ describe Card::Set::Type::Image do
     end
 
     describe "source view" do
-      it "renders url with medium version" do
+      it "renders url with original version" do
         expect(subject.format.render_source)
           .to eq "/files/:#{subject.codename}/standard-medium.png"
       end

data/mod/core/chunk/reference.rb

@@ -11,9 +11,9 @@ class Card
           @referee_name ||= begin
             rendered_name = render_obj(name)
             ref_card = fetch_referee_card rendered_name
-            ref_card ? ref_card.cardname : rendered_name.to_name
+            ref_card ? ref_card.name : rendered_name.to_name
           end
-          @referee_name = @referee_name.absolute(card.cardname).to_name
+          @referee_name = @referee_name.absolute(card.name).to_name
         end
 
         def referee_card
@@ -33,7 +33,7 @@ class Card
               chunk.replace_reference old_name, new_name
             end
           else
-            @name = name.to_name.replace(old_name, new_name)
+            @name = name.to_name.swap old_name, new_name
           end
         end
 

data/mod/core/chunk/view_stub.rb

@@ -4,9 +4,9 @@ class Card
       class ViewStub < Abstract
         Chunk.register_class(
           self,
-          prefix_re: Regexp.escape("<card-view>"),
-          full_re: /\<card-view\>([^\<]*)\<\/card-view\>/,
-          idx_char: "<"
+          prefix_re: Regexp.escape("(stub)"),
+          full_re: /\(stub\)([^\(]*)\(\/stub\)/,
+          idx_char: "("
         )
 
         def initialize text, content
@@ -15,10 +15,14 @@ class Card
 
         def interpret match, _content
           @options_json = match[1]
-          @stub_hash = JSON.parse(@options_json).symbolize_keys
+          @stub_hash = JSON.parse(unescape @options_json).symbolize_keys
           interpret_hash_values
         end
 
+        def unescape stub_json
+          stub_json.gsub '(', '_OParEN_'
+        end
+
         def interpret_hash_values
           @stub_hash.keys.each do |key|
             send "interpret_#{key}"
@@ -44,6 +48,10 @@ class Card
         def process_chunk
           @processed = yield @stub_hash
         end
+
+        def result
+          @processed
+        end
       end
     end
   end

data/mod/core/format/html_format.rb

@@ -62,7 +62,7 @@ class Card
           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",
-                              build_in_layouts: LAYOUTS.keys.join(', '))
+                              built_in_layouts: LAYOUTS.keys.join(', '))
         end
       end
 

data/mod/core/format/text_format.rb

@@ -6,6 +6,11 @@ class Card
       register :text
       register :txt
       aliases["txt"] = "text"
+
+      def self.view_caching?
+        # probably overkill.  problem was with email text message
+        false
+      end
     end
   end
 end

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

@@ -3,6 +3,9 @@ def self.included host_class
   host_class.file_content_mod_name = Card::Set.mod_name(caller)
 end
 
+# FIXME: these should abstracted and configured on the types
+# (same codes for `rake card:create:codefile`)
+
 # @return [Array<String>, String] the name of file(s) to be loaded
 def source_files
   case type_id
@@ -15,14 +18,16 @@ end
 
 def source_dir
   case type_id
-  when CoffeeScriptID, JavaScriptID then "javascript"
-  when CssID, ScssID then "stylesheets"
+  when CoffeeScriptID, JavaScriptID then "lib/javascript"
+  when CssID, ScssID then "lib/stylesheets"
+  else
+    "lib"
   end
 end
 
 def find_file filename
   mod_path = Card::Mod.dirs.path file_content_mod_name
-  file_path = File.join(mod_path, "lib", source_dir, filename)
+  file_path = File.join(mod_path, source_dir, filename)
   return unless File.exist? file_path
   file_path
 end

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

@@ -20,36 +20,27 @@ def abort status, msg="action canceled"
 end
 
 def act opts={}, &block
+  opts ||= {}
+  @action ||= identify_action(opts[:trash])
   if ActManager.act_card
-    add_to_act opts, &block
+    add_to_act &block
   else
     start_new_act opts, &block
   end
 end
 
 def start_new_act opts
-  ActManager.clear
   self.director = nil
-  ActManager.act_card = self
-  if opts && opts[:success]
-    Env[:success] = Env::Success.new(cardname, Env.params[:success])
+  ActManager.run_act(self) do
+    Env.success(name) if opts[:success]
+    run_callbacks(:act) { yield }
   end
-  run_callbacks :act do
-    yield
-  end
-ensure
-  ActManager.clear
 end
 
-def add_to_act opts
+def add_to_act
   # if only_storage_phase is true then the card is already part of the act
   return yield if ActManager.act_card == self || only_storage_phase
   director.reset_stage
-  if opts && opts[:trash]
-    @action = :delete
-  else
-    identify_action
-  end
   director.update_card self
   self.only_storage_phase = true
   yield
@@ -126,39 +117,6 @@ event :notable_exception_raised do
 end
 
 def success
-  Env.success(cardname)
+  Env.success(name)
 end
 
-[:name, :db_content, :trash, :type_id].each do |field|
-  define_method "#{field}_before_act" do
-    attribute_before_act field
-  end
-
-  define_method "#{field}_is_changing?" do
-      attribute_is_changing? field
-    end
-end
-
-def attribute_before_act attr
-  if saved_change_to_attribute? attr
-    attribute_before_last_save attr
-  elsif will_save_change_to_attribute? attr
-    mutations_from_database.changed_values[attr]
-  elsif not_in_callback?
-    attribute_was attr
-  else
-    _read_attribute attr
-  end
-end
-
-def not_in_callback? # or in integrate_with_delay stage
-  mutation_tracker.equal?(mutations_from_database)
-end
-
-def attribute_is_changing? attr
-  if not_in_callback?
-    attribute_changed? attr
-  else
-    saved_change_to_attribute?(attr) || will_save_change_to_attribute?(attr)
-  end
-end

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

@@ -20,7 +20,7 @@ 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
+      subcards[name.field(key)] = value
     end
   end
   args.keys.each do |key|

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

@@ -28,7 +28,7 @@ module ClassMethods
 end
 
 def expire_pieces
-  cardname.piece_names.each do |piece|
+  name.piece_names.each do |piece|
     Card.expire piece
   end
 end

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

@@ -57,7 +57,7 @@ def item_keys args={}
 end
 
 def include_item? item
-  key = item.is_a?(Card) ? item.cardname.key : item.to_name.key
+  key = item.is_a?(Card) ? item.name.key : item.to_name.key
   item_names.map { |name| name.to_name.key }.member? key
 end
 
@@ -92,7 +92,7 @@ def insert_id index, id
 end
 
 def extended_item_cards context=nil
-  context = (context ? context.cardname : cardname)
+  context = (context ? context.name : name)
   args = { limit: "" }
   items = item_cards(args.merge(context: context))
   extended_list = []
@@ -117,7 +117,7 @@ def extended_item_contents context=nil
 end
 
 def extended_list context=nil
-  context = (context ? context.cardname : cardname)
+  context = (context ? context.name : name)
   args = { limit: "" }
   item_cards(args.merge(context: context)).map do |x|
     x.item_cards(args)
@@ -145,12 +145,12 @@ end
 def contextual_content context_card, format_args={}, view_args={}
   view = view_args.delete(:view) || :core
   with_context context_card do
-    format(format_args).render view, view_args
+    format(format_args).render! view, view_args
   end
 end
 
 def each_chunk opts={}
-  content = opts[:content] || raw_content
+  content = opts[:content] || self.content
   chunk_type = opts[:chunk_type] || Card::Content::Chunk
   Card::Content.new(content, self).find_chunks(chunk_type).each do |chunk|
     next unless chunk.referee_name # filter commented nests
@@ -186,7 +186,7 @@ format do
 
   def nest_item cardish, options={}, &block
     options = item_view_options options
-    options[:nest_name] = Card::Name.cardish(cardish).s
+    options[:nest_name] = Card::Name[cardish].s
     nest cardish, options, &block
   end
 
@@ -244,7 +244,7 @@ format do
       next [name_or_card, options || {}] if name_or_card.is_a?(Card)
       options ||= Card.fetch_name name_or_card
       options = { title: options } if options.is_a?(String)
-      [card.cardname.field(name_or_card), options]
+      [card.name.field(name_or_card), options]
     end
   end
 

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

@@ -1,15 +1,21 @@
 ::Card.error_codes[:conflict] = [:conflict, 409]
 
-def content
-  db_content || (new_card? && template.db_content)
-end
 
 def content= value
   self.db_content = value
 end
 
-def raw_content
-  structure ? template.db_content : content
+def content
+  structured_content || standard_content
+end
+alias raw_content content #DEPRECATED!
+
+def standard_content
+  db_content || (new_card? && template.db_content)
+end
+
+def structured_content
+  structure && template.db_content
 end
 
 format do
@@ -53,7 +59,7 @@ def last_draft_content
 end
 
 event :set_content, :store, on: :save do
-  self.db_content = content || "" # necessary?
+  self.db_content = standard_content || "" # necessary?
   self.db_content = Card::Content.clean!(db_content) if clean_html?
   @selected_action_id = @selected_content = nil
   clear_drafts

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

@@ -13,7 +13,7 @@ module ClassMethods
   #      1. a numeric id (Integer)
   #      2. a name/key (String or Card::Name)
   #      3. a codename (Symbol)
-  #    If you pass more then one mark they get joined with a '+'.
+  #    If you pass more then one mark or an array of marks they get joined with a '+'.
   #    The final argument can be a hash to set the following options
   #      :skip_virtual               Real cards only
   #      :skip_modules               Don't load Set modules
@@ -38,18 +38,20 @@ module ClassMethods
 
   # fetch only real (no virtual) cards
   #
-  # @params *args - see #fetch
+  # @params *mark - see #fetch
   # @return [Card]
-  def [] *args
-    fetch(*args, skip_virtual: true)
+  def [] *mark
+    fetch(*mark, skip_virtual: true)
   end
 
   # fetch real cards without set modules loaded. Should only be used for simple attributes
+  # @example
+  #   quick_fetch "A", :self, :structure
   #
-  # @params *args - see #fetch
+  # @params *mark - see #fetch
   # @return [Card]
-  def quick_fetch *args
-    fetch *args, skip_virtual: true, skip_modules: true
+  def quick_fetch *mark
+    fetch mark, skip_virtual: true, skip_modules: true
   end
 
   # fetch only from the soft cache
@@ -71,22 +73,28 @@ module ClassMethods
   # ATTRIBUTE FETCHING
   # The following methods optimize fetching of specific attributes
 
-  # @params *args - see #fetch
+  # @params *mark - see #fetch
   # @return [Integer]
-  def fetch_id *args
-    mark, _opts = normalize_fetch_args args
+  def fetch_id *mark
+    mark, _opts = normalize_fetch_args mark
     return mark if mark.is_a? Integer
     card = quick_fetch mark.to_s
     card && card.id
   end
 
-  # @params *args - see #fetch
+  # @params *mark - see #fetch
   # @return [Card::Name]
   def fetch_name *mark
-    Card::Name.compose mark
+    if (card = quick_fetch(mark))
+      card.name
+    elsif block_given?
+      yield
+    end
+  rescue Card::Error::NotFound => e  # eg. if codename is missing
+    block_given? ? yield.name : raise(e)
   end
 
-  # @params *args - see #fetch
+  # @params *mark - see #fetch
   # @return [Integer]
   def fetch_type_id *mark
     (card = quick_fetch(mark)) && card.type_id
@@ -103,14 +111,14 @@ def fetch opts={}
   # should this fail as an incorrect api call?
   traits = Array.wrap traits
   traits.inject(self) do |card, trait|
-    Card.fetch card.cardname.trait(trait), opts
+    Card.fetch card.name.trait(trait), opts
   end
 end
 
 def renew args={}
   opts = args[:new].clone
   handle_default_content opts
-  opts[:name] ||= cardname
+  opts[:name] ||= name
   opts[:skip_modules] = args[:skip_modules]
   Card.new opts
 end

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

@@ -54,9 +54,9 @@ module ClassMethods
     # look in cache
     card = send "retrieve_from_cache_by_#{mark_type}", mark_key, opts[:local_only]
 
-    if retrieve_from_db?(card, opts)
+    if retrieve_from_db? card, mark_type, mark_key, opts[:look_in_trash]
       # look in db if needed
-      card = retrieve_from_db mark_type, mark_key, opts
+      card = retrieve_from_db mark_type, mark_key, opts[:look_in_trash]
       needs_caching = !card.nil? && !card.trash
     end
 
@@ -72,13 +72,15 @@ module ClassMethods
     end
   end
 
-  def retrieve_from_db? card, opts
-    card.nil? || (opts[:look_in_trash] && card.new_card? && !card.trash)
+  def retrieve_from_db? card, mark_type, mark_key, look_in_trash
+    return false if card&.real?                                      # real card found in cache
+#    return false if mark_type == :key && mark_key.to_name.relative?  # no relative names in db
+    card.nil? || (look_in_trash && !card.trash)                      # card not found in cache (or trash lookup)
   end
 
-  def retrieve_from_db mark_type, mark_key, opts
+  def retrieve_from_db mark_type, mark_key, look_in_trash=false
     query = { mark_type => mark_key }
-    query[:trash] = false unless opts[:look_in_trash]
+    query[:trash] = false unless look_in_trash
     card = Card.where(query).take
     card
   end
@@ -98,8 +100,8 @@ module ClassMethods
       when opts[:skip_virtual] then return nil
     end
     card.assign_name_from_fetched_mark! mark, opts
-    return nil unless opts[:new] || card.known?
     finalize_fetch_results card, opts
+    card if opts[:new] || card.known?
   end
 
   def finalize_fetch_results card, opts
@@ -109,13 +111,13 @@ module ClassMethods
 
   def normalize_fetch_args args
     opts = args.last.is_a?(Hash) ? args.pop : {}
-    mark = compose_mark args
+    mark = id_or_name args
     mark = absolutize_fetch_mark mark, opts.dig(:new, :supercard)
     [mark, opts]
   end
 
   def absolutize_fetch_mark mark, supercard
-    return mark unless mark.is_a?(Card::Name) && supercard
+    return mark unless mark.name? && supercard
     mark.to_name.absolute_name supercard.name
   end