card 1.98.0 → 1.99.1

data/mod/basic_types/set/type/plain_text.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :text_area
   end
 

data/mod/{standard → basic_types}/spec/set/type/html_spec.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Html do
+RSpec.describe Card::Set::Type::Html do
   before do
     Card::Auth.current_id = Card::WagnBotID
   end
 
   it "has special editor" do
-    assert_view_select render_editor("Html"), 'textarea[rows="5"]'
+    assert_view_select render_input("Html"), 'textarea[rows="5"]'
   end
 
-  it "does not render any content in closed view" do
-    rendered = render_card :closed_content,
-                           type: "Html",
+  it "renders no html tags in one_line_content view" do
+    rendered = render_view :one_line_content,
+                           type: "HTML",
                            content: "<strong>Lions and Tigers</strong>"
-    expect(rendered).to eq("")
+    expect(rendered.strip).to eq "Tempo Rary"
   end
 
   it "renders nests" do

data/mod/basic_types/spec/set/type/plain_text_spec.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::PlainText do
+RSpec.describe Card::Set::Type::PlainText do
   it "has special editor" do
-    assert_view_select render_editor("Plain Text"), 'textarea[rows="5"]'
+    assert_view_select render_input("Plain Text"), 'textarea[rows="5"]'
   end
 
   it "has special content that escapes HTML" do
@@ -15,4 +15,9 @@ describe Card::Set::Type::PlainText do
       with_tag "span.card-title"
     end
   end
+
+  specify "view one_line_content" do
+    rendered = format_subject.render :one_line_content
+    expect(rendered).to have_tag "div.text-muted", /Alpha/
+  end
 end

data/mod/bootstrap/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb

@@ -22,9 +22,9 @@ class UpdateBootswatchThemesTo4Beta < Card::Migration::Core
       delete_code_card "style: bootstrap #{n}"
     end
     if Card::Codename.exist? :bootstrap_cards
-      update_card :bootstrap_cards,
-                  name: "style: bootstrap cards",
-                  codename: "style_bootstrap_cards"
+      update_card! :bootstrap_cards,
+                   name: "style: bootstrap cards",
+                   codename: "style_bootstrap_cards"
     end
   end
 

data/mod/bootstrap/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb

@@ -76,7 +76,7 @@ class MigrateCustomizedBootstrapSkin < Card::Migration::Core
     custom_style =
       Card.fetch(OLD_SKIN, "custom theme", "style")&.content || ""
     ensure_card "customized bootstrap style", type_id: Card::ScssID, content: custom_style
-    update_card [NEW_SKIN, :stylesheets],
-                content: "[[customized bootstrap style]]"
+    update_card! [NEW_SKIN, :stylesheets],
+                 content: "[[customized bootstrap style]]"
   end
 end

data/mod/bootstrap/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb

@@ -14,7 +14,7 @@ class AddTypeBootswatchSkin < Card::Migration::Core
 
     ensure_card "Bootswatch skin", type_id: Card::CardtypeID,
                                    codename: "bootswatch_skin"
-    update_card %i[style right options], content: STYLE_INPUT_SEARCH
+    update_card! %i[style right options], content: STYLE_INPUT_SEARCH
     Card::Cache.reset_all
     change_type_of_skins
   end

data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb

@@ -52,7 +52,7 @@ class Skin
   end
 
   def update_scss file_name:, field_name: file_name
-    update_card "#{@skin_name}+#{field_name}", style_args(file_name)
+    update_card! "#{@skin_name}+#{field_name}", style_args(file_name)
   end
 
   def update_css file_name:, field_name: file_name

data/mod/bootstrap/lib/javascript/script_load_select2.js.coffee

@@ -4,18 +4,29 @@ decko.slotReady (slot) ->
   slot.find('select:not(._no-select2)').each (_i) ->
     decko.initSelect2($(this))
 
+decko.slotDestroy (slot) ->
+  slot.find('select:not(._no-select2)').each (_i) ->
+    $(this).deInitSelect2()
+
 $.extend decko,
   initSelect2: (elem) ->
     if elem.length > 1
       decko.initSelect2($(single_el)) for single_el in elem
     else
       opts = { dropdownAutoWidth: "true", containerCssClass: ":all:", width: "auto" }
+
+      elem.attr "id", decko.uniqSelect2Id(elem.attr("id"))
       if elem.hasClass("tags")
         opts.tags = "true"
       if elem.data("minimum-results-for-search")?
         opts.minimumResultsForSearch = elem.data("minimum-results-for-search")
       elem.select2(opts)
 
+  uniqSelect2Id: (id) ->
+    return id unless $("[data-select2-id=" + id + "]").length > 0
+    decko.uniqSelect2Id id + "1"
+
+
 $(window).ready ->
   $('body').on 'select2:select', '._go-to-selected', ->
     val = $(this).val()
