wagn 1.12.13 → 1.13.0.pre

data/spec/mods/standard/sets/type/image_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Image do
   it "should have special editor" do
@@ -11,7 +10,7 @@ describe Card::Set::Type::Image do
   it "should handle size argument in inclusion syntax" do
     image_card = Card.create! :name => "TestImage", :type=>"Image", :content => %{TestImage.jpg\nimage/jpeg\n12345}
     including_card = Card.new :name => 'Image1', :content => "{{TestImage | core; size:small }}"
-    rendered = Card::Format.new(including_card)._render :core
+    rendered = including_card.format._render :core
     assert_view_select rendered, 'img[src=?]', "/files/TestImage-small-#{image_card.current_revision_id}.jpg"
   end
 end

data/spec/mods/standard/sets/type/javascript_spec.rb

@@ -0,0 +1,28 @@
+# load 'spec/mods/zfactory/lib/machine_spec.rb'
+# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
+
+describe Card::Set::Type::JavaScript do
+  let(:js)                    { 'alert( "Hi" );'    }
+  let(:compressed_js)         { 'alert("Hi");'      }
+  let(:changed_js)            { 'alert( "Hello" );' }
+  let(:compressed_changed_js) { 'alert("Hello");'   }
+
+
+  it_should_behave_like 'content machine', that_produces_js do
+    let(:machine_card)  { Card.gimme! "test javascript", :type => :java_script, :content => js}
+    let(:card_content) do
+       { in:       js,         out:     compressed_js, 
+         new_in:   changed_js, new_out: compressed_changed_js }
+    end
+  end
+
+  it_behaves_like "machine input"  do
+    let(:create_machine_input_card) { Card.gimme! "test javascript", :type => :java_script, :content => js }
+    let(:create_machine_card)  { Card.gimme! "script with js+*script", :type => :pointer }
+    let(:card_content) do
+       { in:       js,         out:     compressed_js, 
+         new_in:   changed_js, new_out: compressed_changed_js }
+    end
+  end
+
+end

data/spec/mods/standard/sets/type/layout_type_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::LayoutType do
   it "should include Html card methods" do

data/spec/mods/standard/sets/type/number_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Number do
   it "should have special editor" do

data/spec/mods/standard/sets/type/phrase_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Phrase do
   it "should have special editor" do

data/spec/mods/standard/sets/type/plain_text_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::PlainText do
   it "should have special editor" do

data/spec/mods/standard/sets/type/pointer_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Pointer do
   describe "item_names" do
@@ -52,7 +51,7 @@ describe Card::Set::Type::Pointer do
     it "not break on permissions" do
       watchers = Card.fetch "Home+*watchers", :new=>{}
       watchers.type_code.should == :pointer
-      watchers << Account.current_id
+      watchers << Card::Auth.current_id
       assert_equal '[[Joe User]]', watchers.content
     end
   end

data/spec/mods/standard/sets/type/scss_spec.rb

@@ -1,6 +1,51 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
+
+# load 'spec/mods/zfactory/lib/machine_spec.rb'
+# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
+
 
 describe Card::Set::Type::Scss do
-  # SPECSTUB (low priority)
+  let(:scss) { 
+    %{
+      $link_color: #abcdef;
+      a { color: $link_color; }  
+    }
+  }
+  let(:compressed_css) {  "a{color:#abcdef}\n" }
+  let(:changed_scss) { 
+    %{
+      $link_color: #fedcba; 
+      a { color: $link_color; }
+    }
+  }
+  let(:compressed_changed_css) {  "a{color:#fedcba}\n" }
+  before do
+    @scss_card = Card[:style_functional]
+  end
+  
+  
+  it 'should highlight code in html' do
+    assert_view_select @scss_card.format.render_core, 'div[class=CodeRay]'
+  end
+  
+  it 'should not highlight code in css' do
+    @scss_card.format(:format=>:css).render_core.should_not =~ /CodeRay/
+  end
+  
+  it_should_behave_like "machine input"  do
+    let(:create_machine_input_card) { Card.gimme! "test scss", :type => :scss, :content => scss }
+    let(:create_machine_card)  { Card.gimme! "style with scss+*style", :type => :pointer }
+    let(:card_content) do
+       { in:       scss,         out:     compressed_css, 
+         new_in:   changed_scss, new_out: compressed_changed_css }
+    end
+  end
+
+  it_should_behave_like 'content machine', that_produces_css do
+    let(:machine_card) {  Card.gimme! "test scss", :type => :scss, :content => scss }
+    let(:card_content) do
+       { in:       scss,         out:     compressed_css, 
+         new_in:   changed_scss, new_out: compressed_changed_css }
+    end
+  end
 end

data/spec/mods/standard/sets/type/search_type_spec.rb

@@ -1,16 +1,27 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::SearchType do
   it "should wrap search items with correct view class" do
     Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
     c=render_content("{{Asearch|core;item:name}}")
     c.should match('search-result-item item-name')
