wagn 1.12.13 → 1.13.0.pre

data/lib/card/mailer.rb

@@ -0,0 +1,117 @@
+# -*- encoding : utf-8 -*-
+require 'open-uri'
+
+class Card
+  class Mailer < ActionMailer::Base
+    
+    @@defaults = Wagn.config.email_defaults || {}
+    @@defaults.symbolize_keys!
+    @@defaults[:return_path] ||= @@defaults[:from] if @@defaults[:from]
+    @@defaults[:charset] ||= 'utf-8'
+    default @@defaults
+
+    include Wagn::Location
+
+
+    def confirmation_email account
+      @site = Card.setting :title
+      @link = wagn_url "/update/#{account.left.cardname.url_key}?token=#{account.token}"
+      @expiry = Wagn.config.token_expiry
+
+      confirm_from = token_emails_from(account)
+      mail_from( { :to=>account.email, :subject=>"verification link for #{@site}" }, confirm_from )
+    end
+  
+    def password_reset account
+      @site = Card.setting :title
+      @link = wagn_url "/update/#{account.cardname.url_key}?reset_token=#{account.token_card.refresh(true).content}"
+      @expiry = Wagn.config.token_expiry
+    
+      reset_from = token_emails_from(account)
+      mail_from( { :to=>account.email, :subject=>"verification link for #{@site}" }, reset_from )    
+    end
+
+    def signup_alert invite_request
+      @site = Card.setting :title
+      @card = invite_request
+      @email= invite_request.account.email
+      @name = invite_request.name
+      @content = invite_request.content
+      @request_url  = wagn_url invite_request
+      @requests_url = wagn_url Card[:signup]
+
+      args = {
+        :to           => Card.setting('*request+*to'),
+        :subject      => "#{invite_request.name} signed up for #{@site}",
+        :content_type => 'text/html',
+      }
+      mail_from args, Card.setting('*request+*from') || "#{@name} <#{@email}>"
+    end
+
+
+    def change_notice cd_with_acct, card, action, watched, subedits=[], updated_card=nil
+      cd_with_acct = Card[cd_with_acct] unless Card===cd_with_acct
+      email = cd_with_acct.account.email
+      #warn "change_notice( #{cd_with_acct}, #{email}, #{card.inspect}, #{action.inspect}, #{watched.inspect} Uc:#{updated_card.inspect}...)"
+
+      updated_card ||= card
+      @card = card
+      @updater = updated_card.updater.name
+      @action = action
+      @subedits = subedits
+      @card_url = wagn_url card
+      @change_url  = wagn_url "card/changes/#{card.cardname.url_key}"
+      @unwatch_url = wagn_url "card/watch/#{watched.to_name.url_key}?toggle=off"
+      @udpater_url = wagn_url card.updater
+      @watched = (watched == card.cardname ? "#{watched}" : "#{watched} cards")
+
+      args = {
+        :to           => email,
+        :subject      => "[#{Card.setting :title} notice] #{@updater} #{action} \"#{card.name}\"" ,
+        :content_type => 'text/html',
+      }
+      mail_from args, Card[Card::WagnBotID].account.email
+    end
+
+    def flexmail config
+      @message = config.delete(:message)
+
+      if attachment_list = config.delete(:attach) and !attachment_list.empty?
+        attachment_list.each_with_index do |cardname, i|
+          if c = Card[ cardname ] and c.respond_to?(:attach)
+            attachments["attachment-#{i + 1}.#{c.attach_extension}"] = File.read( c.attach.path )
+          end
+        end
+      end
+
+      mail_from config, config[:from]
+    end
+
+    private
+
+    def token_emails_from account
+      Card.setting( '*invite+*from' ) || begin
+        from_card_id = Auth.current_id
+        from_card_id = WagnBotID if [ AnonymousID, account.left_id ].member? from_card_id
+        from_card = Card[from_card_id]
+        "#{from_card.name} <#{from_card.account.email}>"
+      end
+    end
+
+    def mail_from args, from
+      from_name, from_email = (from =~ /(.*)\<(.*)>/) ? [$1.strip, $2] : [nil, from]
+      
+      if default_from=@@defaults[:from]
+        args[:from] = !from_email ? default_from : "#{from_name || from_email} <#{default_from}>"
+        args[:reply_to] ||= from
+      else
+        args[:from] = from
+      end
+      
+      args[:template_path] = 'mailer'
+      mail args
+    end
+
+  end
+  
+end

data/{app/views → lib/card}/mailer/change_notice.html.erb

@@ -25,8 +25,8 @@
     <p>See the card: <%= @card_url %></p>
 
     <p>
-      You received this email because you're watching "<%= @watched %>". <br/>
-      <a href="<%= @unwatch_url %>">Unwatch</a> to stop receiving these emails.
+      You received this email because you're following "<%= @watched %>". <br/>
+      <a href="<%= @unwatch_url %>">Unfollow</a> to stop receiving these emails.
     </p>
   </body>
 </html>

data/lib/card/mailer/confirmation_email.html.erb

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <body style="text-align:center">
+    <h1>Thank you for signing up with <%= @site %></h1>
+    <div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and activate your account.</div>
+    <div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
+  </body>
+</html>

data/lib/card/mailer/password_reset.html.erb

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <body style="text-align:center">
+    <h1>Password Reset <%= @site %></h1>
+    <div>Someone (you, we hope) asked to reset your password</div>
+    <div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and reset your account details.</div>
+    <div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
+  </body>
+</html>

data/lib/card/name.rb

@@ -1,12 +1,11 @@
 # -*- encoding : utf-8 -*-
 require 'smart_name'
 
-
 class Card
   class Name < SmartName
 
-    self.params  = Wagn::Env # yuck!
-    self.session = proc { Account.current.name }
+    self.params  = Card::Env # yuck!
+    self.session = proc { Auth.current.name }
     self.banned_array = ['/']
 
     def star?

data/lib/card/query.rb

@@ -6,9 +6,6 @@ class Card::Query
   require_dependency 'card/query/card_spec'
   require_dependency 'card/query/value_spec'  
   require_dependency 'card/query/ref_spec'
-  
-  include ActiveRecord::QuotingAndMatching
-
 
   MODIFIERS = {};  %w{ conj return sort sort_as group dir limit offset }.each{|key| MODIFIERS[key.to_sym] = nil }
 

data/lib/card/query/card_spec.rb

@@ -100,7 +100,7 @@ class Card
           when String;   { :key => s.to_name.key }
           when Integer;  { :id => s              }
           when Hash;     s
-          else; raise BadQueyr, "Invalid cardspec args #{s.inspect}"
+          else; raise BadQuery, "Invalid cardspec args #{s.inspect}"
         end
       end
 
@@ -278,7 +278,7 @@ class Card
 
         cards.each do |c|
           unless c && [SearchTypeID,SetID].include?(c.type_id)
-            raise BadQuery, %{"found_by" value needs to be valid Search card}
+            raise BadQuery, %{"found_by" value needs to be valid Search, but #{c.name} is a #{c.type_name}}
           end
           found_by_spec = CardSpec.new(c.get_spec).rawspec
           merge(field(:id) => subspec(found_by_spec))
@@ -459,8 +459,8 @@ class Card
       end
     
       def permission_conditions
-        unless Account.always_ok? #or ( Card::Query.root_perms_only && !root? )
-          read_rules = Account.as_card.read_rules
+        unless Auth.always_ok? #or ( Card::Query.root_perms_only && !root? )
+          read_rules = Auth.as_card.read_rules
           read_rule_list = read_rules.nil? ? 1 : read_rules.join(',')
           "(#{table_alias}.read_rule_id IN (#{ read_rule_list }))"
         end      

data/lib/card/revision.rb

@@ -1,45 +1,47 @@
 # -*- encoding : utf-8 -*-
-class Card::Revision < ActiveRecord::Base
-  before_save :set_stamper
+class Card
+  class Revision < ActiveRecord::Base
+    before_save :set_stamper
 
-  class << self
-    def cache
-      Wagn::Cache[Card::Revision]
-    end
+    class << self
+      def cache
+        Wagn::Cache[Card::Revision]
+      end
     
-    def delete_old
-      where( Card.where( :current_revision_id=>arel_table[:id] ).exists.not ).delete_all
-    end
+      def delete_old
+        where( Card.where( :current_revision_id=>arel_table[:id] ).exists.not ).delete_all
+      end
     
-    def delete_cardless
-      where( Card.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
+      def delete_cardless
+        where( Card.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
+      end
     end
-  end
 
-  def set_stamper
-    self.creator_id = Account.current_id
-  end
+    def set_stamper
+      self.creator_id = Auth.current_id
+    end
 
-  def creator
-    Card[ creator_id ]
-  end
+    def creator
+      Card[ creator_id ]
+    end
 
-  def card
-    Card[ card_id ]
-  end
+    def card
+      Card[ card_id ]
+    end
 
-  def title #ENGLISH
-    current_id = card.current_revision_id
-    if id == current_id
-      'Current Revision'
-    elsif id > current_id
-      'AutoSave'
-    else
-      card.revisions.each_with_index do |rev, index|
-        return "Revision ##{index + 1}" if rev.id == id
+    def title #ENGLISH
+      current_id = card.current_revision_id
+      if id == current_id
+        'Current Revision'
+      elsif id > current_id
+        'AutoSave'
+      else
+        card.revisions.each_with_index do |rev, index|
+          return "Revision ##{index + 1}" if rev.id == id
+        end
+        '[Revisions Missing]'
       end
-      '[Revisions Missing]'
     end
+    
   end
-
 end

data/lib/card/set.rb

@@ -1,240 +1,264 @@
 # -*- encoding : utf-8 -*-
 
-module Card::Set
-
-  mattr_accessor :includable_modules, :base_modules, :traits, :current
-  @@includable_modules, @@base_modules = {}, []
-
-
-  # View definitions
-  #
-  #   When you declare:
-  #     view :view_name, "<set>" do |args|
-  #
-  #   Methods are defined on the format
-  #
-  #   The external api with checks:
-  #     render(:viewname, args)
-  #
-  #   Roughly equivalent to:
-  #     render_viewname(args)
-  #
-  #   The internal call that skips the checks:
-  #     _render_viewname(args)
-  #
-  #   Each of the above ultimately calls:
-  #     _final(_set_key)_viewname(args)
-
-  #
-  # ~~~~~~~~~~  VIEW DEFINITION
-  #
-
-  def view *args, &block
-    format do view *args, &block end
-  end
 
-  def format fmt=nil, &block
-    if block_given?
-      f = Card::Format
-      format = fmt.nil? ? f : f.get_format(fmt)
-      format.class_eval &block
-    else
-      fail "block required"
+class Card
+  module Set
+
+    mattr_accessor :includable_modules, :base_modules, :traits, :current
+    @@includable_modules, @@base_modules = {}, []
+    
+
+    # View definitions
+    #
+    #   When you declare:
+    #     view :view_name, "<set>" do |args|
+    #
+    #   Methods are defined on the format
+    #
+    #   The external api with checks:
+    #     render(:viewname, args)
+    #
+    #   Roughly equivalent to:
+    #     render_viewname(args)
+    #
+    #   The internal call that skips the checks:
+    #     _render_viewname(args)
+    #
+    #   Each of the above ultimately calls:
+    #     _final(_set_key)_viewname(args)
+
+    #
+    # ~~~~~~~~~~  VIEW DEFINITION
+    #
+
+    def view *args, &block
+      format do view *args, &block end
     end
-  end
 
+    def format fmt=nil, &block
+      if block_given?
+        f = Card::Format
+        format = fmt.nil? ? f : f.get_format(fmt)
+        format.class_eval &block
+      else
+        fail "block required"
+      end
+    end
 
-  def event event, opts={}, &final
-    opts[:on] = [:create, :update ] if opts[:on] == :save
+    def event event, opts={}, &final
+      opts[:on] = [:create, :update ] if opts[:on] == :save
 
-    mod = Card::Set.current[:module]
-    Card.define_callbacks event
+      mod = Card::Set.current[:module]
+      Card.define_callbacks event
 
-    mod.class_eval do
-      final_method = "#{event}_without_callbacks" #should be private?
-      define_method final_method, &final
+      mod.class_eval do
+        final_method = "#{event}_without_callbacks" #should be private?
+        define_method final_method, &final
 
-      define_method event do
-        run_callbacks event do
-#          Rails.logger.info "calling event: #{event} for #{self}"
-          send final_method
+        define_method event do
+  #        Rails.logger.info "running #{event} for #{name}"
+          run_callbacks event do
+  #          Rails.logger.info "calling event: #{event} for #{self}"
+            send final_method
+          end
         end
       end
-    end
     
-    set_event_callbacks event, mod, opts
-  end
+      set_event_callbacks event, mod, opts
+    end
 
 
 
-  #
-  # ActiveCard support: accessing plus cards as attributes
-  #
+    #
+    # ActiveCard support: accessing plus cards as attributes
+    #
 
 
-  def card_accessor *args
-    options = args.extract_options!
-    add_traits args, options.merge( :reader=>true, :writer=>true )
-  end
+    def card_accessor *args
+      options = args.extract_options!
+      add_traits args, options.merge( :reader=>true, :writer=>true )
+    end
 
-  def card_reader *args
-    options = args.extract_options!
-    add_traits args, options.merge( :reader=>true )
-  end
+    def card_reader *args
+      options = args.extract_options!
+      add_traits args, options.merge( :reader=>true )
+    end
 
-  def card_writer *args
-    options = args.extract_options!
-    add_traits args, options.merge( :writer=>true )
-  end
-  
+    def card_writer *args
+      options = args.extract_options!
+      add_traits args, options.merge( :writer=>true )
+    end
   
+    
+    def const_missing const
+      if const.to_s =~ /^([A-Z]\S*)ID$/ and code=$1.underscore.to_sym
+        if card_id = Codename[code]
+          const_set const, card_id
+        else
+          raise "Missing codename #{code} (#{const})"
+        end
+      else
+        super
+      end
+    end
   
-  #
-  # Singleton methods
-  #
+    #
+    # Singleton methods
+    #
 
-  class << self
+    class << self
     
-    def extended mod
-      register_set mod
-    end
+      def extended mod 
+        # document!
+        register_set mod
+      end
     
-    def register_set set_module
-      if all_set?( set_module )
-        self.current = { :module=>Card, :opts=>{} }
-        base_modules << set_module unless set_module == Card
-      else
-        self.current = { :module=>set_module, :opts=>opts_from_module( set_module ) }
-      end      
-
-      includable_modules[ set_module.name ] = set_module unless set_module == Card
-    end
+      def method_key opts
+        Card.set_patterns.each do |pclass|
+          if !pclass.opt_keys.map(&opts.method(:has_key?)).member? false;
+            return pclass.method_key_from_opts(opts)
+          end
+        end
+      end
     
-    def all_set? set_module
-      set_module == Card or set_module.name =~ /^Card::Set::All::/
-    end
+      def register_set set_module
+        if all_set?( set_module )
+          self.current = { :module=>Card, :opts=>{} }
+          base_modules << set_module unless set_module == Card
+        else
+          self.current = { :module=>set_module, :opts=>opts_from_module( set_module ) }
+        end      
 
-    def opts_from_module set_module
-      if name_parts = set_module.to_s.split('::')[2..-1]
-        #FIXME - does not handle set patterns with multiple opts (eg type plus right)
-        pattern, anchor = name_parts.map { |part| part.underscore.to_sym }
-        { pattern => anchor }
-      else
-        { }
+        includable_modules[ set_module.name ] = set_module unless set_module == Card
+      end
+    
+      def all_set? set_module
+        set_module == Card or set_module.name =~ /^Card::Set::All::/
       end
-    end
 
-    def set_module_from_name *args
-      # FIXME - this does not properly handle anchorless sets
-      # There are special hacks for *all, but others (like *rstar) will not be found by
-      # include_set_modules, which will look for Card::Set::Rstar, not Card::Set::Rstar::Blah
-      
-      module_name_parts = args.length == 1 ? args[0].split('::') : args
-      module_name_parts.inject Card::Set do |base, part|
-        return if base.nil?
-        part = part.camelize
-        module_name = "#{base.name}::#{part}"
-        if includable_modules.has_key?(module_name)
-          includable_modules[module_name]
+      def opts_from_module set_module
+        if name_parts = set_module.to_s.split('::')[2..-1]
+          #FIXME - does not handle set patterns with multiple opts (eg type plus right)
+          pattern, anchor = name_parts.map { |part| part.underscore.to_sym }
+          { pattern => anchor }
         else
-          base.const_get_or_set( part ) { Module.new }
+          { }
         end
       end
-    rescue NameError => e
-      Rails.logger.warn "set_module_from_name error #{args.inspect}: #{e.inspect}"
-      return nil if NameError ===e
-    end
-    
-    def process_base_modules
-      base_modules.each do |mod|
-        if mod.instance_methods.any?
-          Card.send :include, mod
-        end
-        if class_methods = mod.const_get_if_defined( :ClassMethods )
-          Card.send :extend, class_methods
+
+      def write_tmp_file set_pattern, anchor, from_file, seq
+        # FIXME - this does not properly handle anchorless sets
+        # There are special hacks for *all, but others (like *rstar) will not be found by
+        # include_set_modules, which will look for Card::Set::Rstar, not Card::Set::Rstar::Blah
+        
+        to_file = "#{Wagn.paths['tmp/sets'].first}/#{set_pattern}/#{seq}-#{anchor}.rb"
+        file_content = <<EOF
+# -*- encoding : utf-8 -*-
+class Card; module Set; module #{set_pattern.camelize}; module #{anchor.camelize}
+extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from #{from_file} ~~~~~~~~~~~
+
+#{ File.read from_file }
+
+# ~~~~~~~~~~~ below autogenerated; above pulled from #{from_file} ~~~~~~~~~~~
+end;end;end;end
+EOF
+        File.write to_file, file_content
+        to_file
+      end
+
+          
+      def process_base_modules
+        base_modules.each do |mod|
+          if mod.instance_methods.any?
+            Card.send :include, mod
+          end
+          if class_methods = mod.const_get_if_defined( :ClassMethods )
+            Card.send :extend, class_methods
+          end
+          includable_modules.delete mod.name
         end
-        includable_modules.delete mod.name
+        @@base_modules = []
       end
-      @@base_modules = []
-    end
     
-    def clean_empty_modules
-      includable_modules.each do |mod_name, mod|
-        if mod.instance_methods.empty?
-          includable_modules.delete mod_name
+      def clean_empty_modules
+        includable_modules.each do |mod_name, mod|
+          if mod.instance_methods.empty?
+            includable_modules.delete mod_name
+          end
         end
       end
-    end
     
-  end
+    end
 
 
-  private
+    private
 
 
-  def set_event_callbacks event, mod, opts
-    [:before, :after, :around].each do |kind|
-      if object_method = opts.delete(kind)
-        options = { :prepend => true } 
-        if mod == Card
-          options[:if] = proc { |c| c.event_applies? opts }
-        else
-          parts = mod.name.split '::'
-          set_class_key, anchor_or_placeholder = parts[-2].underscore.to_sym, parts[-1].underscore
-          set_key = Card.method_key( set_class_key => anchor_or_placeholder )
-          options[:if] = proc { |c| c.method_keys.member? set_key and c.event_applies? opts }
-        end        
-        Card.class_eval { set_callback object_method, kind, event, options }
+    def set_event_callbacks event, mod, opts
+      [:before, :after, :around].each do |kind|
+        if object_method = opts.delete(kind)
+          options = { :prepend => true } 
+          if mod == Card
+            options[:if] = proc { |c| c.event_applies? opts }
+          else
+            parts = mod.name.split '::'
+            set_class_key, anchor_or_placeholder = parts[-2].underscore.to_sym, parts[-1].underscore
+            set_key = Card::Set.method_key( set_class_key => anchor_or_placeholder )
+            options[:if] = proc { |c| c.method_keys.member? set_key and c.event_applies? opts }
+          end        
+          Card.class_eval { set_callback object_method, kind, event, options }
+        end
       end
     end
-  end
 
-  def get_traits mod
-    Card::Set.traits ||= {}
-    Card::Set.traits[mod] or Card::Set.traits[mod] = {}
-  end
+    def get_traits mod
+      Card::Set.traits ||= {}
+      Card::Set.traits[mod] or Card::Set.traits[mod] = {}
+    end
 
-  def add_traits args, options
-    mod = Card::Set.current[:module]
-    raise "Can't define card traits on all set" if mod == Card
-    mod_traits = get_traits mod
+    def add_traits args, options
+      mod = Card::Set.current[:module]
+  #    raise "Can't define card traits on all set" if mod == Card
+      mod_traits = get_traits mod
     
-    new_opts = options[:type] ? {:type=>options[:type]} : {}
-    new_opts.merge!( {:content => options[:default]} ) if options[:default]
+      new_opts = options[:type] ? {:type=>options[:type]} : {}
+      new_opts.merge!( {:content => options[:default]} ) if options[:default]
     
-    args.each do |trait|   
-      define_trait_card trait, new_opts
-      define_trait_reader trait if options[:reader]
-      define_trait_writer trait if options[:writer]
+      args.each do |trait|   
+        define_trait_card trait, new_opts
+        define_trait_reader trait if options[:reader]
+        define_trait_writer trait if options[:writer]
 
-      mod_traits[trait.to_sym] = options
+        mod_traits[trait.to_sym] = options
+      end
     end
-  end
   
-  def define_trait_card trait, opts
-    define_method "#{trait}_card" do
-      trait_var "@#{trait}_card" do
-        fetch :trait=>trait.to_sym, :new=>opts
+    def define_trait_card trait, opts
+      define_method "#{trait}_card" do
+        trait_var "@#{trait}_card" do
+          fetch :trait=>trait.to_sym, :new=>opts.clone
+        end
       end
     end
-  end
   
-  def define_trait_reader trait
-    define_method trait do
-      trait_var "@#{trait}" do
-        send( "#{trait}_card" ).content
+    def define_trait_reader trait
+      define_method trait do
+        trait_var "@#{trait}" do
+          send( "#{trait}_card" ).content
+        end
       end
     end
-  end
 
-  def define_trait_writer trait
-    define_method "#{trait}=" do |value|
-      card = send "#{trait}_card"
-      self.cards ||= {}
-      self.cards[card.name] = {:type_id => card.type_id, :content=>value }
-      instance_variable_set "@#{trait}", value
+    def define_trait_writer trait
+      define_method "#{trait}=" do |value|
+        card = send "#{trait}_card"
+        self.subcards ||= {}
+        self.subcards[card.name] = {:type_id => card.type_id, :content=>value }
+        instance_variable_set "@#{trait}", value
+      end
     end
-  end
 
+  end
 end