@@ -25,21 +36,19 @@ $(window).ready ->
   $('body').on "select2:select", "._submit-on-select", (event) ->
       $(event.target).closest('form').submit()
 
-$.fn.cloneSelect2 = (withDataAndEvents, deepWithDataAndEvents) ->
-  $old = if this.is('select') then this else this.find('select')
-  $old.select2 'destroy'
-  $old.removeAttr "data-select2-id"
-  $cloned = this.clone(withDataAndEvents, deepWithDataAndEvents)
-  decko.initSelect2 $old
-  if $cloned.is('select')
-    decko.initSelect2 $cloned
-  else
-    decko.initSelect2 $cloned.find('select')
-  $cloned
-
-
-#  slot.find('.pointer-multiselect').each (i) ->
-#    load_select2($(this))
-#
-#  slot.find('.pointer-select').each (i) ->
-#    load_select2($(this))
+$.fn.extend
+  cloneSelect2: (withDataAndEvents, deepWithDataAndEvents) ->
+    $old = if this.is('select') then this else this.find('select')
+    $old.deInitSelect2()
+    $cloned = this.clone(withDataAndEvents, deepWithDataAndEvents)
+    decko.initSelect2 $old
+    if $cloned.is('select')
+      decko.initSelect2 $cloned
+    else
+      decko.initSelect2 $cloned.find('select')
+    $cloned
+
+  deInitSelect2: ->
+    this.select2 "destroy"
+    this.removeAttr "data-select2-id"
+    this.find("option").removeAttr "data-select2-id"

data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss

@@ -24,7 +24,7 @@ header {
 
 .d0-card-header a {
   color: $body-color;
-  &.edit-link, &.bridge-link {
+  &.edit-link, &.bridge-link, &.help-link {
     color: $text-muted;
   }
 }
@@ -37,7 +37,7 @@ header {
 
 label,
 .navbox-item-label {
-  color: $label_color;
+  // color: $label_color;
 }
 table {
   border-collapse: collapse;
@@ -64,11 +64,6 @@ form {
   padding: 0px;
 }
 
-.form-group > label {
-  color: $dark;
-  font-weight: bold;
-}
-
 .link-muted {
   color: $text-muted;
   &:hover {
@@ -222,6 +217,21 @@ body.mceContentBody {
   }
 }
 
+/*---------- ( Link list )-------------*/
+
+.group-text-middle {
+  border-left: none;
+  border-right: none;
+}
+
+.group-text-left {
+  border-right: none;
+}
+
+.group-text-right {
+  border-left: none;
+}
+
 
 /* CARDTYPE_SPECIFIC ------------------------------*/
 
@@ -373,8 +383,8 @@ body.mceContentBody {
 
 /*----------- Bars and Boxes -------------*/
 
-.expanded-bar, .bar, .box {
-  .missing-view {
+.expanded-bar, .box {
+  .unknown-view {
     // TODO: obviate in ruby with better unknown API
     display: none;
   }

data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb

@@ -6,7 +6,7 @@ format :html do
     voo.show! :customize_button, :box_middle
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -39,10 +39,15 @@ format :html do
     wrap_with :span, content, options
   end
 
-  def popover_link text, title=nil
-    opts = { class: "pl-1 text-muted-link", path: "#", "data-toggle": "popover",
-             "data-trigger": :focus, "data-content": text }
+  def popover_link text, title=nil, link_text=fa_icon("question-circle"), opts={}
+    link_to link_text, popover_opts(text, title, opts)
+  end
+
+  def popover_opts text, title, opts
+    add_class opts, "pl-1 text-muted-link"
+    opts.merge! path: "#", "data-toggle": "popover",
+                "data-trigger": :focus, "data-content": text
     opts["data-title"] = title if title
-    link_to fa_icon("question-circle"), opts
+    opts
   end
 end

data/mod/bootstrap/set/all/bootstrap/tabs.rb

@@ -110,7 +110,7 @@ format :html do
   def tab_button target, text, active=false, link_attr={}
     add_class link_attr, "active" if active
     link = tab_button_link target, text, link_attr
-    li_args = { role: :presentation, class: "nav-item" }
+    li_args = { role: :presentation, class: "nav-item tab-li-#{text.to_name.key}" }
     wrap_with :li, link, li_args
   end
 

data/mod/bootstrap/set/type/customized_bootswatch_skin.rb

@@ -115,7 +115,7 @@ format :html do
      [:stylesheets, { title: "Styles" }]]
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 end

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -57,7 +57,7 @@ def variable_group_with_values group
 end
 
 format :html do
-  view :editor, template: :haml do
+  view :input, template: :haml do
     @colors = card.colors
     @theme_colors = card.theme_colors
   end

data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 RSpec.describe Bootstrap, "bootstrap builder" do
-  class BuilderTest < Card::Format::HtmlFormat::Bootstrap::Component
+  class BuilderTest < ::Bootstrap::Component
     def_tag_method :test_tag, "test-class" do |html, opts, _extra_args|
 
       before { tag :before, "prepend-class" }

data/mod/bootstrap/spec/set/all/bootstrap/form_spec.rb

@@ -3,14 +3,14 @@
 RSpec.describe Bootstrap::Component::Form do
   describe "input" do
     it "has form-group css class" do
-      assert_view_select render_editor("Phrase"),
+      assert_view_select render_input("Phrase"),
                          'input[type="text"][class~="form-control"]'
     end
   end
 
   describe "textarea" do
     it "has form-group css class" do
-      assert_view_select render_editor("Plain Text"),
+      assert_view_select render_input("Plain Text"),
                          'textarea[class~="form-control"]'
     end
   end

data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb

@@ -180,6 +180,14 @@ module CarrierWave
       end.downcase
     end
 
+    def content_type
+      # the original file's content_type method doesn't seem to be very reliable
+      # It uses mime_magic_content_type which returns invalid/invalid for css files
+      # that start with a comment
+      @content_type ||=
+        file.send(:existing_content_type) || file.send(:mini_mime_content_type)
+    end
+
     # generate identifier that gets stored in the card's db_content field
     # @param opts [Hash] generate an identifier using the given storage options
     #   instead of the storage options derived from the model and
@@ -289,8 +297,6 @@ module CarrierWave
     def storage
       case @model.storage_type
       when :cloud
-        require "carrierwave/storage/fog"
-        require "fog"
         ::CarrierWave::Storage::Fog.new(self)
       else ::CarrierWave::Storage::File.new(self)
       end

data/mod/carrierwave/set/abstract/attachment.rb

@@ -12,8 +12,7 @@ end
 
 # we need a card id for the path so we have to update db_content when we have
 # an id
-event :correct_identifier, :finalize,
-      on: :create, when: proc { |c| !c.web? } do
+event :correct_identifier, :finalize, on: :create, when: proc { |c| !c.web? } do
   update_column(:db_content, attachment.db_content)
   expire
 end
@@ -98,7 +97,7 @@ def revision action, before_action=false
 end
 
 def attachment_format ext
-  if ext.present? && attachment && (original_ext = attachment.extension)
+  if ext.present? && attachment && (original_ext = attachment.extension.sub(/^\./, ""))
     if ["file", original_ext].member? ext
       original_ext
     elsif (exts = MIME::Types[attachment.content_type])

data/mod/carrierwave/set/abstract/attachment/storage_type.rb

@@ -1,7 +1,6 @@
 attr_writer :bucket, :storage_type
 
-event :storage_type_change, :store,
-      on: :update, when: :storage_type_changed? do
+event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
   # carrierwave stores file if @cache_id is not nil
   attachment.cache_stored_file!
   # attachment.retrieve_from_cache!(attachment.cache_name)

data/mod/carrierwave/set/abstract/attachment/upload_cache.rb

@@ -54,8 +54,7 @@ end
 
 # at some point uploaded files of canceled file card creation
 # should be deleted. We do this when ever an new file is created.
-event :clear_draft_files, :integrate_with_delay,
-      on: :create do
+event :clear_draft_files, :integrate_with_delay, on: :create do
   Card.delete_tmp_files_of_cached_uploads
 end
 

data/mod/carrierwave/set/self/favicon.rb

@@ -8,4 +8,9 @@ format :html do
     return unless (source = render :source, size: :small)
     tag :link, rel: "shortcut icon", href: source
   end
+
+  def raw_help_text
+    "A favicon (or shortcut icon) is a small image used by browsers to help identify "\
+    "your website. [[http://www.decko.org/favicon|How to customize your favicon]]"
+  end
 end

data/mod/carrierwave/set/self/new_file.rb

@@ -7,7 +7,7 @@ format :html do
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

data/mod/carrierwave/set/self/new_image.rb

@@ -7,7 +7,7 @@ format :html do
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

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

@@ -86,7 +86,7 @@ format :html do
     "#{action} #{humanized_attachment_name}..."
   end
 
-  view :editor do
+  view :input do
     if card.web? || card.no_upload?
       return text_field(:content, class: "d0-card-content")
     end

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

@@ -13,7 +13,7 @@ end
 format do
   include File::Format
 
-  view :closed_content do
+  view :one_line_content do
     _render_core size: :icon
   end
 
@@ -57,7 +57,7 @@ format do
     voo.size =
       case
       when nest_mode == :closed then closed_size
-      when voo.size             then voo.size.to_sym
+      when voo.size.present?    then voo.size.to_sym
       when main?                then main_size
       else                           default_size
       end