card 1.17.4 → 1.18.0

data/db/seed/test/seed.rb

@@ -210,5 +210,8 @@ class SharedData
     first.update_attributes! content: 'chicken'
     first.update_attributes! content: 'chick'
 
+    # Card['*all+*style' ].ensure_machine_output
+    # Card['*all+*script'].ensure_machine_output
+    # (ie9 = Card[:script_html5shiv_printshiv]) && ie9.ensure_machine_output
   end
 end

data/lib/card.rb

@@ -32,6 +32,8 @@ class Card < ActiveRecord::Base
   require_dependency 'card/reference'
   require_dependency 'card/subcards'
   require_dependency 'card/view_cache'
+  require_dependency 'card/stage_director'
+  require_dependency 'card/director_register'
 
   has_many :references_in,  class_name: :Reference, foreign_key: :referee_id
   has_many :references_out, class_name: :Reference, foreign_key: :referer_id
@@ -40,7 +42,7 @@ class Card < ActiveRecord::Base
   has_many :drafts, -> { where(draft: true).order :id }, class_name: :Action
 
   cattr_accessor :set_patterns, :serializable_attributes, :error_codes,
-                 :set_specific_attributes
+                 :set_specific_attributes, :current_act
   @@set_patterns = []
   @@error_codes = {}
 
@@ -52,20 +54,26 @@ class Card < ActiveRecord::Base
     :update_all_users,            # if the above is wrong then this one too
     :silent_change,               # and this probably too
     :remove_rule_stash,
-    :last_action_id_before_edit
+    :last_action_id_before_edit,
+    :skip_phases
   )
 
   attr_accessor :follower_stash
 
-  define_callbacks :prepare, :approve, :store, :stored, :extend, :subsequent,
-                   :select_action, :show, :handle
+  define_callbacks :select_action, :show_page, :handle, :act,
+                   :initialize_stage,
+                   :prepare_to_validate_stage, :validate_stage,
+                   :prepare_to_store_stage, :store_stage,
+                   :finalize_stage,
+                   :integrate_stage, :integrate_with_delay_stage
 
-  before_validation :prepare
-  before_validation :approve
-  around_save :store
-  after_save :extend
+  before_validation :validation_phase, if: -> { run_phases? }
+  around_save :storage_phase
+  after_save :integration_phase, if: -> { run_phases? }
+  after_commit :clean_up, if: -> { run_phases? }
+  after_rollback :clean_up, if: -> { run_phases? }
 
-  TRACKED_FIELDS = %w(name type_id db_content trash)
+  TRACKED_FIELDS = %w(name type_id db_content trash).freeze
   extend CarrierWave::Mount
   ActiveSupport.run_load_hooks(:card, self)
 end

data/lib/card/active_record_ext.rb

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
 module ActiveRecord
-
   module ConnectionAdapters
     class AbstractAdapter
-      def match(string)
-        raise "match not implemented"
+      def match _string
+        raise 'match not implemented'
       end
 
       def cast_types
@@ -17,13 +16,13 @@ module ActiveRecord
     end
 
     class PostgreSQLAdapter
-      def match(string)
+      def match string
         "~* #{string}"
       end
     end
 
     module MysqlCommon
-      def match(string)
+      def match string
         "REGEXP #{string}"
       end
 
@@ -45,14 +44,14 @@ module ActiveRecord
     end
 
     class SQLiteAdapter
-      def match(string)
+      def match string
         "REGEXP #{string}"
       end
     end
   end
 
   module Transactions
-    #FIXME!!
+    # FIXME!!
     # the following code is already in Rails 4 (see https://github.com/rails/rails/commit/c8792c7b2ea4f5fe7a5610225433ea8dd8d0f83e)
     # it allows manual rollbacks in after_save (eg store events) to reset the object correctly
     #  hopefully we can soon get rid of this code!
@@ -73,5 +72,4 @@ module ActiveRecord
       status
     end
   end
-
 end

data/lib/card/active_record_helper.rb

