card 1.97.0.1 → 1.98.0

data/mod/standard/set/type/session.rb

@@ -1,5 +1,9 @@
 include_set Pointer
 
+def virtual?
+  session_content.present?
+end
+
 def history?
   false
 end
@@ -8,22 +12,34 @@ def followable?
   false
 end
 
-event :store_in_session, :initialize, on: :save, changed: :content do
-  Env.session[key] = db_content
-  self.db_content = ""
+def session_key
+  "_card_#{key}"
 end
 
-event :delete_in_session, :validate, on: :delete do
-  Env.session[key] = nil
-  abort :success
+def session_content
+  Env.session[session_key]
+end
+
+def session_content= val
+  Env.session[session_key] = val
 end
 
 def content
-  Env.session[key]
+  db_content || session_content
+end
+
+event :store_in_session, :prepare_to_store, on: :save do
+  self.session_content = db_content
+  abort :success
+end
+
+event :delete_in_session, :prepare_to_store, on: :delete do
+  self.session_content = nil
+  abort :success
 end
 
-def content= val
-  self.db_content = Env.session[key] = val
+def add_to_trash args
+  yield args.merge trash: true
 end
 
 format :html do

data/mod/standard/spec/set/all/path_spec.rb

@@ -59,6 +59,11 @@ describe Card::Set::All::Path do
         expect(path).to eq("http://mydomain.com/root/A")
       end
     end
+
+    it "casts slot[hide] as array" do
+      slot_hide = CGI.escape "slot[hide][]"
+      expect(path(slot: { hide: "myview" })).to eq("/A?#{slot_hide}=myview")
+    end
   end
 
   context "when in html format" do

data/mod/standard/spec/set/all/rich_html/menu_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Card::Set::All::RichHtml::Menu do
 
     example "when voo.edit = :inline" do
       expect(edit_menu(:inline))
-        .to have_tag("a.edit-link", with: { href: "/A?view=edit_in_place" })
+        .to have_tag("a.edit-link", with: { href: "/A?view=edit_inline" })
     end
   end
 end

data/mod/standard/spec/set/all/rich_html/process_layout_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe Card::Set::All::RichHtml::ProcessLayout do
 
     it "renders top menu" do
       expect(open_view).to have_tag "header" do
-        with_tag 'a.nav-link.internal-link[href="/"]', text: "Home"
-        with_tag 'a.nav-link.internal-link[href="/:recent"]', text: "Recent"
+        with_tag 'a.nav-link.dropdown-toggle', text: "Getting started"
+        with_tag 'a.nav-link.known-card[href="/*recent"]', text: "Recent Changes"
         with_tag 'form.navbox-form[action="/*search"]' do
           with_tag 'select[name="query[keyword]"]'
         end
@@ -27,13 +27,13 @@ RSpec.describe Card::Set::All::RichHtml::ProcessLayout do
     it "renders card content" do
       expect(open_view).to have_tag "div.d0-card-body.d0-card-content" \
                                     ".ALL.ALL_PLUS" \
-                                    ".TYPE-basic.RIGHT-b.TYPE_PLUS_RIGHT-basic-b" \
+                                    ".TYPE-rich_text.RIGHT-b.TYPE_PLUS_RIGHT-rich_text-b" \
                                     ".SELF-a-b.card-body.card-text",
                                     text:  /AlphaBeta/
     end
 
     it "renders card credit" do
-      expect(open_view).to have_tag 'div[class~="SELF-Xcredit"]' do
+      expect(open_view).to have_tag 'footer' do
         with_tag "svg"
         with_tag "a", text: "Decko v#{Card::Version.release}"
       end
@@ -53,7 +53,7 @@ RSpec.describe Card::Set::All::RichHtml::ProcessLayout do
       with_layout "<pre>Hey {{_main}}</pre>"
       expect(format_subject.show(:type, {})).to have_tag :pre do
         with_text(/Hey/)
-        with_tag "div#main", "Basic"
+        with_tag "div#main", "RichText"
       end
     end
 
@@ -61,7 +61,7 @@ RSpec.describe Card::Set::All::RichHtml::ProcessLayout do
       with_layout "<pre>Hey {{_main|type}}</pre>"
       expect(format_subject.show(nil, {})).to have_tag :pre do
         with_text(/Hey/)
