card 1.20.4 → 1.21.0

data/mod/pointer/set/abstract/{01_pointer → 02_pointer}/edit.rb

@@ -12,10 +12,8 @@ event :insert_item_event, :prepare_to_validate,
 end
 
 format :html do
-
   view :editor do |args|
-    hidden_field(:content, class: "card-content") +
-      raw(_render(part_view, args))
+    _render_hidden_content_field + raw(_render(part_view, args))
     # .merge(pointer_item_class: 'form-control')))
   end
 
@@ -28,8 +26,8 @@ format :html do
     items = args[:item_list] || card.item_names(context: :raw)
     items = [""] if items.empty?
     rendered_items = items.map do |item|
-                       _render_list_item args.merge(pointer_item: item)
-                     end.join "\n"
+      _render_list_item args.merge(pointer_item: item)
+    end.join "\n"
     extra_css_class = args[:extra_css_class] || "pointer-list-ul"
 
     <<-HTML

data/mod/pointer/set/self/input_options.rb

@@ -0,0 +1,12 @@
+include_set Abstract::Pointer
+
+basket :options
+add_to_basket :options, "radio"
+add_to_basket :options, "checkbox"
+add_to_basket :options, "select"
+add_to_basket :options, "multiselect"
+add_to_basket :options, "list"
+
+def raw_content
+  options.to_pointer_content
+end

data/mod/pointer/spec/set/self/input_options_spec.rb

@@ -0,0 +1,8 @@
+describe Card::Set::Self::InputOptions do
+  it "loads the self set" do
+    expect(Card[:input, :right, :options].item_names).to contain_exactly(
+      "radio", "checkbox", "select", "multiselect", "list", "ace editor",
+      "prosemirror editor", "tinymce editor", "text area", "text field", "calendar"
+    )
+  end
+end

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

@@ -1,9 +1,10 @@
 # -*- encoding : utf-8 -*-
+
 describe Card::Set::Type::Pointer do
   describe "item_names" do
     it "returns array of names of items referred to by a pointer" do
       card = Card.new(type: "Pointer", content: "[[Busy]]\n[[Body]]")
-      card.item_names.should == %w(Busy Body)
+      card.item_names.should == %w[Busy Body]
     end
   end
 
@@ -113,7 +114,7 @@ describe Card::Set::Type::Pointer do
         in_stage :validate,
                  on: :save,
                  trigger: pointer_update("[[item1]]\n[[item3]]") do
-          expect(changed_item_names.sort).to eq %w(item2 item3)
+          expect(changed_item_names.sort).to eq %w[item2 item3]
         end
       end
     end

data/mod/prosemirror_editor/set/abstract/prosemirror_editor.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :editor do
+  def prosemirror_editor_input
     wrap_with :div, id: unique_id, class: "prosemirror-editor" do
       hidden_field :content, class: "card-content", value: card.raw_content
     end

data/mod/prosemirror_editor/set/self/script_prosemirror.rb

@@ -1,3 +1,4 @@
 include_set Abstract::CodeFile
 
 Self::ScriptMods.add_to_basket :item_codenames, :script_prosemirror
+Self::InputOptions.add_to_basket :options, "prosemirror editor"

data/mod/settings/lib/card/setting.rb

@@ -20,8 +20,7 @@ class Card
       templating:  "Templating",
       permission:  "Permissions",
       webpage:     "Webpage",
-      pointer:     "Pointer",
-      editing_cue: "Editing cues",
+      editing:     "Editing",
       event:       "Events",
       other:       "Other",
       config:      "Config"

data/mod/settings/set/abstract/permission.rb

