card 1.21.0 → 1.91

data/mod/standard/set/rstar/rules_editor.rb

@@ -31,7 +31,7 @@ format :html do
   end
 
   def open_rule_body rule_view
-    wrap_with :div, class: "card-body" do
+    wrap_with :div, class: "d0-card-body" do
       nest current_rule, view: rule_view, rule_context: card
     end
   end

data/mod/standard/set/self/activity_toolbar_button.rb

@@ -2,12 +2,12 @@ include_set Abstract::ToolbarSplitButton
 
 format :html do
   view :core do
-    subject.toolbar_split_button "activity", view: :history, icon: :time do
+    subject.toolbar_split_button "activity", view: :history, icon: :history do
       {
         history: (subject._render_history_link if card.history?),
-        discussion: subject.link_to_related(:discussion, "discuss"),
-        follow:  subject._render_follow_link,
-        editors: subject.link_to_related(:editors, "editors")
+        discussion: subject.link_to_related(:discussion, "discuss", class: "dropdown-item"),
+        follow:  subject._render_follow_link(link_opts: { class: "dropdown-item" }),
+        editors: subject.link_to_related(:editors, "editors", class: "dropdown-item")
       }
     end
   end

data/mod/standard/set/self/navbox.rb

@@ -1,8 +1,8 @@
 
 format :html do
   view :raw do
-    wrap_with :div, class: "form-group" do
-      text_field_tag :_keyword, "", class: "navbox form-control",
+    wrap_with :div, class: "form-group w-100" do
+      text_field_tag :_keyword, "", class: "_navbox navbox form-control w-100",
                                     placeholder: navbar_placeholder
     end
   end
@@ -10,17 +10,12 @@ format :html do
   def navbar_placeholder
     @@placeholder ||= begin
       holder_card = Card["#{Card[:navbox].name}+*placeholder"]
-      holder_card ? holder_card.raw_content : ""
+      holder_card ? holder_card.raw_content : "Search"
     end
   end
 
-  view :navbar_left do
-    class_up "navbox-form", "navbar-form navbar-left"
-    _render_core
-  end
-
-  view :navbar_right do
-    class_up "navbox-form", "navbar-form navbar-left"
+  view :navbar do
+    class_up "navbox-form", "form-inline w-25"
     _render_core
   end
 

data/mod/standard/set/self/rules_toolbar_button.rb

@@ -32,7 +32,8 @@ format :html do
 
   def edit_rules_link text, rule_view
     subject.link_to_view :edit_rules, text,
-                         path: { rule_view: rule_view }
+                         path: { rule_view: rule_view },
+                         class: "dropdown-item"
   end
 
   def edit_nest_rules_link text

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

@@ -87,9 +87,9 @@ format :html do
 
   def group_tab group_key
     heading_id = "heading-#{group_key}"
-    wrap_with :div, class: "panel panel-default" do
-      wrap_with :div, class: "panel-heading", role: "tab", id: heading_id do
-        wrap_with :h4, class: "panel-title" do
+    wrap_with :div, class: "card" do
+      wrap_with :div, class: "card-header", role: "tab", id: heading_id do
+        wrap_with :h5, class: "mb-0" do
           group_collapse_link group_key
         end
       end
@@ -115,7 +115,9 @@ format :html do
     settings = card.visible_settings group_key
     wrap_with :div, id: collapse_id, class: "panel-collapse collapse",
                     role: "tabpanel", "aria-labelledby" => heading_id do
-      rules_table settings.map(&:codename)
+      wrap_with :div, class: "card-block" do
+        rules_table settings.map(&:codename)
+      end
     end
   end
 
@@ -181,47 +183,30 @@ format :html do
   end
 
   view :set_navbar do |_args|
-    id = "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}"
+    id = "set-navbar-#{card.cardname.safe_key}-#{voo.home_view}"
     related_sets = card.related_sets(true)
     return "" if related_sets.size <= 1
-    navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
-               class: "slotter toolbar", navbar_type: "inverse",
-               collapsed_content: close_link("pull-right visible-xs") do
-      [
-        wrap_with(:span, "Set:", class: "navbar-text hidden-xs"),
-        (wrap_with :ul, class: "nav navbar-nav nav-pills" do
-          related_sets.map do |name, label|
-            slot_opts = { subheader: showname(name),
-                          subframe: true,
-                          hide: "header set_label rule_navbar",
-                          show: "subheader set_navbar" }
-            link = link_to_card name, label, remote: true,
-                                             path: { view: @slot_view,
-                                                     slot: slot_opts }
-            li_pill link, name == card.name
-          end
-        end)
-      ]
+    navbar id, brand: "Set", toggle_align: :right,
+               class: "slotter toolbar navbar-toggleable-md",
+               navbar_type: "inverse",
+               collapsed_content: close_link("pull-right hidden-sm-up") do
+      set_navbar_content related_sets
     end
   end
 
   def li_pill content, active
