card 1.101.3 → 1.101.4

data/lib/card/cache/persistent.rb

@@ -15,40 +15,9 @@ class Card
     # re-included after retrieval from the persistent cache.
     #
     class Persistent
-      attr_accessor :prefix
-
-      class << self
-        # name of current database; used here to insure that different databases
-        # are cached separately
-        # TODO: find better home for this method
-        def database_name
-          @database_name ||= (cfg = Cardio.config) &&
-                             (dbcfg = cfg.database_configuration) &&
-                             dbcfg[Rails.env]["database"]
-        end
-
-        def stamp
-          @stamp ||= Cardio.cache.fetch(stamp_key) { new_stamp }
-        end
-
-        # stamp generator
-        def new_stamp
-          Time.now.to_i.to_s(36) + rand(999).to_s(36)
-        end
+      extend PersistentClass
 
-        def stamp_key
-          "#{database_name}-stamp"
-        end
-
-        def renew
-          @stamp = nil
-        end
-
-        def reset
-          @stamp = new_stamp
-          Cardio.cache.write stamp_key, @stamp
-        end
-      end
+      attr_accessor :prefix
 
       # @param opts [Hash]
       # @option opts [Rails::Cache] :store
@@ -58,7 +27,7 @@ class Card
         @store = opts[:store]
         @klass = opts[:class]
         @class_key = @klass.to_s.to_name.key
-        @database = opts[:database] || self.class.database_name
+        @database = opts[:database] || Cardio.database_name
       end
 
       # renew insures you're using the most current cache version by

data/lib/card/cache/persistent_class.rb

@@ -0,0 +1,28 @@
+class Card
+  class Cache
+    # class methods for Card::Cache::Persistent
+    module PersistentClass
+      def stamp
+        @stamp ||= Cardio.cache.fetch(stamp_key) { new_stamp }
+      end
+
+      # stamp generator
+      def new_stamp
+        Time.now.to_i.to_s(36) + rand(999).to_s(36)
+      end
+
+      def stamp_key
+        "#{Cardio.database_name}-stamp"
+      end
+
+      def renew
+        @stamp = nil
+      end
+
+      def reset
+        @stamp = new_stamp
+        Cardio.cache.write stamp_key, @stamp
+      end
+    end
+  end
+end

data/lib/card/codename.rb

@@ -138,7 +138,7 @@ class Card
 
       def unknown_codename! mark
         raise Card::Error::CodenameNotFound,
-              Cardio.tr(:exception_unknown_codename, codename: mark)
+              Cardio.t(:lib_exception_unknown_codename, codename: mark)
       end
 
       def id_constant codename, id=nil

data/lib/card/content.rb

@@ -36,9 +36,10 @@ class Card
     end
 
     # Find all chunks of a given type
-    # @param chunk_type [Chunk Class]
+    # @param chunk_type [Chunk Class or Symbol]
     # @return [Array of Chunk instances]
-    def find_chunks chunk_type
+    def find_chunks chunk_type=nil
+      chunk_type = interpret_chunk_type chunk_type
       each_chunk.select { |chunk| chunk.is_a?(chunk_type) }
     end
 
@@ -119,6 +120,19 @@ class Card
 
     private
 
+    def interpret_chunk_type chunk_type
+      case chunk_type
+      when nil
+        Chunk
+      when Symbol, String
+        Chunk.const_get chunk_type
+      when Class
+        chunk_type
+      else
+        raise ArgumentError, "unknown chunk type: #{chunk_type}"
+      end
+    end
+
     def stash_chunks chunk_classes
       chunks = []
       each_chunk do |chunk|

data/lib/card/content/all.rb

