wagn 1.12.13 → 1.13.0.pre

data/spec/models/card/validation_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card, "validate name" do
 

data/spec/models/card_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card do
 
@@ -11,7 +10,7 @@ describe Card do
 
   describe "creation" 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
@@ -35,7 +34,7 @@ describe Card do
 
   describe "content change should create new revision" do
     before do
-      Account.as_bot do
+      Card::Auth.as_bot do
         @c = Card['basicname']
         @c.update_attributes! :content=>'foo'
       end
@@ -130,7 +129,7 @@ describe "basic card tests" do
 
   it 'update_should_create_subcards' do
     banana = Card.create! :name=>'Banana'
-    Card.update banana.id, :cards=>{ "+peel" => { :content => "yellow" }}
+    Card.update banana.id, :subcards=>{ "+peel" => { :content => "yellow" }}
 
     peel = Card['Banana+peel']
     peel.content.       should == "yellow"
@@ -139,26 +138,26 @@ describe "basic card tests" do
 
   it 'update_should_create_subcards_as_wagn_bot_if_missing_subcard_permissions' do
     Card.create :name=>'peel'
-    Account.current_id = Card::AnonID
+    Card::Auth.current_id = Card::AnonymousID
     Card['Banana'].should_not be
     Card['Basic'].ok?(:create).should be_false, "anon can't creat"
 
-    Card.create! :type=>"Fruit", :name=>'Banana', :cards=>{ "+peel" => { :content => "yellow" }}
+    Card.create! :type=>"Fruit", :name=>'Banana', :subcards=>{ "+peel" => { :content => "yellow" }}
     Card['Banana'].should be
     peel = Card["Banana+peel"]
 
     peel.current_revision.content.should == "yellow"
-    peel.creator_id.should == Card::AnonID
+    peel.creator_id.should == Card::AnonymousID
   end
 
   it 'update_should_not_create_subcards_if_missing_main_card_permissions' do
     b = Card.create!( :name=>'Banana' )
-    Account.as Card::AnonID do
-      b.update_attributes :cards=>{ "+peel" => { :content => "yellow" }}
+    Card::Auth.as Card::AnonymousID do
+      b.update_attributes :subcards=>{ "+peel" => { :content => "yellow" }}
       b.errors[:permission_denied].should_not be_empty
       
       
-      c = Card.update(b.id, :cards=>{ "+peel" => { :content => "yellow" }})
+      c = Card.update(b.id, :subcards=>{ "+peel" => { :content => "yellow" }})
       c.errors[:permission_denied].should_not be_empty
       Card['Banana+peel'].should be_nil
     end
@@ -167,7 +166,7 @@ describe "basic card tests" do
 
   it 'create_without_read_permission' do
     c = Card.create!({:name=>"Banana", :type=>"Fruit", :content=>"mush"})
-    Account.as Card::AnonID do
+    Card::Auth.as Card::AnonymousID do
       assert_raises Card::PermissionDenied do
         c.ok! :read
       end

data/spec/mods/core/chunks/literal_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Chunk::EscapedLiteral, "literal chunk tests" do
 

data/spec/mods/core/chunks/uri_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Chunk::URI, "URI chunk tests" do
   it "should test_non_matches" do

data/spec/mods/core/formats/data_format_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::DataFormat do
   # format has no methods

data/spec/mods/core/formats/html_format_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::HtmlFormat do
 
@@ -13,10 +12,10 @@ describe Card::HtmlFormat do
 
     it "inclusions in multi edit" do
       c = Card.new :name => 'ABook', :type => 'Book'
-      rendered =  Card::Format.new(c).render( :edit )
+      rendered =  c.format.render( :edit )
 
       assert_view_select rendered, 'fieldset' do
-        assert_select 'textarea[name=?][class="tinymce-textarea card-content"]', 'card[cards][+illustrator][content]'
+        assert_select 'textarea[name=?][class="tinymce-textarea card-content"]', 'card[subcards][+illustrator][content]'
       end
     end
 
@@ -32,7 +31,7 @@ describe Card::HtmlFormat do
 
     context "full wrapping" do
       before do
-        @ocslot = Card::Format.new(Card['A'])
+        @ocslot = Card['A'].format
       end
 
       it "should have the appropriate attributes on open" do
@@ -61,9 +60,9 @@ describe Card::HtmlFormat do
 
     context "Simple page with Default Layout" do
       before do
-        Account.as_bot do
+        Card::Auth.as_bot do
           card = Card['A+B']
-          @simple_page = Card::HtmlFormat.new(card).render(:layout)
+          @simple_page = card.format.render(:layout)
           #warn "render sp: #{card.inspect} :: #{@simple_page}"
         end
       end
@@ -101,29 +100,29 @@ describe Card::HtmlFormat do
 
     context "layout" do
       before do
-        Account.as_bot do
+        Card::Auth.as_bot do
           @layout_card = Card.create(:name=>'tmp layout', :type=>'Layout')
           #warn "layout #{@layout_card.inspect}"
         end
         c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
         @main_card = Card.fetch('Joe User')
-        Wagn::Env[:main_name] = @main_card.name
+        Card::Env[:main_name] = @main_card.name
         
         #warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 
       it "should default to core view when in layout mode" do
         @layout_card.content = "Hi {{A}}"
-        Account.as_bot { @layout_card.save }
+        Card::Auth.as_bot { @layout_card.save }
 
-        Card::Format.new(@main_card).render(:layout).should match('Hi Alpha')
+        @main_card.format.render(:layout).should match('Hi Alpha')
       end
 
       it "should default to open view for main card" do
         @layout_card.content='Open up {{_main}}'
-        Account.as_bot { @layout_card.save }
+        Card::Auth.as_bot { @layout_card.save }
 
-        result = Card::Format.new(@main_card).render_layout
+        result = @main_card.format.render_layout
         result.should match(/Open up/)
         result.should match(/card-header/)
         result.should match(/Joe User/)
@@ -131,31 +130,31 @@ describe Card::HtmlFormat do
 
       it "should render custom view of main" do
         @layout_card.content='Hey {{_main|name}}'
-        Account.as_bot { @layout_card.save }
+        Card::Auth.as_bot { @layout_card.save }
 
-        result = Card::Format.new(@main_card).render_layout
+        result = @main_card.format.render_layout
         result.should match(/Hey.*div.*Joe User/)
         result.should_not match(/card-header/)
       end
 
       it "shouldn't recurse" do
         @layout_card.content="Mainly {{_main|core}}"
-        Account.as_bot { @layout_card.save }
+        Card::Auth.as_bot { @layout_card.save }
 
-        rendered = Card::Format.new(@layout_card).render(:layout).should == 
+        rendered = @layout_card.format.render(:layout).should == 
           %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>}
           #probably better to check that it matches "Mainly" exactly twice.
       end
       
       
       it "should handle nested _main references" do
-        Account.as_bot do
+        Card::Auth.as_bot do
           @layout_card.content="{{outer space}}"
           @layout_card.save!
           Card.create :name=>"outer space", :content=>"{{_main|name}}"
         end
         
-        Card::Format.new(@layout_card).render(:layout).should == 'Joe User'
+        @layout_card.format.render(:layout).should == 'Joe User'
       end
     end
 

data/spec/mods/core/formats/text_format_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::TextFormat do
   # format has no methods

data/spec/mods/core/sets/all/active_card_spec.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::ActiveCard do
-  # SPECSTUB (low priority)
+  # SPECSTUB
 end

data/spec/mods/core/sets/all/attribute_tracking_spec.rb

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::AttributeTracking do
   context "new card" do
     before(:each) do
-      Account.as_bot do
+      Card::Auth.as_bot do
         @c = Card.new :name=>"New Card", :content=>"Great Content"
       end
     end

data/spec/mods/core/sets/all/collection_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Collection do
   describe "#item_names" do
@@ -26,9 +25,6 @@ describe Card::Set::All::Collection do
   end
 
   describe "#contextual_content" do
-    it "returns content for basic setting" do
-      Card.new(:name=>"foo", :content => "X").contextual_content.should == "X"
-    end
 
     it "processes inclusions relative to context card" do
       context_card = Card["A"] # refers to 'Z'
@@ -39,7 +35,7 @@ describe Card::Set::All::Collection do
     it "returns content even when context card is hard templated" do #why the heck is this good?  -efm
       context_card = Card["A"] # refers to 'Z'
       
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.create! :name => "A+*self+*structure", :content => "Banana"
       end
       c = Card.new( :name => "foo", :content => "{{_self+B|core}}" )

data/spec/mods/core/sets/all/content_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Content do
   describe 'save_draft' do

data/spec/mods/core/sets/all/fetch_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Fetch do
   describe ".fetch" do
@@ -17,7 +16,7 @@ describe Card::Set::All::Fetch do
     end
 
     it "returns nil and caches trash cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.fetch("A").delete!
         Card.fetch("A").should be_nil
         mock.dont_allow(Card).find_by_key
@@ -31,11 +30,11 @@ describe Card::Set::All::Fetch do
     end
 
     it "returns virtual cards and caches them as missing" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         card = Card.fetch("Joe User+*email")
         card.should be_instance_of(Card)
         card.name.should == "Joe User+*email"
-        Card::Format.new(card).render_raw.should == 'joe@user.com'
+        card.format.render_raw.should == 'joe@user.com'
       end
       #card.raw_content.should == 'joe@user.com'
       #cached_card = Card.cache.read("joe_user+*email")
@@ -50,9 +49,8 @@ describe Card::Set::All::Fetch do
     
 
     it "fetches newly virtual cards" do
-      #pending "needs new cache clearing"
       Card.fetch( 'A+virtual').should be_nil
-      Account.as_bot { Card.create :name=>'virtual+*right+*structure' }
+      Card::Auth.as_bot { Card.create :name=>'virtual+*right+*structure' }
       Card.fetch( 'A+virtual').should_not be_nil
     end
     