@@ -1,42 +1,52 @@
-module Card::ActiveRecordHelper
-  def create_card args
-    resolve_name_conflict args
-    Card.create! args
-  end
+class Card
+  module ActiveRecordHelper
+    def create_card args
+      resolve_name_conflict args
+      Card.create! args
+    end
 
-  def create_card! args
-    create_card args.reverse_merge(rename_if_conflict: :new)
-  end
+    def create_card! args
+      create_card args.reverse_merge(rename_if_conflict: :new)
+    end
 
-  def update_card name, args
-    resolve_name_conflict args
-    Card[name].update_attributes! args
-  end
+    def update_card name, args
+      resolve_name_conflict args
+      Card[name].update_attributes! args
+    end
 
-  def update_card! args
-    update_card args.reverse_merge(rename_if_conflict: :new)
-  end
+    def update_card! args
+      update_card args.reverse_merge(rename_if_conflict: :new)
+    end
 
-  def create_or_update name_or_args, args=nil
-    name = args ? name_or_args : name_or_args[:name]
-    args ||= name_or_args
-    if Card[name]
-      update_card name, args
-    else
-      create_card args.merge(name: name)
+    def create_or_update name_or_args, args={}
+      if name_or_args.is_a?(Hash)
+        name = name_or_args.delete :name
+        args = name_or_args
+      else
+        name = name_or_args
+      end
+      if Card[name]
+        update_card name, args
+      else
+        create_card args.merge(name: name)
+      end
     end
-  end
 
-  def create_or_update! name_or_args, args=nil
-    name = args ? name_or_args : name_or_args[:name]
-    args ||= {}
-    create_or_update name, args.reverse_merge(rename_if_conflict: :new)
-  end
+    def create_or_update! name_or_args, args=nil
+      if name_or_args.is_a?(Hash)
+        name = name_or_args.delete(:name)
+        args = name_or_args
+      else
+        name = name_or_args
+        args ||= {}
+      end
+      create_or_update name, args.reverse_merge(rename_if_conflict: :new)
+    end
 
-  def resolve_name_conflict args
-    rename = args.delete :rename_if_conflict
-    if rename
+    def resolve_name_conflict args
+      rename = args.delete :rename_if_conflict
+      return unless rename
       args[:name] = Card.uniquify_name args[:name], rename
     end
   end
-end
+end

data/lib/card/auth.rb

@@ -5,11 +5,11 @@ class Card
     @@as_card = @@as_id = @@current_id = @@current = nil
     @@simulating_setup_need = nil
 
-    SETUP_COMPLETED_KEY = 'SETUP_COMPLETED'
+    SETUP_COMPLETED_KEY = 'SETUP_COMPLETED'.freeze
     DEFAULT_RECAPTCHA_SETTINGS = {
       recaptcha_public_key: '6LeoHfESAAAAAN1NdQeYHREq4jTSQhu1foEzv6KC',
       recaptcha_private_key: '6LeoHfESAAAAAHLZpn7ijrO4_KGLEr2nGL4qjjis'
-    }
+    }.freeze
 
     # after_save :reset_instance_cache
 
@@ -193,7 +193,7 @@ class Card
 
       def always_ok?
         usr_id = as_id
-        return false if !usr_id
+        return false unless usr_id
         always_ok_usr_id? usr_id
       end
 

data/lib/card/cache.rb

@@ -13,7 +13,7 @@ class Card
   end
 
   class Cache
-    TEST_ENVS         = %w{test cucumber}
+    TEST_ENVS         = %w(test cucumber).freeze
     @@prepopulating   = TEST_ENVS.include? Rails.env
     @@no_rails_cache  = TEST_ENVS.include?(Rails.env) || ENV['NO_RAILS_CACHE']
     @@cache_by_class  = {}
@@ -22,7 +22,7 @@ class Card
 
     class << self
       def [] klass