-    render_content("{{Asearch|core;item:open}}").should match('search-result-item item-open')
-    render_content("{{Asearch|core}}").should match('search-result-item item-closed')
+    render_content("{{Asearch|core}}"          ).scan('search-result-item item-closed').size.should == 10
+    render_content("{{Asearch|core;item:open}}").scan('search-result-item item-open'  ).size.should == 10
+    render_content("{{Asearch|core|titled}}"   ).scan('search-result-item item-titled').size.should == 10
   end
 
   it "should handle returning 'count'" do
     render_card(:core, :type=>'Search', :content=>%{{ "type":"User", "return":"count"}}).should == '10'
   end
+  
+  it "should pass item args correctly" do
+    Card.create!(
+      :name=>'Pointer2Searches', 
+      :type_id=>Card::PointerID, 
+      :content=>"[[Layout+*type+by name]]\n[[PlainText+*type+by name]]"
+    )
+    r = render_content "{{Pointer2Searches|core|closed|hide:menu}}"
+    r.scan('"view":"link"').size.should == 0
+    r.scan('item-closed').size.should == 2 #there are two of each
+  end
 end

data/spec/mods/standard/sets/type/set_spec.rb

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

data/spec/mods/standard/sets/type/setting_spec.rb

@@ -1,6 +1,10 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Setting do
-  # SPECSTUB (HIGH priority)
+  context "core view" do
+    it 'should have a table' do
+      core = render_card :core, :name=>:help
+      assert_view_select core, 'table' 
+    end
+  end
 end

data/spec/mods/standard/sets/type/signup_spec.rb

@@ -0,0 +1,93 @@
+# -*- encoding : utf-8 -*-
+
+
+describe Card::Set::Type::Signup do
+  
+  before do
+    Card::Auth.current_id = Card::AnonymousID
+  end
+  
+  
+  context 'request form' do
+    before do
+      card = Card.new :type_id=>Card::SignupID
+      @form = card.format.render_new
+    end
+    
+    it 'should prompt to signup' do
+      Card::Auth.as :anonymous do
+        @form.match( /Sign up/ ).should be_true
+      end
+    end
+  end
+  
+
+   
+  context 'signup (without approval)' do
+    before do
+      ActionMailer::Base.deliveries = [] #needed?
+      
+      Card::Auth.as_bot do
+        Card.create! :name=>'User+*type+*create', :content=>'[[Anyone]]'
+        Card.create! :name=>'*request+*to', :content=>'request@wagn.org'
+      end
+      @request = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID, '+*account'=>{ 
+        '+*email'=>'wolf@wagn.org', '+*password'=>'wolf'
+      }
+      @account = @request.account
+      @token = @account.token
+    end
+    
+    it 'should create all the necessary cards' do
+      @request.type_id.should == Card::SignupID
+      @account.email.should == 'wolf@wagn.org'
+      @account.status.should == 'pending'
+      @account.salt.should_not == ''
+      @account.password.length.should > 10 #encrypted
+      @account.token.should be_present
+    end
+  
+    it 'should send email with an appropriate link' do
+    end
+    
+    it 'should create an authenticable token' do
+      Card::Auth.authenticate_by_token(@token).should == @request.id
+    end
+    
+    it 'should notify someone' do
+      ActionMailer::Base.deliveries.last.to.should == ['request@wagn.org']
+    end
+    
+    it 'should be activated by an update' do
+      Card::Env.params[:token] = @token
+      @request.update_attributes({})
+      #puts @request.errors.full_messages * "\n"
+      @request.errors.should be_empty
+      @request.type_id.should == Card::UserID
+      @account.status.should == 'active'
+      Card[ @account.name ].active?.should be_true
+    end
+    
+    it 'should reject expired token and create new token' do
+      @account.token_card.update_column :updated_at, 3.days.ago.strftime("%F %T")
+      @account.token_card.expire
+      Card::Env.params[:token] = @token
+      
+      result = @request.update_attributes!({})
+      result.should == true                 # successfully completes save
+      @account.token.should_not == @token   # token gets updated
+      success = Card::Env.params[:success]
+      success[:message].should =~ /expired/ # user notified of expired token
+    end
+  
+  end
+
+
+  context 'signup (with approval)' do
+
+  end
+  
+  
+ 
+
+end

data/spec/mods/standard/sets/type/skin_spec.rb

