wagn 1.14.8 → 1.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d41c9e082ba7d54cafd997a24bbe890372884708
-  data.tar.gz: 4acdb3fad920ab7e4aea3b4d019ae8c7ef9af47c
+  metadata.gz: f6e661b341c8a71e483cd218c80a8b2e20033d0b
+  data.tar.gz: bf400c1756544a093fb3a1f9c2bc40d23bd19888
 SHA512:
-  metadata.gz: ca2ec51091c1d0349fcff8f7f0eb879fbf160e3a468599b40aa7cf9a6c26b9c0388015e6f39f73aa04f7e76a8e83fa8b46752f9c58641b9f292d3ffa1390b8e5
-  data.tar.gz: 577f21513149a3600d5bc250fec0cad97318877492441590113b46844077f6ad3188943c673476afa642da3a74b17904dc434c0fb86c8a7d6053e9abda56fb79
+  metadata.gz: c13311a967f128a8684e2c8eae810ac4386ae2e07320f0d567bfded8168c1981eca877d3c4a30301553685daaa0ff4070b7a0bd1f43ba27821b16efca39bc063
+  data.tar.gz: 42eccd892969a798788f4a1e0dbe5fe79a6af5815e0f659851795a2abef22a3b83b31f8e6d946bdd6889dcfd76a4b2f4a6a1a58efeecf8c21050ba0a5f16555e

data/VERSION

@@ -1 +1 @@
-1.14.8
+1.14.9

data/mod/01_core/set/all/content.rb

@@ -16,7 +16,7 @@ def content=(value)
 end
 
 def raw_content
-  structure ? template.db_content : db_content
+  structure ? template.db_content : content
 end
 
 

data/mod/01_core/set/all/fetch.rb

@@ -54,8 +54,11 @@ module ClassMethods
     if card.new_card?
       if opts[:new]
         return card.renew(opts) if !clean_cache_opts? opts
+      elsif opts[:skip_virtual]
+        return
       else
-        return unless !opts[:skip_virtual] && card.virtual?
+        card.include_set_modules unless opts[:skip_modules]  # need to load modules here to call the right virtual? method 
+        return unless card.virtual?
       end
       card.name = mark.to_s if mark && mark.to_s != card.name
     end

data/mod/01_core/spec/set/all/templating_spec.rb

@@ -57,6 +57,7 @@ describe Card::Set::All::Templating do
       Card::Auth.as_bot  do
         @bt = Card.create! :name=>"birthday+*right+*default", :type=>'Date', :content=>"Today!"
       end
+      @bb = Card.new :name=>'Bob+birthday'
       @jb = Card.create! :name=>"Jim+birthday"
     end
 
@@ -69,7 +70,9 @@ describe Card::Set::All::Templating do
     end
     
     it "should apply to new cards" do
-      expect(Card.new(:name=>"Pete+birthday").content).to eq('Today!')
+      pb = Card.new :name=>"Pete+birthday"
+      expect(pb.raw_content).to eq('Today!')
+      expect(pb.content).to eq('Today!')
     end
   end
 

data/mod/03_machines/set/type/scss.rb

@@ -1,16 +1,13 @@
-include Card::Set::Type::Css
+include Type::Css
 
-format :html do
-  view :core, :mod=>Css::HtmlFormat
-  view :editor, :mod=>PlainText::HtmlFormat
-  view :content_changes, :mod=>CoffeeScript::HtmlFormat
-end
-  
 def diff_args
   {:format=>:text}
 end  
 
+
 format do
+  include Css::Format
+  
   view :core do |args|
     process_content compile_scss(_render_raw)
   end
@@ -21,7 +18,6 @@ format do
     e
   end
   
-
 end
 
-
+format( :html ) { include Css::HtmlFormat }  

data/mod/03_machines/spec/set/type/css_spec.rb

@@ -11,6 +11,7 @@ describe Card::Set::Type::Css do
       assert_view_select css_card.format.render_core, 'div[class=CodeRay]'
     end
   end
+  
 
   it_behaves_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test css", :type => :css, :content => css }

data/mod/03_machines/spec/set/type/scss_spec.rb

@@ -38,6 +38,14 @@ describe Card::Set::Type::Scss do
     end
   end
 
+  it "should process links and inclusions but not urls" do
+    Card::Auth.as_bot do
+      scss = ".TYPE-X.no-citations {\n  color: #BA5B5B;\n}\n"
+      card = Card.create! :name=>'minimal css', :type=>'scss', :content=>scss
+      card.format(:css).render_core.should == scss
+    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