@@ -62,7 +60,6 @@ describe Card::Set::All::Fetch do
       Card.fetch('yomama', :new=>{}).name.should == 'yomama'
       Card.fetch('YOMAMA', :new=>{}).name.should == 'YOMAMA'
       Card.fetch('yomama!', :new=>{ :name=>'Yomama'} ).name.should == 'Yomama'
-#      Card.fetch('yomama!', :new=>{ :type=>'Phrase'} ).name.should == 'yomama!'  FIXME!!     
     end
 
     it "does not recurse infinitely on template templates" do
@@ -74,7 +71,7 @@ describe Card::Set::All::Fetch do
       Card.cache.reset_local
       Card.cache.local.keys.should == []
 
-      Account.as_bot do
+      Card::Auth.as_bot do
 
         a = Card.fetch("A")
         a.should be_instance_of(Card)
@@ -102,7 +99,7 @@ describe Card::Set::All::Fetch do
 
     describe "preferences" do
       before do
-        Account.current_id = Card::WagnBotID
+        Card::Auth.current_id = Card::WagnBotID
       end
 
       it "prefers db cards to pattern virtual cards" do
@@ -184,7 +181,7 @@ describe Card::Set::All::Fetch do
 
   describe "#fetch_virtual" do
     it "should find cards with *right+*structure specified" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.create! :name=>"testsearch+*right+*structure", :content=>'{"plus":"_self"}', :type => 'Search'
       end
       c = Card.fetch("A+testsearch".to_name)

data/spec/mods/core/sets/all/initialize_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Initialize do
   describe "new" do

data/spec/mods/core/sets/all/name_spec.rb

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Name do
   describe 'autoname' do
     before do
-      Account.as_bot do
+      Card::Auth.as_bot do
         @b1 = Card.create! :name=>'Book+*type+*autoname', :content=>'b1'
       end
     end
@@ -22,9 +21,41 @@ describe Card::Set::All::Name do
 
     it "should handle trashed names" do
       b1 = Card.create! :type=>'Book'
-      Account.as_bot { b1.delete }
+      Card::Auth.as_bot { b1.delete }
       b1 = Card.create! :type=>'Book'
       b1.name.should== 'b1'
     end
   end
+  
+  describe 'codename' do
+    before :each do
+      @card = Card['a']
+    end
+    
+    it 'should require admin permission' do
+      @card.update_attributes :codename=>'structure'
+      @card.errors[:codename].first.should =~ /only admins/
+    end
+    
+    it 'should check uniqueness' do
+      Card::Auth.as_bot do
+        @card.update_attributes :codename=>'structure'
+        @card.errors[:codename].first.should =~ /already in use/
+      end
+    end
+    
+  end
+  
+  describe 'repair_key' do
+    it 'should fix broken keys' do
+      a = Card['a']
+      a.update_column 'key', 'broken_a'
+      a.expire
+      
+      a = Card.find a.id
+      a.key.should == 'broken_a'
+      a.repair_key
+      a.key.should == 'a'
+    end
+  end
 end

data/spec/mods/core/sets/all/pattern_spec.rb

@@ -1,11 +1,10 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::All::Pattern do
 
   describe :set_names do
     it "returns self, type, all for simple cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         card = Card.new( :name => "AnewCard" )
         card.set_names.should == [ "Basic+*type","*all"]
         card.save!
@@ -15,7 +14,7 @@ describe Card::Set::All::Pattern do
     end
 
     it "returns set names for simple star cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.fetch('*update').set_names.should == [
           "*update+*self","*star","Setting+*type","*all"
         ]
@@ -23,7 +22,7 @@ describe Card::Set::All::Pattern do
     end
 
     it "returns set names for junction cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.new( :name=>"Iliad+author" ).set_names.should == [
           "Book+author+*type plus right","author+*right","Basic+*type","*all plus","*all"
         ]
@@ -31,7 +30,7 @@ describe Card::Set::All::Pattern do
     end
 
     it "returns set names for compound star cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.new( :name=>"Iliad+*to" ).set_names.should == [
           "Book+*to+*type plus right","*to+*right","*rstar","Phrase+*type","*all plus","*all"
         ]
@@ -39,7 +38,7 @@ describe Card::Set::All::Pattern do
     end
     
     it "handles type plus right prototypes properly" do #right place for this?  really need more prototype tests...
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.fetch('Fruit+flavor+*type plus right').prototype.set_names.include?('Fruit+flavor+*type plus right').should be_true
       end
     end
@@ -65,7 +64,7 @@ describe Card::Set::All::Pattern do
 
   describe :safe_set_keys do
     it "returns css names for simple star cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         card = Card.new( :name => "*AnewCard")
         card.safe_set_keys.should == "ALL TYPE-basic STAR"
         card.save!
@@ -89,5 +88,3 @@ describe Card::Set::All::Pattern do
     end
   end
 end
-
-