card 1.20.4 → 1.21.0

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

@@ -18,6 +18,12 @@ format do
   end
 end
 
+format :html do
+  view :hidden_content_field, tags: :unknown_ok do
+    hidden_field :content, class: "card-content"
+  end
+end
+
 def label
   name
 end

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

@@ -1,4 +1,4 @@
-EVENT_CONDITIONS = [:set, :on, :changed, :when].freeze
+EVENT_CONDITIONS = %i[set on changed when].freeze
 
 def event_applies? opts
   EVENT_CONDITIONS.all? do |key|

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

@@ -351,13 +351,13 @@ def append_missing_view_cache_keys
 end
 
 def hard_write_view_cache_keys
-#  puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
+  #  puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
   return unless Card.cache.hard
   Card.cache.hard.write_attribute key, :view_cache_keys, @view_cache_keys
 end
 
 def expire_views
-#  puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
+  #  puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
   return unless view_cache_keys.present?
   Array.wrap(@view_cache_keys).each do |view_cache_key|
     Card::View.cache.delete view_cache_key

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

@@ -65,22 +65,12 @@ format do
   #   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
+  include Card::Set::Format::HamlViews
 
-  def haml_to_html haml, locals, a_binding=nil
-    a_binding ||= binding
-    ::Haml::Engine.new(haml).render a_binding, locals || {}
+  def view_template_path view, tmp_set_path=__FILE__
+    set_path =
+      tmp_set_path.gsub(%r{/tmp/set/mod\d+-([^/]+)/}, '/mod/\1/template/')
+    haml_template_path view, set_path
   end
 end
-

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

@@ -1,10 +1,10 @@
-JUNK_INIT_ARGS = %w(missing skip_virtual id).freeze
+JUNK_INIT_ARGS = %w[missing skip_virtual id].freeze
 
 module ClassMethods
   def new args={}, _options={}
     args = (args || {}).stringify_keys
     JUNK_INIT_ARGS.each { |a| args.delete(a) }
-    %w(type type_code).each { |k| args.delete(k) if args[k].blank? }
+    %w[type type_code].each { |k| args.delete(k) if args[k].blank? }
     args.delete("content") if args["attach"] # should not be handled here!
     super args
   end

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

@@ -220,7 +220,7 @@ end
 event :set_left_and_right, :store,
       changed: :name, on: :save do
   if cardname.junction?
-    [:left, :right].each do |side|
+    %i[left right].each do |side|
       sidename = cardname.send "#{side}_name"
       sidecard = Card[sidename]
 

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

@@ -4,9 +4,8 @@ Card.error_codes.merge! permission_denied: [:denial, 403],
 
 module ClassMethods
   def repair_all_permissions
-    Card.where(
-      "(read_rule_class is null or read_rule_id is null) and trash is false"
-    ).each do |broken_card|
+    Card.where("(read_rule_class is null or read_rule_id is null) and trash is false")
+        .each do |broken_card|
       broken_card.include_set_modules
       broken_card.repair_permissions!
     end
@@ -53,10 +52,19 @@ def anyone_can? action
   who_can(action).include? Card::AnyoneID
 end
 
-def permission_rule_id_and_class action
+def direct_rule_card action
   direct_rule_id = rule_card_id action
   require_permission_rule! direct_rule_id, action
