card 1.93.3 → 1.93.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199075c5dc749a22620b59dfa9804a8c44cd2efa
-  data.tar.gz: e33773ececb04f233ae04572ac2e68695819383b
+  metadata.gz: 9ca5a3aee7c51d1ea3f43add1af3d85a71314af8
+  data.tar.gz: 0135ed52dec26c17de6a0d1c3232db8c3c41f9e9
 SHA512:
-  metadata.gz: e58bc871b56f02b400d8901ec0737375d8e653b32cef27a85f92535639cf2870268f1631a7a72e087cfe37a3c84d341a640cdb71ad60badb92c98aeecde77f34
-  data.tar.gz: df87056eaca1f05495b4dd1dfc0f32b2f0aca833ef6afdf83577c858d169121382ca0c6e8513d6b370d106a0315908de53e7ba9ff978bf5687c5d0abd76073cc
+  metadata.gz: f78b2dedc458c623bcd224b80104a2cd9af0b5815b826962cab302bb23f2cc087bb4fcf86ffd338ff1a718ed2a7cb8bb0b937469be0b04ed61d01bd7dba0c0e2
+  data.tar.gz: 5489766302152fc62b3fdcdc25d8f00ebb0449f52cb509a12b6a3bdbe6fd41dd043aadc1abe64f03ad083a7ddc4715eee5770ff14cecb280c6658464c5f25aef

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/db/migrate/20170908114452_increase_text_size_for_delayed_jobs.rb

@@ -0,0 +1,9 @@
+class IncreaseTextSizeForDelayedJobs < ActiveRecord::Migration[5.1]
+  def self.up
+    change_column :delayed_jobs, :handler, :text, :limit => 16777215
+  end
+
+  def self.down
+    change_column :delayed_jobs, :handler, :text
+  end
+end

