wagn 1.13.0.pre1 → 1.13.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e0f648f23fed4223cd97e9b6c26867861a4643
-  data.tar.gz: 1b1a3f53e55ee36f81169a33c739a31d060eb27a
+  metadata.gz: b8faf3945e01dfc7e56a2b1edb8b1f3e2ef1b033
+  data.tar.gz: 3cdc4a0268f4352f583822daae068459f07ae855
 SHA512:
-  metadata.gz: be2ed2d9ac1f1c7257063e76cf8aaded8c44062c19a337605b927d648f8a0e68b29361c7118268d84e029f189d9778468cb43f00b160d192d35d76f77635d8b1
-  data.tar.gz: da2fbeb91f17eff7a020a64c29902a8d4d512965f0e1c62ddbca35d1dc6c1f04939b5fe8c3eda10a296aa924b350204172d23f1b924f6f7d389cf5b892522a44
+  metadata.gz: 00098a43f7e3956d1f653660b67f9df87a7ec0120e80edd9ee83047bbd263bc1cc5d96f5c33b7bcbcdb09be6a6d83533583d9a69bc278bcbd2de3387b5dc1fb9
+  data.tar.gz: 61f0a6c1bbad7a336f7cfae12e059a34d67dd55f6e22609a38117d8eeea8b446d0e37b8b1f62d8ab597faff45f702132879488634010bf14795ec2b2545a50a6

data/VERSION

@@ -1 +1 @@
-1.13.0.pre1
+1.13.0.pre2

data/app/controllers/card_controller.rb

@@ -138,7 +138,7 @@ class CardController < ActionController::Base
         end
       end
     @card.selected_revision_id = params[:rev].to_i if params[:rev]
-
+    
     Card::Env[:main_name] = params[:main] || (card && card.name) || ''
     render_errors if card.errors.any?
     true
@@ -252,7 +252,7 @@ class CardController < ActionController::Base
   end
 
 
-  rescue_from Exception do |exception|
+  rescue_from StandardError do |exception|
     Rails.logger.info "exception = #{exception.class}: #{exception.message}"
 
     @card ||= Card.new
@@ -262,7 +262,7 @@ class CardController < ActionController::Base
       ## some are redundantly defined in view
       when Card::Oops, Card::Query
         card.errors.add :exception, exception.message 
-        # Card::Oops error messages are visible to end users and are generally not treated as bugs.
+        # these error messages are visible to end users and are generally not treated as bugs.
         # Probably want to rename accordingly.
         :errors
       when Card::PermissionDenied, Wagn::PermissionDenied

data/db/migrate_cards/20140307231621_user_data_to_cards.rb

@@ -59,7 +59,11 @@ class UserDataToCards < ActiveRecord::Migration
             cardname = "#{base.name}+#{Card[:account].name}+#{Card[field].name}"
             user_field = ( field==:password ? :crypted_password : field )
             if content = user.send( user_field )
-              Card.create! date_args.merge( :name=>cardname, :content=>content)
+              begin
+                Card.create! date_args.merge( :name=>cardname, :content=>content)
+              rescue => e
+                puts "error importing #{cardname}: #{e.message}"
+              end
             end
           end
         end

data/lib/card.rb

@@ -1,34 +1,31 @@
 # -*- encoding : utf-8 -*-
 
 class Card < ActiveRecord::Base
+
   require_dependency 'card/active_record_ext'
-  
   require_dependency 'card/codename'
   require_dependency 'card/query'
-  require_dependency 'card/set_pattern'  
+  require_dependency 'card/set_pattern'
   require_dependency 'card/set'
   require_dependency 'card/format'
   require_dependency 'card/exceptions'
   require_dependency 'card/auth'
   require_dependency 'card/loader'
 
-  extend Set
-
   has_many :revisions, :order => :id
   has_many :references_from, :class_name => :Reference, :foreign_key => :referee_id
   has_many :references_to,   :class_name => :Reference, :foreign_key => :referer_id
 
-  cache_attributes 'name', 'type_id' #Review - still worth it in Rails 3?
+  cache_attributes 'name', 'type_id' # review - still worth it in Rails 3?
 
   cattr_accessor :set_patterns, :error_codes
   @@set_patterns, @@error_codes = [], {}
 
   attr_writer :selected_revision_id #writer because read method is in mod (and does not override upon load)
-  attr_accessor :action, :supercard,         
+  attr_accessor :action, :supercard,
     :comment, :comment_author,    # obviated soon
     :update_referencers           # wrong mechanism for this
 
-
   define_callbacks :approve, :store, :extend
   
   before_validation :approve
@@ -40,3 +37,4 @@ class Card < ActiveRecord::Base
   tracks :content # we can phase this out and just use "dirty" handling once current content is stored in the cards table
 
 end
+

data/lib/card/chunk.rb

@@ -47,6 +47,7 @@ class Card
     register_list :default, [ :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link ]
     register_list :references,                         [ :EscapedLiteral, :Include, :Link ]
     register_list :inclusion_only,                     [  :Include ]
+    register_list :inclusion_and_link,                 [  :Include, :Link ]
   
     class Abstract
       class_attribute :config

data/lib/card/codename.rb

@@ -1,47 +1,64 @@
 # -*- encoding : utf-8 -*-
 
-class Card::Codename
+class Card
+  class Codename
 
-  @@codehash=nil
+    @@codehash=nil
 
-  class << self
-    # returns codename for id and vice versa.  not in love with this api --efm
-    def [] key
-      if !key.nil?
-        key = key.to_sym unless Integer===key
-        codehash[key]
+    class << self
+      # returns codename for id and vice versa.  not in love with this api --efm
+      def [] key
+        if !key.nil?
+          key = key.to_sym unless Integer===key
+          codehash[key]
+        end
       end
-    end
 
-    def codehash
-      @@codehash || load_hash
-    end
+      def codehash
+        @@codehash || load_hash
+      end
 
-    def reset_cache
-      @@codehash = nil
-    end
+      def reset_cache
+        @@codehash = nil
+      end
 
-    #only used in migration
-    def bootdata hash
-      @@codehash = hash
-    end
+      #only used in migration
+      def bootdata hash
+        @@codehash = hash
+      end
 
 
-    private
+      private
 
-    def load_hash
-      @@codehash = {}
-      sql = 'select id, codename from cards where codename is not NULL'
-      ActiveRecord::Base.connection.select_all(sql).each do |row|
-        #FIXME: remove duplicate checks, put them in other tools
-        code, cid = row['codename'].to_sym, row['id'].to_i
-        if @@codehash.has_key?(code) or @@codehash.has_key?(cid)
-          warn "dup code ID:#{cid} (#{@@codehash[code]}), CD:#{code} (#{@@codehash[cid]})"
+      def load_hash
+        @@codehash = {}
+        sql = 'select id, codename from cards where codename is not NULL'
+        ActiveRecord::Base.connection.select_all(sql).each do |row|
+          #FIXME: remove duplicate checks, put them in other tools
+          code, cid = row['codename'].to_sym, row['id'].to_i
+          if @@codehash.has_key?(code) or @@codehash.has_key?(cid)
+            warn "dup code ID:#{cid} (#{@@codehash[code]}), CD:#{code} (#{@@codehash[cid]})"
+          end
+          @@codehash[code] = cid; @@codehash[cid] = code
         end
-        @@codehash[code] = cid; @@codehash[cid] = code
-      end
 
-      @@codehash
+        @@codehash
+      end
+    end
+    
+  end
+  
+  
+  def self.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
+  
 end

data/lib/card/env.rb

@@ -63,4 +63,3 @@ class Card
   end  
   Env.reset
 end
-

data/lib/card/exceptions.rb

@@ -4,7 +4,7 @@ class Card
   class Error < StandardError #code problem
   end
   
-  class Oops < Error # wagneer problem
+  class Oops < Error # wagneer problem (rename!)
   end
   
   class BadQuery < Error
@@ -27,10 +27,10 @@ class Card
     end
   end
   
-  class Abort < Exception
+  class Abort < StandardError
     attr_reader :status
 
-    def initialize status=:failure, msg=''
+    def initialize status, msg=''
       @status = status
       super msg
     end

data/lib/card/format.rb

@@ -9,14 +9,14 @@ class Card
       :layout=>:layout, :new=>:edit, :setup=>:edit, :normal=>:normal, :template=>:template } #should be set in views
     
     cattr_accessor :ajax_call, :registered, :max_depth
-    [ :perms, :denial_views, :subset_views, :error_codes, :view_tags, :aliases ].each do |acc|
+    [ :perms, :denial_views, :error_codes, :view_tags, :aliases ].each do |acc|
       cattr_accessor acc
       self.send "#{acc}=", {}
     end
     @@max_char_count = 200 #should come from Wagn.config
     @@max_depth      = 20 # ditto
     
-    attr_reader :card, :root, :parent, :vars
+    attr_reader :card, :root, :parent, :main_opts
     attr_accessor :form, :error_status, :inclusion_opts
   
     class << self
@@ -25,77 +25,16 @@ class Card
       def register format
         @@registered << format.to_s
       end
-
-      def get_format format
-        fkey = @@aliases[ format ] || format
-        Card.const_get( "#{fkey.to_s.camelize}Format" )
-      end
-
-      def view view, *args, &final
-        view = view.to_name.key.to_sym
-        if block_given?
-          define_view view, args[0], &final
-        else
-          opts = Hash===args[0] ? args.shift : nil
-          alias_view view, opts, args.shift
-        end
-      end
-
-      def define_view view, opts, &final
-        opts ||= {}
-        opts.merge! Card::Set.current[:opts]
-        
-        extract_class_vars view, opts
-        view_key = get_set_key view, opts
-        
-        define_method "_final_#{view_key}", &final
-        define_render_methods view
-      end
-
-      def alias_view alias_view, opts, referent_view=nil
-        subset_views[alias_view] = true if opts && !opts.empty?
-
-        referent_view ||= alias_view
-        alias_opts = Card::Set.current[:opts]
-        referent_view_key = get_set_key referent_view, (opts || alias_opts)
-        alias_view_key    = get_set_key alias_view, alias_opts
-
-        define_method "_final_#{alias_view_key}" do |*a|
-          send "_final_#{referent_view_key}", *a
-        end
-        define_render_methods alias_view
-      end
-
-      def define_render_methods view
-        # note: this could also be done with method_missing. is this any faster?
-        if !method_defined? "render_#{view}"
-          define_method "_render_#{view}" do |*a|
-            send_final_render_method view, *a
-          end
-
-          define_method "render_#{view}" do |*a|
-            send "_render_#{ ok_view view, *a }", *a
-          end
-        end
+    
+      def format_class_name format
+        f = format.to_s
+        f = @@aliases[ f ] || f
+        "#{ f.camelize }Format"
       end
-      
 
-      
 
-      def new card, opts={}
-        klass = self != Format ? self : get_format( (opts[:format] || :html).to_sym )
-        new_format = klass.allocate
-        new_format.send :initialize, card, opts
-        new_format
-      end
-    
-      def tagged view, tag
-        view and tag and view_tags = @@view_tags[view.to_sym] and view_tags[tag.to_sym]
-      end
-        
-      private
-      
       def extract_class_vars view, opts
+        return unless opts.present?
         perms[view]       = opts.delete(:perms)      if opts[:perms]
         error_codes[view] = opts.delete(:error_code) if opts[:error_code]
         denial_views[view]= opts.delete(:denial)     if opts[:denial]
@@ -106,43 +45,62 @@ class Card
             view_tags[view][tag] = true
           end
         end
-        
-        if !opts.empty?
-          subset_views[view] = true
+
+      end
+
+      def new card, opts={}
+        if self != Format
+          super
+        else
+          klass = Card.const_get format_class_name( opts[:format] || :html )
+          self == klass ? super : klass.new( card, opts )
         end
       end
+    
+      def tagged view, tag
+        view and tag and view_tags = @@view_tags[view.to_sym] and view_tags[tag.to_sym]
+      end
+      
       
-      def get_set_key selection_key, opts
-        unless pkey = Card::Set.method_key(opts)
-          raise "bad method_key opts: #{pkey.inspect} #{opts.inspect}"
+      def format_ancestry
+        ancestry = [ self ]
+        unless self == Card::Format
+          ancestry = ancestry + superclass.format_ancestry
         end
