wagn 1.12.13 → 1.13.0.pre

data/spec/{models → lib}/card/reference_spec.rb

@@ -1,16 +1,15 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Reference do
 
   before do
-    Account.current_id = Card::WagnBotID
+    Card::Auth.current_id = Card::WagnBotID
   end
 
   describe "references on hard templated cards should get updated" do
     it "on structuree creation" do
       Card.create! :name=>"JoeForm", :type=>'UserForm'
-      Card::Format.new(Card["JoeForm"]).render(:core)
+      Card["JoeForm"].format.render(:core)
       assert_equal ["joe_form+age", "joe_form+description", "joe_form+name"],
         Card["JoeForm"].includees.map(&:key).sort
       Card["JoeForm"].references_expired.should_not == true
@@ -24,7 +23,7 @@ describe Card::Reference do
       Card.create! :name=>"SpecialForm+*type+*structure", :content=>"{{+bar}}"
       c = Card["Form1"]
       c.references_expired.should be_true
-      Card::Format.new(Card["Form1"]).render(:core)
+      Card["Form1"].format.render(:core)
       c = Card["Form1"]
       c.references_expired.should be_nil
       Card["Form1"].includees.map(&:key).should == ["form1+bar"]
@@ -36,7 +35,7 @@ describe Card::Reference do
       tmpl.content = "{{+monkey}} {{+banana}} {{+fruit}}";
       tmpl.save!
       Card["JoeForm"].references_expired.should be_true
-      Card::Format.new(Card["JoeForm"]).render(:core)
+      Card["JoeForm"].format.render(:core)
       assert_equal ["joe_form+banana", "joe_form+fruit", "joe_form+monkey"],
         Card["JoeForm"].includees.map(&:key).sort
       Card["JoeForm"].references_expired.should_not == true
@@ -86,11 +85,11 @@ describe Card::Reference do
 
   it "should update referencers on rename when requested (case 2)" do
     card = Card['Administrator Menu+*self+*read']
-    refs = Card::Reference.where(:referee_id => Card::AdminID).map(&:referer_id).sort
+    refs = Card::Reference.where(:referee_id => Card::AdministratorID).map(&:referer_id).sort
     card.update_referencers = true
     card.name='Administrator Menu+*type+*read'
     card.save
-    Card::Reference.where(:referee_id => Card::AdminID).map(&:referer_id).sort.should == refs
+    Card::Reference.where(:referee_id => Card::AdministratorID).map(&:referer_id).sort.should == refs
   end
 
   it "should not update references when not requested" do

data/spec/lib/card/revision_spec.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Revision do
+
+  it 'should be created whenever content is updated' do
+    author1 = Card::Auth[ 'joe@user.com' ]
+    author2 = Card::Auth[ 'sara@user.com' ]
+    author_cd1 = Card[author1.id]
+    author_cd2 = Card[author2.id]
+    Card::Auth.current_id = Card::WagnBotID
+    rc1=author_cd1.fetch(:new=>{}, :trait=>:roles)
+    rc1 << Card::AdministratorID
+    rc2 = author_cd2.fetch(:new=>{}, :trait=>:roles)
+    rc2 << Card::AdministratorID
+    author_cd1.save
+    author_cd2.save
+    Card::Auth.current_id = author_cd1.id
+    card = Card.create! :name=>'alpha', :content=>'stuff'
+    Card::Auth.current_id = author_cd2.id
+    card.content = 'boogy'
+    card.save
+    card.reload
+
+    assert_equal 2, card.revisions.count, 'Should have two revisions'
+    assert_equal author_cd2.name, card.current_revision.creator.name, 'current author'
+    assert_equal author_cd1.name, card.revisions.first.creator.name,  'first author'
+  end
+
+
+end

data/spec/lib/card/set_pattern_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 module SetPatternSpecHelper
   def it_generates( opts )

data/spec/lib/card/set_spec.rb

@@ -1,22 +1,21 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 module Card::Set::Right::Account # won't this conflict with a real set (and fail to provide controlled test?)
   extend Card::Set
 
-  card_accessor :status, :default => "request", :type=>:phrase
-  card_writer :write,    :default => "request", :type=>:phrase
-  card_reader :read,     :default => "request", :type=>:phrase
+  card_accessor :role,   :default => "request", :type=>:phrase
+  card_writer   :write,  :default => "request", :type=>:phrase
+  card_reader   :read,   :default => "request", :type=>:phrase
 end
 
 describe Card do
   before do
-    @account_card = Card['sara'].fetch(:trait=>:account)
+    @account_card = Card['sara'].fetch :trait=>:account
   end
 
   describe "Read and write card attribute" do
     it "gets email attribute" do
-      @account_card.status.should == 'request'
+      @account_card.role.should == 'request'
     end
 
     it "shouldn't have a reader method for card_writer" do
