card 1.99.1 → 1.99.2

data/mod/tinymce_editor/set/all/reference_editor/link_editor.rb

@@ -0,0 +1,33 @@
+format :html do
+  view :link_editor, cache: :never, unknown: true,
+                     wrap: {
+                       slot: { class: "_overlay d0-card-overlay card nodblclick" }
+                     } do
+    link_editor :overlay
+  end
+
+  view :modal_link_editor, cache: :never, unknown: true,
+                           wrap: { slot: { class: "nodblclick" } } do
+    modal_link_editor
+  end
+
+  def link_editor editor_mode
+    @tm_snippet_editor_mode = editor_mode
+    haml :reference_editor, ref_type: :link, editor_mode: @tm_snippet_editor_mode,
+                            apply_opts: link_apply_opts, snippet: link_snippet
+  end
+
+  def modal_link_editor
+    wrap_with :modal do
+      link_editor :modal
+    end
+  end
+
+  def link_snippet
+    @link_snippet ||= LinkParser.new params[:tm_snippet_raw]
+  end
+
+  def link_apply_opts
+    apply_tm_snippet_data link_snippet
+  end
+end

data/mod/tinymce_editor/set/all/reference_editor/link_editor/link_parser.rb

@@ -0,0 +1,35 @@
+#! no set module
+
+# Extracts all information needed to generate the link editor form
+# from a link syntax string
+class LinkParser
+  attr_reader :name, :options, :field, :raw
+
+  def self.new link_string
+    return super if link_string.is_a? String
+
+    OpenStruct.new(name: "", options: {}, raw: "[[ ]]")
+  end
+
+  def initialize link_string
+    @raw = link_string
+    link = Card::Content::Chunk::Link.new link_string, nil
+    init_name link.name
+    @options = link.options
+  end
+
+  def title
+    @options && @options[:title]
+  end
+
+  def field?
+    @field
+  end
+
+  private
+
+  def init_name name
+    @field = name.to_name.simple_relative?
+    @name = @field ? name.to_s[1..-1] : name
+  end
+end

data/mod/tinymce_editor/set/all/reference_editor/nest_editor.rb