-    "<li role='presentation' #{"class='active'" if active}>#{content}</li>"
+    "<li role='presentation' class='nav-item #{'active' if active}'>#{content}</li>"
   end
 
   view :rule_navbar do
     navbar "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}",
-           toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
-           class: "slotter toolbar", navbar_type: "inverse",
-           collapsed_content: close_link("pull-right visible-xs") do
-      [rule_navbar_heading, rule_navbar_content]
+           brand: 'Rules', toggle_align: :right,
+           class: "slotter toolbar navbar-toggleable-md", navbar_type: "inverse",
+           collapsed_content: close_link("pull-right hidden-sm-up") do
+      rule_navbar_content
     end
   end
 
-  def rule_navbar_heading
-    wrap_with :span, "Rules:", class: "navbar-text hidden-xs"
-  end
-
   def rule_navbar_pills
     pills = [["common",   :common_rules],
              ["by group", :grouped_rules],
@@ -239,9 +224,26 @@ format :html do
     end
   end
 
+  def set_navbar_content related_sets
+    wrap_with :ul, class: "nav navbar-nav nav-pills" do
+      related_sets.map do |name, label|
+        slot_opts = { subheader: showname(name),
+                      subframe: true,
+                      hide: "header set_label rule_navbar",
+                      show: "subheader set_navbar" }
+        link = link_to_card name, label, remote: true,
+                            path: { view: @slot_view,
+                                    slot: slot_opts },
+                            class: "nav-link"
+
+        li_pill link, name == card.name
+      end
+    end
+  end
+
   def view_link_pill name, view
     selected_view = @selected_rule_navbar_view || @slot_view || voo.home_view
-    link = link_to_view view, name, class: "slotter", role: "pill",
+    link = link_to_view view, name, class: "nav-link slotter", role: "pill",
                                     path: { slot: { show: :rule_navbar } }
     li_pill link, selected_view == view
   end

data/mod/standard/spec/chunk/include_spec.rb

@@ -106,14 +106,14 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       create! "Alpha", "Pooey"
       beta = create! "Beta", "{{Alpha}}"
       result = beta.format.render_core
-      assert_view_select result, 'div[class~="card-content"]', "Pooey"
+      assert_view_select result, 'div[class~="d0-card-content"]', "Pooey"
     end
 
     it "handles simple relative names" do
       alpha = create! "Alpha", "{{#{Card::Name.joint}Beta}}"
       create! "Beta"
       create! "#{alpha.name}#{Card::Name.joint}Beta", "Woot"
-      assert_view_select alpha.format.render_core, "div[class~=card-content]",
+      assert_view_select alpha.format.render_core, "div[class~=d0-card-content]",
                          "Woot"
     end
 
@@ -125,7 +125,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       bob_address = create! "bob+address"
 
       r = bob_address.reload.format.render_core
-      assert_view_select r, "div[class~=card-content]", "Sparta"
+      assert_view_select r, "div[class~=d0-card-content]", "Sparta"
       expect(Card.fetch("bob+address").includees.map(&:name))
         .to eq([bob_city.name])
     end
@@ -135,7 +135,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       create! "Beta", "{{Delta}}"
       create! "Delta", "Booya"
       r = alpha.format.render_core
-      assert_view_select r, "div[class~=card-content]"
+      assert_view_select r, "div[class~=d0-card-content]"
       expect(r).to match(/Booya/)
     end
 

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

@@ -7,7 +7,7 @@ describe Card::Set::All::History do
     # end
     it "has a frame" do
       history = render_card :history, name: "A"
-      assert_view_select history, 'div[class~="card-frame"]'
+      assert_view_select history, 'div[class~="d0-card-frame"]'
     end
 
     describe "#action_summary" do

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

@@ -11,11 +11,11 @@ describe Card::Set::All::RichHtml::Wrapper do
         @ocslot.render(:open),
         'div[class="card-slot open-view ALL TYPE-basic SELF-a"]'
       ) do