-        fail 'nil klass' if klass.nil?
+        raise 'nil klass' if klass.nil?
         cache_type = (@@no_rails_cache ? nil : Cardio.cache)
         cache_by_class[klass] ||= new class: klass,
                                       store: cache_type
@@ -30,7 +30,7 @@ class Card
 
       def renew
         cache_by_class.keys do |klass|
-          fail "renewing nil cache: #{klass}" unless klass.cache
+          raise "renewing nil cache: #{klass}" unless klass.cache
           cache_by_class[klass].system_prefix = system_prefix(klass)
         end
         reset_soft
@@ -136,7 +136,7 @@ class Card
         if @hard
           @hard.fetch(key, &block)
         else
-          block.call
+          yield
         end
       end
     end

data/lib/card/cache/persistent.rb

@@ -15,7 +15,7 @@ class Card::Cache::Persistent
   end
 
   def read key
-    @store.read(@prefix + key)
+    @store.read(full_key(key))
   end
 
   def write_variable key, variable, value
@@ -27,15 +27,15 @@ class Card::Cache::Persistent
   end
 
   def write key, value
-    @store.write(@prefix + key, value)
+    @store.write(full_key(key), value)
   end
 
   def fetch key, &block
-    @store.fetch @prefix + key, &block
+    @store.fetch full_key(key), &block
   end
 
   def delete key
-    @store.delete @prefix + key
+    @store.delete full_key(key)
   end
 
   def reset
@@ -45,6 +45,10 @@ class Card::Cache::Persistent
   end
 
   def exist? key
-    @store.exist? @prefix + key
+    @store.exist? full_key(key)
+  end
+
+  def full_key key
+    @prefix + key
   end
 end

data/lib/card/cache/temporary.rb

@@ -2,11 +2,11 @@ class Card::Cache::Temporary
   attr_reader :store
 
   def initialize
-    @store = Hash.new
+    @store = {}
   end
 
   def read key
-    return unless @store.has_key? key
+    return unless @store.key? key
     @store[key]
   end
 
@@ -14,8 +14,8 @@ class Card::Cache::Temporary
     @store[key] = value
   end
 
-  def fetch key, &block
-    read(key) || write(key, block.call)
+  def fetch key, &_block
+    read(key) || write(key, yield)
   end
 
   def delete key
@@ -33,6 +33,6 @@ class Card::Cache::Temporary
   end
 
   def exist? key
-    @store.has_key? key
+    @store.key? key
   end
 end

data/lib/card/chunk.rb

@@ -57,7 +57,7 @@ class Card
       :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link
     ]
     register_list :references,  [:EscapedLiteral, :Include, :Link]
-    register_list :inclusion_only, [:Include]
+    register_list :nest_only, [:Include]
     register_list :query, [:QueryReference]
 
     class Abstract

data/lib/card/codename.rb

@@ -43,7 +43,7 @@ class Card
 
       def check_duplicates codehash, codename, card_id
         # FIXME: remove duplicate checks here; should be caught upon creation
-        return unless codehash.has_key?(codename) || codehash.has_key?(card_id)
+        return unless codehash.key?(codename) || codehash.key?(card_id)
         warn "dup code ID:#{card_id} (#{codehash[codename]}), " \
              "CD:#{codename} (#{codehash[card_id]})"
       end
@@ -63,7 +63,8 @@ class Card
   end
 
   def self.const_missing const
-    if const.to_s =~ /^([A-Z]\S*)ID$/ && (code = $1.underscore.to_sym)
+    if const.to_s =~ /^([A-Z]\S*)ID$/ &&
+       (code = Regexp.last_match(1).underscore.to_sym)
       if (card_id = Codename[code])
         const_set const, card_id
       else

data/lib/card/content.rb

@@ -16,9 +16,7 @@ class Card
         end
       @opts = opts || {}
 
-      unless Array === content
-        content = parse_content content
-      end
+      content = parse_content content unless content.is_a?(Array)
       super content
     end
 
@@ -60,7 +58,7 @@ class Card
     end
 
     def process_each_chunk &block