@@ -0,0 +1,59 @@
+class Card
+  class Content
+    # content-related methods for cards
+    module All
+      def content
+        structured_content || standard_content
+      end
+      alias_method :raw_content, :content # DEPRECATED!
+
+      def content= value
+        self.db_content = standardize_content(value)
+      end
+
+      def content?
+        content.present?
+      end
+
+      def standard_content
+        db_content || (new_card? && template.db_content)
+      end
+
+      def standardize_content value
+        value.is_a?(Array) ? value.join("\n") : value
+      end
+
+      def structured_content
+        structure && template.db_content
+      end
+
+      def refresh_content
+        self.content = Card.find(id)&.db_content
+      end
+
+      def save_content_draft _content
+        clear_drafts
+      end
+
+      def clear_drafts
+        drafts.created_by(Card::Auth.current_id).each(&:delete)
+      end
+
+      def last_draft_content
+        drafts.last.card_changes.last.value
+      end
+
+      def blank_content?
+        content.blank? || content.strip.blank?
+      end
+
+      def nests?
+        content_object.has_chunk? Content::Chunk::Nest
+      end
+
+      def content_object
+        Card::Content.new content, self
+      end
+    end
+  end
+end

data/lib/card/director/act_direction.rb

@@ -60,6 +60,10 @@ class Card
         directors.keys.any? { |card| card.key == name.to_name.key }
       end
 
+      def include_id? id
+        directors.keys.any? { |card| card.id == id }
+      end
+
       def new_director card, parent
         if !parent && act_card && act_card != card && running_act?
           act_card.director.subdirectors.add card

data/lib/card/director/all.rb

@@ -0,0 +1,61 @@
+class Card
+  class Director
+    # director-related Card instance methods
+    module All
+      def act options={}, &block
+        if act_card
+          add_to_act options, &block
+        else
+          start_new_act(&block)
+        end
+      end
+
+      def act_card
+        Card::Director.act_card
+      end
+
+      def act_card?
+        self == act_card
+      end
+
+      def save! *args
+        as_subcard = args.first&.delete :as_subcard
+        act(as_subcard: as_subcard) { super }
+      end
+
+      def save *args
+        act { super }
+      end
+
+      def valid? *args
+        act(validating: true) { super }
+      end
+
+      def update *args
+        act { super }
+      end
+
+      def update! *args
+        act { super }
+      end
+
+      alias_method :update_attributes, :update
+      alias_method :update_attributes!, :update!
+
+      private
+
+      def start_new_act
+        self.director = nil
+        Director.run_act(self) do
+          run_callbacks(:act) { yield }
+        end
+      end
+
+      def add_to_act options={}
+        director.appoint self unless @director
+        director.head = true unless options[:validating] || options[:as_subcard]
+        yield
+      end
+    end
+  end
+end

data/lib/card/director/card_class.rb

@@ -0,0 +1,18 @@
+class Card
+  class Director
+    # director-related Card class methods
+    module CardClass
+      def create! opts
+        card = Card.new opts
+        card.save!
+        card
+      end
+
+      def create opts
+        card = Card.new opts
+        card.save
+        card
+      end
+    end
+  end
+end

data/lib/card/director/phases.rb

@@ -25,7 +25,6 @@ class Card
         run_stage :prepare_to_validate
         run_stage :validate
       ensure
-        # @card.expire_pieces if @card.errors.any?
         @card.errors.empty?
       end
 

data/lib/card/dirty.rb

@@ -61,10 +61,20 @@ class Card
       super || dirty_name(left_id_before_act, right_id_before_act)
     end
 
-    def dirty_name left, right
-      return unless left.present? && right.present?
+    def dirty_name left_id, right_id
+      return unless left_id.present? && right_id.present?
 
-      Card::Name[left, right]
+      parts = [left_id, right_id].map { |id| Card.quick_fetch(id)&.name_before_act }
+
+      Card::Name[*parts]
+    end
+
+    def lex_before_act
+      if (old_left_id = left_id_before_act)
+        [old_left_id, right_id_before_act]
+      else
+        name_before_act
+      end
     end
   end
 end

data/lib/card/env/success.rb

@@ -5,8 +5,8 @@ class Card
       include Location
       include Target
 
-      attr_accessor :redirect, :name, :name_context, :reload
-      attr_writer :params, :card
+      attr_accessor :name, :name_context, :reload
+      attr_writer :params, :redirect, :card
       attr_reader :id
 
       def initialize name_context=nil, success_args=nil
@@ -17,12 +17,8 @@ class Card
       end
 
       def to_url name_context=@name_context
-        case (target = target(name_context))
-        when Card
-          target.format.path params
-        else
-          target
-        end
+        target = target name_context
+        target.is_a?(Card) ? target.format.path(params) : target
       end
 
       def in_context name_context
@@ -34,10 +30,14 @@ class Card
         if value.is_a? Hash
           apply value
         else
-          self.target = value
+          self.mark = value
         end
       end
 
+      def redirect
+        @redirect.present? ? @redirect : false
+      end
+
       def reload?
         @reload.to_s == "true"
       end
@@ -79,11 +79,9 @@ class Card
       end
 
       def method_missing method, *args
-        if (m = method.match(/^(\w+(=)?)/))
-          infer_bracket m[1].to_sym, m[2], args[0]
-        else
-          super
-        end
+        return super unless (m = method.match(/^(\w+(=)?)/))
+
+        infer_bracket m[1].to_sym, m[2], args[0]
       end
 
       def infer_bracket method, assign, val
@@ -94,6 +92,8 @@ class Card
 
       def apply hash
         hash.each_pair do |key, value|
+          next unless value.present?
+
           self[key] = value
         end
       end

data/lib/card/env/success/target.rb

@@ -11,16 +11,13 @@ class Card
         end
 
         def target name_context=@name_context
-          card(name_context) ||
-            (@target == :previous ? Card::Env.previous_location : @target) ||
-            Card.fetch(name_context)
+          card(name_context) || @target || Card.fetch(name_context)
         end
 
         # TODO: refactor to use cardish
         def mark= value
           case value
           when Integer then @id = value
-          when String then @name = value
           when Card then @card = value
           else
             self.target = value
@@ -60,13 +57,14 @@ class Card
 
         def process_target value
           case value
-          when ""                     then ""
-          when "*previous", :previous then :previous
-          when %r{^(http|/)}          then value
-          when /^REDIRECT:\s*(.+)/
-            @redirect = true
-            process_target Regexp.last_match(1)
-          else self.mark = value
+          when ""
+            ""
+          when "*previous", ":previous", :previous
+            Card::Env.previous_location
+          when %r{^(http|/)}
+            value
+          else
+            @name = Name[value]
           end
         end
       end

data/lib/card/error.rb

@@ -22,7 +22,7 @@ class Card
     end
 
     def message_from_card
-      Cardio.tr :exception_for_card, cardname: card.name, message: card_message_text
+      Cardio.t :lib_exception_for_card, cardname: card.name, message: card_message_text
     end
 
     def backtrace

data/lib/card/fetch/all.rb

@@ -0,0 +1,32 @@
+class Card
+  class Fetch
+    # fetch-related Card instance methods
+    module All
+      # fetching from the context of a card
+      def fetch traits, opts={}
+        opts[:new][:supercard] = self if opts[:new]
+        Array.wrap(traits).inject(self) do |card, trait|
+          Card.fetch card.name.trait(trait), opts
+        end
+      end
+
+      def newish opts
+        reset_patterns
+        Card.with_normalized_new_args opts do |norm_opts|
+          handle_type norm_opts do
+            assign_attributes norm_opts
+            self.name = name # trigger superize_name
+          end
+        end
+      end
+
+      def refresh force=false
+        return self unless force || frozen? || readonly?
+        return unless id
+        fresh_card = self.class.find id
+        fresh_card.include_set_modules
+        fresh_card
+      end
+    end
+  end
+end