wagn 1.12.13 → 1.13.0.pre

data/lib/card/content.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require_dependency 'card/chunk'
-# you could make the case that Card::Chunk should be Card::Content::Chunk, which would make the above unnecessary (but create noise elsewhere)
+# you could make the case that Card::Chunk should be Card::Content::Chunk...
 
 class Card
   class Content < SimpleDelegator

data/lib/card/core_ext.rb

@@ -0,0 +1,74 @@
+class Object
+  # FIXME: move this, mixin, don't extend Object
+  def deep_clone
+    case self
+    when Fixnum,Bignum,Float,NilClass,FalseClass,TrueClass,Symbol
+      klone = self
+    when Hash
+      klone = self.clone
+      self.each{|k,v| klone[k] = v.deep_clone}
+    when Array
+      klone = self.clone
+      klone.clear
+      self.each{|v| klone << v.deep_clone}
+    else
+      klone = self.clone
+    end
+    klone.instance_variables.each {|v|
+      klone.instance_variable_set(v,
+      klone.instance_variable_get(v).deep_clone)
+    }
+    klone
+  end
+
+  def send_unless method, *args, &block
+    ( block_given? ? yield : self ) or  send method, *args
+  end
+
+  def send_if     method, *args, &block
+    ( block_given? ? yield : self ) and send method, *args
+  end
+  
+  def to_name
+    Card::Name.new self
+  end
+end
+
+
+
+class Module
+  RUBY_VERSION_18 = !!(RUBY_VERSION =~ /^1\.8/)
+  
+  def const_get_if_defined const
+    args = RUBY_VERSION_18 ? [ const ] : [ const, false ]
+    if const_defined? *args
+      const_get *args
+    end
+  end
+  
+  def const_get_or_set const
+    const_get_if_defined const or const_set const, yield
+  end
+end
+
+
+
+class Hash
+  # FIXME: this is too ugly and narrow for a core extension.
+  class << self
+    def new_from_semicolon_attr_list(attr_string)
+      return {} if attr_string.blank?
+      attr_string.strip.split(';').inject({}) do |result, pair|
+        value, key = pair.split(':').reverse
+        key ||= 'view'
+        key.strip!; value.strip!
+        result[key.to_sym] = value
+        result
+      end
+    end
+  end
+
+end
+
+
+

data/lib/card/env.rb

@@ -0,0 +1,66 @@
+# Card::Env can differ for each request; Wagn.config should not
+
+class Card
+  module Env
+    class << self
+      def reset args={}
+        @@env = { :main_name => nil }
+      
+        if c = args[:controller]
+          self[:controller] = c
+          self[:session] = c.request.session
+          self[:params] = c.request.params
+          self[:ajax] = c.request.xhr? || c.request.params[:simulate_xhr]
+          self[:host]       = Wagn.config.override_host     || c.request.env['HTTP_HOST']
+          self[:protocol]   = Wagn.config.override_protocol || c.request.protocol
+        
+        end
+      end
+    
+      def [] key
+        @@env[key.to_sym]
+      end
+    
+      def []= key, value
+        @@env[key.to_sym] = value
+      end
+      
+      #hacky - should be in module
+      def recaptcha_on?
+        if self[:recaptcha_on].nil?
+          self[:recaptcha_count] = 0
+          self[:recaptcha_on] = self[:controller] && have_recaptcha_keys? && !Auth.signed_in? && !Auth.needs_setup? && !Auth.always_ok?
+        end
+        self[:recaptcha_on]
+      end
+
+      def params
+        self[:params] ||= {}
+      end
+      
+      def session
+        self[:session] ||= {}
+      end
+    
+      def ajax?
+        self[:ajax]
+      end
+    
+      def method_missing method_id, *args
+        case args.length
+        when 0 ; self[ method_id ]
+        when 1 ; self[ method_id ] = args[0]
+        else   ; super
+        end
+      end
+    
+      private
+    
+      def have_recaptcha_keys?
+        !!( Wagn.config.recaptcha_public_key && Wagn.config.recaptcha_private_key )
+      end
+    end
+  end  
+  Env.reset
+end
+

data/lib/card/flexmail.rb

@@ -1,47 +1,53 @@
 # -*- encoding : utf-8 -*-
 