@@ -32,13 +31,14 @@ describe Card do
     it "sets and saves attribute" do
       @account_card.write= 'test_value'
       @account_card.status= 'pending'
-      @account_card.status.should == 'pending'
-      Account.as_bot { @account_card.save }
-      Card.cache.reset
+#      @account_card.status.should == 'pending'
+      Card::Auth.as_bot { @account_card.save }
+#      Card.cache.reset
       (tcard = Card['sara'].fetch(:trait=>:account)).should be
       tcard.status.should == 'pending'
       tcard.fetch(:trait=>:write).content.should == 'test_value'
     end
+
   end
 
   let(:card) { proxy Card.new(:name=>'simple') }

data/spec/lib/wagn/cache_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Wagn::Cache do
   describe "with nil store" do

data/spec/mailers/mailer_spec.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
-describe Mailer do
+describe Card::Mailer do
   #include ActionMailer::Quoting
 
   before do
@@ -21,7 +20,7 @@ describe Mailer do
       user =  Card['sara'].id
       card =  Card["Sunglasses"]
       action = "edited"
-      Mailer.change_notice( user, card, action, card.name ).deliver
+      Card::Mailer.change_notice( user, card, action, card.name ).deliver
     end
 
     it "deliver a message" do
@@ -36,7 +35,7 @@ describe Mailer do
         assert_equal ["sara@user.com"],  @mail.to
       end
       it "is from Wag bot email" do
-        assert_equal [Account.admin.email], @mail.from
+        assert_equal [Card[Card::WagnBotID].account.email], @mail.from
       end
     end
   end
@@ -46,12 +45,8 @@ describe Mailer do
   end
 
   private
-    def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/user_notifier/#{action}")
-    end
-
     def encode(subject)
-      quoted_printable(subject, Mailer::CHARSET)
+      quoted_printable(subject, Card::Mailer::CHARSET)
     end
 
 end

data/spec/models/card/cardtype_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 class Card
   # REVIEW: hooks api will do this differently, probably should remove and add new tests elsewhere
@@ -67,7 +66,7 @@ end
 
 describe Card, "created without permission" do
   before do
-    Account.current_id = Card::AnonID
+    Card::Auth.current_id = Card::AnonymousID
   end
 
   # FIXME:  this one should pass.  unfortunately when I tried to fix it it started looking like the clean solution
@@ -93,14 +92,14 @@ describe Card, "Normal card with dependents" do
     @a.dependents.length.should > 0
   end
   it "should successfully have its type changed" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @a.type_id = Card::PhraseID;
       @a.save!
       Card['A'].type_code.should== :phrase
     end
   end
   it "should still have its dependents after changing type" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       assert type_id = Card.fetch_id('cardtype_e')
       @a.type_id = type_id; @a.save!
       Card['A'].dependents.length.should > 0
@@ -112,7 +111,7 @@ end
 =begin No extension any more, is there a modified version of this we need?
 describe Card, "Recreated Card" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
     @ct = Card.create! :name=>'Species', :type=>'Cardtype'
     @ct.delete!
     @ct = Card.create! :name=>'Species', :type=>'Cardtype'
@@ -128,7 +127,7 @@ end
 
 describe Card, "New Cardtype" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @ct = Card.create! :name=>'Animal', :type=>'Cardtype'
     end
   end
@@ -144,7 +143,7 @@ end
 
 describe Card, "Wannabe Cardtype Card" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @card = Card.create! :name=> 'convertible'
       @card.type_id=Card::CardtypeID
       @card.save!
@@ -156,16 +155,15 @@ describe Card, "Wannabe Cardtype Card" do
   end
 end
 
-describe User, "Joe User" do
+describe Card, "Joe User" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @r3 = Card['r3']
       Card.create :name=>'Cardtype F+*type+*create', :type=>'Pointer', :content=>'[[r3]]'
     end
 
-    @user = Account.user
-    @ucard = Card[@user.card_id]
-    @type_names = Account.createable_types
+    @ucard = Card::Auth.current
+    @type_names = Card::Auth.createable_types
   end
 
   it "should not have r3 permissions" do
@@ -193,7 +191,7 @@ describe Card, "Cardtype with Existing Cards" do
   end
 
   it "should raise an error when you try to delete it" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @ct.delete
       @ct.errors[:cardtype].should_not be_empty
     end
@@ -204,7 +202,7 @@ end
 describe Card::Set::Type::Cardtype do
 
   it "should handle changing away from Cardtype" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       ctg = Card.create! :name=>"CardtypeG", :type=>"Cardtype"
       ctg.type_id = Card::BasicID
       ctg.save!

data/spec/models/card/create_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 # FIXME this shouldn't be here
 describe Card::Set::Type::Cardtype, ".create with :codename" do
