card 1.91 → 1.92

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

@@ -48,8 +48,8 @@ event :update_related_listed_by_card_on_content_update, :finalize,
       on: :update, changed: :content do
   new_items = item_keys
   changed_items =
-    if db_content_was
-      old_items = item_keys(content: db_content_was)
+    if db_content_before_act
+      old_items = item_keys(content: db_content_before_act)
       old_items + new_items - (old_items & new_items)
     else
       new_items
@@ -74,8 +74,8 @@ end
 
 def update_all_items
   current_items = item_keys
-  if db_content_was
-    old_items = item_keys(content: db_content_was)
+  if db_content_before_act
+    old_items = item_keys(content: db_content_before_act)
     update_listed_by_cache_for old_items
   end
   update_listed_by_cache_for current_items

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

@@ -11,9 +11,9 @@ format do
 
   def search_result_view
     case search_with_params
-    when Exception          then :search_error
-    when Integer            then :search_count
-    when @mode == :template then :raw
+    when Exception              then :search_error
+    when Integer                then :search_count
+    when nest_mode == :template then :raw
     else                         :card_list
     end
   end
@@ -58,7 +58,7 @@ format :html do
   end
 
   view :closed_content, cache: :never do
-    if @depth > max_depth
+    if depth > max_depth
       "..."
     else
       search_params[:limit] = closed_limit

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

@@ -26,4 +26,8 @@ format :html do
   def default_core_args args
     args[:items] = { view: :name }
   end
+
+  def editor
+    :text_field
+  end
 end

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

@@ -227,7 +227,7 @@ format :html do
   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),
+        slot_opts = { subheader: title_in_context(name),
                       subframe: true,
                       hide: "header set_label rule_navbar",
                       show: "subheader set_navbar" }

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

@@ -4,8 +4,8 @@ end
 
 view :core do
   case card.raw_content.to_i
-  when 1 then "yes"
-  when 0 then "no"
+  when 1 then tr(:yes)
+  when 0 then tr(:no)
   else
     "?"
   end

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

@@ -53,7 +53,7 @@ describe Card::Content::Chunk::Link do
     assert_link "[[Onassis+]]", format_args: format_args,
                                 class: "wanted-card",
                                 href: "/Onassis+Kennedy",
-                                text: "Onassis"
+                                text: "Onassis+Kennedy"
   end
 
   it "handles relative urls" do

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::History do
+RSpec.describe Card::Set::All::History do
   context "history view" do
     # before do
     #   Card.create! name: 'my histoer card'
@@ -26,11 +26,17 @@ describe Card::Set::All::History do
   end
 
   describe "#create_act_and_action" do
-    let!(:act_start_cnt) { Card::Act.count }
-    let(:content)        { "Nobody expects the Spanish inquisition" }
-    let(:act)            { @card.acts.last }
-    let(:action)         { act.actions.last }
-
+    let!(:act_start_cnt) {Card::Act.count}
+    let(:content) {"Nobody expects the Spanish inquisition"}
+    let(:act) {@card.acts.last}
+    let(:action) {act.actions.last}
+
+    INITIAL_VALUES = {
+      name: "single card",
+      type_id: Card::BasicID.to_s,
+      db_content: "Nobody expects the Spanish inquisition",
+      trash: "f"
+    }
     context "for single card" do
       before do
         @card = Card::Auth.as_bot do
@@ -42,21 +48,33 @@ describe Card::Set::All::History do
         it "adds new act" do
           expect(Card::Act.count).to eq(act_start_cnt + 1)
           expect(act.card_id).to eq(@card.id)
+          expect(act.acted_at).to be > Time.zone.now - 1.minute
         end
         it "adds create action" do
           expect(action.action_type).to eq(:create)
         end
+        it "does not add card changes entries" do
+          expect(action.card_changes).to be_empty
+        end
+        it "fetches card changes from cards table" do
+          expect(action.changed_values).to eq(INITIAL_VALUES)
+
+        end
       end
 
       context "when updated" do
         it "adds no act if nothing changed" do