-class Card::Flexmail
-  class << self
-    def configs_for card
-      email_config_cardnames(card).map do |email_config|
-        config = {}
-
-        [:to, :from, :cc, :bcc, :attach].each do |field|
-          config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
-              # configuration can be anything visible to configurer
-              Account.as( fld_card.updater ) do
-                list = fld_card.extended_list card
-                field == :attach ? list : list * ','
-              end
-        end
+class Card
+  class Flexmail
 
-        [:subject, :message].each do |field|
-          config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
-              Account.as( fld_card.updater ) do
-                fld_card.contextual_content card, :format=>'email_html'
-              end
-        end
+    class << self
+      
+      def configs_for card
+        email_config_cardnames(card).map do |email_config|
+          config = {}
+
+          [:to, :from, :cc, :bcc, :attach].each do |field|
+            config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
+                # configuration can be anything visible to configurer
+                Auth.as( fld_card.updater ) do
+                  list = fld_card.extended_list card
+                  field == :attach ? list : list * ','
+                end
+          end
 
-        config[:subject] = strip_html(config[:subject]).strip
-        config
+          [:subject, :message].each do |field|
+            config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
+                Auth.as( fld_card.updater ) do
+                  fld_card.contextual_content card, :format=>'email_html'
+                end
+          end
+
+          config[:subject] = strip_html(config[:subject]).strip
+          config
+        end
       end
-    end
 
-    def email_config_cardnames card
-      #warn "card is #{card.inspect}"
-      event_card = card.rule_card :send
-      return [] unless event_card
-      Account.as_bot { event_card.item_names }
-    end
+      def email_config_cardnames card
+        #warn "card is #{card.inspect}"
+        event_card = card.rule_card :send
+        return [] unless event_card
+        Auth.as_bot { event_card.item_names }
+      end
 
-    def mail_for card
-      configs_for(card).map do |config|
-        Mailer.flexmail config
-      end.compact.each(&:deliver)
-    end
+      def mail_for card
+        configs_for(card).map do |config|
+          Card::Mailer.flexmail config
+        end.compact.each(&:deliver)
+      end
 
-    def strip_html string
-      string.gsub(/<\/?[^>]*>/, "")
+      def strip_html string
+        string.gsub(/<\/?[^>]*>/, "")
+      end
+      
     end
+    
   end
-end
+end

data/lib/card/format.rb

@@ -6,7 +6,7 @@ class Card
 
     DEPRECATED_VIEWS = { :view=>:open, :card=>:open, :line=>:closed, :bare=>:core, :naked=>:core }
     INCLUSION_MODES  = { :closed=>:closed, :closed_content=>:closed, :edit=>:edit,
-      :layout=>:layout, :new=>:edit, :normal=>:normal, :template=>:template } #should be set in views
+      :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|
@@ -113,7 +113,7 @@ class Card
       end
       
       def get_set_key selection_key, opts
-        unless pkey = Card.method_key(opts)
+        unless pkey = Card::Set.method_key(opts)
           raise "bad method_key opts: #{pkey.inspect} #{opts.inspect}"
         end
         key = pkey.blank? ? selection_key : "#{pkey}_#{selection_key}"
@@ -155,11 +155,17 @@ class Card
       { :view => :name }
     end
     
-    def params()       @params     ||= controller.params                          end
-    def flash()        @flash      ||= controller.request ? controller.flash : {} end
-    def controller()   @controller ||= StubCardController.new                     end
-    def session()      CardController===controller ? controller.session : {}      end
-    def ajax_call?()   @@ajax_call                                                end
+    def params
+      Env.params
+    end
+    
+    def controller
+      Env[:controller] ||= CardController.new
+    end
+    
+    def session
+      Env.session
+    end
 
     def showname title=nil
       if title
@@ -174,7 +180,7 @@ class Card
     end
 
     def focal? # meaning the current card is the requested card
-      if ajax_call?
+      if Env.ajax?
         @depth == 0
       else
         main?
@@ -353,7 +359,7 @@ class Card
       card.update_references( obj_content, true ) if card.references_expired  # I thik we need this genralized
 
       obj_content.process_content_object do |chunk_opts|
-        expand_inclusion chunk_opts.merge(opts) { yield }
+        prepare_nest chunk_opts.merge(opts) { yield }
       end
     end
 
@@ -435,47 +441,54 @@ class Card
       result
     end
 