-      each_chunk { |chunk| chunk.process_chunk &block }
+      each_chunk { |chunk| chunk.process_chunk(&block) }
       self
     end
 
@@ -99,7 +97,7 @@ class Card
             position += (match.end(0) - offset.to_i)
             # move scanning position up to end of chunk
             if context_ok
-              @chunks << interval_string if interval_string.size > 0
+              @chunks << interval_string unless interval_string.empty?
               # add the nonchunk string to the chunk list
               @chunks << chunk_class.new(match, self)
               # add the chunk to the chunk list
@@ -114,11 +112,10 @@ class Card
             # no match.  look at the next character
           end
 
-          if !match || !context_ok
-            interval_string += content[chunk_start..position - 1]
-            # moving beyond the alleged chunk.
-            # append failed string to "nonchunk" string
-          end
+          next unless !match || !context_ok
+          interval_string += content[chunk_start..position - 1]
+          # moving beyond the alleged chunk.
+          # append failed string to "nonchunk" string
         end
       end
 
@@ -135,21 +132,21 @@ class Card
     end
 
     ALLOWED_TAGS = {}
-    %w{
+    %w(
       br i b pre cite caption strong em ins sup sub del ol hr ul li p
       div h1 h2 h3 h4 h5 h6 span table tr td th tbody thead tfoot
-    }.each { |tag| ALLOWED_TAGS[tag] = [] }
+    ).each { |tag| ALLOWED_TAGS[tag] = [] }
 
     # allowed attributes
     ALLOWED_TAGS.merge!(
-      'a' => ['href', 'title', 'target'],
-      'img' => ['src', 'alt', 'title'],
+      'a' => %w(href title target),
+      'img' => %w(src alt title),
       'code' => ['lang'],
       'blockquote' => ['cite']
     )
 
     if Card.config.allow_inline_styles
-      ALLOWED_TAGS['table'] += %w[ cellpadding align border cellspacing ]
+      ALLOWED_TAGS['table'] += %w( cellpadding align border cellspacing )
     end
 
     ALLOWED_TAGS.each_key do |k|
@@ -157,9 +154,9 @@ class Card
       ALLOWED_TAGS[k] << 'style' if Card.config.allow_inline_styles
       ALLOWED_TAGS[k]
     end
-    ALLOWED_TAGS
+    ALLOWED_TAGS.freeze
 
-    ATTR_VALUE_RE = [/(?<=^')[^']+(?=')/, /(?<=^")[^"]+(?=")/, /\S+/]
+    ATTR_VALUE_RE = [/(?<=^')[^']+(?=')/, /(?<=^")[^"]+(?=")/, /\S+/].freeze
 
     class << self
       ## Method that cleans the String of HTML tags
@@ -167,31 +164,15 @@ class Card
 
       # this has been hacked for card to allow classes if
       # the class begins with "w-"
-      def clean!(string, tags=ALLOWED_TAGS)
-        string.gsub(/<(\/*)(\w+)([^>]*)>/) do
-          raw = $~
+      def clean! string, tags=ALLOWED_TAGS
+        string.gsub(%r{<(/*)(\w+)([^>]*)>}) do
+          raw = $LAST_MATCH_INFO
           tag = raw[2].downcase
           if (attrs = tags[tag])
             html_attribs =
-              attrs.inject([tag]) do |pcs, attr|
-                q = '"'
-                rest_value = nil
-                if raw[3] =~ /\b#{attr}\s*=\s*(?=(.))/i
-                  rest_value = $'
-                  (idx = %w{' "}.index($1)) && (q = $1)
-                  re = ATTR_VALUE_RE[idx || 2]
-                  if (match = rest_value.match(re))
-                    rest_value = match[0]
-                    if attr == 'class'
-                      rest_value =
-                        rest_value.split(/\s+/).select do |s|
-                          s =~ /^w-/i
-                        end * ' '
-                    end
-                  end
-                end
+              attrs.each_with_object([tag]) do |attr, pcs|
+                q, rest_value = process_attribute attr, raw[3]
                 pcs << "#{attr}=#{q}#{rest_value}#{q}" unless rest_value.blank?
-                pcs
               end * ' '
             "<#{raw[1]}#{html_attribs}>"
           else
@@ -200,6 +181,23 @@ class Card
         end.gsub(/<\!--.*?-->/, '')
       end
 
+      def process_attribute attr, all_attributes
+        return ['"', nil] unless all_attributes =~ /\b#{attr}\s*=\s*(?=(.))/i
+        q = '"'
+        rest_value = $'
+        (idx = %w(' ").index(Regexp.last_match(1))) &&
+          (q = Regexp.last_match(1))
+        re = ATTR_VALUE_RE[idx || 2]
+        if (match = rest_value.match(re))
+          rest_value = match[0]
+          if attr == 'class'
+            rest_value =
+              rest_value.split(/\s+/).select { |s| s =~ /^w-/i }.join(' ')
+          end
+        end
+        [q, rest_value]
+      end
+
       if Card.config.space_last_in_multispace
         def clean_with_space_last! string, tags=ALLOWED_TAGS
           cwo = clean_without_space_last!(string, tags)
@@ -208,8 +206,9 @@ class Card
         alias_method_chain :clean!, :space_last
       end
 
-      def truncatewords_with_closing_tags input, words=25, truncate_string='...'
-        if input.nil? then return end
+      def truncatewords_with_closing_tags input, words=25,
+                                          _truncate_string='...'
+        return if input.nil?
         wordlist = input.to_s.split
         l = words.to_i - 1
         l = 0 if l < 0
@@ -217,21 +216,7 @@ class Card
         # nuke partial tags at end of snippet
         wordstring.gsub!(/(<[^\>]+)$/, '')
 
-        tags = []
-
-        # match tags with or without self closing (ie. <foo />)
-        wordstring.scan(/\<([^\>\s\/]+)[^\>]*?\>/).each do |t|
-          tags.unshift(t[0])
-        end
-        # match tags with self closing and mark them as closed
-        wordstring.scan(/\<([^\>\s\/]+)[^\>]*?\/\>/).each do |t|
-          if !(x = tags.index(t[0])).nil? then tags.slice!(x) end
-        end
-        # match close tags
-        wordstring.scan(/\<\/([^\>\s\/]+)[^\>]*?\>/).each do |t|
-          if !(x = tags.rindex(t[0])).nil? then tags.slice!(x) end
-        end
-
+        tags = find_tags wordstring
         tags.each { |t| wordstring += "</#{t}>" }
 
         if wordlist.length > l
@@ -239,12 +224,32 @@ class Card
         end
 
         # wordstring += '...' if wordlist.length > l
-        wordstring.gsub! /<[\/]?br[\s\/]*>/, ' '
+        wordstring.gsub! %r{<[/]?br[\s/]*>}, ' '
         # Also a hack -- get rid of <br>'s -- they make line view ugly.
-        wordstring.gsub! /<[\/]?p[^>]*>/, ' '
+        wordstring.gsub! %r{<[/]?p[^>]*>}, ' '
         ## Also a hack -- get rid of <br>'s -- they make line view ugly.
         wordstring
       end
+
+      def find_tags wordstring
+        tags = []
+
+        # match tags with or without self closing (ie. <foo />)
+        wordstring.scan(%r{\<([^\>\s/]+)[^\>]*?\>}).each do |t|
+          tags.unshift(t[0])
+        end
+        # match tags with self closing and mark them as closed
+        wordstring.scan(%r{\<([^\>\s/]+)[^\>]*?/\>}).each do |t|
+          next unless (x = tags.index(t[0]))
+          tags.slice!(x)
+        end
+        # match close tags
+        wordstring.scan(%r{\</([^\>\s/]+)[^\>]*?\>}).each do |t|
+          next unless (x = tags.rindex(t[0]))
+          tags.slice!(x)
+        end
+        tags
+      end
     end
   end
 end