card 1.20.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f7c57e5d0fbbb3e0d01a20620dda63db140430
-  data.tar.gz: 7cc371c0a6316b66dade977c1757d9bd172c6ca4
+  metadata.gz: c534f962f8efbd355dba40eb9c56d372a404ad31
+  data.tar.gz: 96581a6169cfb59c688226d2dec3ae3e649e4a78
 SHA512:
-  metadata.gz: 4c412b712c3d638ba1d1701473ce9294541834ecf566d937db1b92f1e520709c2a7dc9d9f991fcfcbc99ba198c8403d0e52ddfee20a318b53823aa3eb6f10ea4
-  data.tar.gz: 97ea814246b69a991fd77a29f7c3019fe827d46ed7efcac6773c6c1862ce4bd4daafe141abdfd7778f9c66f2078afbe7303aeb599699b79e5b477e0d26df8969
+  metadata.gz: 22480806d1d43f92b17003808caa026c0bd7061b210669cd5d761ae319b740e9e227685e08e9eb4b4abe7ec303db26ce49ed743a7181f3393abe24f2afdc1b66
+  data.tar.gz: ebc1391547c721118de7c1198936e5f27ab094f5e8285a7120a98d980298546eec0de17f2d2dafe829b6fc79653fdb7244e0df8e95b95df7543f9ee5246086b2

data/VERSION

@@ -1 +1 @@
-1.20.0
+1.20.1

data/card.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
     ["sass",                       "~> 3.2"],
     ["coffee-script",              "~> 2.2"],
     ["uglifier",                   "~> 3.0"],
-    ["nokogiri",                   "~> 1.6.8"],
+    ["nokogiri",                   "~> 1.6.8"], # 1.7 needs ruby 2.1
     ["haml",                       "~> 4.0"],
     ["kaminari",                   "~> 0.16"],
     ["bootstrap-kaminari-views",   "~> 0"],

data/lib/card.rb

@@ -50,8 +50,8 @@ class Card < ActiveRecord::Base
   serializable_attr_accessor(
     :action, :supercard, :superleft,
     :current_act, :current_action,
-    :comment, :comment_author,    # obviated soon
-    :update_referers,          # wrong mechanism for this
+    :comment,                     # obviated soon
+    :update_referers,             # wrong mechanism for this
     :update_all_users,            # if the above is wrong then this one too
     :silent_change,               # and this probably too
     :remove_rule_stash,
@@ -66,12 +66,16 @@ class Card < ActiveRecord::Base
 
     # VALIDATION PHASE
     :initialize_stage, :prepare_to_validate_stage, :validate_stage,
+    :initialize_final_stage, :prepare_to_validate_final_stage,
+    :validate_final_stage,
 
     # STORAGE PHASE
     :prepare_to_store_stage, :store_stage, :finalize_stage,
+    :prepare_to_store_final_stage, :store_final_stage, :finalize_final_stage,
 
     # INTEGRATION PHASE
-    :integrate_stage, :integrate_with_delay_stage
+    :integrate_stage, :integrate_with_delay_stage,
+    :integrate_final_stage, :integrate_with_delay_final_stage
   )
 
   # Validation and integration phase are only called for the act card

data/lib/card/act_manager/stage_director.rb

@@ -202,12 +202,22 @@ class Card
       def run_single_stage stage, &block
         return true unless valid_next_stage? stage
         # puts "#{@card.name}: #{stage} stage".red
+        prepare_stage_run stage
+        execute_stage_run stage, &block
+      rescue => e
+        @card.clean_after_stage_fail
+        raise e
+      end
 
+      def prepare_stage_run stage
         @stage = stage_index stage
-        if stage == :initialize
-          @running ||= true
-          prepare_for_phases
-        end
+        return unless stage == :initialize
+
+        @running ||= true
+        prepare_for_phases
+      end
+
+      def execute_stage_run stage, &block
         # in the store stage it can be necessary that
         # other subcards must be saved before we save this card
         if stage == :store
@@ -215,24 +225,26 @@ class Card
         else
           run_stage_callbacks stage
           run_subdirector_stages stage
+          run_final_stage_callbacks stage
         end
-      rescue => e
-        @card.clean_after_stage_fail
-        raise e
       end
 
-      def run_stage_callbacks stage
+      def run_stage_callbacks stage, callback_postfix=""
         Rails.logger.debug "#{stage}: #{@card.name}"
         # we use abort :success in the :store stage for :save_draft
         if stage_index(stage) <= stage_index(:store) && !main?
           @card.abortable do
-            @card.run_callbacks :"#{stage}_stage"
+            @card.run_callbacks :"#{stage}#{callback_postfix}_stage"
           end
         else
-          @card.run_callbacks :"#{stage}_stage"
+          @card.run_callbacks :"#{stage}#{callback_postfix}_stage"
         end
       end
 
+      def run_final_stage_callbacks stage
+        run_stage_callbacks stage, "_final"
+      end
+
       def run_subdirector_stages stage
         @subdirectors.each do |subdir|
           subdir.catch_up_to_stage stage

data/lib/card/cache/persistent.rb

@@ -63,7 +63,7 @@ class Card
       # the cache. Note that Cardio.cache is a simple Rails::Cache, not
       # a Card::Cache object.
       def stamp
-        @stamp ||= Cardio.cache.fetch stamp_key { new_stamp }
+        @stamp ||= Cardio.cache.fetch(stamp_key) { new_stamp }
       end
 
       # key for looking up the current stamp
@@ -73,7 +73,7 @@ class Card
 
       # stamp generator
       def new_stamp
-        Time.now.to_i.to_s 32
+        Time.now.to_i.to_s(32) + rand(9999).to_s(32)
       end
 
       # prefix added to cache key to create a system-wide unique key
@@ -96,17 +96,23 @@ class Card
       # @param key [String]
       # @param attribute [String, Symbol]
       def write_attribute key, attribute, value
-        if @store && (object = read key)
+        return value unless @store
+        if (object = deep_read key)
           object.instance_variable_set "@#{attribute}", value
           write key, object
         end
         value
-      rescue
-        # FIXME: somehow read is finding Card objects with set_modules_loaded
-        # That shouldn't be possible (#fetch is designed to prevent it), and
-        # it immediately breaks write.  Best guess is that #read is somehow
-        # shortcutting and returning current object.  need to research!
-        Rails.logger.info "failed to write attribute: #{attribute}"
+      end
+
+      def deep_read key
+        local_cache = @store.send :local_cache
+        local_cache.clear if local_cache
+        read key
+      end
+
+      def read_attribute key, attribute
+        object = deep_read key
+        object.instance_variable_get "@#{attribute}"
       end
 
       def write key, value

data/lib/card/format/nest.rb

@@ -50,20 +50,27 @@ class Card
       end
 
       def nest_subformat nested_card, opts, view
-        return self if reuse_format? opts, view
+        return self if reuse_format? opts[:nest_name], view
         sub = subformat nested_card
         sub.main! if opts[:main]
         sub
       end
 
-      def reuse_format? opts, view
-        return false unless opts[:nest_name] =~ /^_(self)?$/
-        !content_view? view
+      def reuse_format? nest_name, view
+        nest_name =~ /^_(self)?$/ &&
+          card.context_card == card &&
+          !nest_recursion_risk?(view)
+      end
+
+      def nest_recursion_risk? view
+        content_view?(view) && voo.structure
       end
 
       def content_view? view
         # TODO: this should be specified in view definition
-        [:core, :content, :titled, :open, :closed].member? view.to_sym
+        [
+          :core, :content, :titled, :open, :closed, :open_content
+        ].member? view.to_sym
       end
 
       # Main difference compared to #nest is that you can use

data/lib/card/format/nest/fetch.rb

@@ -7,6 +7,7 @@ class Card
           case cardish
           when Card            then cardish
           when Symbol, Integer then Card.fetch cardish
+          when "_", "_self"    then card.context_card
           else
             opts[:nest_name] = cardish.to_s
             Card.fetch cardish, new: nest_new_args(opts)
@@ -19,7 +20,7 @@ class Card
           nest_name = nest_opts[:nest_name].to_s
           new_args = { name: nest_name, type: nest_opts[:type] }
 