-    def expand_inclusion opts
+    def prepare_nest opts
+      opts ||= {}
       case
       when opts.has_key?( :comment )                            ; opts[:comment]     # as in commented code
       when @mode == :closed && @char_count > @@max_char_count   ; ''                 # already out of view
-      when opts[:inc_name]=='_main' && !ajax_call? && @depth==0    ; expand_main opts
+      when opts[:inc_name]=='_main' && !Env.ajax? && @depth==0  ; expand_main opts
       else
-        included_card = Card.fetch opts[:inc_name], :new=>new_inclusion_card_args(opts)
-        result = process_inclusion included_card, opts
+        nested_card = Card.fetch opts[:inc_name], :new=>new_inclusion_card_args(opts)
+        result = nest nested_card, opts
         @char_count += result.length if @mode == :closed && result
         result
       end
     end
 
     def expand_main opts
-      [:item, :view, :size].each do |key|
-        if val=params[key] and val.to_s.present?
-          opts[key] = val.to_sym   #to sym??  why??
-        end
-      end
-      opts[:view] = @main_view || opts[:view] || :open
+      opts.merge! @main_opts if @main_opts
+      legacy_main_opts_tweaks! opts
+
+      opts[:view] ||= :open
       with_inclusion_mode :normal do
         @mainline = true
-        result = wrap_main process_inclusion( root.card, opts )
+        result = wrap_main nest( root.card, opts )
         @mainline = false
         result
       end
     end
+    
+    def legacy_main_opts_tweaks! opts 
+      if val=params[:size] and val.present?
+        opts[:size] = val.to_sym
+      end
+
+      if val=params[:item] and val.present?
+        opts[:items] = (opts[:items] || {}).reverse_merge :view=>val.to_sym
+      end
+    end
 
     def wrap_main content
       content  #no wrapping in base format
     end
 
-    def process_inclusion tcard, opts={}
+    def nest nested_card, opts={}
       opts.delete_if { |k,v| v.nil? }
       opts.reverse_merge! inclusion_defaults
       
-      sub = subformat tcard
-      if opts[:item] #currently needed to handle web params
-        opts[:items] = (opts[:items] || {}).reverse_merge :view=>opts[:item]
-      end
-      sub.inclusion_opts = opts[:items] 
+      sub = subformat nested_card
+      sub.inclusion_opts = opts[:items] ? opts[:items].clone : {}
+
 
       view = canonicalize_view opts.delete :view
       opts[:home_view] = [:closed, :edit].member?(view) ? :open : view
@@ -483,14 +496,14 @@ class Card
 
       view = case
       when @mode == :edit
-        if @@perms[view]==:none || tcard.structure || tcard.key.blank? # eg {{_self|type}} on new cards
+        if @@perms[view]==:none || nested_card.structure || nested_card.key.blank? # eg {{_self|type}} on new cards
           :blank
         else
           :edit_in_form
         end
       when @mode == :template   ; :template_rule
       when @@perms[view]==:none ; view
-      when @mode == :closed     ; !tcard.known?  ? :closed_missing : :closed_content
+      when @mode == :closed     ; !nested_card.known?  ? :closed_missing : :closed_content
       else                      ; view
       end
       
@@ -501,7 +514,7 @@ class Card
       content = params[cardname.to_s.gsub(/\+/,'_')]
 
       # CLEANME This is a hack to get it so plus cards re-populate on failed signups
-      if p = params['cards'] and card_params = p[cardname.to_s]
+      if p = params['subcards'] and card_params = p[cardname.to_s]
         content = card_params['content']
       end
       content if content.present?  # why is this necessary? - efm  

data/lib/{generators → card/generators}/card_migration/templates/card_migration.erb

@@ -7,10 +7,4 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       
     end
   end
-
-  def down
-    contentedly do
-      
-    end
-  end
 end

data/lib/{generators → card/generators}/format/templates/format_spec_template.erb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::<%= file_name.camelize %>Format do
-  # SPECSTUB (low priority)
+
 end

data/lib/{generators → card/generators}/set/templates/set_spec_template.erb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'wagn/spec_helper'
 
 describe Card::Set::<%= set_pattern.camelize %>::<%= anchor.camelize %> do
-  # SPECSTUB (low priority)
+
 end

data/lib/card/generators/set/templates/set_template.erb

@@ -0,0 +1 @@
+

data/lib/card/loader.rb