@@ -24,7 +24,7 @@ format :html do
   view :editor do
     item_names = inheriting? ? [] : card.item_names
     %(
-      #{hidden_field :content, class: 'card-content'}
+      #{_render_hidden_content_field}
       <div class="perm-editor">
         #{inheritance_checkbox}
         <div class="perm-group perm-vals perm-section">

data/mod/settings/set/self/add_help.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :editing_cue, position: 2, rule_type_editable: true
+setting_opts group: :editing, position: 2, rule_type_editable: true

data/mod/settings/set/self/autoname.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :templating, position: 3
+setting_opts group: :templating, position: 4

data/mod/settings/set/self/csv_structure.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts group: :templating, position: 3, rule_type_editable: true

data/mod/settings/set/self/help.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :editing_cue, position: 1, rule_type_editable: true
+setting_opts group: :editing, position: 1, rule_type_editable: true

data/mod/settings/set/self/input.rb

@@ -1,4 +1,3 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 3,
-             restricted_to_type: [:pointer, :session],
+setting_opts group: :editing, position: 3,
              rule_type_editable: false

data/mod/settings/set/self/options.rb

@@ -1,4 +1,4 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 1,
-             restricted_to_type: [:pointer, :session],
+setting_opts group: :editing, position: 1,
+             restricted_to_type: %i[pointer session],
              rule_type_editable: true

data/mod/settings/set/self/options_label.rb

@@ -1,4 +1,4 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 2,
-             restricted_to_type: [:pointer, :session],
+setting_opts group: :editing, position: 2,
+             restricted_to_type: %i[pointer session],
              rule_type_editable: false

data/mod/settings/set/type/setting.rb

@@ -26,7 +26,7 @@ def set_classes_with_rules
             right: id,
             # sort:  'content',
 
-            sort:  %w(content name),
+            sort:  %w[content name],
             limit: 0 }
     wql[:left][(set_class.anchorless? ? :id : :right_id)] = set_class.pattern_id
 

data/mod/settings/spec/set/right/script_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Right::Script do
   let(:new_js)                { 'alert( "Hey" );'   }
   let(:compressed_new_js)     { 'alert("Hey");'   }
 
-  it_should_behave_like "pointer machine", that_produces: :js do
+  it_behaves_like "pointer machine", that_produces: :js do
     let(:input_name) { "test js" }
     let(:machine_card) do
       Card.gimme! "test my style+*script", type: :pointer, content: ""

data/mod/settings/spec/set/right/style_spec.rb

@@ -10,7 +10,7 @@ describe Card::Set::Right::Style do
   let(:new_css)                { "#box{ display: none}\n"   }
   let(:compressed_new_css)     { "#box{display:none}\n"   }
 
-  it_should_behave_like "pointer machine", that_produces: :css do
+  it_behaves_like "pointer machine", that_produces: :css do
     let(:machine_card) do
       Card.gimme! "test my style+*style", type: :pointer, content: ""
     end

data/mod/solid_cache/set/abstract/solid_cache.rb

@@ -10,6 +10,8 @@
 
 card_accessor :solid_cache, type: :html
 
+include_set Abstract::Lock
+
 def self.included host_class
   host_class.format(host_class.try(:cached_format) || :base) do
     view :core do |args|
@@ -56,7 +58,7 @@ module ClassMethods
 
   def define_event_to_update_expired_cached_cards set_of_changed_card, args,
                                                   method_name
-    args[:on] ||= [:create, :update, :delete]
+    args[:on] ||= %i[create update delete]
     name = event_name set_of_changed_card, args
     stage = args[:in_stage] || :integrate
     Card::Set.register_set set_of_changed_card
@@ -79,7 +81,7 @@ module ClassMethods
 end
 
 def expire_solid_cache _changed_card=nil
-  return unless solid_cache?
+  return unless solid_cache? && solid_cache_card.real?
   Auth.as_bot do
     solid_cache_card.delete!
   end
@@ -109,7 +111,7 @@ def updated_content_for_cache _changed_card=nil
 end
 
 def write_to_solid_cache new_content
-  Auth.as_bot do
+  lock do
     if solid_cache_card.new_card?
       solid_cache_card.update_attributes! content: new_content
     elsif new_content != solid_cache_card.content

data/mod/solid_cache/spec/set/abstract/solid_cache_spec.rb

@@ -8,9 +8,10 @@ describe Card::Set::Abstract::SolidCache do
 
     # let(:core_view) { 'Alpha <a class="known-card" href="/Z">Z</a>' }
     let(:core_view) { "Alpha Z[/Z]" }
+
     context "with solid cache" do
       it "saves core view in solid cache card" do
-        @card.format_with_set(Card::Set::Abstract::SolidCache, &:render_core)
+        @card.format_with_set(described_class, &:render_core)
         Card::Auth.as_bot do
           expect(Card["A", :solid_cache]).to be_instance_of(Card)
           expect(Card["A", :solid_cache].content).to eq(core_view)
@@ -18,7 +19,7 @@ describe Card::Set::Abstract::SolidCache do
       end
 
       it "uses solid cache card content as core view" do
-        @card.format_with_set(Card::Set::Abstract::SolidCache) do |format|
+        @card.format_with_set(described_class) do |format|
           Card::Auth.as_bot do
             Card["A"].solid_cache_card.update_attributes! content: "cache"
           end