-        key = pkey.blank? ? selection_key : "#{pkey}_#{selection_key}"
-        #warn "gvkey #{selection_key}, #{opts.inspect} R:#{key}"
-        key.to_sym
+        ancestry
       end
+        
     end
     
     
     #~~~~~ INSTANCE METHODS
 
     def initialize card, opts={}
-      @card = card
+      @card = card or raise Card::Error, "format initialized without card"
       opts.each do |key, value|
         instance_variable_set "@#{key}", value
       end
 
-      @mode ||= :normal      
-      @char_count = @depth = 0
-      @root = self
-      @vars = {}
+      @mode  ||= :normal
+      @depth ||= 0
+      @root  ||= self      
 
       @context_names ||= if params[:slot] && context_name_list = params[:slot][:name_context]
         context_name_list.split(',').map &:to_name
       else [] end
+        
+      include_set_format_modules
+      self
     end
     
-
-    
+    def include_set_format_modules
+      self.class.format_ancestry.reverse.each do |klass|
+        card.set_format_modules( klass ).each do |m|
+          singleton_class.send :include, m
+        end
+      end
+    end
+  
     def inclusion_defaults
       @inclusion_defaults ||= begin
         defaults = get_inclusion_defaults.clone
@@ -196,11 +154,22 @@ class Card
       end
     end
 
-    def method_missing method_id, *args, &proc
-      proc = proc {|*a| raw yield *a } if proc
-      #Rails.logger.warn "mmiss #{self.class}, #{@card.inspect}, #{caller[0]}, #{method_id}"
-      response = template.send method_id, *args, &proc
-      String===response ? template.raw( response ) : response
+    def method_missing method, *opts, &proc
+      case method
+      when /(_)?(optional_)?render(_(\w+))?/  
+        view = $3 ? $4 : opts.shift      
+        args = opts[0] ? opts.shift.clone : {} 
+        args.merge!( :optional=>true, :default_visibility=>opts.shift) if $2
+        args[ :skip_permissions ] = true if $1
+        render view, args           
+      when /^_view_(\w+)/
+        view = @current_view || $1 
+        unsupported_view view
+      else
+        proc = proc { |*a| raw yield *a } if proc
+        response = root.template.send method, *opts, &proc
+        String===response ? root.template.raw( response ) : response
+      end
     end
 
     #
@@ -210,33 +179,20 @@ class Card
     
 
     def render view, args={}
-      prefix = args.delete(:allowed) ? '_' : ''
-      method = "#{prefix}render_#{canonicalize_view view}"
-      if respond_to? method
-        send method, args
-      else
-        unknown_view view
-      end
-    end
-
-    def _render view, args={}
-      args[:allowed] = true
-      render view, args
-    end
-
-    def optional_render view, args, default=:show
-      if show_view? view, args, default
-        view = args["optional_#{ canonicalize_view view }_view".to_sym] || view
-        render view, args
+      unless args.delete(:optional) && !show_view?( view, args )
+        @current_view = view = ok_view canonicalize_view( view ), args       
+        args = default_render_args view, args
+        with_inclusion_mode view do
+          send "_view_#{ view }", args
+        end
       end
+    rescue => e
+      rescue_view e, view
     end
 
-    def _optional_render view, args, default=:show
-      args[:allowed] = true
-      optional_render view, args, default
-    end
     
-    def show_view? view, args, default=:show
+    def show_view? view, args
+      default = args.delete(:default_visibility) || :show #FIXME - ugly
       view_key = canonicalize_view view
       api_option = args["optional_#{ view_key }".to_sym]
       case 
@@ -267,24 +223,6 @@ class Card
     end
     
 
-    def send_final_render_method view, *a
-      @current_view = view
-      args = default_render_args view, *a
-      if final_method = view_method(view)
-        with_inclusion_mode view do
-          send final_method, args
-        end
-      else
-        unsupported_view view
-      end
-    rescue Exception=>e
-      if Rails.env =~ /^cucumber|test$/
-        raise e
-      else
-        rescue_view e, view
-      end
-    end
-
     def default_render_args view, a=nil
       args = case a
       when nil   ; {}