data/mod/05_email/set/right/bcc.rb

@@ -23,6 +23,8 @@ format :email_text do
   view :email_addresses do |args|
     context = args[:context] || self
     card.item_names(:context=>context.cardname).map do |item_name|
+      # note that context is processed twice here because pointers absolutize item_names by default
+      # while other types can return relative names.  That's poor default behavior and should be fixed!
       item_name = item_name.to_name.to_absolute(context).to_s
       if item_name.match /.+\@.+\..+/ 
         item_name

data/mod/05_email/set/type/email_template.rb

@@ -58,8 +58,8 @@ def email_config args={}
   if default_from=Card::Mailer.default[:from]
     config[:from] = from_email ? "#{from_name || from_email} <#{default_from}>" : default_from
     config[:reply_to] ||= config[:from]
-  else
-    config[:from] ||= Card[Card::WagnBotID].account.email
+  elsif config[:from].blank? 
+    config[:from] = Card[Card::WagnBotID].account.email
   end
   config.select {|k,v| v.present? }
 end

data/mod/05_standard/set/right/account.rb

@@ -25,7 +25,7 @@ end
 
 format do
   view :verify_url do |args|
-    wagn_url "/update/#{card.cardname.left_name.url_key}?token=#{card.token}"
+    wagn_url "update/#{card.cardname.left_name.url_key}?token=#{card.token}"
   end
 
   view :verify_days do |args|
@@ -33,7 +33,7 @@ format do
   end
 
   view :reset_password_url do |args|
-    wagn_url "/update/#{card.cardname.url_key}?reset_token=#{card.token_card.refresh(true).content}"
+    wagn_url "update/#{card.cardname.url_key}?reset_token=#{card.token_card.refresh(true).content}"
   end
 
   view :reset_password_days do |args|
@@ -128,6 +128,12 @@ event :reset_token do
 end
   
 
+event :send_welcome_email do
+  if ((welcome = Card['welcome email']) && welcome.type_code == :email_template)
+    welcome.deliver(:context=>left, :to=>self.email)
+  end
+end
+
 event :send_account_verification_email, :on=>:create, :after=>:extend, :when=>proc{ |c| c.token.present? } do
   Card[:verification_email].deliver( :context => self, :to => self.email )
 end

data/mod/05_standard/set/type/signup.rb

@@ -98,6 +98,7 @@ end
 event :activate_account do
   subcards['+*account'] = {'+*status'=>'active'}
   self.type_id = Card.default_accounted_type_id
+  account.send_welcome_email
 end
 
 event :approve_with_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_with_token] } do

data/mod/05_standard/spec/set/type/signup_spec.rb

@@ -83,7 +83,6 @@ describe Card::Set::Type::Signup do
       success = Card::Env.params[:success]
       expect(success[:message]).to match(/expired/) # user notified of expired token
     end
-  
   end
 
 
@@ -121,7 +120,7 @@ describe Card::Set::Type::Signup do
       
     end
     
-    it 'deos not send verification email' do
+    it 'does not send verification email' do
       expect(Mail::TestMailer.deliveries[-2]).to be_nil
     end
     
@@ -155,6 +154,26 @@ describe Card::Set::Type::Signup do
 
   end
   
+  context 'a welcome email card exists' do
+    before do
+      Card::Auth.as_bot do 
+        Card.create! :name=>'welcome email', :subcards=>{'+*subject'=>'welcome', 
+                     '+*html_message'=>'Welcome {{_self|name}}'}, :type_id=>Card::EmailTemplateID
+      end
+      Mail::TestMailer.deliveries.clear
+      @signup = Card.create! :name=>'Big Bad Sheep', :type_id=>Card::SignupID, 
+        '+*account'=>{'+*email'=>'sheep@wagn.org', '+*password'=>'sheep'}     
+      
+    end
+    it 'sends welcome email when account is activated' do
+      @signup.activate_account
+      @mail = ActionMailer::Base.deliveries.find{ |a| a.subject == 'welcome' }
+      Mail::TestMailer.deliveries.clear
+      
+      expect(@mail).to be_truthy
+      expect(@mail.body.raw_source ).to include('Welcome Big Bad Sheep')
+    end
+  end
   
   context 'invitation' do
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.14.8
+  version: 1.14.9
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails