card 1.17.1 → 1.17.2

data/spec/models/card/trash_spec.rb

@@ -2,8 +2,8 @@
 
 require 'card/action'
 
-describe Card, "deleting card" do
-  it "should require permission" do
+describe Card, 'deleting card' do
+  it 'should require permission' do
     a = Card['a']
     Card::Auth.as :anonymous do
       expect(a.ok?(:delete)).to eq(false)
@@ -15,17 +15,17 @@ describe Card, "deleting card" do
   end
 end
 
-describe Card, "deleted card" do
+describe Card, 'deleted card' do
   before do
     Card::Auth.as_bot do
       @c = Card['A']
       @c.delete!
     end
   end
-  it "should be in the trash" do
+  it 'should be in the trash' do
     expect(@c.trash).to be_truthy
   end
-  it "should come out of the trash when a plus card is created" do
+  it 'should come out of the trash when a plus card is created' do
     Card::Auth.as_bot do
       Card.create(name: 'A+*acct')
       c = Card[ 'A' ]
@@ -34,18 +34,18 @@ describe Card, "deleted card" do
   end
 end
 
-describe Card, "in trash" do
-  it "should be retrieved by fetch with new" do
-    Card.create(name: "Betty").delete
-    c=Card.fetch "Betty", new: {}
+describe Card, 'in trash' do
+  it 'should be retrieved by fetch with new' do
+    Card.create(name: 'Betty').delete
+    c=Card.fetch 'Betty', new: {}
     c.save
-    expect(Card["Betty"]).to be_instance_of(Card)
+    expect(Card['Betty']).to be_instance_of(Card)
   end
 end
 
 
-describe Card, "plus cards" do
-  it "should be deleted when root is" do
+describe Card, 'plus cards' do
+  it 'should be deleted when root is' do
     Card::Auth.as 'joe_admin' do
       c = Card.create! name: 'zz+top'
       root = Card['zz']
@@ -59,20 +59,20 @@ end
 
 # FIXME: these user tests should probably be in a set of cardtype specific tests somewhere..
 describe Card do
-  context "with revisions" do
-    before do Card::Auth.as_bot { @c = Card["Wagn Bot"] } end
-    it "should not be removable" do
+  context 'with revisions' do
+    before do Card::Auth.as_bot { @c = Card['Wagn Bot'] } end
+    it 'should not be removable' do
       expect(@c.delete).not_to be_truthy
     end
   end
 
-  context "without revisions" do
+  context 'without revisions' do
     before do
       Card::Auth.as_bot do
         @c = Card.create! name: 'User Must Die', type: 'User'
       end
     end
-    it "should be removable" do
+    it 'should be removable' do
       expect(@c.delete!).to be_truthy
     end
   end
@@ -94,39 +94,39 @@ end
 #  end
 #end
 
-describe Card, "dependent removal" do
+describe Card, 'dependent removal' do
   before do
     @a = Card['A']
     @a.delete!
-    @c = Card.find_by_key "A+B+C".to_name.key
+    @c = Card.find_by_key 'A+B+C'.to_name.key
   end
 
-  it "should be trash" do
+  it 'should be trash' do
     expect(@c.trash).to be_truthy
   end
 
-  it "should not be findable by name" do
-    expect(Card["A+B+C"]).to eq(nil)
+  it 'should not be findable by name' do
+    expect(Card['A+B+C']).to eq(nil)
   end
 end
 
-describe Card, "rename to trashed name" do
+describe Card, 'rename to trashed name' do
   before do
     Card::Auth.as_bot do
-      @a = Card["A"]
-      @b = Card["B"]
+      @a = Card['A']
+      @b = Card['B']
       @a.delete!  #trash
       Rails.logger.info "\n\n~~~~~~~deleted~~~~~~~~\n\n\n"
 
-      @b.update_attributes! name: "A", update_referencers: true
+      @b.update_attributes! name: 'A', update_referers: true
     end
   end
 
-  it "should rename b to a" do
+  it 'should rename b to a' do
     expect(@b.name).to eq('A')
   end
 
-  it "should rename a to a*trash" do
+  it 'should rename a to a*trash' do
     expect((c = Card.find(@a.id)).cardname.to_s).to eq('A*trash')
     expect(c.name).to eq('A*trash')
     expect(c.key).to eq('a*trash')
@@ -134,56 +134,56 @@ describe Card, "rename to trashed name" do
 end
 
 
-describe Card, "sent to trash" do
+describe Card, 'sent to trash' do
   before do
     Card::Auth.as_bot do
