card 1.16.15 → 1.17.0

data/lib/card/content.rb

@@ -50,8 +50,8 @@ class Card
       when Array then each       { |e| yield e if e.is_a?(Chunk::Abstract) }
       when String # noop. strings are parsed in self, so no chunks in a String
       else
-        Rails.logger.warn msg, 'error self is unrecognized type'\
-                                " #{self.class} #{__getobj__.class}"
+        Rails.logger.warn 'error self is unrecognized type' \
+                          " #{self.class} #{__getobj__.class}"
       end
     end
 
@@ -59,7 +59,7 @@ class Card
       each_chunk.select { |chunk| chunk.is_a?(chunk_type) }
     end
 
-    def process_content_object &block
+    def process_each_chunk &block
       each_chunk { |chunk| chunk.process_chunk &block }
       self
     end

data/lib/card/env.rb

@@ -42,6 +42,9 @@ class Card
         self[:success] ||= Card::Success.new(cardname, params[:success])
       end
 
+      def localhost?
+        self[:host] && self[:host] =~ /^localhost/
+      end
 
       def ajax?
         self[:ajax]

data/lib/card/format.rb

@@ -12,7 +12,7 @@ class Card
     # FIXME: should be set in views
 
     cattr_accessor :ajax_call, :registered
-    [:perms, :denial_views, :closed_views, :error_codes, :view_tags, :aliases
+    [:perms, :denial, :closed, :error_code, :view_tags, :aliases
     ].each do |accessor_name|
       cattr_accessor accessor_name
       send "#{accessor_name}=", {}
@@ -37,10 +37,10 @@ class Card
 
       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]
-        closed_views[view] = opts.delete(:closed)     if opts[:closed]
+        [:perms, :error_code, :denial, :closed].each do |varname|
+          class_var = send varname
+          class_var[view] = opts.delete(varname) if opts[varname]
+        end
         extract_view_tags view, opts
       end
 
@@ -183,16 +183,12 @@ class Card
     end
 
     def method_missing method, *opts, &proc