-  direct_rule = Card.fetch direct_rule_id, skip_modules: true
+  Card.fetch direct_rule_id, skip_modules: true
+end
+
+def permission_rule_id action
+  direct_rule = direct_rule_card action
+  applicable_permission_rule_id direct_rule, action
+end
+
+def permission_rule_id_and_class action
+  direct_rule = direct_rule_card action
   [
     applicable_permission_rule_id(direct_rule, action),
     direct_rule.rule_class_name
@@ -65,18 +73,22 @@ end
 
 def applicable_permission_rule_id direct_rule, action
   if junction? && direct_rule.db_content =~ /^\[?\[?_left\]?\]?$/
-    lcard = left_or_new(skip_virtual: true, skip_modules: true)
-    if action == :create && lcard.real? && !lcard.action == :create
-      action = :update
-    end
-    lcard.permission_rule_id_and_class(action).first
+    left_permission_rule_id action
   else
     direct_rule.id
   end
 end
 
+def left_permission_rule_id action
+  lcard = left_or_new(skip_virtual: true, skip_modules: true)
+  if action == :create && lcard.real? && lcard.action != :create
+    action = :update
+  end
+  lcard.permission_rule_id action
+end
+
 def permission_rule_card action
-  Card.fetch permission_rule_id_and_class(action).first
+  Card.fetch permission_rule_id(action)
 end
 
 def require_permission_rule! rule_id, action
@@ -126,7 +138,7 @@ def ok_to_create
   permit :create
   return if !@action_ok || !junction?
 
-  [:left, :right].each do |side|
+  %i[left right].each do |side|
     # left is supercard; create permissions will get checked there.
     next if side == :left && @superleft
     part_card = send side, new: {}
@@ -140,7 +152,7 @@ end
 
 def ok_to_read
   return if Auth.always_ok?
-  @read_rule_id ||= permission_rule_id_and_class(:read).first
+  @read_rule_id ||= permission_rule_id(:read)
   return if Auth.as_card.read_rules.member? @read_rule_id
   deny_because you_cant "read this"
 end
@@ -169,7 +181,7 @@ event :clear_read_rule, :store, on: :delete do
 end
 
 event :set_read_rule, :store,
-      on: :save, changed: [:type_id, :name] do
+      on: :save, changed: %i[type_id name] do
   read_rule_id, read_rule_class = permission_rule_id_and_class(:read)
   self.read_rule_id = read_rule_id
   self.read_rule_class = read_rule_class
@@ -303,9 +315,9 @@ module Follow
   end
 
   def permit action, verb=nil
-    if [:create, :delete, :update].include?(action) && Auth.signed_in? &&
+    if %i[create delete update].include?(action) && Auth.signed_in? &&
        (user = rule_user) && Auth.current_id == user.id
-      return true
+      true
     else
       super action, verb
     end

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

@@ -215,8 +215,7 @@ module ClassMethods
         left: {
           left: { type_id: SetID }, right: user_name
         },
-        return: :name
-      }, "preference cards for user: #{user_name}"
+        return: :name }, "preference cards for user: #{user_name}"
     )
   end
 

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

@@ -10,7 +10,7 @@ def subfield field_name
   subcards.field field_name
 end
 
-# phase_method :add_subcard, before: :store do |name_or_card, args=nil|
+# phase_method :attach_subcard, before: :store do |name_or_card, args=nil|
 # TODO: handle differently in different stages
 def attach_subcard name_or_card, args={}
   subcards.add name_or_card, args
@@ -23,7 +23,7 @@ def attach_subcard! name_or_card, args={}
   subcard
 end
 
-# phase_method :add_subfield, before: :approve do |name_or_card, args=nil|
+# phase_method :attach_subfield, before: :approve do |name_or_card, args=nil|
 def attach_subfield name_or_card, args={}
   subcards.add_field name_or_card, args
 end
@@ -66,7 +66,7 @@ end
 event :handle_subcard_errors do
   subcards.each do |subcard|
     subcard.errors.each do |field, err|
-      err = "#{field} #{err}" unless [:content, :abort].member? field
+      err = "#{field} #{err}" unless %i[content abort].member? field
       errors.add subcard.relative_name.s, err
     end
   end

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

@@ -21,11 +21,15 @@ def template
   end
 end
 
+def default_type_id default_card=nil
+  default_card ? default_card.type_id : Card.default_type_id
+end
+
 def new_card_template
   default = rule_card :default, skip_modules: true
 
   dup_card = dup
-  dup_card.type_id = default ? default.type_id : Card.default_type_id
+  dup_card.type_id = default_type_id default
 
   if (structure = dup_card.structure_rule_card)
     @virtual = true if junction?

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

@@ -81,7 +81,7 @@ event :validate_delete, :validate, on: :delete do
   end
 
   undeletable_all_rules_tags =
-    %w(default style layout create read update delete)
+    %w[default style layout create read update delete]
   # FIXME: HACK! should be configured in the rule
 
   if junction? && (l = left) && l.codename == "all" &&

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

@@ -39,7 +39,7 @@ module ClassMethods
   def merge name, attribs={}, opts={}
     # puts "merging #{name}"
     card = fetch name, new: {}
-    [:image, :file].each do |attach|
+    %i[image file].each do |attach|
       next unless attribs[attach] && attribs[attach].is_a?(String)
       attribs[attach] = ::File.open(attribs[attach])
     end

data/mod/core/spec/set/all/actify_spec.rb

@@ -116,7 +116,7 @@ describe "act API" do
         end
         Card["A"].update_attributes! name: "new name"
       end
-      expect(@called_events).to eq([:i_name, :iwd_name])
+      expect(@called_events).to eq(%i[i_name iwd_name])
     end
   end
 

data/mod/core/spec/set/all/assign_attributes_spec.rb