-        with_tag "div#main", "Basic"
+        with_tag "div#main", "RichText"
       end
     end
   end
@@ -83,7 +83,7 @@ RSpec.describe Card::Set::All::RichHtml::ProcessLayout do
 
   def with_layout content
     Card::Layout.clear_cache
-    create_layout "tmp layout", content: "<body>#{content}</body>"
+    create_layout_type "tmp layout", content: "<body>#{content}</body>"
     Card["*all+*layout"].content = "[[tmp layout]]"
     Card["tmp layout"].refresh
   end

data/mod/standard/spec/set/all/rich_html/wrapper_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Card::Set::All::RichHtml::Wrapper do
 
     it "has the appropriate attributes on open" do
       expect_view(:open, card: "A")
-        .to have_tag'div.card-slot.open-view.ALL.TYPE-basic.SELF-a' do
+        .to have_tag'div.card-slot.open-view.ALL.TYPE-rich_text.SELF-a' do
           with_tag 'div.d0-card-frame.card' do
             with_tag 'div.d0-card-header.card-header' do
               with_tag 'div.d0-card-header-title'
@@ -18,7 +18,7 @@ RSpec.describe Card::Set::All::RichHtml::Wrapper do
 
     it "has the appropriate attributes on closed" do
       expect_view(:closed, card: "A")
-        .to have_tag 'div.card-slot.closed-view.ALL.TYPE-basic.SELF-a' do
+        .to have_tag 'div.card-slot.closed-view.ALL.TYPE-rich_text.SELF-a' do
           with_tag 'div.d0-card-frame.card' do
             with_tag 'div.d0-card-header.card-header' do
               with_tag 'div.d0-card-header-title'

data/mod/standard/spec/set/type/cardtype_spec.rb

@@ -1,18 +1,18 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Cardtype do
+RSpec.describe Card::Set::Type::Cardtype do
   describe "view: add_button" do
     it "creates link with correct path" do
-      expect(render_content("{{Basic|add_button}}"))
-        .to have_tag('a[href="/new/Basic"]', text: "Add Basic")
+      expect(render_content("{{RichText|add_button}}"))
+        .to have_tag('a[href="/new/RichText"]', text: "Add RichText")
     end
     it "handles title argument" do
-      expect(render_content("{{Basic|add_button;title: custom link text}}"))
-        .to have_tag('a[href="/new/Basic"]', text: "custom link text")
+      expect(render_content("{{RichText|add_button;title: custom link text}}"))
+        .to have_tag('a[href="/new/RichText"]', text: "custom link text")
     end
     it "handles params" do
-      expect(render_content("{{Basic|add_button;params:_project=_self}}"))
-        .to have_tag('a[href="/new/Basic?_project=Tempo+Rary+2"]')
+      expect(render_content("{{RichText|add_button;params:_project=_self}}"))
+        .to have_tag('a[href="/new/RichText?_project=Tempo+Rary+2"]')
     end
   end
 
@@ -55,7 +55,7 @@ describe Card::Set::Type::Cardtype do
     end
 
     it "its create permissions should be based on Basic" do
-      expect(ct.who_can(:create)).to eq(Card["Basic"].who_can(:create))
+      expect(ct.who_can(:create)).to eq(Card[:basic].who_can(:create))
     end
   end
 end

data/mod/standard/spec/set/type/layout_type_spec.rb

@@ -1,12 +1,12 @@
 # -*- encoding : utf-8 -*-
 
-TMP_LAYOUT = %(
+TMP_LAYOUT = <<-HTML.freeze
   <body class="wrong-sidebar">
     {{_main|bar}}
   </body>
-).freeze
+HTML
 
-describe Card::Set::Type::LayoutType do
+RSpec.describe Card::Set::Type::LayoutType do
   it "includes Html card methods" do
     expect(Card.new(type: "Layout").clean_html?).to be_falsey
   end
@@ -19,8 +19,10 @@ describe Card::Set::Type::LayoutType do
 
   it "takes effect immediately when content changed" do
     layout = Card["Default Layout"]