data/db/migrate_core_cards/data/cards/*header

@@ -2,10 +2,10 @@
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar-collapse-1" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-    <div class="navbar-brand">
+    <a class="navbar-brand" href="/">
       {{*logo|core;size:small}}
       {{*title|core}}
-    </div>
+    </a>
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
       <div class="navbar-nav mr-auto">
         {{*main menu|navbar_links}}

data/lib/card/format/nest.rb

@@ -6,6 +6,13 @@ class Card
       include Subformat
       include Mode
 
+      def nest cardish, options={}, override=true, &block
+        return "" if nest_invisible?
+        nested_card = fetch_nested_card cardish, options
+        view, options = interpret_nest_options nested_card, options
+        nest_render nested_card, view, options, override, &block
+      end
+
       # nested by another card's content
       # (as opposed to a direct API nest)
       def content_nest opts={}
@@ -15,11 +22,11 @@ class Card
         nest nest_name, opts
       end
 
-      def nest cardish, options={}, override=true, &block
-        return "" if nest_invisible?
-        nested_card = fetch_nested_card cardish, options
-        view, options = interpret_nest_options nested_card, options
-        nest_render nested_card, view, options, override, &block
+      # create a path for a nest with respect ot the nest options
+      def nest_path name, nest_opts={}
+        path_opts = { slot: nest_opts.clone }
+        path_opts[:view] = path_opts[:slot].delete :view
+        page_path name, path_opts
       end
 
       def interpret_nest_options nested_card, options

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

@@ -9,7 +9,7 @@ class Card
           when Symbol, Integer then Card.fetch cardish
           when "_", "_self"    then card.context_card
           else
-            opts[:nest_name] = cardish.to_s
+            opts[:nest_name] = Card::Name[cardish].to_s
             Card.fetch cardish, new: nest_new_args(opts)
           end
         end
@@ -53,7 +53,6 @@ class Card
           return unless (nestcard_params = subcard_params[nest_name])
           nestcard_params["content"]
         end
-
       end
     end
   end

data/lib/card/format/render.rb

@@ -17,9 +17,9 @@ class Card
       def with_voo voo
         old_voo = @voo
         @voo = voo
-        result = yield
+        yield
+      ensure
         @voo = old_voo
-        result
       end
 
       def view_options_with_defaults view, options

data/lib/card/model/save_helper.rb

@@ -179,7 +179,7 @@ class Card
       end
 
       def ensure_attributes card, args
-        args = args.to_h.with_indifferent_access
+        # args = args.to_h.with_indifferent_access
         subcards = card.extract_subcard_args! args
         update_args =
           args.select do |key, value|

data/lib/card/set/format/haml_views.rb

@@ -44,12 +44,14 @@ class Card
           end
         end
 
-        def haml_template_path view, source=nil
+        def  haml_template_path view=nil, source=nil
           each_template_path(source) do |template_dir, source_dir|
             path = try_haml_template_path template_dir, view, source_dir
             return path if path
           end
-          raise Card::Error, "can't find haml template for #{view}"
+          msg = "can't find haml template"
+          msg += " for #{view}" if view.present?
+          raise Card::Error, msg
         end
 
         def each_template_path source
@@ -62,7 +64,9 @@ class Card
         end
 
         def try_haml_template_path template_path, view, source_dir, ext="haml"
-          path = ::File.expand_path("#{template_path}/#{view}.#{ext}", source_dir)
+          template_path = File.join(template_path, view.to_s) if view.present?
+          template_path += ".#{ext}"
+          path = ::File.expand_path(template_path, source_dir)
                        .sub(%r{(/mod/[^/]+)/set/}, "\\1/#{TEMPLATE_DIR}/")
           ::File.exist?(path) && path
         end

data/lib/card/subcards.rb

@@ -1,14 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 class Card
-  def subcards
-    @subcards ||= Subcards.new(self)
-  end
-
-  def expire_subcards
-    subcards.clear
-  end
-
   # API to create/update/delete additional cards together with the main card.
   # The most common case is for fields but subcards don't have to be descendants.
   #
@@ -19,59 +11,37 @@ class Card
   # Together with "my address" you want to create the subcards
   # "my address+name", "my address+street", etc.
   class Subcards
+    require_dependency "card/subcards/add"
+    require_dependency "card/subcards/remove"
+    require_dependency "card/subcards/relate"
+
+    include Add
+    include Remove
+    include Relate
+
     attr_accessor :context_card, :keys
     def initialize context_card
       @context_card = context_card
       @keys = ::Set.new
     end
 
-    # @example Add a subcard with name 'spoiler'
-    #   add 'spoiler', type: 'Phrase', content: 'John Snow is a Targaryen'
-    #   card_obj = Card.new name: 'spoiler', type: 'Phrase',
-    #                       content: 'John Snow is a Targaryen'
-    #   add card_obj
-    #   add name: 'spoiler', type: 'Phrase', content: 'John Snow is a Targaryen'
-    #
-    # @example Add a subcard that is added in the integration phase
-    #     (and hence doesn't hold up the transaction for the main card)
-    #   add 'spoiler', content: 'John Snow is a Targaryen',
-    #                  transact_in_stage: :integrate
-    #   add card_obj, delayed: true
-    def add name_or_card_or_attr, attr_or_opts={}
-      case name_or_card_or_attr
-      when Card
-        new_by_card name_or_card_or_attr, attr_or_opts
-      when Hash
-        args = name_or_card_or_attr
-        if args[:name]
-          new_by_attributes args.delete(:name), args
-        else
-          multi_add args
-        end
-      else
-        new_by_attributes name_or_card_or_attr, attr_or_opts
-      end
+    def [] name
+      card(name) || field(name)
+    end
+
+    def field name
+      key = field_name_to_key name
+      fetch_subcard key if @keys.include? key
     end
 
-    def add_child name, args
-      name = name.is_a?(Symbol) ? name.cardname : name.to_name
-      add name.prepend_joint, args
+    def card name
+      return unless @keys.include? name.to_name.key
+      fetch_subcard name
     end
-    alias_method :add_field, :add_child
 
-    def remove_child name_or_card
-      if name_or_card.is_a? Card
-        remove name_or_card
-      else
-        absolute_name = @context_card.name.field_name(name_or_card)
-        if @keys.include? absolute_name.key
-          remove absolute_name
-        else
-          remove @context_card.name.relative_field_name(name_or_card)
-        end
-      end
+    def present?
+      @keys.present?
     end
-    alias_method :remove_field, :remove_child
 
     def catch_up_to_stage stage_index
       each_card do |subcard|
@@ -79,46 +49,12 @@ class Card
       end
     end
 
-    def clear
-      @keys.each do |key|
-        if (subcard = fetch_subcard key)
-          ActManager.delete subcard.director
-        end
-        Card.cache.soft.delete key
-      end
-      @keys = ::Set.new
-    end
-
-    def deep_clear cleared=::Set.new
-      each_card do |card|
-        next if cleared.include? card.id
-        cleared << card.id
-        card.subcards.deep_clear cleared
-      end
-      clear
-    end
-
-    def remove name_or_card
-      key = subcard_key name_or_card
-      return unless @keys.include? key
-      @keys.delete key
-      removed_card = fetch_subcard key
-      removed_card.current_action.delete if removed_card.current_action
-      ActManager.deep_delete removed_card.director
-      Card.cache.soft.delete key
-      removed_card
-    end
-
     def rename old_name, new_name
       return unless @keys.include? old_name.to_name.key
       @keys.delete old_name.to_name.key
       @keys << new_name.to_name.key
     end
 
-    def << value
-      add value
-    end
-
     def method_missing method, *args
       return unless @keys.respond_to? method
       @keys.send method, *args
@@ -146,163 +82,26 @@ class Card
       end
     end
 
-    def []= name, card_or_attr
-      case card_or_attr
-      when Hash
-        new_by_attributes name, card_or_attr
-      when Card
-        new_by_card card_or_attr
-      end
-    end
-
-    def [] name
-      card(name) || field(name)
-    end
-
-    def field name
-      key = field_name_to_key name
-      fetch_subcard key if @keys.include? key
-    end
-
-    def card name
-      return unless @keys.include? name.to_name.key
-      fetch_subcard name
-    end
-
-    def present?
-      @keys.present?
+    def fetch_subcard key
+      Card.fetch key, local_only: true, new: {}
     end
 
     private
 
-    # Handles hash with several subcards
-    def multi_add args
-      args.each_pair do |key, val|
-        case val
-        when String then new_by_attributes key, content: val
-        when Card
-          val.name = absolutize_subcard_name key
-          new_by_card val
-        when nil then next
-        else new_by_attributes key, val
-        end
-      end
-    end
-
-    def subcard_key name_or_card
-      key = case name_or_card
-            when Card
-              name_or_card.key
-            when Symbol
-              fetch_subcard(name_or_card).key
-            else
-              name_or_card.to_name.key
+    def subcard_key cardish
+      key = case cardish
+            when Card   then cardish.key
+            when Symbol then fetch_subcard(cardish).key
+            else             cardish.to_name.key
             end
       key = absolutize_subcard_name(key).key unless @keys.include?(key)
       key
     end
 
-    def fetch_subcard key
-      Card.fetch key, local_only: true, new: {}
-    end
-
-    def field_name_to_key name
-      if @context_card.name =~ /^\+/
-        @context_card.name.relative_field_name(name).key
-      else
-        absolute_key = @context_card.name.field_name(name).key
-        if @keys.include? absolute_key
-          absolute_key
-        else
-          @context_card.name.relative_field_name(name).key
-        end
-      end
-    end
-
-    # TODO: this method already exists as card instance method in
-    #   tracked_attributes.rb. Find a place for it where its accessible
-    #   for both. There is one important difference. The keys are symbols
-    # here instead of strings
-    def extract_subcard_args! name, args
-      subcards = args.delete(:subcards) || {}
-      if (subfields = args.delete(:subfields))
-        subfields.each_pair do |key, value|
-          subcards[name.to_name.field(key)] = value
-        end
-      end
-      args.keys.each do |key|
-        subcards[key] = args.delete(key) if key =~ /^\+/
-      end
-      subcards
-    end
-
-    def new_by_attributes name, attributes={}
-      attributes ||= {}
-      absolute_name = absolutize_subcard_name name
-      if absolute_name.field_of?(@context_card.name) &&
-         (absolute_name.parts.size - @context_card.name.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.subcards.new_by_attributes absolute_name, attributes
-      else
-        subcard_args = extract_subcard_args! name, attributes
-        t_i_s = attributes.delete(:transact_in_stage)
-        card = Card.assign_or_initialize_by absolute_name.s, attributes, local_only: true
-        subcard = new_by_card card, transact_in_stage: t_i_s
-        card.subcards.add subcard_args
-        subcard
-      end
-    end
-
     def absolutize_subcard_name name
       name = Card::Name[name]
       return name if @context_card.name.parts.first.blank?
       name.absolute_name @context_card.name
     end
-
-    def new_by_card card, opts={}
-      card.supercard = @context_card
-      if !card.name.simple? &&
-         card.name.field_of?(@context_card.name)
-        card.superleft = @context_card
-      end
-      @keys << card.key
-      Card.write_to_soft_cache card
-      card.director = @context_card.director.subdirectors.add(card, opts)
-      card
-    end
-  end
-
-  def right_id= card_or_id
-    write_card_or_id :right_id, card_or_id
-  end
-
-  def left_id= card_or_id
-    write_card_or_id :left_id, card_or_id
-  end
-
-  def type_id= card_or_id
-    write_card_or_id :type_id, card_or_id
-  end
-
-  def write_card_or_id attribute, card_or_id
-    if card_or_id.is_a? Card
-      card = card_or_id
-      if card.id
-        write_attribute attribute, card.id
-      else
-        add_subcard card
-        card.director.prior_store = true
-        with_id_when_exists(card) do |id|
-          write_attribute attribute, id
-        end
-      end
-    else
-      write_attribute attribute, card_or_id
-    end
-  end
-
-  def with_id_when_exists card, &block
-    card.director.call_after_store(&block)
   end
 end