@@ -155,8 +155,8 @@ RSpec.describe Card::Set::All::AssignAttributes do
     end
 
     it "test_update_descendants" do
-      old_names = %w(One+Two One+Two+Three Four+One Four+One+Five)
-      new_names = %w(Uno+Two Uno+Two+Three Four+Uno Four+Uno+Five)
+      old_names = %w[One+Two One+Two+Three Four+One Four+One+Five]
+      new_names = %w[Uno+Two Uno+Two+Three Four+Uno Four+Uno+Five]
       card_list = old_names.map { |name| Card[name] }
 
       assert_equal old_names, card_list.map(&:name)

data/mod/core/spec/set/all/collection_spec.rb

@@ -6,9 +6,10 @@ describe Card::Set::All::Collection do
       item_names_args = @context ? { context: @context } : {}
       Card.new(@args).item_names(item_names_args)
     end
+
     it "returns item for each line of basic content" do
       @args = { name: "foo", content: "X\nY" }
-      is_expected.to eq(%w(X Y))
+      is_expected.to eq(%w[X Y])
     end
 
     it "returns list of card names for search" do
@@ -54,7 +55,9 @@ describe Card::Set::All::Collection do
   end
 
   describe "#contextual_content" do
-    let(:context_card) { Card["A"] } # refers to 'Z'
+    let(:context_card) { Card["A"] }
+
+    # refers to 'Z'
     it "processes nests relative to context card" do
       c = create "foo", content: "{{_self+B|core}}"
       expect(c.contextual_content(context_card)).to eq("AlphaBeta")
@@ -67,7 +70,7 @@ describe Card::Set::All::Collection do
       expect(c.contextual_content(context_card)).to eq("AlphaBeta")
     end
 
-    it "it doesn't use chunk list of context card" do
+    it "doesn't use chunk list of context card" do
       c = create "foo", content: "test@email.com", type: "HTML"
       expect(c.contextual_content(context_card)).not_to have_tag "a"
     end

data/mod/core/spec/set/all/export_spec.rb

@@ -1,134 +1,62 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Export do
-  before do
-    login_as "joe_user"
-  end
   describe "rendering json in export mode" do
-    subject do
-      big_blind = Card.create! name: "special means special",
-                               type_id: Card::PointerID,
-                               content: "[[#{@collection_card.name}]]"
-      big_blind.format(:json).render_export
+    def export_pointer content, type=:pointer
+      export_name = "#{type} export card"
+      create export_name, type: type, content: content
+
+      create("export pointer", type_id: Card::PointerID, content: export_name)
+        .format(:json).render_export
     end
+
     context "pointer card" do
       it "contains cards in the pointer card and its children" do
-        small_blind = Card.create! name: "Elbert Hubbard",
-                                   type_id: Card::BasicID,
-                                   content: "Do not take life too seriously."
-        small_blind_1 =
-          Card.create! name: "Elbert Hubbard+hello world",
-                       type_id: Card::BasicID,
-                       content: "You will never get out of it alive."
-        @collection_card =
-          Card.create! name: "normal pointer", type_id: Card::PointerID,
-                       content: "[[#{small_blind.name}]]\r\n"\
-                                "[[#{small_blind_1.name}]]"
-
-        is_expected.to include(name: "normal pointer",
-                               type: "Pointer",
-                               content: "[[Elbert Hubbard]]\n"\
-                                        "[[Elbert Hubbard+hello world]]")
-        is_expected.to include(name: "Elbert Hubbard",
-                               type: "Basic",
-                               content: "Do not take life too seriously.")
-        is_expected.to include(name: "Elbert Hubbard+hello world",
-                               type: "Basic",
-                               content: "You will never get out of it alive.")
+        expect(export_pointer(%w[T A+B])).to include(
+          a_hash_including(name: "pointer export card", type: "Pointer",
+                           content: "[[T]]\n[[A+B]]"),
+          a_hash_including(name: "T", type: "Basic", content: "Theta"),
+          a_hash_including(name: "A+B", type: "Basic", content: "AlphaBeta")
+        )
       end
       it "handles multi levels pointer cards" do