@@ -28,7 +29,7 @@ describe Card::Set::Abstract::SolidCache do
     end
     context "with solid cache disabled" do
       it "ignores solid cache card content" do
-        @card.format_with_set(Card::Set::Abstract::SolidCache) do |format|
+        @card.format_with_set(described_class) do |format|
           Card::Auth.as_bot do
             Card["A"].solid_cache_card.update_attributes! content: "cache"
           end

data/mod/standard/set/abstract/01_search_params.rb

@@ -1,3 +1,5 @@
+include_set Abstract::PagingParams
+
 format do
   def offset
     search_params[:offset] || 0
@@ -20,9 +22,8 @@ format do
   end
 
   def offset_and_limit_search_params hash
-    [:offset, :limit].each do |key|
-      hash[key] = params[key].to_i if params[key]
-    end
+    hash[:offset] = offset_param
+    hash[:limit] = limit_param
   end
 end
 

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

@@ -16,6 +16,7 @@ def returning item, args
 end
 
 def item_cards args={}
+  args[:limit] ||= 0
   returning(:card, args) { search args }
 end
 
@@ -78,7 +79,7 @@ format do
 
   def implicit_item_view
     view = voo_items_view || query_with_params.statement[:item] ||
-      default_item_view
+           default_item_view
     Card::View.canonicalize view
   end
 end

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

@@ -0,0 +1,22 @@
+format :html do
+  def toolbar_split_button name, button_link_opts
+    button_link = toolbar_split_button_link name, button_link_opts
+    split_button(button_link, active_toolbar_item) { yield }
+  end
+
+  def toolbar_split_button_link name, opts
+    link_text = toolbar_split_button_link_text name, opts
+    opts[:class] = "active" if active_toolbar_button == name
+    button_link link_text, opts
+  end
+
+  def toolbar_split_button_link_text name, opts
+    icon = glyphicon opts.delete(:icon)
+    icon + content_tag(:span, " #{name}".html_safe,
+                       class: "visible-md visible-lg pull-right")
+  end
+
+  def subject
+    parent || self
+  end
+end

data/mod/standard/set/all/links.rb

@@ -9,7 +9,7 @@ format :html do
   end
 
   def interpret_data_opts_to_link_to opts
-    [:remote, :method].each do |key|
+    %i[remote method].each do |key|
       next unless (val = opts.delete key)
       opts["data-#{key}"] = val
     end
@@ -85,7 +85,7 @@ format do
   # :view, :related, :card, or :resource, it will use the respective method to
   # render a link.
   def smart_link_to text, opts={}
-    if (linktype = [:view, :related, :card, :resource].find { |key| opts[key] })
+    if (linktype = %i[view related card resource].find { |key| opts[key] })
       send "link_to_#{linktype}", opts.delete(linktype), text, opts
     else
       send :link_to, text, opts
@@ -133,7 +133,7 @@ format do
   end
 
   def standardize_action! opts
-    return if [:create, :update, :delete].member? opts[:action]
+    return if %i[create update delete].member? opts[:action]
     opts.delete :action
   end
 

data/mod/standard/set/all/rich_html/classy.rb

@@ -0,0 +1,37 @@
+format :html do
+  # Classy home for classes and klasses
+  def class_up klass, classier, force=false
+    key = klass.to_s
+    return if !force && class_list[key]
+    class_list[key] = classier.to_s
+  end
+
+  def class_down klass, classier
+    class_list.delete klass if class_list[klass] == classier
+  end
+
+  def with_class_up klass, classier, force=false
+    class_up klass, classier, force
+    yield
+  ensure
+    class_down klass, classier
+  end
+
+  # don't use in the given block the additional class that
+  # was added to `klass`
+  def without_upped_class klass
+    tmp_class = class_list.delete klass
+    result = yield tmp_class
+    class_list[klass] = tmp_class
+    result
+  end
+
+  def class_list
+    @class_list ||= {}
+  end
+
+  def classy *classes
+    classes = Array.wrap(classes).flatten
+    [classes, class_list[classes.first]].flatten.compact.join " "
+  end
+end

data/mod/standard/set/all/rich_html/editing.rb

@@ -2,7 +2,7 @@ format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
   view :edit, perms: :update, tags: :unknown_ok, cache: :never do
     voo.show :toolbar, :help