-          @card.update_attributes  name: "single card", content: content
+          @card.update_attributes name: "single card", content: content
           expect(Card::Act.count).to eq(act_start_cnt + 1)
         end
         it "adds new act" do
           @card.update_attributes content: "new content"
           expect(Card::Act.count).to eq(act_start_cnt + 2)
         end
+        it "adds changes to create action" do
+          @card.update_attributes content: "new content"
+          expect(@card.actions.first.changed_values).to eq INITIAL_VALUES
+        end
       end
 
       context "when deleted" do
@@ -75,6 +93,9 @@ describe Card::Set::All::History do
           expect(action.card_changes.last.field).to eq("trash")
           expect(action.card_changes.last.value).to be_truthy
         end
+        it "adds changes to create action" do
+          expect(@card.actions.first.changed_values).to eq INITIAL_VALUES
+        end
       end
 
       context "when creation fails" do
@@ -96,7 +117,7 @@ describe Card::Set::All::History do
 
         it "doesn't create act and actions if subcard fails" do
           Card::Auth.as("joe_user") do
-            act_count    = Card::Act.count
+            act_count = Card::Act.count
             action_count = Card::Action.count
             Card.create name: "crete fail", subcards: { "*all+*create" => "" }
             expect(Card::Action.count).to eq action_count
@@ -142,8 +163,7 @@ describe Card::Set::All::History do
           expect(@plus_action.action_type).to eq(:create)
         end
         it "adds content change" do
-          changed_content =
-            @plus_action.card_changes.find_by_field_name(:db_content).value
+          changed_content = @plus_action.value(:db_content)
           expect(changed_content).to eq(content)
         end
         it "adds superaction for plus card" do
@@ -210,8 +230,7 @@ describe Card::Set::All::History do
           expect(@plus_action.action_type).to eq(:create)
         end
         it "content change" do
-          expect(@plus_action.card_changes(true)
-            .find_by_field_name(:db_content).value).to eq(content)
+          expect(@plus_action.value(:db_content)).to eq(content)
         end
       end
     end

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

@@ -10,10 +10,10 @@ describe Card::Set::All::RichHtml::Form do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
       tf = @card.format.type_field(no_current_type: true)
       expect(tf).not_to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(31)
+      expect(tf.scan(/<option /).length).to eq(SharedData::CARDTYPE_COUNT)
       tf = @card.format.type_field
       expect(tf).to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(31)
+      expect(tf.scan(/<option /).length).to eq(SharedData::CARDTYPE_COUNT)
     end
 
     it "gets type list" do

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

@@ -10,6 +10,7 @@ describe Card::Set::All::RichHtml::Toolbar do
       end
     end
   end
+
   context "hidden toolbar" do
     subject do
       render_content "{{A|edit; hide: toolbar}}"

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Cardtype do
-  describe "add_button view" do
+  describe "view: add_button" do
     it "creates link with correct path" do
       add_link = render_content "{{Basic|add_button}}"
       assert_view_select add_link, 'a[href="/new/Basic"]', "Add Basic"
@@ -15,4 +15,47 @@ describe Card::Set::Type::Cardtype do
       assert_view_select add_link, 'a[href="/new/Basic?_project=Tempo+Rary+2"]'
     end
   end