-    expect(format_subject.show(nil, {})).to match(/right-sidebar/)
+    expect(format_subject.show(nil, {})).to have_tag :body do
+      without_tag :aside
+    end
     Card::Auth.as_bot { layout.update_attributes! content: TMP_LAYOUT }
-    expect(format_subject.show(nil, {})).to match(/wrong-sidebar.*bar-view/m)
+    expect(format_subject.show(nil, {})).to have_tag "body.wrong-sidebar"
   end
 end

data/mod/standard/spec/set/type/search_type_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Card::Set::Type::SearchType do
         search_card = Card.create type: "Search", name: "Asearch",
                                   content: %({"id":"1"})
         rss = search_card.format(:rss).render_feed
-        expect(rss).to have_tag("title", text: "Wagn Bot")
+        expect(rss).to have_tag("title", text: "Decko Bot")
       end
     end
   end
@@ -86,7 +86,7 @@ RSpec.describe Card::Set::Type::SearchType do
 
     describe "view :nested_fields" do
       subject do
-        Card::Env.params[:item] = :name_with_fields
+        # Card::Env.params[:item] = :name_with_fields
         render_card_with_args :core, { name: "Book+*type+by name" },
                               { format: :csv },  items: { view: :name_with_fields }
       end

data/mod/standard/spec/set/type/session_spec.rb

@@ -0,0 +1,33 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Type::Session do
+  it "stores content in session", as_bot: true, aggregate_failures: true do
+    create_session "sesh", "some content"
+    expect(Card.fetch("sesh", new: { type_id: Card::SessionID }).content)
+      .to eq "some content"
+    expect(Card::Env.session["_card_sesh"]).to eq "some content"
+    expect(Card.fetch("sesh")).to be_nil
+  end
+
+  it "is possible to access content before save" do
+    card = Card.new name: "sesh", content: "content", type_id: Card::SessionID
+    expect(card.content).to eq "content"
+  end
+
+  example "update content" do
+    create_session "sesh", "some content"
+    card = Card.fetch("sesh", new: { type_id: Card::SessionID })
+    card.content = "new content"
+    expect(card.content).to eq "new content"
+  end
+
+  example "delete content", as_bot: true, aggregate_failures: true do
+    create_session "sesh", "some content"
+    card = Card.fetch("sesh", new: { type_id: Card::SessionID })
+
+    expect(card.content).to eq "some content"
+    expect(Card::Env.session["_card_sesh"]).to eq "some content"
+    card.delete!
+    expect(Card::Env.session["_card_sesh"]).to be_nil
+  end
+end

data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee

@@ -6,6 +6,10 @@ decko.addEditor(
     tinyMCE.get(@[0].id).getContent()
 )
 
+decko.slotDestroy (slot) ->
+  slot.find("textarea.tinymce-textarea").each ->
+    tinyMCE.get($(this).attr("id")).remove()
+
 $.extend decko,
   setTinyMCEConfig: (string) ->
     setter = ->
@@ -41,7 +45,8 @@ $.extend decko,
 
     tinyMCE.baseURL = decko.path('assets/tinymce_editor/tinymce')
     tinyMCE.suffix = '.min'
-    tinyMCE.remove("##{el_id}") if tinyMCE.get(el_id)?
+    # "##{el_id}"
+    # tinyMCE.get(el_id).remove() if $("##{el_id}")[0]? and tinyMCE.get(el_id)?
     tinyMCE.init conf
 
   addNestPlugin: (conf) ->

data/mod/utility/set/abstract/bs_badge.rb

@@ -9,11 +9,12 @@ format :html do
 
   def badge_haml_opts count, label, opts
     process_badge_opts count, opts
-    { count: count, label: label, klass: opts[:klass], color: opts[:color] }
+    { count: count, label: label, klass: opts[:klass], color: opts[:color],
+      title: opts[:title] }
   end
 
   def process_badge_opts count, opts
-    if count.zero? && !opts[:zero_ok]
+    if count.try(:zero?) && !opts[:zero_ok]
       opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
     end
     opts[:color] ||= "secondary"

data/mod/utility/set/abstract/bs_badge/labeled_badge.haml

@@ -1,4 +1,4 @@
-%span.labeled-badge{ class: klass }
+%span.labeled-badge{ class: klass, title: title }
   %span.badge{ class: "badge-#{color}" }
     = count
   %label.text-muted