-    frame_and_form :update do
+    frame_and_form :update, edit_form_opts do
       [
         edit_view_hidden,
         _optional_render_content_formgroup,
@@ -11,6 +11,10 @@ format :html do
     end
   end
 
+  def edit_form_opts
+    # for override
+  end
+
   def edit_view_hidden
     # for override
   end
@@ -163,7 +167,7 @@ format :html do
 
   view :edit_nest_rules, cache: :never do |args|
     return ""
-    # FIXME - view can recurse.  temporarily turned off
+    # FIXME: - view can recurse.  temporarily turned off
     voo.show :toolbar
     view = args[:rule_view] || :field_related_rules
     frame do

data/mod/standard/set/all/rich_html/editor.rb

@@ -0,0 +1,50 @@
+include_set Abstract::ProsemirrorEditor
+include_set Abstract::TinymceEditor
+include_set Abstract::AceEditor
+
+Self::InputOptions.add_to_basket :options, "text area"
+Self::InputOptions.add_to_basket :options, "text field"
+Self::InputOptions.add_to_basket :options, "calendar"
+
+format :html do
+  def editor
+    (c = card.rule(:input)) && c.gsub(/[\[\]]/, "").tr(" ", "_")
+  end
+
+  def editor_method editor_type
+    "#{editor_type}_input"
+  end
+
+  def editor_defined_by_card
+    return unless (editor_card = Card[editor])
+    nest editor_card, view: :core
+  end
+
+  view :editor do
+    try(editor_method(editor)) ||
+      editor_defined_by_card ||
+      send(editor_method(default_editor))
+  end
+
+  def default_editor
+    :rich_text
+  end
+
+  # overriden by mods that provide rich text editors
+  def rich_text_input
+    prosemirror_editor_input
+  end
+
+  def text_area_input
+    text_area :content, rows: 5, class: "card-content",
+                        "data-card-type-code" => card.type_code
+  end
+
+  def text_field_input
+    text_field :content, class: "card-content"
+  end
+
+  def calendar_input
+    text_field :content, class: "date-editor"
+  end
+end

data/mod/standard/set/all/rich_html/form.rb

@@ -1,4 +1,4 @@
-include_set Abstract::ProsemirrorEditor
+
 
 format :html do
   # FIELDSET VIEWS
@@ -7,7 +7,7 @@ format :html do
   end
 
   view :name_formgroup do
-    formgroup "name", editor: "name" do
+    formgroup "name", editor: "name", help: false do
       raw name_field
     end
   end
@@ -24,7 +24,7 @@ format :html do
   end
 
   def wrap_type_formgroup
-    formgroup "type", editor: "type", class: "type-formgroup" do
+    formgroup "type", editor: "type", class: "type-formgroup", help: false do
       yield
     end
   end
@@ -77,7 +77,6 @@ format :html do
     hidden_field :last_action_id_before_edit, class: "current_revision_id"
   end
 
-
   def edit_slot
     if inline_nests_editor?
       _render_core
@@ -115,7 +114,7 @@ format :html do
   def single_card_edit_slot
     if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
       # display content field in formgroup for consistency with other fields
-      formgroup("", editor: :content) { content_field }
+      formgroup("", editor: :content, help: false) { content_field }
     else
       editor_wrap(:content) { content_field }
     end
@@ -168,10 +167,8 @@ format :html do
 
   def card_form action, opts={}
     @form_root = true
-    url, action = card_form_url_and_action action
     success = opts.delete(:success)
-    html_opts = card_form_html_opts action, opts
-    form_for card, url: url, html: html_opts, remote: true do |form|
+    form_for card, card_form_opts(action, opts) do |form|
       @form = form
       success_tags(success) + output(yield(form))
     end
@@ -191,11 +188,21 @@ format :html do
     end
   end
 
-  def card_form_html_opts action, opts={}
-    klasses = Array.wrap(opts[:class]) << "card-form slotter"
-    klasses << "autosave" if action == :update
-    opts[:class] = klasses.join " "
+  # @param action [Symbol] :create or :update
+  # @param opts [Hash] html options
+  # @option opts [Boolean] :redirect (false) if true form is no "slotter"
+  def card_form_opts action, opts={}
+    url, action = card_form_url_and_action action
+    html_opts = card_form_html_opts action, opts
+    form_opts = { url: url, html: html_opts }
+    form_opts[:remote] = true unless html_opts.delete(:redirect)
+    form_opts
+  end
 
+  def card_form_html_opts action, opts={}
+    add_class opts, "card-form"
+    add_class opts, "slotter" unless opts[:redirect]
+    add_class opts, "autosave" if action == :update
     opts[:recaptcha] ||= "on" if card.recaptcha_on?
     opts.delete :recaptcha if opts[:recaptcha] == :off
     opts