wagn 1.12.13 → 1.13.0.pre

data/spec/controllers/location_spec.rb

@@ -1,4 +1,5 @@
-require 'wagn/spec_helper'
+
+#FIXME - this shouldn't really be with the controller specs
 
 describe CardController, "location test from old integration" do
 
@@ -29,7 +30,7 @@ describe CardController, "location test from old integration" do
   # FIXME: this should probably be files in the spot for a delete test
   it "should test_removal_and_return_to_previous_undeleted_card_after_deletion" do
     t1 = t2 = nil
-    Account.as_bot do
+    Card::Auth.as_bot do
       t1 = Card.create! :name => "Testable1", :content => "hello"
       t2 = Card.create! :name => "Testable1+bandana", :content => "world"
     end

data/spec/lib/card/auth_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Auth do
+
+  it 'should authenticate user' do
+    assert_equal Card::Auth[ 'joe@user.com' ].id, Card::Auth.authenticate('joe@user.com', 'joe_pass')
+  end
+
+  it 'should authenticate user despite whitespace' do
+    assert_equal Card::Auth[ 'joe@user.com' ].id, Card::Auth.authenticate(' joe@user.com ', ' joe_pass ')
+  end
+
+  it 'should authenticate user with weird email capitalization' do
+    assert Card::Auth.authenticate('JOE@user.com', 'joe_pass')
+  end
+  
+end

data/spec/lib/card/chunk_spec.rb

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

data/spec/lib/card/codename_spec.rb

@@ -1,30 +1,24 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Codename, "Codename" do
 
   before do
-    @codes = Card::Codename.codehash.each_key.find_all do |key|
-      Symbol===key
-    end
+    @codename = :default
   end
 
-  it "should have sane codename data" do
-    @codes.each do |code|
-      code.                      should be_instance_of Symbol
-      (i = Card::Codename[code]).should be_a_kind_of Integer
-      Card::Codename[i].         should == code
-    end
+  it "should be sane" do    
+    Card[@codename].codename.should == @codename.to_s #would prefer Symbol eventually
+    card_id = Card::Codename[@codename]
+    card_id.should be_a_kind_of Integer
+    Card::Codename[card_id].should == @codename
   end
 
-  it "cards should exist and be indestructable" do
-    Account.as_bot do
-      @codes.each do |code|
-        card = Card[code]
-        card.delete
-        card.errors[:delete].first.should match 'is a system card'
-        Card[code].should be
-      end
+  it "should make cards indestructable" do
+    Card::Auth.as_bot do
+      card = Card[@codename]
+      card.delete
+      card.errors[:delete].first.should match 'is a system card'
+      Card[@codename].should be
     end
   end
   