-      case method
-      when /(_)?(optional_)?render(_(\w+))?/
+      if method =~ /(_)?(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
@@ -207,12 +203,14 @@ class Card
     def render view, args={}
       view = canonicalize_view view
       return if hidden_view? view, args
-      @current_view = view = ok_view view, args
-      args = default_render_args view, args
-      with_inclusion_mode view do
-        Card::ViewCache.fetch(self, view, args) do
-          method = view_method view, args
-          method.arity == 0 ? method.call : method.call(args)
+      view = ok_view view, args
+      current_view(view) do
+        args = default_render_args view, args
+        with_inclusion_mode view do
+          Card::ViewCache.fetch(self, view, args) do
+            method = view_method view, args
+            method.arity == 0 ? method.call : method.call(args)
+          end
         end
       end
     rescue => e
@@ -296,6 +294,14 @@ class Card
       end
     end
 
+    def current_view view
+      old_view = @current_view
+      @current_view = view
+      yield
+    ensure
+      @current_view = old_view
+    end
+
     def error_cardname
       card && card.name.present? ? card.name : 'unknown card'
     end
@@ -319,19 +325,14 @@ class Card
                      mainline: @mainline, form: @form
     end
 
-    def process_content content=nil, opts={}
-      process_content_object(content, opts).to_s
+    def process_content override_content=nil, opts={}
+      process_content_object(override_content, opts).to_s
     end
 
-    def process_content_object content=nil, opts={}
-      return content unless card
-      content = card.raw_content || '' if content.nil?
+    def process_content_object override_content=nil, opts={}
+      content = override_content || render_raw || ''
       content_object = get_content_object content, opts
-      if card.references_expired
-        # FIXME: should be handled with method on Card
-        card.update_references content_object, true
-      end
-      content_object.process_content_object do |chunk_opts|
+      content_object.process_each_chunk do |chunk_opts|
         prepare_nest chunk_opts.merge(opts) { yield }
       end
     end
@@ -346,32 +347,34 @@ class Card
 
     def ok_view view, args={}
       return view if args.delete :skip_permissions
-      approved_view =
-        case
-        when @depth >= Card.config.max_depth
-          # prevent recursion. @depth tracks subformats
-          :too_deep
-        when @@perms[view] == :none
-          # permission skipping specified in view definition
-          view
-        when args.delete(:skip_permissions)
-          # permission skipping specified in args
-          view
-        when !card.known? && !tagged(view, :unknown_ok)
-          # handle unknown cards (where view not exempt)
-          view_for_unknown view, args
-        else
-          # run explicit permission checks
-          permitted_view view, args
-        end
-
+      approved_view = approved_view view, args
       args[:denied_view] = view if approved_view != view
-      if focal? && (error_code = @@error_codes[approved_view])
+      if focal? && (error_code = @@error_code[approved_view])
         root.error_status = error_code
       end
       approved_view
     end
 
+    def approved_view view, args={}
+      case
+      when @depth >= Card.config.max_depth
+        # prevent recursion. @depth tracks subformats
+        :too_deep
+      when @@perms[view] == :none
+        # permission skipping specified in view definition
+        view
+      when args.delete(:skip_permissions)
+        # permission skipping specified in args
+        view
+      when !card.known? && !tagged(view, :unknown_ok)
+        # handle unknown cards (where view not exempt)
+        view_for_unknown view, args
+      else
+        # run explicit permission checks
+        permitted_view view, args
+      end
+    end
+
     def tagged view, tag
       self.class.tagged view, tag
     end
@@ -386,7 +389,7 @@ class Card
         end
 
       if args[:denied_task]
-        @@denial_views[view] || :denial
+        @@denial[view] || :denial
       else
         view
       end
@@ -511,13 +514,13 @@ class Card
     end
 
     def view_in_closed_mode homeview, nested_card
-      approved_view = @@closed_views[homeview]
+      approved_view = @@closed[homeview]
       case
-      when approved_view == true   then homeview
-      when @@error_codes[homeview] then homeview
-      when approved_view           then approved_view
-      when !nested_card.known?     then :closed_missing
-      else                              :closed_content
+      when approved_view == true  then homeview
+      when @@error_code[homeview] then homeview
+      when approved_view          then approved_view
+      when !nested_card.known?    then :closed_missing
+      else                             :closed_content
       end
     end
 

data/lib/card/migration.rb

@@ -63,14 +63,14 @@ class Card::Migration < ActiveRecord::Migration
   end
 
   def contentedly
-    Card::Cache.reset_global
+    Card::Cache.reset_all
     Cardio.schema_mode '' do
       Card::Auth.as_bot do
         ActiveRecord::Base.transaction do
           begin
             yield
           ensure
-            Card::Cache.reset_global
+            Card::Cache.reset_all
           end
         end
       end
@@ -122,6 +122,10 @@ class Card::Migration < ActiveRecord::Migration
   def down
     raise ActiveRecord::IrreversibleMigration
   end
+
+  def update_machine_output
+    Card.search(right: { codename: 'machine_output' }).each(&:delete)
+  end
 end
 
 require 'card/core_migration'

data/lib/card/name.rb

@@ -74,7 +74,7 @@ class Card
       to_absolute_name(context_name)
     end
 
-    def field_of? context_name
+    def child_of? context_name
       if context_name.present?
         # Do I still equal myself after I've been relativised in the context
         # of context_name?
@@ -84,6 +84,14 @@ class Card
       end
     end
 
+    def field_of? context_name
+      if context_name.present?
+        child_of?(context_name) && relative_name(context_name).length == 2
+      else
+        s.match(/^\s*\+[^+]+$/)
+      end
+    end
+
     def setting?
       Set::Type::Setting.member_names[key]
     end

data/lib/card/query.rb

@@ -46,7 +46,7 @@ class Card
 
     ATTRIBUTES = {
       basic:           %w( id name key type_id content left_id right_id
-                           creator_id updater_id codename                     ),
+                           creator_id updater_id codename read_rule_id ),
       relational:      %w( type part left right
                            editor_of edited_by last_editor_of last_edited_by
                            creator_of created_by member_of member             ),

data/lib/card/reference.rb

@@ -10,28 +10,27 @@ class Card::Reference < ActiveRecord::Base
   end
 
   class << self
-
     def delete_all_from card
       delete_all referer_id: card.id
     end
 
     def delete_all_to card
-      where( referee_id: card.id ).update_all present: 0, referee_id: nil
+      where(referee_id: card.id).update_all present: 0, referee_id: nil
     end
 
     def update_existing_key card, name=nil
       key = (name || card.name).to_name.key
-      where( referee_key: key ).update_all present: 1, referee_id: card.id
+      where(referee_key: key).update_all present: 1, referee_id: card.id
     end
 
     def update_on_rename card, newname, update_referers=false
       if update_referers
-        # not currentlt needed because references are deleted and re-created in the process of adding new revision
-        #where( referee_id: card.id ).update_all referee_key: newname.to_name.key
+        # not currently needed because references are deleted and re-created
+        # in the process of adding new revision
+        # where referee_id: card.id).update_all referee_key: newname.to_name.key
       else
         delete_all_to card
       end
-      #Rails.logger.warn "update on rename #{card.inspect}, #{newname}, #{update_referers}"
       update_existing_key card, newname
     end
 
@@ -41,22 +40,29 @@ class Card::Reference < ActiveRecord::Base
     end
 
     def repair_missing_referees
-      joins('LEFT JOIN cards ON card_references.referee_id = cards.id').where('(cards.id IS NULL OR cards.trash IS TRUE) AND referee_id IS NOT NULL').update_all referee_id: nil
+      joins(
+        'LEFT JOIN cards ON card_references.referee_id = cards.id'
+      ).where(
+        '(cards.id IS NULL OR cards.trash IS TRUE) AND referee_id IS NOT NULL'
+      ).update_all referee_id: nil
     end
 
     def delete_missing_referers
-      joins('LEFT JOIN cards ON card_references.referer_id = cards.id').where('cards.id IS NULL OR cards.trash IS TRUE').delete_all
+      joins(
+        'LEFT JOIN cards ON card_references.referer_id = cards.id'
+      ).where(
+        'cards.id IS NULL OR cards.trash IS TRUE'
+      ).delete_all
     end
 
     def repair_all
       delete_missing_referers
 
       Card.where(trash: false).find_each do |card|
-        Rails.logger.info "\nRepairing references for '#{card.name}' (id: #{card.id}) ... "
+        Rails.logger.info "Repairing references for '#{card.name}'" \
+                          "(id: #{card.id}) ... "
         card.update_references
       end
     end
-
   end
-
 end

data/lib/card/set.rb

@@ -438,7 +438,7 @@ EOF
       mod_traits = get_traits mod
 
       new_opts = options[:type] ? { type: options[:type] } : {}
-      new_opts.merge!(content: options[:default]) if options[:default]
+      new_opts.merge!(default_content: options[:default]) if options[:default]
 
       args.each do |trait|
         define_trait_card trait, new_opts

data/lib/card/subcards.rb

@@ -15,18 +15,18 @@ class Card
 
   def preserve_subcards
     return unless subcards.present?
-    Card.cache.write_local subcards_cache_key, @subcards
+    Card.cache.soft.write subcards_cache_key, @subcards
   end
 
   def restore_subcards
-    cached_subcards = Card.cache.read_local(subcards_cache_key)
+    cached_subcards = Card.cache.soft.read(subcards_cache_key)
     return unless cached_subcards
     @subcards = cached_subcards
     @subcards.context_card = self
   end
 
   def expire_subcards
-    Card.cache.delete_local subcards_cache_key
+    Card.cache.soft.delete subcards_cache_key
     subcards.clear
   end
 
@@ -43,7 +43,7 @@ class Card
 
     def clear
       @keys.each do |key|
-        Card.cache.delete_local key
+        Card.cache.soft.delete key
       end
       @keys = ::Set.new
     end
@@ -61,7 +61,7 @@ class Card
       key = absolutize_subcard_name(key).key unless @keys.include?(key)
       @keys.delete key
       removed_card = fetch_subcard key
-      Card.cache.delete_local key
+      Card.cache.soft.delete key
       removed_card
     end
 
@@ -239,7 +239,7 @@ class Card
         card.superleft = @context_card
       end
       @keys << card.key
-      Card.write_to_local_cache card
+      Card.write_to_soft_cache card
       card
     end
   end

data/lib/card/view_cache.rb

@@ -10,11 +10,42 @@ class Card
         Card::Cache[Card::ViewCache]
       end
 
-      def increment_cnt
-        cache.write(CNT_KEY, count+1)
+      def fetch format, view, args, &block
+        return block.call if cacheable_view?(view, format)
+
+        key = cache_key view, format, args
+        if !cache.exist?(key)
+          increment_cached_views_cnt
+          reduce_cache if cached_views_cnt > LIMIT
+        end
+        increment_frequency key
+
+        if Card.config.view_cache == 'debug'
+          verbose_fetch key, &bloack
+        else
+          cache.fetch key, &block
+        end
+      end
+
+      def reset
+        cache.reset
+      end
+
+      private
+
+      def verbose_fetch
+        if cache.exist? key
+          "fetched from view cache: #{cache.read key}"
+        else
+          "written to view cache: #{cache.fetch(key, &block)}"
+        end
       end
 
-      def count
+      def increment_cached_views_cnt
+        cache.write(CNT_KEY, cached_views_cnt + 1)
+      end
+
+      def cached_views_cnt
         cache.read(CNT_KEY) || 0
       end
 
@@ -22,7 +53,7 @@ class Card
         update_frequency do |freq|
           cnts_with_key = freq.keys.map { |key| [freq[key], key] }
           index = 1
-          SortedSet.new(cnts_with_key).each do |cnt, key|
+          SortedSet.new(cnts_with_key).each do |_cnt, key|
             if index < (LIMIT - SIZE)
               cache.delete(key)
               freq.delete(key)
@@ -40,37 +71,23 @@ class Card
         cache.write(FREQUENCY_KEY, freq)
       end
 
-      def fetch(format, view, args, &block)
-        if !Card.config.view_cache || !format.view_caching? || !format.main? ||  (view != :open && view != :content) || format.class != HtmlFormat
-          return block.call
-        end
-
-        roles = Card::Auth.current.all_roles.sort.join '_'
-        key = "view_#{view}_#{format.card.key}_args_#{Card::Cache.obj_to_key(args)}_roles_#{roles}"
-
-        if !cache.exist?(key)
-          increment_cnt
-          reduce_cache if count > LIMIT
-        end
-
+      def increment_frequency key
         update_frequency do |freq|
           freq[key] ||= 0
           freq[key] += 1
         end
+      end
 
-        if Card.config.view_cache == 'debug'
-          if cache.exist? key
-            "fetched from view cache: #{cache.read key}"
-          else
-            "written to view cache: #{cache.fetch(key, &block)}"
-          end
-        else
-          cache.fetch(key, &block)
-        end
+      def cache_key view, format, args
+        roles_key = Card::Auth.current.all_roles.sort.join '_'
+        args_key = Card::Cache.obj_to_key(args)
+        '%s#%s__args__%s__roles__%s' %
+          [format.card.key, view, args_key, roles_key]
       end
 
-      def reset hard=false
-        cache.reset hard
+      def cacheable_view? view, format
+        !Card.config.view_cache || !format.view_caching? || !format.main? ||
+          (view != :open && view != :content) || format.class != HtmlFormat
       end
     end
   end