-        assert_select 'div[class="card-frame panel panel-default"]' do
-          assert_select 'div[class="card-header panel-heading"]' do
-            assert_select 'div[class="card-header-title panel-title"]'
+        assert_select 'div[class="d0-card-frame card"]' do
+          assert_select 'div[class="d0-card-header card-header"]' do
+            assert_select 'div[class="d0-card-header-title"]'
           end
-          assert_select 'div[class~="card-body"]'
+          assert_select 'div[class~="d0-card-body"]'
         end
       end
     end
@@ -25,11 +25,11 @@ describe Card::Set::All::RichHtml::Wrapper do
       assert_view_select(
         v, 'div[class="card-slot closed-view ALL TYPE-basic SELF-a"]'
       ) do
-        assert_select 'div[class="card-frame panel panel-default"]' do
-          assert_select 'div[class="card-header panel-heading"]' do
-            assert_select 'div[class="card-header-title panel-title"]'
+        assert_select 'div[class="d0-card-frame card"]' do
+          assert_select 'div[class="d0-card-header card-header"]' do
+            assert_select 'div[class="d0-card-header-title"]'
           end
-          assert_select 'div[class~="card-body card-content"]'
+          assert_select 'div[class~="d0-card-body d0-card-content"]'
           assert_select 'div[class~="closed-content"]'
         end
       end

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

@@ -3,6 +3,6 @@
 describe Card::Set::Type::Phrase do
   it "has special editor" do
     assert_view_select render_editor("Phrase"),
-                       'input[type="text"][class~="card-content"]'
+                       'input[type="text"][class~="d0-card-content"]'
   end
 end

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

@@ -3,7 +3,7 @@
 describe Card::Set::Type::Uri do
   it "has special editor" do
     assert_view_select render_editor("Uri"),
-                       'input[type="text"][class~="card-content"]'
+                       'input[type="text"][class~="d0-card-content"]'
   end
 
   it "renders core view links" do

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

@@ -1,19 +1,19 @@
-wagn.addEditor(
+decko.addEditor(
   '.tinymce-textarea',
   ->
-    wagn.initTinyMCE @[0].id
+    decko.initTinyMCE @[0].id
   ->
     tinyMCE.get(@[0].id).getContent()
 )
 
-$.extend wagn,
+$.extend decko,
   setTinyMCEConfig: (string) ->
     setter = ->
       try
         $.parseJSON string
       catch
         {}
-    wagn.tinyMCEConfig = setter()
+    decko.tinyMCEConfig = setter()
 
   initTinyMCE: (el_id) ->
     # verify_html: false -- note: this option needed for empty
@@ -22,13 +22,13 @@ $.extend wagn,
       plugins: 'autoresize'
       autoresize_max_height: 500
     }
-    user_conf = if wagn.tinyMCEConfig? then wagn.tinyMCEConfig else {}
+    user_conf = if decko.tinyMCEConfig? then decko.tinyMCEConfig else {}
     hard_conf = {
       mode: 'exact'
       elements: el_id
       # CSS could be made optional, but it may involve migrating old legacy
       # *tinyMCE settings to get rid of stale stuff.
-      content_css: wagn.cssPath
+      content_css: decko.cssPath
       entity_encoding: 'raw'
     }
     $.extend conf, user_conf, hard_conf

data/mod/tinymce_editor/set/abstract/tinymce_editor.rb

@@ -1,6 +1,6 @@
 format :html do
   def tinymce_editor_input
-    text_area :content, rows: 3, class: "tinymce-textarea card-content",
+    text_area :content, rows: 3, class: "tinymce-textarea d0-card-content",
                         id: unique_id
   end
 end

data/script/fetch_bootswatch_themes.rb

@@ -0,0 +1,38 @@
+require "active_support"
+require "uri/https"
+require "open-uri"
+require "fileutils"
+
+THEMES = %w[Cerulean Cosmo Cyborg Darkly Flatly Journal Litera Lumen Lux Materia Minty
+            Pulse Sandstone Simplex Slate Solar Spacelab Superhero United Yeti]
+           .map(&:downcase).freeze
+
+class Theme
+  STORE_DIR = File.expand_path("../../db/migrate_core_cards/data/b4_themes", __FILE__).freeze
+  BOOTSWATCH_HOST = "bootswatch.com".freeze
+  VERSION = "4-alpha"
+
+  def initialize name
+    @theme = name
+    @store_dir =  File.join STORE_DIR, @theme
+    FileUtils.mkdir_p @store_dir
+  end
+
+  def store_path filename
+    File.join @store_dir, filename
+  end
+
+  def uri object
+    URI::HTTPS.build host: BOOTSWATCH_HOST, path: "/#{VERSION}/#{@theme}/#{object}"
+  end
+end
+
+THEMES.each do |theme_name|
+  theme = Theme.new theme_name
+  %w[_variables.scss _bootswatch.scss thumbnail.png].each do |filename|
+    File.open(theme.store_path(filename), "w") do |f|
+      puts theme.uri(filename)
+      f.puts theme.uri(filename).read
+    end
+  end
+end