-      @c = Card["basicname"]
+      @c = Card['basicname']
       @c.delete!
     end
   end
 
-  it "should be trash" do
+  it 'should be trash' do
     expect(@c.trash).to eq(true)
   end
 
-  it "should not be findable by name" do
-    expect(Card["basicname"]).to eq(nil)
+  it 'should not be findable by name' do
+    expect(Card['basicname']).to eq(nil)
   end
 
-  it "should still have actions" do
+  it 'should still have actions' do
     expect(@c.actions.count).to eq(2)
     expect(@c.last_change_on(:db_content).value).to eq('basiccontent')
   end
 end
 
-describe Card, "revived from trash" do
+describe Card, 'revived from trash' do
   before do
     Card::Auth.as_bot do
-      Card["basicname"].delete!
+      Card['basicname'].delete!
 
       @c = Card.create! name: 'basicname', content: 'revived content'
     end
   end
 
-  it "should not be trash" do
+  it 'should not be trash' do
     expect(@c.trash).to eq(false)
   end
 
-  it "should have 3 actions" do
+  it 'should have 3 actions' do
     expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old content" do
+  it 'should still have old content' do
     expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
   end
 
-  it "should have the same content" do
+  it 'should have the same content' do
     expect(@c.content).to eq('revived content')
 #    Card.fetch(@c.name).content.should == 'revived content'
   end
 end
 
-describe Card, "recreate trashed card via new" do
+describe Card, 'recreate trashed card via new' do
 #  before do
 #    Card::Auth.as(Card::WagnBotID)
 #    @c = Card.create! type: 'Basic', name: "BasicMe"
@@ -198,60 +198,60 @@ describe Card, "recreate trashed card via new" do
 
 end
 
-describe Card, "junction revival" do
+describe Card, 'junction revival' do
   before do
     Card::Auth.as_bot do
-      @c = Card.create! name: "basicname+woot", content: "basiccontent"
+      @c = Card.create! name: 'basicname+woot', content: 'basiccontent'
       @c.delete!
-      @c = Card.create! name: "basicname+woot", content: "revived content"
+      @c = Card.create! name: 'basicname+woot', content: 'revived content'
     end
   end
 
-  it "should not be trash" do
+  it 'should not be trash' do
     expect(@c.trash).to eq(false)
   end
 
-  it "should have 3 actions" do
+  it 'should have 3 actions' do
     expect(@c.actions.count).to eq(3)
   end
 
-  it "should still have old action" do
+  it 'should still have old action' do
     expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
   end
 
-  it "should have old content" do
+  it 'should have old content' do
     expect(@c.db_content).to eq('revived content')
   end
 end
 
-describe "remove tests" do
+describe 'remove tests' do
 
   before do
-    @a = Card["A"]
+    @a = Card['A']
   end
 
   # I believe this is here to test a bug where cards with certain kinds of references
   # would fail to delete.  probably less of an issue now that delete is done through
   # trash.
-  it "test_remove" do
-    assert @a.delete!, "card should be deleteable"
-    assert_nil Card["A"]
+  it 'test_remove' do
+    assert @a.delete!, 'card should be deleteable'
+    assert_nil Card['A']
   end
 
-  it "test_recreate_plus_card_name_variant" do
-    Card.create( name: "rta+rtb" ).delete
-    Card["rta"].update_attributes name: "rta!"
-    c = Card.create! name: "rta!+rtb"
-    assert Card["rta!+rtb"]
-    assert !Card["rta!+rtb"].trash
+  it 'test_recreate_plus_card_name_variant' do
+    Card.create( name: 'rta+rtb' ).delete
+    Card['rta'].update_attributes name: 'rta!'
+    c = Card.create! name: 'rta!+rtb'
+    assert Card['rta!+rtb']
+    assert !Card['rta!+rtb'].trash
     assert Card.find_by_key('rtb*trash').nil?
   end
 
-  it "test_multiple_trash_collision" do
-    Card.create( name: "alpha" ).delete
+  it 'test_multiple_trash_collision' do
+    Card.create( name: 'alpha' ).delete
     3.times do
-      b = Card.create( name: "beta" )
-      b.name = "alpha"
+      b = Card.create( name: 'beta' )
+      b.name = 'alpha'
       assert b.save!
       b.delete
     end

data/spec/models/card/type_transition_spec.rb

@@ -4,22 +4,21 @@ class Card
   cattr_accessor :count
 
   module Set::Type
-
     module CardtypeA
       extend Card::Set
 
       def ok_to_delete