@@ -0,0 +1,145 @@
+# -*- encoding : utf-8 -*-
+
+require_dependency 'wagn/exceptions'
+
+class Card
+  module Loader
+    
+    class << self
+      def load_mods
+        load_set_patterns
+        load_formats
+        load_sets
+      end
+      
+      def load_chunks
+        mod_dirs.each do |mod|
+          load_dir "#{mod}/chunks/*.rb"
+        end
+      end
+            
+      def load_layouts
+        mod_dirs.inject({}) do |hash, mod|
+          dirname = "#{mod}/layouts"
+          if File.exists? dirname
+            Dir.foreach( dirname ) do |filename|
+              next if filename =~ /^\./
+              hash[ filename.gsub /\.html$/, '' ] = File.read( [dirname, filename] * '/' )
+            end
+          end
+          hash
+        end
+      end
+
+      private
+    
+      def mod_dirs
+        @@mod_dirs ||= begin
+          (Wagn.paths['gem-mods'].existent + Wagn.paths['local-mods'].existent).map do |dirname|
+            Dir.entries( dirname ).sort.map do |filename|
+              "#{dirname}/#{filename}" if filename !~ /^\./
+            end
+          end.flatten.compact
+        end
+      end
+
+      def load_set_patterns
+        if rewrite_tmp_files?
+          load_set_patterns_from_source
+        end
+        load_dir "#{Wagn.paths['tmp/set_patterns'].first}/*.rb"
+      end
+
+      def load_set_patterns_from_source
+        prepare_tmp_dir 'tmp/set_patterns'
+        seq = 100
+        mod_dirs.each do |mod|
+          dirname = "#{mod}/set_patterns"
+          if Dir.exists? dirname
+            Dir.entries( dirname ).sort.each do |filename|
+              if m = filename.match( /^(\d+_)?([^\.]*).rb/) and key = m[2]
+                filename = [ dirname, filename ] * '/'
+                SetPattern.write_tmp_file key, filename, seq
+                seq = seq + 1
+              end
+            end
+          end
+        end
+      end
+
+      def load_formats
+        #cheating on load issues now by putting all inherited-from formats in core mod.
+        mod_dirs.each do |mod|
+          load_dir "#{mod}/formats/*.rb"
+        end
+      end
+
+      def load_sets
+        prepare_tmp_dir 'tmp/sets'
+        load_sets_by_pattern
+        Set.process_base_modules 
+        Set.clean_empty_modules
+      end
+
+
+      def load_sets_by_pattern
+        Card.set_patterns.reverse.map(&:key).each do |set_pattern|
+          pattern_tmp_dir = "#{Wagn.paths['tmp/sets'].first}/#{set_pattern}"
+          if rewrite_tmp_files?
+            Dir.mkdir pattern_tmp_dir
+            load_implicit_sets_from_source set_pattern
+          end
+          if Dir.exists? pattern_tmp_dir
+            load_dir "#{pattern_tmp_dir}/*.rb"
+          end
+        end    
+      end
+
+      def load_implicit_sets_from_source set_pattern
+        seq = 1000
+        mod_dirs.each do |mod_dir|
+          dirname = [mod_dir, 'sets', set_pattern] * '/'
+          next unless File.exists?( dirname )
+
+          #FIXME support multiple anchors!
+          Dir.entries( dirname ).sort.each do |anchor_filename|
+            next if anchor_filename =~ /^\./
+            anchor = anchor_filename.gsub /\.rb$/, ''
+
+            filename = [dirname, anchor_filename] * '/'
+            Set.write_tmp_file set_pattern, anchor, filename, seq
+            seq = seq + 1
+          end
+        end
+      end
+
+      
+      
+      def prepare_tmp_dir path
+        if rewrite_tmp_files?
+          p = Wagn.paths[ path ]
+          if p.existent.first
+            FileUtils.rm_rf p.first, :secure=>true
+          end
+          Dir.mkdir p.first
+        end
+      end
+      
+      def rewrite_tmp_files?
+        if defined?( @@rewrite )
+          @@rewrite
+        else
+          @@rewrite = !( Rails.env.production? and Wagn.paths['tmp/sets'].existent.first )
+        end
+      end
+
+      def load_dir dir
+        Dir[dir].sort.each do |file|
+  #          puts Benchmark.measure("from #load_dir: rd: #{file}") {
+          require_dependency file
+  #          }.format("%n: %t %r")
+        end
+      end
+    end
+  end
+end