-          new_args[:supercard] = card unless nest_name.strip.blank?
+          new_args[:supercard] = card.context_card unless nest_name.strip.blank?
           # special case.  gets absolutized incorrectly. fix in smartname?
 
           nest_new_main_args new_args if nest_name =~ /^_main\+/

data/lib/card/format/render.rb

@@ -49,8 +49,11 @@ class Card
 
       # setting (:alway, :never, :nested) designated in view definition
       def view_cache_setting view
-        setting_method = self.class.view_cache_setting_method view
-        respond_to?(setting_method) ? send(setting_method) : :standard
+        method = self.class.view_cache_setting_method view
+        coded_setting = respond_to?(method) ? send(method) : :standard
+        return :never if coded_setting == :never
+        # seems unwise to override a hard-coded "never"
+        (voo && voo.cache) || coded_setting
       end
 
       def stub_render cached_content

data/lib/card/set/event.rb

@@ -78,11 +78,17 @@ class Card
         if opts[:after] || opts[:before]
           # ignore :in options
         elsif opts[:in]
-          opts[:after] = :"#{opts.delete(:in)}_stage" if opts[:in]
+          opts[:after] =
+            callback_name opts.delete(:in), opts.delete(:after_subcards)
         end
         opts[:on] = [:create, :update] if opts[:on] == :save
       end
 
+      def callback_name stage, after_subcards=false
+        name = after_subcards ? "#{stage}_final_stage" : "#{stage}_stage"
+        name.to_sym
+      end
+
       def define_event_method event, call_method
         class_eval do
           define_method event do

data/lib/card/subcards.rb

@@ -41,8 +41,6 @@ class Card
       case name_or_card_or_attr
       when Card
         new_by_card name_or_card_or_attr, attr_or_opts
-      when Symbol, String
-        new_by_attributes name_or_card_or_attr, attr_or_opts
       when Hash
         args = name_or_card_or_attr
         if args[:name]
@@ -50,6 +48,8 @@ class Card
         else
           multi_add args
         end
+      else
+        new_by_attributes name_or_card_or_attr, attr_or_opts
       end
     end
 
@@ -251,7 +251,7 @@ class Card
          (absolute_name.parts.size - @context_card.cardname.parts.size) > 2
         left_card = new_by_attributes absolute_name.left
         new_by_card left_card, transact_in_stage: attributes[:transact_in_stage]
-        left_card.new_by_attributes absolute_name, attributes
+        left_card.subcards.new_by_attributes absolute_name, attributes
       else
         subcard_args = extract_subcard_args! attributes
         t_i_s = attributes.delete(:transact_in_stage)

data/lib/card/view/cache.rb

@@ -20,7 +20,7 @@ class Card
       end
 
       # answers: should this cache fetch depend on one already in progress?
-      # Note that f you create a brand new format object (ie, not a subformat)
+      # Note that if you create a brand new format object (ie, not a subformat)
       # midrender, (eg card.format...), it needs to be treated as unrelated to
       # any caching in progress.
       def caching?

data/lib/card/view/fetch.rb

@@ -11,10 +11,12 @@ class Card
       # - creating a stub within another render
       #   (so that the stub may be rendered later)
       def fetch &block
-        case cache_level
-        when :yield       then yield
-        when :cache_yield then cache_fetch(&block)
-        when :stub        then stub
+        with_fetch_logging do |cache_level|
+          case cache_level
+          when :yield       then yield
+          when :cache_yield then cache_fetch(&block)
+          when :stub        then stub
+          end
         end
       end
 
@@ -27,11 +29,21 @@ class Card
       # * *standard* (default) cache independently or dependently, but
       #   don't double cache
       # * *never* don't ever cache this view
-      def cache_level
+      def determine_cache_level
         return :yield unless Cardio.config.view_cache
         send "#{caching? ? 'dependent' : 'independent'}_cache_level"
       end
 
+      def with_fetch_logging
+        cache_level = determine_cache_level
+        logging = false # TODO: make configurable
+        if logging
+          puts "FETCH_VIEW (#{card.name}##{requested_view})" \
+               "cache-level = #{cache_level}"
+        end
+        yield cache_level
+      end
+
       # INDEPENDENT CACHING
       # takes place on its own (not within another view being cached)
 