-        small_blind = Card.create! name: "Elbert Hubbard",
-                                   type_id: Card::BasicID,
-                                   content: "Do not take life too seriously."
-        inner_pointer_card = Card.create! name: "inner pointer",
-                                          type_id: Card::PointerID,
-                                          content: "[[#{small_blind.name}]]"
-        small_blind_1 = Card.create! name: "Elbert Hubbard+hello world",
-                                     type_id: Card::BasicID,
-                                     content: "You will never get out of it"\
-                                              " alive."
-        @collection_card =
-          Card.create! name: "normal pointer",
-                       type_id: Card::PointerID,
-                       content: "[[#{inner_pointer_card.name}""]]\r\n"\
-                               "[[#{small_blind_1.name}]]"
-
-        is_expected.to include(name: "normal pointer",
-                               type: "Pointer",
-                               content: "[[inner pointer]]\n"\
-                                        "[[Elbert Hubbard+hello world]]")
-        is_expected.to include(name: "inner pointer",
-                               type: "Pointer",
-                               content: "[[Elbert Hubbard]]")
-        is_expected.to include(name: "Elbert Hubbard",
-                               type: "Basic",
-                               content: "Do not take life too seriously.")
-        is_expected.to include(name: "Elbert Hubbard+hello world",
-                               type: "Basic",
-                               content: "You will never get out of it alive.")
+        inner_pointer = create "inner pointer", type: :pointer, content: "T"
+        expect(export_pointer([inner_pointer.name, "A+B"])).to include(
+          a_hash_including(name: "pointer export card", type: "Pointer",
+                           content: "[[inner pointer]]\n[[A+B]]"),
+          a_hash_including(name: "inner pointer", type: "Pointer",
+                           content: "[[T]]"),
+          a_hash_including(name: "T", type: "Basic", content: "Theta"),
+          a_hash_including(name: "A+B", type: "Basic", content: "AlphaBeta")
+        )
       end
       it "stops while the depth count > 10" do
-        @collection_card = Card.create! name: "normal pointer",
-                                        type_id: Card::PointerID,
-                                        content: "[[normal pointer]]"
-        is_expected.to include(name: "normal pointer", type: "Pointer",
-                               content: "[[normal pointer]]")
+        expect(export_pointer("pointer export card")).to include(
+          name: "pointer export card", type: "Pointer",
+          content: "[[pointer export card]]"
+        )
       end
     end
-    context "Skin card" do
-      it "contains cards in the pointer card and its children" do
-        Card::Auth.as_bot do
-          small_blind =
-            Card.create! name: "Elbert Hubbard",
-                         type_id: Card::BasicID,
-                         content: "The best thing about a boolean is "\
-                         "even if you are wrong,"\
-                         " you are only off by a bit"
-          @collection_card = Card.create! name: "normal pointer",
-                                          type_id: Card::SkinID,
-                                          content: "[[#{small_blind.name}]]"
 
-          is_expected.to include(name: "normal pointer",
-                                 type: "Skin", content: "[[Elbert Hubbard]]")
-          is_expected.to include(name: "Elbert Hubbard",
-                                 type: "Basic",
-                                 content: "The best thing about"\
-                                 " a boolean is even if you are wrong, "\
-                                 "you are only off by a bit")
-        end
+    context "skin card" do
+      it "contains cards in the pointer card and its children" do
+        export = export_pointer("[[T]]", :skin)
+        expect(export).to include(
+          a_hash_including(name: "skin export card", type: "Skin",
+                           content: "[[T]]"),
+          a_hash_including(name: "T", type: "Basic", content: "Theta")
+        )
       end
     end
+
     context "search card" do
       it "contains cards from search card and its children" do
-        Card.create!(
-          name: "Elbert Hubbard",
-          type_id: Card::BasicID,
-          content: "Do not take life too seriously."
+        expect(export_pointer('{"left":"A"}', :search_type)).to include(
+          a_hash_including(name: "search_type export card", type: "Search",
+                           content: '{"left":"A"}'),
+          a_hash_including(name: "A+B", content: "AlphaBeta", type: "Basic"),
+          a_hash_including(name: "A+C", type: "Basic")
         )
-        Card.create!(
-          name: "Elbert Hubbard+hello world",
-          type_id: Card::BasicID,
-          content: "You will never get out of it alive."
-        )
-        Card.create!(
-          name: "Elbert Hubbard+quote",
-          type_id: Card::BasicID,
-          content: "Procrastination is the art of keeping up with yesterday."
-        )
-        @collection_card = Card.create! name: "search card",
-                                        type_id: Card::SearchTypeID,
-                                        content: %({"left":"Elbert Hubbard"})
-
-        is_expected.to include(name: "search card",
-                               type: "Search",
-                               content: %({"left":"Elbert Hubbard"}))
-        is_expected.to include(name: "Elbert Hubbard+hello world",
-                               type: "Basic",
-                               content: "You will never get out of it alive.")
-        is_expected.to include(name: "Elbert Hubbard+quote",
-                               type: "Basic",
-                               content: "Procrastination is the art of keeping"\
-                                        " up with yesterday.")
       end
     end
   end