+
+  it "can only be deleted when no instances present" do
+    city = create_cardtype "City"
+    sparta = create_city "Sparta"
+    expect(sparta.type_id).to eq city.id
+    expect { city.delete! }
+      .to raise_error(/this card must remain/)
+    expect(Card["City"]).to be_a(Card)
+    sparta.delete!
+    expect { city.delete! }
+      .not_to raise_error
+  end
+
+  it "type can't be change when instances present" do
+    expect { update "Cardtype A", type_id: Card::BasicID }
+      .to raise_error(/can't alter this type/)
+    Card["type-a-card"].delete!
+    expect { update "Cardtype A", type_id: Card::BasicID }
+      .not_to raise_error
+    expect(Card["Cardtype A"]).to have_type :basic
+  end
+
+  specify "no cards without cardtype" do
+    Card.all.each do |card|
+      expect(card.type_card).to be_a(Card)
+    end
+  end
+
+  describe "new Cardtype" do
+    let(:ct) do
+      Card::Auth.as_bot do
+        Card.create! name: "Animal", type: "Cardtype"
+      end
+    end
+
+    it "has create permissions" do
+      expect(ct.who_can(:create)).not_to be_nil
+    end
+
+    it "its create permissions should be based on Basic" do
+      expect(ct.who_can(:create)).to eq(Card["Basic"].who_can(:create))
+    end
+  end
 end

data/mod/standard/spec/set/type/email_template/email_config_spec.rb

@@ -138,7 +138,8 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
       Card::Env[:protocol] = "http://"
       Card::Env[:host] = "www.fake.com"
       is_expected.to include 'Card link(<a class="known-card" '\
-                               'href="http://www.fake.com/A">A</a>)'
+                               'href="http://www.fake.com/A">' \
+                               '<span class="card-title">A</span></a>)'
     end
   end
 

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

@@ -67,9 +67,11 @@ describe Card::Set::Type::List do
 
     context "when the name of Stam Broker changed to Stam Trader" do
       before do
+        Card::Auth.as_bot do
         Card["Stam Broker"].update_attributes!(
           name: "Stam Trader", update_referers: true
         )
+        end
       end
       it { is_expected.to eq ["Darles Chickens", "Stam Trader"] }
     end
@@ -125,7 +127,7 @@ describe Card::Set::Type::List do
   context "when the name of the cardtype books changed" do
     before do
       Card["book"].update_attributes!(
-        type_id: Card::BasicID, update_referers: true
+        name: "film", update_referers: true
       )
     end
     it { is_expected.to eq ["Darles Chickens", "Stam Broker"] }
@@ -134,9 +136,12 @@ describe Card::Set::Type::List do
   context "when the name of the cardtype authors changed" do
     before do
       Card["author"].update_attributes!(
-        type_id: Card::BasicID, update_referers: true
+        name: "publisher", update_referers: true
       )
     end
-    it { is_expected.to eq ["Darles Chickens", "Stam Broker"] }
+    specify do
+      expect(Card.fetch("Parry Hotter+publisher").item_names)
+        .to contain_exactly("Darles Chickens", "Stam Broker")
+    end
   end
 end

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

@@ -152,12 +152,6 @@ describe Card::Set::Type::ListedBy do
 
         it { is_expected.to eq ["50 grades of shy", "Parry Hotter"] }
       end
-      context "when the name of the cardtype authors changed" do
-        before do
-          Card["author"].update_attributes! type_id: Card::BasicID
-        end
-        it { is_expected.to eq ["50 grades of shy", "Parry Hotter"] }
-      end
     end
   end
 end

data/spec/config/initializers/patches/active_job_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe ActiveJob::Arguments, "serialize patch" do
+  it "handles symbols" do
+    ser = ActiveJob::Arguments.serialize([:sym])
+    deser = ActiveJob::Arguments.deserialize(ser)
+    expect(deser).to eq [:sym]
+  end
+end

data/spec/lib/card/action_spec.rb

@@ -6,9 +6,10 @@ describe Card::Action do
       a = Card["A"]
       a.update_attributes!(name: "New A")
       a.update_attributes!(content: "New content")
-      a.delete_old_actions
+      a.clear_history
       expect(a.actions.count).to eq(1)
-      expect(a.actions(true).last.value :name).to eq("New A")
+      expect(a.actions.last.card_changes.count).to eq(0)
+      expect(a.actions.reload.last.value :name).to eq("New A")
     end
   end
 end

data/spec/lib/card/codename_spec.rb

@@ -1,12 +1,12 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Codename, "Codename" do
+RSpec.describe Card::Codename, "Codename" do
   before do
     @codename = :default
   end
 
   it "is sane" do
-    expect(Card[@codename].codename).to eq(@codename.to_s) # would prefer Symbol eventually
+    expect(Card[@codename].codename).to eq(@codename)
     card_id = Card::Codename[@codename]
     expect(card_id).to be_a_kind_of Integer
     expect(Card::Codename[card_id]).to eq(@codename)
@@ -20,4 +20,9 @@ describe Card::Codename, "Codename" do
       expect(Card[@codename]).to be
     end
   end
+
+  it "raises error for missing codename" do
+    expect { Card::NotACodenameID }
+      .to raise_error "Missing codename not_a_codename (NotACodenameID)"
+  end
 end

data/spec/lib/card/content_spec.rb

@@ -26,7 +26,7 @@ describe Card::Content do
       rendered: ["Some Links and includes: ",
                  '<a class="wanted-card" ' \
                  'href="/the_card">' \
-                 "the text</a>",
+                 '<span class="card-title">the text</span></a>',
                  ", and ",
                  { options: { view: "Is Nestd",
                               nest_name: "This Card",
@@ -407,4 +407,22 @@ describe Card::Content do
       # end
     end
   end
+
+  describe "#pieces" do
+    def pieces content
+      Card::Content.new(content, Card["A"],).pieces
+    end
+
+    example "A {{B}}" do
+      expect(pieces("A {{B}}").size).to eq 2
+    end
+
+    example "A" do
+      expect(pieces("A").size).to eq 1
+    end
+
+    example "{{B}}" do
+      expect(pieces("{{B}}").size).to eq 1
+    end
+  end
 end

data/spec/lib/card/format/render_spec.rb

@@ -3,17 +3,17 @@ describe Card::Format::Render do
     before { Cardio.config.view_cache = true }
 
     let(:cache_key) do
-      "a-Card::Format::HtmlFormat-normal-home_view:content;"\
-      "nest_name:A;nest_syntax:A|content;view:contentcontent:show"
+      "z-Card::Format::HtmlFormat-normal-home_view:content;"\
+      "nest_name:Z;nest_syntax:Z|content;view:contentcontent:show"
     end
-
+    
     subject { Card::Cache[Card::View] }
 
     it "can be changed with nest option" do
       is_expected.to receive(:fetch).with cache_key
-      render_content "{{A|content}}"
+      render_content "{{Z|content}}"
       is_expected.not_to receive(:fetch)
-      render_content "{{A|cache:never}}"
+      render_content "{{Z|cache:never}}"
     end
   end
 end

data/spec/lib/card/i18n_spec.rb

@@ -1,37 +1,22 @@
 # -*- encoding : utf-8 -*-
-require "pathname"
 
-use_i18_tasks = !(RUBY_VERSION =~ /^(1|2\.0)/)
-if use_i18_tasks
-  require "i18n/tasks"
-end
+require "i18n/tasks"
 
 RSpec.describe "I18n" do
   # Note: I18n::Tasks only knows how to function when run from root of Card GEM,
   # since it locates its configuration file and source to parse relative to this
-  def card_gem_root
-    Pathname(__FILE__).parent.parent.parent.parent.to_s
-  end
-
-  if use_i18_tasks
-    let(:i18n) { Dir.chdir(card_gem_root) { I18n::Tasks::BaseTask.new } }
-    let(:missing_keys) { Dir.chdir(card_gem_root) { i18n.missing_keys } }
-    let(:unused_keys) { Dir.chdir(card_gem_root) { i18n.unused_keys } }
-  end
+  let(:i18n) { Dir.chdir(Cardio.gem_root) { I18n::Tasks::BaseTask.new } }
+  let(:missing_keys) { Dir.chdir(Cardio.gem_root) { i18n.missing_keys } }
+  let(:unused_keys) { Dir.chdir(Cardio.gem_root) { i18n.unused_keys } }
 
   it "does not have missing keys" do
-    unless use_i18_tasks
-      skip "upgrade to Ruby 2.1+ and install i18n-tasks gem"
-    end
     expect(missing_keys).to be_empty,
       "Missing #{missing_keys.leaves.count} i18n keys, to show them `cd` to " \
       "root of `card` gem and run `i18n-tasks missing`"
   end
 
   it "does not have unused keys" do
-    unless use_i18_tasks
-      skip "upgrade to Ruby 2.1+ and install i18n-tasks gem"
-    end
+    pending
     expect(unused_keys).to be_empty,
       "#{unused_keys.leaves.count} unused i18n keys, to show them `cd` to " \
       "root of `card` gem and run `i18n-tasks unused`"