data/spec/lib/card/cache_spec.rb

@@ -73,7 +73,7 @@ describe Card::Cache do
 
   describe "with file store" do
     before do
-      cache_path = "#{Wagn.root}/tmp/cache"
+      cache_path = "#{Decko.root}/tmp/cache"
       FileUtils.mkdir_p(cache_path) unless File.directory?(cache_path)
       @hard = ActiveSupport::Cache::FileStore.new cache_path
 

data/spec/lib/card/migration/import_spec.rb

@@ -1,13 +1,23 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Migration::Import do
+  let(:path) { Card::Migration.data_path }
+  let(:importer) { Card::Migration::Import.new path }
+
+  def card_meta_path
+    Card::Migration::Import::ImportData.new(path).instance_variable_get("@path")
+  end
+
+  def card_content_dir
+    Card::Migration::Import::ImportData.new(path).instance_variable_get("@card_content_dir")
+  end
+
   def meta_data
-    path = Card::Migration::Import::ImportData::DEFAULT_PATH
-    YAML.load_file(path).deep_symbolize_keys
+    YAML.load_file(card_meta_path).deep_symbolize_keys
   end
 
   def content_path filename
-    File.join(Card::Migration::Import::ImportData::CARD_CONTENT_DIR, filename)
+    File.join(card_content_dir, filename)
   end
 
   def content_data_file filename
@@ -15,17 +25,13 @@ describe Card::Migration::Import do
   end
 
   before(:each) do
-    if File.exist? Card::Migration::Import::ImportData::DEFAULT_PATH
-      FileUtils.rm Card::Migration::Import::ImportData::DEFAULT_PATH
-    end
-    if Dir.exist? Card::Migration::Import::ImportData::CARD_CONTENT_DIR
-      FileUtils.rm_rf Card::Migration::Import::ImportData::CARD_CONTENT_DIR
-    end
+    FileUtils.rm card_meta_path if File.exist? card_meta_path
+    FileUtils.rm_rf card_content_dir if Dir.exist? card_content_dir
   end
 
   describe ".add_remote" do
     it "adds remote to yml file" do
-      Card::Migration::Import.add_remote "test", "url"
+      importer.add_remote "test", "url"
       remotes = meta_data[:remotes]
       expect(remotes[:test]).to eq "url"
     end
@@ -33,7 +39,7 @@ describe Card::Migration::Import do
 
   describe ".pull" do
     it "saves card attributes" do
-      Card::Migration::Import.pull "A"
+      importer.pull "A"
       cards = meta_data[:cards]
       expect(cards).to be_instance_of(Array)
       expect(cards.first[:name]).to eq "A"
@@ -41,23 +47,23 @@ describe Card::Migration::Import do
     end
 
     it "saves card content" do
-      Card::Migration::Import.pull "A"
+      importer.pull "A"
       expect(content_data_file("a")).to eq "Alpha [[Z]]"
     end
 
     context "called with deep: true" do
       it "saves nested card" do
-        Card::Migration::Import.pull "B", deep: true
+        importer.pull "B", deep: true
         expect(content_data_file("z")).to eq "I'm here to be referenced to"
       end
 
       it "does not save linked card" do
-        Card::Migration::Import.pull "A", deep: true
+        importer.pull "A", deep: true
         expect(File.exist?(content_path("z"))).to be_falsey
       end
 
       it "saves pointer items" do
-        Card::Migration::Import.pull "Fruit+*type+*create", deep: true
+        importer.pull "Fruit+*type+*create", deep: true
         expect(File.exist?(content_path("anyone"))).to be_truthy
       end
     end
@@ -65,9 +71,9 @@ describe Card::Migration::Import do
 
   describe ".merge" do
     it "updates card content" do
-      Card::Migration::Import.pull "A"
+      importer.pull "A"
       File.write content_path("a"), "test"
-      Card::Migration::Import.merge
+      importer.merge
       expect(Card["A"].content).to eq "test"
     end
   end