@@ -13,13 +12,13 @@ end
 
 describe Card, "created by Card.new " do
   before(:each) do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @c = Card.new :name=>"New Card", :content=>"Great Content"
     end
   end
 
   it "should not override explicit content with default content" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       Card.create! :name => "blue+*right+*default", :content => "joe", :type=>"Pointer"
       c = Card.new :name => "Lady+blue", :content => "[[Jimmy]]"
       c.content.should == "[[Jimmy]]"
@@ -31,7 +30,7 @@ end
 
 describe Card, "created by Card.create with valid attributes" do
   before(:each) do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @b = Card.create :name=>"New Card", :content=>"Great Content"
       @c = Card.find(@b.id)
     end

data/spec/models/card/trash_spec.rb

@@ -1,11 +1,10 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 
 describe Card, "deleting card" do
   it "should require permission" do
     a = Card['a']
-    Account.as :anonymous do
+    Card::Auth.as :anonymous do
       a.ok?(:delete).should == false
       a.delete.should == false
       a.errors[:permission_denied].should_not be_empty
@@ -17,7 +16,7 @@ end
 
 describe Card, "deleted card" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @c = Card['A']
       @c.delete!
     end
@@ -26,7 +25,7 @@ describe Card, "deleted card" do
     @c.trash.should be_true
   end
   it "should come out of the trash when a plus card is created" do
-    Account.as_bot do
+    Card::Auth.as_bot do
       Card.create(:name=>'A+*acct')
       c = Card[ 'A' ]
       c.trash.should be_false
@@ -46,7 +45,7 @@ end
 
 describe Card, "plus cards" do
   it "should be deleted when root is" do
-    Account.as :joe_admin do
+    Card::Auth.as :joe_admin do
       c = Card.create! :name=>'zz+top'
       root = Card['zz']
       root.delete
@@ -58,21 +57,23 @@ describe Card, "plus cards" do
 end
 
 # FIXME: these user tests should probably be in a set of cardtype specific tests somewhere..
-describe User, "with revisions" do
-  before do Account.as_bot { @c = Card["Wagn Bot"] } end
-  it "should not be removable" do
-    @c.delete.should_not be_true
+describe Card do
+  context "with revisions" do
+    before do Card::Auth.as_bot { @c = Card["Wagn Bot"] } end
+    it "should not be removable" do
+      @c.delete.should_not be_true
+    end
   end
-end
 
-describe User, "without revisions" do
-  before do
-    Account.as_bot do
-      @c = Card.create! :name=>'User Must Die', :type=>'User'
+  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
+      @c.delete!.should be_true
     end
-  end
-  it "should be removable" do
-    @c.delete!.should be_true
   end
 end
 
@@ -82,7 +83,7 @@ end
 #NOT WORKING, BUT IT SHOULD
 #describe Card, "a part of an unremovable card" do
 #  before do
-#     Account.as(Card::WagnBotID)
+#     Card::Auth.as(Card::WagnBotID)
 #     # this ugly setup makes it so A+Admin is the actual user with edits..
 #     Card["Wagn Bot"].update_attributes! :name=>"A+Wagn Bot"
 #  end
@@ -110,7 +111,7 @@ end
 
 describe Card, "rename to trashed name" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @a = Card["A"]
       @b = Card["B"]
       @a.delete!  #trash
@@ -134,7 +135,7 @@ end
 
 describe Card, "sent to trash" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @c = Card["basicname"]
       @c.delete!
     end
@@ -156,7 +157,7 @@ end
 
 describe Card, "revived from trash" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       Card["basicname"].delete!
       
       @c = Card.create! :name=>'basicname', :content=>'revived content'
@@ -183,7 +184,7 @@ end
 
 describe Card, "recreate trashed card via new" do
 #  before do
-#    Account.as(Card::WagnBotID)
+#    Card::Auth.as(Card::WagnBotID)
 #    @c = Card.create! :type=>'Basic', :name=>"BasicMe"
 #  end
 
@@ -198,7 +199,7 @@ end
 
 describe Card, "junction revival" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @c = Card.create! :name=>"basicname+woot", :content=>"basiccontent"
       @c.delete!
       @c = Card.create! :name=>"basicname+woot", :content=>"revived content"

data/spec/models/card/type_transition_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 class Card
   cattr_accessor :count
@@ -42,7 +41,7 @@ end
 
 describe Card, "with role" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @role = Card.search(:type=>'Role')[0]
     end
   end
@@ -56,7 +55,7 @@ end
 
 describe Card, "with account" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       @joe = change_card_to_type('Joe User', :basic)
     end
   end
@@ -132,7 +131,7 @@ end
 
 describe Card, "type transition create callback" do
   before do
-    Account.as_bot do
+    Card::Auth.as_bot do
       Card.create(:name=>'Basic+*type+*delete', :type=>'Pointer', :content=>"[[Anyone Signed in]]")
     end
     @c = change_card_to_type("basicname", :cardtype_f)