@@ -0,0 +1,174 @@
+format :html do
+  NEST_OPTIONS = %i[view title show hide wrap help variant size params].freeze
+  # Card::View::Options.shark_keys - %i[nest_syntax nest_name items cache]
+  # TODO: connect to Card::View::Options
+  # (that way a mod can add an option that becomes available to nests)
+
+  view :nest_editor, cache: :never, unknown: true,
+                     wrap: {
+                       slot: { class: "_overlay d0-card-overlay card nodblclick" }
+                     } do
+    nest_editor :overlay
+  end
+
+  view :modal_nest_editor, cache: :never, unknown: true,
+                           wrap: { slot: { class: "nodblclick" } } do
+    modal_nest_editor
+  end
+
+  view :nest_content, perms: :create, cache: :never, unknown: true, wrap: :slot do
+    if card.known?
+      known_nest_content
+    else
+      unknown_nest_content
+    end
+  end
+
+  def nest_editor editor_mode
+    @tm_snippet_editor_mode = editor_mode
+    voo.hide :content_tab unless show_content_tab?
+    haml :reference_editor, ref_type: :nest, editor_mode: @tm_snippet_editor_mode,
+                            apply_opts: nest_apply_opts,
+                            snippet: nest_snippet
+  end
+
+  def nest_editor_tabs
+    tabs = {}
+    tabs[:content] = nest_content_tab if voo.show? :content_tab
+    static_tabs(tabs.merge(
+                  options: haml(:_options, snippet: nest_snippet),
+                  rules: nest_rules_tab,
+                  help: haml(:_help)
+                ),
+                default_active_tab, "tabs")
+  end
+
+  def show_content_tab?
+    !card.is_structure?
+  end
+
+  def default_active_tab
+    voo.show?(:content_tab) ? :content : :options
+  end
+
+  def nest_content_tab
+    name_dependent_slot do
+      @nest_content_tab || nest(card.name.field(nest_snippet.name),
+                                view: :nest_content, hide: :guide)
+    end
+  end
+
+  def nest_rules_tab
+    name_dependent_slot do
+      nest(set_name_for_nest_rules, view: :nest_rules)
+    end
+  end
+
+  def name_dependent_slot
+    result = [empty_nest_name_alert(nest_snippet.name.blank?)]
+    result <<
+      if nest_snippet.name.blank?
+        content_tag :div, "", class: "card-slot" # placeholder
+      else
+        yield
+      end
+    result
+  end
+
+  def empty_nest_name_alert show
+    alert :warning, false, false,
+          class: "mb-0 _empty-nest-name-alert #{'d-none' unless show}" do
+      "nest name required" # LOCALIZE
+    end
+  end
+
+  def modal_nest_editor
+    wrap_with :modal do
+      nest_editor :modal
+    end
+  end
+
+  def nest_snippet
+    @nest_snippet ||= NestParser.new params[:tm_snippet_raw],
+                                     default_nest_view, default_item_view
+  end
+
+  def left_type_for_nest_editor_set_selection
+    card.type_name
+  end
+
+  def set_name_for_nest_rules
+    nest_name = nest_snippet.name
+    if left_type_for_nest_editor_set_selection
+      [left_type_for_nest_editor_set_selection, nest_name, :type_plus_right]
+    else
+      [nest_name, :right]
+    end
+  end
+
+  def default_nest_editor_item_options
+    [[:view, default_item_view]]
+  end
+
+  def nest_option_name_select selected=nil, level=0
+    classes = "form-control form-control-sm _nest-option-name"
+    classes += " _new-row" unless selected
+    select_tag "nest_option_name_#{unique_id}",
+               nest_option_name_select_options(selected, level),
+               class: classes, id: nil
+    # id: nil ensures that select2 generates its own unique identifier
+    # that ensures that we can clone this tag without breaking select2
+  end
+
+  def nest_option_name_select_options selected, level
+    options = selected ? [] : ["--"]
+    options += NEST_OPTIONS
+    options_for_select(
+      options, disabled: nest_option_name_disabled(selected, level),
+               selected: selected
+    )
+  end
+
+  def nest_option_name_disabled selected, level
+    disabled = if level == 0
+                 nest_snippet.options
+               else
+                 nest_snippet.item_options[level - 1] || default_nest_editor_item_options
+               end
+
+    disabled = disabled&.map(&:first)
+    disabled&.delete selected if selected
+    disabled
+  end
+
+  def nest_apply_opts
+    apply_tm_snippet_data nest_snippet
+  end
+
+  def nest_option_value_select value=nil
+    # select_tag "nest_option_value_#{unique_id}"
+    text_field_tag "value", value,
+                   class: "_nest-option-value form-control form-control-sm",
+                   disabled: !value,
+                   id: nil
+  end
+
+  def known_nest_content
+    voo.hide! :cancel_button
+    add_name_context
+    with_nest_mode :edit do
+      frame do
+        [
+          render_edit_inline
+        ]
+      end
+    end
+  end
+
+  def unknown_nest_content
+    voo.hide! :guide
+    voo.show! :new_type_formgroup
+    new_view_frame_and_form buttons: new_image_buttons,
+                            success: { tinymce_id: Env.params[:tinymce_id] }
+  end
+end

data/mod/tinymce_editor/set/all/reference_editor/nest_editor/_options.haml

@@ -0,0 +1,12 @@
+.options-container.p-2.border-bottom
+  = haml_partial :options_select, template: false, level: 0, data: snippet.options
+- snippet.item_options.each_with_index do |options, i|
+  .options-container.p-2.border-bottom._configure-items
+    %h6
+      = "#{'sub' * i} items"
+    = haml_partial :options_select, template: false, level: i + 1, data: options
+.options-container.p-2.border-bottom._configure-items
+  = button_tag "Configure #{'sub' * snippet.item_options.size}items", situation: "secondary", class: "_configure-items-button btn-sm"
+  = haml_partial :options_select, template: true, level: snippet.item_options.size + 1, data: default_nest_editor_item_options
+
+

data/mod/{edit/set/all → tinymce_editor/set/all/reference_editor}/nest_editor/nest_parser.rb

@@ -13,6 +13,11 @@ class NestParser
                    raw: "{{+|view: #{default_view}}}")
   end
 
+  def self.new_image name
+    OpenStruct.new(name: name, field?: true, options: [%i[size medium]], item_options: [],
+                   raw: "{{+#{name}|size: medium}}")
+  end
+
   def field?
     @field
   end
@@ -34,7 +39,8 @@ class NestParser
   end
 
   def extract_options options
-    Card::Set::All::NestEditor::NEST_OPTIONS.each_with_object([]) do |key, res|
+    Card::Set::All::ReferenceEditor::NestEditor::NEST_OPTIONS
+      .each_with_object([]) do |key, res|
       next unless options[key]
 
       if key.in? %i[show hide]

data/mod/tinymce_editor/set/all/reference_editor/nest_image.rb

@@ -0,0 +1,70 @@
+format :html do
+  view :nest_image, unknown: true, cache: :never,
+                    wrap: {
+                      slot: { class: "_overlay d0-card-overlay card nodblclick" }
+                    } do
+    nest_image_editor :overlay
+  end
+
+  view :modal_nest_image, unknown: true, cache: :never,
+                          wrap: { slot: { class: "nodblclick" } } do
+    nest_image_editor :modal
+  end
+
+  view :new_image, perms: :create, unknown: true, cache: :never do
+    new_view_frame_and_form new_image_form_opts
+  end
+
+  def nest_image_editor editor_mode
+    adapt_reference_editor_for_images
+    nest_editor editor_mode
+  end
+
+
+  def adapt_reference_editor_for_images
+    nest_name = card.autoname(card.name.field("image01"))
+    voo.show! :content_tab
+    @nest_content_tab = nest(nest_name, view: :new_image, type: :image, hide: :guide)
+
+    image_name = nest_name.to_name.right
+    @nest_snippet = NestEditor::NestParser.new_image image_name
+  end
+
+
+  def new_image_form_opts
+    { buttons: new_image_buttons,
+      success: { tinymce_id: Env.params[:tinymce_id],
+                 view: :open } }
+  end
+
+  def new_image_buttons
+    button_formgroup do
+      [standard_save_button(no_origin_update: true, class: "_change-create-to-update")]
+    end
+  end
+end
+
+format :js do
+  view :change_create_to_update, unknown: true do
+    tm_id = if Env.params[:tinymce_id].present?
+              "\"#{Env.params[:tinymce_id]}\""
+            else
+              '$(".tinymce-textarea").attr("id")'
+            end
+    <<-JAVASCRIPT.strip_heredoc
+      nest.changeCreateToUpdate(#{tm_id});
+    JAVASCRIPT
+  end
+
+  view :open_nest_editor, unknown: true do
+    tm_id = if Env.params[:tinymce_id].present?
+              "\"#{Env.params[:tinymce_id]}\""
+            else
+              '$(".tinymce-textarea").attr("id")'
+            end
+    <<-JAVASCRIPT.strip_heredoc
+      tm = tinymce.get(#{tm_id});
+      nest.insertNest(tm, "{{+#{card.name.tag}|size: medium}}");
+    JAVASCRIPT
+  end
+end

data/mod/tinymce_editor/set/all/reference_editor/reference_editor.haml

@@ -0,0 +1,18 @@
+%div._nest-editor
+  .nest-header.d-flex.ml-2
+    %h5.mt-1
+      = ref_type.capitalize
+    .ml-auto
+      = link_to fa_icon(:close), path: "#", "data-dismiss": editor_mode, class: "text-dark p-1 ml-1"
+
+  .form
+    = haml_partial "#{ref_type}_editor", snippet: snippet
+
+  .card-footer.p-0
+    .preview.mx-1.my-1.form-control-feedback
+      = text_field_tag "preview", snippet.raw, class: "_#{ref_type}-preview w-100 text-muted", readonly: true
+    %hr.mt-1.mb-1
+    .form-group-inline.d-flex.justify-content-center.py-2
+      = button_tag (modal_tm_snippet_editor? ? "Apply and Close" : "Apply"), apply_opts.merge(class: "_#{ref_type}-apply btn-sm mr-3")
+      %a.border-light.text-dark.btn.btn-sm.btn-outline-secondary{"data-dismiss": editor_mode, href: "#"}
+        = modal_tm_snippet_editor? ? "Cancel" : "Close"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.99.1
+  version: 1.99.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -362,6 +362,7 @@ files:
 - config/initializers/02_patches/active_support.rb
 - config/initializers/02_patches/better_errors.rb
 - config/initializers/02_patches/kaminari.rb
+- config/initializers/02_patches/zeitwerk.rb
 - config/initializers/core_extensions.rb
 - config/initializers/deck_config.rb
 - config/initializers/delayed_job_config.rb
@@ -372,6 +373,7 @@ files:
 - config/initializers/patches.rb
 - config/initializers/recaptcha.rb
 - config/initializers/uuid_state_file.rb
+- config/initializers/zeitwerk.rb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -494,6 +496,9 @@ files:
 - db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb
 - db/migrate_core_cards/20190918200115_ensure_description_card.rb
 - db/migrate_core_cards/20191008201046_fixture_fix.rb
+- db/migrate_core_cards/20191028135243_add_link_editor_to_tiny_mce_config.rb
+- db/migrate_core_cards/20191115160748_history_cleanup.rb
+- db/migrate_core_cards/20191118145629_codename_fixes.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -630,14 +635,16 @@ files:
 - lib/card/codename.rb
 - lib/card/content.rb
 - lib/card/content/chunk.rb
+- lib/card/content/chunk/abstract.rb
 - lib/card/content/clean.rb
 - lib/card/content/diff.rb
-- lib/card/content/diff/lcs.rb
-- lib/card/content/diff/processor.rb
+- lib/card/content/diff/l_c_s.rb
+- lib/card/content/diff/l_c_s/processor.rb
 - lib/card/content/diff/result.rb
 - lib/card/content/parser.rb
 - lib/card/content/truncate.rb
 - lib/card/dirty.rb
+- lib/card/dirty/method_factory.rb
 - lib/card/env.rb
 - lib/card/env/location.rb
 - lib/card/env/location_history.rb
@@ -678,6 +685,7 @@ files:
 - lib/card/mod/loader/set_loader.rb
 - lib/card/mod/loader/set_pattern_loader.rb
 - lib/card/mod/module_template.rb
+- lib/card/mod_inflector.rb
 - lib/card/model/save_helper.rb
 - lib/card/name.rb
 - lib/card/name/fields_and_traits.rb
@@ -709,6 +717,7 @@ files:
 - lib/card/reference.rb
 - lib/card/seed_consts.rb
 - lib/card/set.rb
+- lib/card/set/abstract.rb
 - lib/card/set/advanced_api.rb
 - lib/card/set/basket.rb
 - lib/card/set/code_nest.rb
@@ -728,9 +737,11 @@ files:
 - lib/card/set/i18n_scope.rb
 - lib/card/set/inheritance.rb
 - lib/card/set/loader.rb
+- lib/card/set/pattern.rb
+- lib/card/set/pattern/base.rb
 - lib/card/set/required_field.rb
 - lib/card/set/trait.rb
-- lib/card/set_pattern.rb
+- lib/card/set/type.rb
 - lib/card/subcards.rb
 - lib/card/subcards/add.rb
 - lib/card/subcards/relate.rb
@@ -782,7 +793,7 @@ files:
 - mod/Modfile
 - mod/account/README.md
 - mod/account/set/abstract/account_field.rb
-- mod/account/set/abstract/accounted.rb
+- mod/account/set/abstract/accountable.rb
 - mod/account/set/all/account.rb
 - mod/account/set/right/account.rb
 - mod/account/set/right/account/events.rb
@@ -801,6 +812,7 @@ files:
 - mod/account/set/type/user.rb
 - mod/account/set/type/user/setup_help.haml
 - mod/account/set/type_plus_right/user/email.rb
+- mod/account/spec/set/abstract/accountable_spec.rb
 - mod/account/spec/set/all/account_spec.rb
 - mod/account/spec/set/right/account_spec.rb
 - mod/account/spec/set/right/email_spec.rb
@@ -4105,7 +4117,7 @@ files:
 - mod/bootstrap/vendor/select2/vendor/jquery-2.1.0.js
 - mod/carrierwave/Gemfile
 - mod/carrierwave/config/core_initializers/carrierwave.rb
-- mod/carrierwave/lib/carrier_wave/cardmount.rb
+- mod/carrierwave/lib/carrier_wave/card_mount.rb
 - mod/carrierwave/lib/carrier_wave/file_card_uploader.rb
 - mod/carrierwave/lib/carrier_wave/image_card_uploader.rb
 - mod/carrierwave/set/abstract/attachment.rb
@@ -4933,7 +4945,6 @@ files:
 - mod/developer/spec/set/all/view_viz_spec.rb
 - mod/developer/spec/set/right/debug_spec.rb
 - mod/edit/set/all/bridge.rb
-- mod/edit/set/all/bridge/account_section.rb
 - mod/edit/set/all/bridge/bridge.haml
 - mod/edit/set/all/bridge/bridge_pills.rb
 - mod/edit/set/all/bridge/follow_section.rb
@@ -4950,14 +4961,6 @@ files:
 - mod/edit/set/all/form_buttons.rb
 - mod/edit/set/all/form_elements.rb
 - mod/edit/set/all/formgroup.rb
-- mod/edit/set/all/nest_editor.rb
-- mod/edit/set/all/nest_editor/_help.haml
-- mod/edit/set/all/nest_editor/_options.haml
-- mod/edit/set/all/nest_editor/_options_select.haml
-- mod/edit/set/all/nest_editor/_options_select_row.haml
-- mod/edit/set/all/nest_editor/nest_editor.haml
-- mod/edit/set/all/nest_editor/nest_parser.rb
-- mod/edit/set/all/nest_image.rb
 - mod/edit/set/all/new.rb
 - mod/edit/set/all/overlay_guide.haml
 - mod/edit/set/all/overlay_guide.rb
@@ -4970,9 +4973,9 @@ files:
 - mod/edit/spec/set/all/editing_spec.rb
 - mod/edit/spec/set/all/form_elements_spec.rb
 - mod/edit/spec/set/all/form_spec.rb
-- mod/edit/spec/set/all/nest_editor/nest_parser_spec.rb
-- mod/edit/spec/set/all/nest_editor_spec.rb
-- mod/edit/spec/set/all/nest_image_spec.rb
+- mod/edit/spec/set/all/reference_editor/nest_editor/nest_parser_spec.rb
+- mod/edit/spec/set/all/reference_editor/nest_editor_spec.rb
+- mod/edit/spec/set/all/reference_editor/nest_image_spec.rb
 - mod/email/README
 - mod/email/format/email_html_format.rb
 - mod/email/format/email_text_format.rb
@@ -5079,6 +5082,7 @@ files:
 - mod/machines/lib/javascript/decko/filter_links.js.coffee
 - mod/machines/lib/javascript/decko/follow.js.coffee
 - mod/machines/lib/javascript/decko/layout.js.coffee
+- mod/machines/lib/javascript/decko/link_editor.js.coffee
 - mod/machines/lib/javascript/decko/mod.js.coffee
 - mod/machines/lib/javascript/decko/modal.js.coffee
 - mod/machines/lib/javascript/decko/name_editor.js.coffee
@@ -5263,6 +5267,7 @@ files:
 - mod/pointer/set/abstract/02_pointer/options_api.rb
 - mod/pointer/set/abstract/02_pointer/other_views.rb
 - mod/pointer/set/abstract/code_pointer.rb
+- mod/pointer/set/abstract/id_pointer.rb
 - mod/pointer/set/right/content_options.rb
 - mod/pointer/set/self/input_options.rb
 - mod/pointer/set/self/script_editors.rb
@@ -5597,6 +5602,19 @@ files:
 - mod/tinymce_editor/public/assets/tinymce/themes/silver/theme.min.js
 - mod/tinymce_editor/public/assets/tinymce/tinymce.min.js
 - mod/tinymce_editor/set/abstract/tinymce_editor.rb
+- mod/tinymce_editor/set/all/reference_editor.rb
+- mod/tinymce_editor/set/all/reference_editor/_link_editor.haml
+- mod/tinymce_editor/set/all/reference_editor/_nest_editor.haml
+- mod/tinymce_editor/set/all/reference_editor/link_editor.rb
+- mod/tinymce_editor/set/all/reference_editor/link_editor/link_parser.rb
+- mod/tinymce_editor/set/all/reference_editor/nest_editor.rb
+- mod/tinymce_editor/set/all/reference_editor/nest_editor/_help.haml
+- mod/tinymce_editor/set/all/reference_editor/nest_editor/_options.haml
+- mod/tinymce_editor/set/all/reference_editor/nest_editor/_options_select.haml
+- mod/tinymce_editor/set/all/reference_editor/nest_editor/_options_select_row.haml
+- mod/tinymce_editor/set/all/reference_editor/nest_editor/nest_parser.rb
+- mod/tinymce_editor/set/all/reference_editor/nest_image.rb
+- mod/tinymce_editor/set/all/reference_editor/reference_editor.haml
 - mod/tinymce_editor/set/self/script_tinymce.rb
 - mod/tinymce_editor/set/self/script_tinymce_config.rb
 - mod/tinymce_editor/set/self/tiny_mce.rb