@@ -303,20 +241,20 @@ class Card
     
 
     def rescue_view e, view
-      controller.send :notify_airbrake, e if Airbrake.configuration.api_key
-      Rails.logger.info "\nError rendering #{error_cardname} / #{view}: #{e.class} : #{e.message}"
-      Rails.logger.debug "BT:  #{e.backtrace*"\n  "}"
-      rendering_error e, view
+      if Rails.env =~ /^cucumber|test$/
+        raise e
+      else
+        controller.send :notify_airbrake, e if Airbrake.configuration.api_key
+        Rails.logger.info "\nError rendering #{error_cardname} / #{view}: #{e.class} : #{e.message}"
+        Rails.logger.debug "BT:  #{e.backtrace*"\n  "}"
+        rendering_error e, view
+      end
     end
 
     def error_cardname
       card && card.name.present? ? card.name : 'unknown card'
     end
   
-    def unknown_view view
-      "unknown view: #{view}"
-    end
-
     def unsupported_view view
       "view (#{view}) not supported for #{error_cardname}"
     end
@@ -330,21 +268,13 @@ class Card
     #
 
     def subformat subcard
-      #should consider calling "child"
       subcard = Card.fetch( subcard, :new=>{} ) if String===subcard
-      sub = self.clone
-      sub.initialize_subformat subcard, self
+      sub = self.class.new subcard, :parent=>self, :depth=>@depth+1, :root=>@root,
+        # FIXME - the following four should not be hard-coded here.  need a generalized mechanism
+        # for attribute inheritance
+        :context_names=>@context_names, :mode=>@mode, :mainline=>@mainline, :form=>@form
     end
 
-    def initialize_subformat subcard, parent
-      @parent = parent
-      @card = subcard
-      @vars = {}
-      @char_count = 0
-      @depth += 1
-      @inclusion_defaults = @inclusion_opts = @showname = @ok = nil
-      self
-    end
 
     def process_content content=nil, opts={}
       process_content_object(content, opts).to_s
@@ -352,18 +282,19 @@ class Card
 
     def process_content_object content=nil, opts={}
       return content unless card
-      content = card.content if content.nil?
+      content = card.raw_content || '' if content.nil?
 
       obj_content = Card::Content===content ? content : Card::Content.new( content, format=self )
 
-      card.update_references( obj_content, true ) if card.references_expired  # I thik we need this generalized
+      card.update_references( obj_content, refresh=true ) if card.references_expired  # I thik we need this generalized
 
       obj_content.process_content_object do |chunk_opts|
         prepare_nest chunk_opts.merge(opts) { yield }
       end
     end
 
-    def ok_view view, args={}
+    def ok_view view, args={}    
+      return view if args.delete :skip_permissions
       approved_view = case
         when @depth >= @@max_depth      ; :too_deep                    # prevent recursion. @depth tracks subformats
         when @@perms[view] == :none     ; view                         # view requires no permissions
@@ -417,17 +348,7 @@ class Card
         DEPRECATED_VIEWS[view_key] || view_key
       end
     end
-
-    def view_method view
-      return "_final_#{view}" unless card && @@subset_views[view]
-      card.method_keys.each do |method_key|
-        meth = "_final_"+(method_key.blank? ? "#{view}" : "#{method_key}_#{view}")
-        #warn "looking up #{method_key}, M:#{meth} for #{card.name}"
-        return meth if respond_to?(meth.to_sym)
-      end
-      nil
-    end
-
+    
     def with_inclusion_mode mode
       if switch_mode = INCLUSION_MODES[ mode ] and @mode != switch_mode
         old_mode, @mode = @mode, switch_mode
@@ -442,6 +363,8 @@ class Card
     end
 
     def prepare_nest opts
+      @char_count ||= 0
+      
       opts ||= {}
       case
       when opts.has_key?( :comment )                            ; opts[:comment]     # as in commented code
@@ -456,7 +379,7 @@ class Card
     end
 
     def expand_main opts
-      opts.merge! @main_opts if @main_opts
+      opts.merge! root.main_opts if root.main_opts
       legacy_main_opts_tweaks! opts
 
       opts[:view] ||= :open