data/mod/utility/set/abstract/filterable.rb

@@ -0,0 +1,13 @@
+format :html do
+  def filterable filter_hash={}, html_opts={}
+    add_class html_opts, "_filterable _noFilterUrlUpdates"
+    html_opts[:data] ||= {}
+    html_opts[:data][:filter] = filter_hash
+    wrap_with :div, yield, html_opts
+  end
+
+  def filtering selector=nil
+    selector ||= "._filter-widget:visible"
+    wrap_with :div, yield, class: "_filtering", "data-filter-selector": selector
+  end
+end

data/mod/utility/set/abstract/filterable_bar.rb

@@ -0,0 +1,11 @@
+include_set Abstract::Filterable
+
+before :bar do
+  class_up "bar-body", "_filterable"
+  super()
+end
+
+before :expanded_bar do
+  class_up "bar", "_filterable"
+  super()
+end

data/mod/utility/set/abstract/media.rb

@@ -1,15 +1,6 @@
 format :html do
   def image_card
-    @image_card ||= card.fetch(trait: :image)
-  end
-
-  def image_src opts
-    return "" unless image_card
-    nest(image_card, view: :source, size: opts[:size])
-  end
-
-  def image_alt
-    image_card&.name
+    @image_card ||= card.fetch(trait: :image, new: {})
   end
 
   def text_with_image opts={}
@@ -21,13 +12,6 @@ format :html do
   private
 
   def normalized_text_with_image_opts opts
-    opts.reverse_merge! title: _render_title,
-                        text: "",
-                        src: image_src(opts),
-                        alt: image_alt,
-                        size: :original,
-                        media_opts: {},
-                        media_left_extras: "",
-                        media_left: ""
+    opts.reverse_merge! title: _render_title, text: "", size: voo.size, media_opts: {}
   end
 end

data/mod/utility/set/abstract/media/media_snippet.haml

@@ -1,10 +1,9 @@
 .media{media_opts}
   .media-left
-    .image-box{class: "mr-1 #{size}"}
-      %img.media-object{class: size, src: src.html_safe, alt: alt}
-    = media_left_extras
-  .media-body
-    - if title != ""
-      %h5.media-heading
+    = nest image_card, view: :boxed, size: size
+  .media-body{ class: "media-body-#{size}" }
+    - if title.present?
+      %h5{ class: classy("media-heading") }
         = title
-    = text
+    .media-text
+      = text

data/mod/utility/spec/set/abstract/media_spec.rb

@@ -35,11 +35,5 @@ RSpec.describe Card::Set::Abstract::Media do
           with_tag "img[src*='small']"
         end
     end
-
-    it "doesn't escape a stubbed src argument" do
-      stub = "(stub)#{Card::View::Stub.escape '{"mode":"normal"}'}(/stub)"
-      allow(html_format).to receive(:nest).and_return stub
-      expect(text_with_image).to include %{src='(stub){"mode":"normal"}(/stub)'}
-    end
   end
 end

data/mod/virtual/set/abstract/virtual_cache.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 def virtual?
-  true
+  new?
 end
 
 def history?

data/tmpsets/set/mod001-utility/abstract/bs_badge.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (BsBadge)
+#
+module BsBadge;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/bs_badge.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def labeled_badge count, label, opts={}
+    haml :labeled_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def tab_badge count, label, opts={}
+    haml :tab_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def badge_haml_opts count, label, opts
+    process_badge_opts count, opts
+    { count: count, label: label, klass: opts[:klass], color: opts[:color] }
+  end
+
+  def process_badge_opts count, opts
+    if count.zero? && !opts[:zero_ok]
+      opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
+    end
+    opts[:color] ||= "secondary"
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/bs_badge.rb ~~

data/tmpsets/set/mod001-utility/abstract/filterable.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (Filterable)
+#
+module Filterable;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def filterable key, value, opts={}
+    add_class opts, "filterable"
+    opts[:data] ||= {}
+    opts[:data].merge! filter_data(key, value)
+    wrap_with :div, yield, opts
+  end
+
+  def filter_data key, value
+    { filter: { key: key, value: value } }
+  end
+
+  def filtering
+    wrap_with :div, yield, class: "filtering"
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable.rb ~~