@@ -1,6 +1,27 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Skin do
-  # SPECSTUB (low priority)
+  let(:css)                    { "#box { display: block }"  }
+  let(:compressed_css)         { "#box{display:block}\n"    }
+  let(:changed_css)            { "#box { display: inline }" }
+  let(:compressed_changed_css) { "#box{display:inline}\n"   }
+  
+  
+  it_should_behave_like 'pointer machine', that_produces_css do
+    let(:machine_card)  { Card.gimme! "test skin factory", :type => :skin, :content => ''}
+    let(:machine_input_card) { Card.gimme! "test skin supplier",  :type => :css, :content => css  }
+    let(:card_content) do
+       { in:       css,         out:     compressed_css, 
+         new_in:   changed_css, new_out: compressed_changed_css }
+    end
+  end
+  
+  it_behaves_like "machine input"  do
+    let(:create_machine_input_card) { Card.gimme! "test skin supplier", :type => :css, :content => css }
+    let(:create_machine_card)  { Card.gimme! "style with skin factory+*style", :type => :pointer }
+    let(:card_content) do
+       { in:       css,         out:     compressed_css, 
+         new_in:   changed_css, new_out: compressed_changed_css }
+    end
+  end
 end

data/spec/mods/standard/sets/type/toggle_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::Type::Toggle do
   it "should have special editor" do

data/spec/mods/standard/sets/type/user_spec.rb

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

data/{lib/wagn → spec}/spec_helper.rb

@@ -2,22 +2,32 @@
 require 'spork'
 ENV["RAILS_ENV"] = 'test'
 
+require 'simplecov'
+require File.expand_path( '../../spec/mods/standard/lib/machine_spec.rb', __FILE__ )
+require File.expand_path( '../../spec/mods/standard/lib/machine_input_spec.rb', __FILE__ )
+
 Spork.prefork do
-  require File.expand_path( '../../../config/environment', __FILE__ )
+  require File.expand_path( '../../config/environment', __FILE__ )
   require 'rspec/rails'
-
+  
+  
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
-  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
+#  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
 
-  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+#  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
   JOE_USER_ID = Card['joe_user'].id
 
   RSpec.configure do |config|
 
     config.include RSpec::Rails::Matchers::RoutingMatchers, :example_group => {
-      :file_path => /\bspec\/controllers\// }
+      :file_path => /\bspec\/controllers\//
+    }
 
+    format_index = ARGV.find_index {|arg| arg =~ /--format/ }
+    formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
+    config.add_formatter formatter
+    
     #config.include CustomMatchers
     #config.include ControllerMacros, :type=>:controllers
 
@@ -29,12 +39,12 @@ Spork.prefork do
 
     config.use_transactional_fixtures = true
     config.use_instantiated_fixtures  = false
-
+    
 
     config.before(:each) do
-      Account.current_id = JOE_USER_ID
+      Card::Auth.current_id = JOE_USER_ID
       Wagn::Cache.restore
-      Wagn::Env.reset
+      Card::Env.reset
     end
     config.after(:each) do
       Timecop.return
@@ -44,6 +54,7 @@ end
 
 
 Spork.each_run do
+
   # This code will be run each time you run your specs.
 end
 
@@ -53,8 +64,11 @@ module Wagn::SpecHelper
   #~~~~~~~~~  HELPER METHODS ~~~~~~~~~~~~~~~#
   
   def login_as user
-    Account.current_id = @request.session[:user] = (uc=Card[user.to_s] and uc.id)
-    #warn "(ath)login_as #{user.inspect}, #{Account.current_id}, #{@request.session[:user]}"
+    Card::Auth.current_id = (uc=Card[user.to_s] and uc.id)
+    if @request
+      @request.session[:user] = Card::Auth.current_id
+    end
+    #warn "(ath)login_as #{user.inspect}, #{Card::Auth.current_id}, #{@request.session[:user]}"
   end
   
   def newcard name, content=""
@@ -73,14 +87,13 @@ module Wagn::SpecHelper
 
   def render_editor(type)
     card = Card.create(:name=>"my favority #{type} + #{rand(4)}", :type=>type)
-    Card::Format.new(card).render(:edit)
+    card.format.render(:edit)
   end
 
   def render_content content, format_args={}
     @card ||= Card.new :name=>"Tempo Rary 2"
     @card.content = content
-    f = Card::Format.new @card, format_args
-    f._render :core
+    @card.format(format_args)._render :core
   end
 
   def render_card view, card_args={}, format_args={}
@@ -91,7 +104,39 @@ module Wagn::SpecHelper
         Card.new card_args.merge( :name=> 'Tempo Rary' )
       end
     end
-    Card::Format.new(card, format_args)._render(view)
+    card.format(format_args)._render(view)
+  end
+end
+
+
+class Card
+  def self.gimme! name, args = {}
+    Card::Auth.as_bot do
+      c = Card.fetch( name, :new => args )
+      c.putty args
+      Card.fetch name 
+    end    
+  end
+  
+  def self.gimme name, args = {}
+    Card::Auth.as_bot do
+      c = Card.fetch( name, :new => args )
+      if args[:content] and c.content != args[:content]
+        c.putty args
+        c = Card.fetch name 
+      end
+      c
+    end    
+  end
+  
+  def putty args = {}
+    Card::Auth.as_bot do
+      if args.present? 
+        update_attributes! (args) 
+      else 
+        save!
+      end
+    end
   end
 end