data/lib/card/view/options.rb

@@ -7,30 +7,31 @@ class Card
         nest: [
           :view,          # view to render
           :show,          # render these views when optional
-          :hide,          # do render these views when optional
+          :hide,          # do not render these views when optional
           :nest_name,     # name as used in nest
           :nest_syntax    # full nest syntax
         ],
         # note: show/hide can be single view (Symbol), list of views (Array),
         # or comma separated views (String)
         heir: [
-          :main,          # format object is page's "main" object (Boolean)
-          :home_view,     # view for slot to return to when no view specified
-          :edit_structure # use a different structure for editing (Array)
-
+          :main,           # format object is page's "main" object (Boolean)
+          :home_view,      # view for slot to return to when no view specified
+          :edit_structure  # use a different structure for editing (Array)
         ],
         both: [
-          :help,          # cue text when editing
-          :structure,     # overrides the content of the card
-          :title,         # overrides the name of the card
-          :variant,       # override the canonical version of the name with
-          #                 a different variant
-          :editor,        # inline_nests makes a form within standard content
-          #                 (Symbol)
-          :type,          # set the default type of new cards
-          :size,          # set an image size
-          :params,        # parameters for add button.  deprecate?
-          :items          # options for items (Hash)
+          :help, # cue text when editing
+          :structure, # overrides the content of the card
+          :title, # overrides the name of the card
+          :variant, # override the canonical version of the name with
+          #                a different variant
+          :editor, # inline_nests makes a form within standard content
+          #                (Symbol)
+          :type, # set the default type of new cards
+          :size, # set an image size
+          :params, # parameters for add button.  deprecate?
+          :items, # options for items (Hash)
+          :cache # change view cache behaviour
+        #                (Symbol<:always, :standard, :never>)
         ],
         none: [
           :skip_perms,  # do not check permissions for this view (Boolean)
@@ -55,6 +56,24 @@ class Card
         def heir_keys
           @heir_keys ||= ::Set.new(keymap[:both]) + keymap[:heir]
         end
+
+        def accessible_keys
+          heir_keys + [:nest_name, :nest_syntax] - [:items]
+        end
+
+        def define_getter option_key
+          define_method option_key do
+            norm_method = "normalize_#{option_key}"
+            value = live_options[option_key]
+            try(norm_method, value) || value
+          end
+        end
+
+        def define_setter option_key
+          define_method "#{option_key}=" do |value|
+            live_options[option_key] = value
+          end
+        end
       end
 
       # There are two primary options hashes:
@@ -76,28 +95,35 @@ class Card
         live_options[:items] ||= {}
       end
 
-      (heir_keys + [:nest_name, :nest_syntax] - [:items]).each do |option_key|
-        define_method option_key do
-          norm_method = "normalize_#{option_key}"
-          value = live_options[option_key]
-          try(norm_method, value) || value
-        end
-
-        define_method "#{option_key}=" do |value|
-          live_options[option_key] = value
-        end
+      accessible_keys.each do |option_key|
+        define_getter option_key
+        define_setter option_key
       end
 
       def normalize_editor value
         value && value.to_sym
       end
 
+      def normalize_cache value
+        value && value.to_sym
+      end
+
       # options to be used in data attributes of card slots (normalized options
       # with standard keys)
       def slot_options
         normalized_options.select { |k, _v| Options.all_keys.include? k }
       end
 
+      def closest_live_option key
+        if live_options.key? key
+          live_options[key]
+        else
+          (parent && parent.closest_live_option(key)) ||
+            (format.parent && format.parent.voo &&
+              format.parent.voo.closest_live_option(key))
+        end
+      end
+
       private
 
       # option normalization includes standardizing options into a hash with

data/lib/cardio.rb

@@ -47,6 +47,7 @@ module Cardio
         acts_per_page:          10,
         space_last_in_multispace: true,
         closed_search_limit:    10,
+        paging_limit: 20,
 
         non_createable_types:   [%w(signup setting set)],
         view_cache: false,
@@ -58,7 +59,7 @@ module Cardio
 
         file_storage:           :local,
         file_buckets:           {},
-        file_default_bucket:    nil
+        file_default_bucket: nil
       }
     end