-        deny_because("not allowed to delete card a")
+        deny_because 'not allowed to delete card a'
       end
     end
 
-#    module CardtypeC
-#      extend Card::Set
-#    end
+    # module CardtypeC
+    #   extend Card::Set
+    # end
 
     module CardtypeD
       def valid?
-        errors.add :create_error, "card d always has errors"
+        errors.add :create_error, 'card d always has errors'
         errors.empty?
       end
     end
@@ -39,78 +38,78 @@ class Card
   end
 end
 
-describe Card, "with role" do
+describe Card, 'with role' do
   before do
     Card::Auth.as_bot do
       @role = Card.search(type: 'Role')[0]
     end
   end
 
-  it "should have a role type" do
+  it 'should have a role type' do
     expect(@role.type_id).to eq(Card::RoleID)
   end
 end
 
 
 
-describe Card, "with account" do
+describe Card, 'with account' do
   before do
     Card::Auth.as_bot do
       @joe = change_card_to_type('Joe User', :basic)
     end
   end
 
-  it "should not have errors" do
+  it 'should not have errors' do
     expect(@joe.errors.empty?).to eq(true)
   end
 
-  it "should allow type changes" do
+  it 'should allow type changes' do
     expect(@joe.type_code).to eq(:basic)
   end
 
 end
 
-describe Card, "type transition approve create" do
+describe Card, 'type transition approve create' do
   it 'should have cardtype b create role r1' do
     expect((c=Card.fetch('Cardtype B+*type+*create')).content).to eq('[[r1]]')
     expect(c.type_code).to eq(:pointer)
   end
 
-  it "should have errors" do
-    c = change_card_to_type("basicname", "cardtype_b")
+  it 'should have errors' do
+    c = change_card_to_type 'basicname', 'cardtype_b'
     expect(c.errors[:permission_denied]).not_to be_empty
   end
 
-  it "should be the original type" do
-    lambda { change_card_to_type("basicname", "cardtype_b") }
-    expect(Card["basicname"].type_code).to eq(:basic)
+  it 'should be the original type' do
+    lambda { change_card_to_type 'basicname', 'cardtype_b' }
+    expect(Card['basicname'].type_code).to eq(:basic)
   end
 end
 
-
-#describe Card, "type transition validate_delete" do
-#  before do @c = change_card_to_type("type-c-card", :basic) end
+# describe Card, "type transition validate_delete" do
+#   before do @c = change_card_to_type("type-c-card", :basic) end
 #
-#  it "should have errors" do
-#    @c.errors[:delete_error].first.should == "card c is indestructible"
-#  end
+#   it "should have errors" do
+#     @c.errors[:delete_error].first.should == "card c is indestructible"
+#   end
 #
-#  it "should retain original type" do
-#    Card["type_c_card"].type_code.should == :cardtype_c
-#  end
-#end
+#   it "should retain original type" do
+#     Card["type_c_card"].type_code.should == :cardtype_c
+#   end
+# end
 
-describe Card, "type transition validate_create" do
-  before do @c = change_card_to_type("basicname", "cardtype_d") end
+describe Card, 'type transition validate_create' do
+  before { @c = change_card_to_type 'basicname', 'cardtype_d' }
 
-  it "should have errors" do
-    pending "CardtypeD does not have a codename, so this is an invalid test"
-    expect(@c.errors[:type].first.match(/card d always has errors/)).to be_truthy
+  it 'should have errors' do
+    pending 'CardtypeD does not have a codename, so this is an invalid test'
+    msg = /card d always has errors/
+    expect(@c.errors[:type].first.match msg).to be_truthy
   end
 
-  it "should retain original type" do
-    pending "CardtypeD does not have a codename, so this is an invalid test"
-    expect(Card["basicname"].type_code).to eq(:basic)
+  it 'should retain original type' do
+    pending 'CardtypeD does not have a codename, so this is an invalid test'
+    expect(Card['basicname'].type_code).to eq(:basic)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.17.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -263,6 +263,7 @@ files:
 - db/migrate/20141216053032_better_index_names.rb
 - db/migrate/20150724210803_add_comment_to_actions.rb
 - db/migrate/20151105225559_more_space_for_db_content.rb
+- db/migrate/20160122153608_new_indeces.rb
 - db/migrate_core_cards/20120611203506_rails_inflection_updates.rb
 - db/migrate_core_cards/20130411191151_renaming_for_menu.rb
 - db/migrate_core_cards/20130411211600_delete_old_related_tab_cards.rb