data/spec/lib/card/content_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 require 'card/content'
 
 CONTENT = {

data/spec/lib/card/diff_spec.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
-require 'wagn/spec_helper'
 require 'card/diff'
 require 'diff'
 

data/spec/lib/card/flexmail_spec.rb

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Flexmail do
   describe "#email_config_cardnames" do
     it "handles relative names" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.create! :name=>'emailtest+*right+*send', :content=>'[[_left+email_config]]', :type=>'Pointer'
         trigger_card = Card.new(:name=>'Huckleberry+emailtest')
         Card::Flexmail.email_config_cardnames(trigger_card).first.should=='emailtest+*right+email_config'
@@ -14,7 +13,7 @@ describe Card::Flexmail do
 
   describe ".configs_for" do
     before do
-      Account.current_id = Card::WagnBotID
+      Card::Auth.current_id = Card::WagnBotID
       Card.create! :name => "mailconfig+*to", :content => "joe@user.com"
       Card.create! :name => "mailconfig+*from", :content => "from@user.com"
       Card.create! :name => "mailconfig+*subject", :content => "Subject of the mail"
@@ -32,7 +31,7 @@ describe Card::Flexmail do
     end
 
     it "handles *email cards" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.create! :name => "mailconfig+*cc", :content => "[[Joe User+*email]]", :type=>'Pointer'
         Card.create! :name => "mailconfig+*bcc", :content => '{"name":"Joe Admin","append":"*email"}', :type=>'Search'
       end
@@ -70,7 +69,7 @@ describe Card::Flexmail do
         end
       end
 
-      Account.as_bot do
+      Card::Auth.as_bot do
         Card.create!  :name => 'Bobs addy', :content=>'bob@bob.com', :type=>'Phrase'
         Card.create!  :name => 'default subject', :content=>'a very nutty thang', :type=>'Phrase'
         Card.create!  :name => "mailconfig+*to", :content => %{ {"key":"bob_addy"} }, :type=>'Search'
@@ -87,9 +86,9 @@ describe Card::Flexmail do
     end
 
     it "returns list with correct hash for card with configs" do
-      Account.as_bot do
-        Wagn::Env[:protocol] = 'http://'
-        Wagn::Env[:host]     = 'a.com'
+      Card::Auth.as_bot do
+        Card::Env[:protocol] = 'http://'
+        Card::Env[:host]     = 'a.com'
         
         #c = Card.new(:name => "Banana Trigger", :content => "data content [[A]]", :type=>'Trigger')
         #warn "boom: #{ Card::Flexmail.configs_for(c).inspect }"
@@ -98,7 +97,7 @@ describe Card::Flexmail do
           :name    => "Banana Trigger",
           :content => "data content [[A]]",
           :type    => 'Trigger',
-          :cards=> {
+          :subcards=> {
             '+email'      => {:content=>'gary@gary.com'},
             '+subject'    => {:type=>'Pointer', :content=>'[[default subject]]'},
 #            '+attachment' => {:type=>'File', :content=>"notreally.txt" }
@@ -121,15 +120,15 @@ describe Card::Flexmail do
   describe "hooks for" do
     describe "untemplated card" do
       before do
-        Account.as_bot {
+        Card::Auth.as_bot {
           Card.create! :name => "emailtest+*right+*send", :type => "Pointer", :content => "[[mailconfig]]"
           Card.create! :name => "mailconfig+*to", :content => "joe@user.com"
         }
       end
 
       it "calls to mailer only on Card#create" do
-        Account.as_bot do
-          mock( Mailer ).flexmail( hash_including :to=>"joe@user.com" ).times 1
+        Card::Auth.as_bot do
+          mock( Card::Mailer ).flexmail( hash_including :to=>"joe@user.com" ).times 1
           c =Card.create :name => "Banana+emailtest"
           c.update_attributes! :content => 'short lived'
           c.delete!
@@ -139,14 +138,14 @@ describe Card::Flexmail do
       
 
       it "handles case of referring to self for content" do
-        Account.as_bot do
+        Card::Auth.as_bot do
           Card.create! :name => "Email", :type => "Cardtype"
           Card.create! :name => "Email+*type+*send", :type => "Pointer", :content => "[[mailconfig]]"
           Card.create! :name => "mailconfig+*message", :content => "this {{_self|core}}"
         end
 
         Rails.logger.level = ActiveSupport::BufferedLogger::Severity::DEBUG
-        mock(Mailer).flexmail(hash_including(:message=>"this had betta work"))
+        mock(Card::Mailer).flexmail(hash_including(:message=>"this had betta work"))
         Card.create!(:name => "ToYou", :type => "Email", :content => "had betta work")
       end
 
@@ -154,7 +153,7 @@ describe Card::Flexmail do
 
     describe "templated card" do
       before do
-        Account.as_bot do
+        Card::Auth.as_bot do
           Card.create! :name => "Book+*type+*send", :type => "Pointer",
             :content => "[[mailconfig]]"
           Card.create! :name => "mailconfig+*to", :content => "joe@user.com"
@@ -162,14 +161,14 @@ describe Card::Flexmail do
       end
 
       it "doesn't call to mailer on Card#create" do
-        mock.dont_allow(Mailer).flexmail
+        mock.dont_allow(Card::Mailer).flexmail
         Card.create :name => "Banana+emailtest"
       end
 
       it "calls to mailer on Card#create" do
-        mock(Mailer).flexmail(hash_including(:to=>"joe@user.com")).at_least(1)
+        mock(Card::Mailer).flexmail(hash_including(:to=>"joe@user.com")).at_least(1)
         c = Card.create :name => "Illiodity", :type=>"Book"
-        Card.update(c.id, :cards=> {"~author" => {"name" => "Bukowski"}})
+        Card.update(c.id, :subcards=> {"~author" => {"name" => "Bukowski"}})
       end
     end
   end
@@ -178,12 +177,12 @@ describe Card::Flexmail do
   # rather that the flexmail module.
   # They can/should be brought out to more modular space if/when modules support adding
   # view template (through adding directories, etc.)
-  describe "Mailer#flexmail" do
+  describe Card::Mailer do
     # to access things like 'create_account_url' include UrlWriter
     # include ActionController::UrlWriter
 
     before(:all) do
-      @email = Mailer.flexmail({
+      @email = Card::Mailer.flexmail({
         :to=>"joe@user.com",
         :subject=>"boo-ya",
         :message=>"Ipsum Daido Lorem"

data/spec/lib/card/format_spec.rb

@@ -1,176 +1,7 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Format do
-=begin
-  describe :render do
-    it "should ignore underscores in view names" do
-      render_card(:not_found).should == render_card('not found')
-    end
-    
-    it "should render denial when user lacks read permissions" do
-      c = Card.fetch('Administrator Menu')
-      c.who_can(:read).should == [Card::AdminID]
-      Account.as(:anonymous) do
-        c.ok?(:read).should == false
-        Card::Format.new(c).render(:core).should =~ /denied/
-      end
-    end
-  end
-#~~~~~~~~~~~~ special syntax ~~~~~~~~~~~#
-
-  context "special syntax" do
-
-    it "should allow for inclusion in links as in Cardtype" do
-       Account.as_bot do
-         Card.create! :name=>"TestType", :type=>'Cardtype', :content=>'[[/new/{{_self|linkname}}|add {{_self|name}} card]]'
-         Card.create! :name=>'TestType+*self+*structure', :content=>'_self' #otherwise content overwritten by *structure rule
-         Card::Format.new(Card['TestType']).render_core.should == '<a class="internal-link" href="/new/TestType">add TestType card</a>'
-       end
-    end
-
-    it "css in inclusion syntax in wrapper" do
-      c = Card.new :name => 'Afloatright', :content => "{{A|float:right}}"
-      assert_view_select Card::Format.new(c)._render( :core ), 'div[style="float:right;"]'
-    end
-
-    it "HTML in inclusion syntax stripped" do
-      c =Card.new :name => 'Afloat', :type => 'Html', :content => '{{A|float:left<object class="subject">}}'
-      result = Card::Format.new(c)._render( :core )
-      assert_view_select result, 'div[style="float:left;"]'
-    end
-  end
-  
-  describe "language quirks" do
-    it "should not fail on quirky language" do
-      render_content( 'irc: man').should == 'irc: man'
-      # this is really a specification issue, should we exclude the , like we do . at the end of a 'free' URI ?
-      render_content( 'ethan@wagn.org, dude').should == '<a class="email-link" href="mailto:ethan@wagn.org">ethan@wagn.org</a>, dude'
-    end
-  
-    it "should leave alone something that quacks like a URI when URI module raises invalid uri error" do
-      # it does leave this alone, there was too much going on in one test
-      wack_uri = 'git://<a href="/wagn/wagn.git">/wagn/wagn.git</a>'
-      render_content( wack_uri ).should == wack_uri
-    end
-    it "should leave alone something that quacks like a URI when ?" do
-      pending "its embeded in an <a> tag? quotes? need a spec"
-      wack_uri = '<a href="http://github.com/wagn/wagn.git">github.com/wagn/wagn.git</a>'
-      render_content( wack_uri ).should == wack_uri
-    end
-    it "should leave alone something that quacks like a URI when URI module raises invalid uri error" do
-      render_content( 'mailto:eat@joe.com?v=k').should == "<a class=\"email-link\" href=\"mailto:eat@joe.com?v=k\">mailto:eat@joe.com?v=k</a>"
-      #render_content( 'mailto:eat@joe.com?v=k').should == "mailto:eat@joe.com?v=k\">mailto:eat@joe.com?Subject=Hello"
-    end
-  end
-
-#~~~~~~~~~~~~ Error handling ~~~~~~~~~~~~~~~~~~#
-
-  describe "Error handling" do
-
-    it "prevents infinite loops" do
-      Card.create! :name => "n+a", :content=>"{{n+a|array}}"
-      c = Card.new :name => 'naArray', :content => "{{n+a|array}}"
-      Card::Format.new(c)._render( :core ).should =~ /too deep/
-    end
-
-    it "missing relative inclusion is relative" do
-      c = Card.new :name => 'bad_include', :content => "{{+bad name missing}}"
-      rr=(r=Card::Format.new(c))._render(:titled)
-      rr.match(/Add.*\+.*bad name missing/).should_not be_nil
-    end
-
-    it "renders deny for unpermitted cards" do
-      Account.as_bot do
-        Card.create(:name=>'Joe no see me', :type=>'Html', :content=>'secret')
-        Card.create(:name=>'Joe no see me+*self+*read', :type=>'Pointer', :content=>'[[Administrator]]')
-      end
-      assert_view_select Card::Format.new(Card.fetch('Joe no see me')).render(:core), 'span[class="denied"]'
-    end
-  end
-
-
-  describe "new_inclusion_card_args (with cgi params)" do
-    
-# WHERE WAS THIS USED?    
-#    it "uses params for card name substitutions" do
-#      c = Card.new :name => 'cardcore', :content => "{{_card+B|core}}"
-#      result = Card::Format.new(c, :params=>{'_card' => "A"})._render_core
-#      result.should == "AlphaBeta"
-#    end
-
-    it "should not change inclusion name if variable isn't present" do
-      c = Card.new :name => 'cardBname', :content => "{{_card+B|name}}"
-      Card::Format.new(c)._render( :core ).should == "_card+B"
-    end
-
-  end
-
-#~~~~~~~~~~~~~  content views
-# includes some *right stuff
-
-
-  context "structure rule" do
-    it "is used in new card forms when soft" do
-      Account.as :joe_admin do
-        content_card = Card["Cardtype E+*type+*default"]
-        content_card.content= "{{+Yoruba}}"
-        content_card.save!
-
-        help_card    = Card.create!(:name=>"Cardtype E+*type+*add help", :content=>"Help me dude" )
-        card = Card.new(:type=>'Cardtype E')
-
-        assert_view_select Card::HtmlFormat.new(card).render_new, 'div[class~="content-editor"]' do
-          assert_select 'textarea[class="tinymce-textarea card-content"]', :text => '{{+Yoruba}}'
-        end
-      end
-    end
-
-    it "is used in new card forms when hard" do
-      Account.as :joe_admin do
-        content_card = Card.create!(:name=>"Cardtype E+*type+*structure",  :content=>"{{+Yoruba}}" )
-        help_card    = Card.create!(:name=>"Cardtype E+*type+*add help", :content=>"Help me dude" )
-        card = Card.new(:type=>'Cardtype E')
-
-        mock(card).rule_card(:thanks, {:skip_modules=>true}).returns(nil)
-        mock(card).rule_card(:autoname).returns(nil)
-        mock(card).rule_card(:default,  {:skip_modules=>true}   ).returns(Card['*all+*default'])
-        mock(card).rule_card(:add_help, {:fallback=>:help} ).returns(help_card)
-        rendered = Card::HtmlFormat.new(card).render_new
-        #warn "rendered = #{rendered}"
-        assert_view_select rendered, 'fieldset' do
-          assert_select 'textarea[name=?][class="tinymce-textarea card-content"]', "card[cards][+Yoruba][content]"
-        end
-      end
-    end
-
-    it "should be used in edit forms" do
-      Account.as_bot do
-        config_card = Card.create!(:name=>"templated+*self+*structure", :content=>"{{+alpha}}" )
-      end
-      @card = Card.fetch('templated')# :name=>"templated", :content => "Bar" )
-      @card.content = 'Bar'
-      result = Card::Format.new(@card).render :edit
-#      warn "res #{@card.inspect}\n#{result}"
-      assert_view_select result, 'fieldset' do
-        assert_select 'textarea[name=?][class="tinymce-textarea card-content"]', 'card[cards][+alpha][content]'
-      end
-    end
-
-    it "works on type-plus-right sets edit calls" do
-      Account.as_bot do
-        Card.create(:name=>'Book+author+*type plus right+*default', :type=>'Phrase', :content=>'Zamma Flamma')
-      end
-      c = Card.new :name=>'Yo Buddddy', :type=>'Book'
-      result = Card::HtmlFormat.new(c).render( :new )
-      assert_view_select result, 'fieldset' do
-        assert_select 'input[name=?][type="text"][value="Zamma Flamma"]', 'card[cards][+author][content]'
-        assert_select %{input[name=?][type="hidden"][value="#{Card::PhraseID}"]},     'card[cards][+author][type_id]'
-      end
-    end
-  end
 
-=end
   describe '#show?' do
     before :all do
       @format = described_class.new Card.new

data/spec/lib/{wagn → card}/loader_spec.rb

@@ -1,6 +1,5 @@
-require "wagn/spec_helper"
 
-describe Wagn::Loader do
+describe Card::Loader do
   let(:card_double) { proxy Card }
   let(:pat_all_double) { proxy Card::SetPattern::AllPattern }
   let(:format_double) { proxy Card::Format }

data/spec/lib/card/name_spec.rb

@@ -1,6 +1,4 @@
 # -*- encoding : utf-8 -*-
-  # encoding: utf-8
-require 'wagn/spec_helper'
 
 describe Card::Name do
 
@@ -253,9 +251,9 @@ describe Card::Name do
     end
 
     it "does session user substitution" do
-      "_user".to_name.to_absolute("A").should == Account.current.name
-      Account.as_bot do
-        "_user".to_name.to_absolute("A").should == Account.current.name
+      "_user".to_name.to_absolute("A").should == Card::Auth.current.name
+      Card::Auth.as_bot do
+        "_user".to_name.to_absolute("A").should == Card::Auth.current.name
       end
     end
   end

data/spec/lib/card/query_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 A_JOINEES = ["B", "C", "D", "E", "F"]
 
@@ -191,7 +190,7 @@ describe Card::Query do
 
   describe "permissions" do
     it "should not find cards not in group" do
-      Account.as_bot  do
+      Card::Auth.as_bot  do
         Card.create :name=>"C+*self+*read", :type=>'Pointer', :content=>"[[R1]]"
       end
       Card::Query.new( :plus=>"A" ).run.map(&:name).sort.should == %w{ B D E F }
@@ -292,13 +291,11 @@ describe Card::Query do
     end
 
     it "should sort by plus card content" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         c = Card.fetch('Setting+*self+*table of contents')
         c.content = '10'
         c.save
-        c = Card['Basic+*type+*table of contents']
-        c.content = '3'
-        c.save
+        c = Card.create! :name=>'Basic+*type+*table of contents', :content=>'3'
 
         w = Card::Query.new( :right_plus=>'*table of contents', :sort=>{ :right=>'*table_of_contents'}, :sort_as=>'integer'  ) # FIXME: codename
         #warn "sql from new wql = #{w.sql}"
@@ -307,7 +304,7 @@ describe Card::Query do
     end
 
     it "should sort by count" do
-      Account.as_bot do
+      Card::Auth.as_bot do
         w = Card::Query.new( :name=>[:in,'Sara','John','Joe User'], :sort=>{ :right=>'*watcher', :item=>'referred_to', :return=>'count' } )
         w.run.map(&:name).should == ['Joe User','John','Sara']
       end
@@ -373,7 +370,7 @@ describe Card::Query do
   #=end
   describe "found_by" do
     before do
-      Account.current_id = Card::WagnBotID
+      Card::Auth.current_id = Card::WagnBotID
       c = Card.create(:name=>'Simple Search', :type=>'Search', :content=>'{"name":"A"}')
     end