gamefic 1.4.1 → 1.5.0

data/lib/gamefic/text/html/entities.rb

@@ -0,0 +1,9 @@
+module Gamefic
+
+  module Text
+    module Html
+      ENTITIES = { "&quot;" => "\"", "&amp;" => "&", "&lt;" => "<", "&gt;" => ">", "&nbsp;" => " ", "&iexcl;" => "¡", "&cent;" => "¢", "&pound;" => "£", "&curren;" => "¤", "&yen;" => "¥", "&brvbar;" => "¦", "&sect;" => "§", "&uml;" => "¨", "&copy;" => "©", "&ordf;" => "ª", "&laquo;" => "«", "&not;" => "¬", "&shy;" => "­", "&reg;" => "®", "&macr;" => "¯", "&deg;" => "°", "&plusmn;" => "±", "&sup2;" => "²", "&sup3;" => "³", "&acute;" => "´", "&micro;" => "µ", "&para;" => "¶", "&middot;" => "·", "&cedil;" => "¸", "&sup1;" => "¹", "&ordm;" => "º", "&raquo;" => "»", "&frac14;" => "¼", "&frac12;" => "½", "&frac34;" => "¾", "&iquest;" => "¿", "&Agrave;" => "À", "&Aacute;" => "Á", "&Acirc;" => "Â", "&Atilde;" => "Ã", "&Auml;" => "Ä", "&Aring;" => "Å", "&AElig;" => "Æ", "&Ccedil;" => "Ç", "&Egrave;" => "È", "&Eacute;" => "É", "&Ecirc;" => "Ê", "&Euml;" => "Ë", "&Igrave;" => "Ì", "&Iacute;" => "Í", "&Icirc;" => "Î", "&Iuml;" => "Ï", "&ETH;" => "Ð", "&Ntilde;" => "Ñ", "&Ograve;" => "Ò", "&Oacute;" => "Ó", "&Ocirc;" => "Ô", "&Otilde;" => "Õ", "&Ouml;" => "Ö", "&times;" => "×", "&Oslash;" => "Ø", "&Ugrave;" => "Ù", "&Uacute;" => "Ú", "&Ucirc;" => "Û", "&Uuml;" => "Ü", "&Yacute;" => "Ý", "&THORN;" => "Þ", "&szlig;" => "ß", "&agrave;" => "à", "&aacute;" => "á", "&acirc;" => "â", "&atilde;" => "ã", "&auml;" => "ä", "&aring;" => "å", "&aelig;" => "æ", "&ccedil;" => "ç", "&egrave;" => "è", "&eacute;" => "é", "&ecirc;" => "ê", "&euml;" => "ë", "&igrave;" => "ì", "&iacute;" => "í", "&icirc;" => "î", "&iuml;" => "ï", "&eth;" => "ð", "&ntilde;" => "ñ", "&ograve;" => "ò", "&oacute;" => "ó", "&ocirc;" => "ô", "&otilde;" => "õ", "&ouml;" => "ö", "&divide;" => "÷", "&oslash;" => "ø", "&ugrave;" => "ù", "&uacute;" => "ú", "&ucirc;" => "û", "&uuml;" => "ü", "&yacute;" => "ý", "&thorn;" => "þ", "&yuml;" => "ÿ", "&OElig;" => "Œ", "&oelig;" => "œ", "&Scaron;" => "Š", "&scaron;" => "š", "&Yuml;" => "Ÿ", "&fnof;" => "ƒ", "&circ;" => "ˆ", "&tilde;" => "˜", "&Alpha;" => "Α", "&Beta;" => "Β", "&Gamma;" => "Γ", "&Delta;" => "Δ", "&Epsilon;" => "Ε", "&Zeta;" => "Ζ", "&Eta;" => "Η", "&Theta;" => "Θ", "&Iota;" => "Ι", "&Kappa;" => "Κ", "&Lambda;" => "Λ", "&Mu;" => "Μ", "&Nu;" => "Ν", "&Xi;" => "Ξ", "&Omicron;" => "Ο", "&Pi;" => "Π", "&Rho;" => "Ρ", "&Sigma;" => "Σ", "&Tau;" => "Τ", "&Upsilon;" => "Υ", "&Phi;" => "Φ", "&Chi;" => "Χ", "&Psi;" => "Ψ", "&Omega;" => "Ω", "&alpha;" => "α", "&beta;" => "β", "&gamma;" => "γ", "&delta;" => "δ", "&epsilon;" => "ε", "&zeta;" => "ζ", "&eta;" => "η", "&theta;" => "θ", "&iota;" => "ι", "&kappa;" => "κ", "&lambda;" => "λ", "&mu;" => "μ", "&nu;" => "ν", "&xi;" => "ξ", "&omicron;" => "ο", "&pi;" => "π", "&rho;" => "ρ", "&sigmaf;" => "ς", "&sigma;" => "σ", "&tau;" => "τ", "&upsilon;" => "υ", "&phi;" => "φ", "&chi;" => "χ", "&psi;" => "ψ", "&omega;" => "ω", "&thetasym;" => "ϑ", "&upsih;" => "ϒ", "&piv;" => "ϖ", "&ensp;" => " ", "&emsp;" => " ", "&thinsp;" => " ", "&zwnj;" => "‌", "&zwj;" => "‍", "&lrm;" => "‎", "&rlm;" => "‏", "&ndash;" => "–", "&mdash;" => "—", "&lsquo;" => "‘", "&rsquo;" => "’", "&sbquo;" => "‚", "&ldquo;" => "“", "&rdquo;" => "”", "&bdquo;" => "„", "&dagger;" => "†", "&Dagger;" => "‡", "&bull;" => "•", "&hellip;" => "…", "&permil;" => "‰", "&prime;" => "′", "&Prime;" => "″", "&lsaquo;" => "‹", "&rsaquo;" => "›", "&oline;" => "‾", "&frasl;" => "⁄", "&euro;" => "€", "&image;" => "ℑ", "&weierp;" => "℘", "&real;" => "ℜ", "&trade;" => "™", "&alefsym;" => "ℵ", "&larr;" => "←", "&uarr;" => "↑", "&rarr;" => "→", "&darr;" => "↓", "&harr;" => "↔", "&crarr;" => "↵", "&lArr;" => "⇐", "&uArr;" => "⇑", "&rArr;" => "⇒", "&dArr;" => "⇓", "&hArr;" => "⇔", "&forall;" => "∀", "&part;" => "∂", "&exist;" => "∃", "&empty;" => "∅", "&nabla;" => "∇", "&isin;" => "∈", "&notin;" => "∉", "&ni;" => "∋", "&prod;" => "∏", "&sum;" => "∑", "&minus;" => "−", "&lowast;" => "∗", "&radic;" => "√", "&prop;" => "∝", "&infin;" => "∞", "&ang;" => "∠", "&and;" => "∧", "&or;" => "∨", "&cap;" => "∩", "&cup;" => "∪", "&int;" => "∫", "&there4;" => "∴", "&sim;" => "∼", "&cong;" => "≅", "&asymp;" => "≈", "&ne;" => "≠", "&equiv;" => "≡", "&le;" => "≤", "&ge;" => "≥", "&sub;" => "⊂", "&sup;" => "⊃", "&nsub;" => "⊄", "&sube;" => "⊆", "&supe;" => "⊇", "&oplus;" => "⊕", "&otimes;" => "⊗", "&perp;" => "⊥", "&sdot;" => "⋅", "&lceil;" => "⌈", "&rceil;" => "⌉", "&lfloor;" => "⌊", "&rfloor;" => "⌋", "&lang;" => "〈", "&rang;" => "〉", "&loz;" => "◊", "&spades;" => "♠", "&clubs;" => "♣", "&hearts;" => "♥", "&diams;" => "♦" }
+    end
+  end
+
+end

data/lib/gamefic/tty.rb

@@ -1,3 +1,5 @@
+require 'gamefic/text'
+
 module Gamefic
   module Engine
     autoload :Tty, 'gamefic/engine/tty'

data/lib/gamefic/user/tty.rb

@@ -1,14 +1,12 @@
 require 'gamefic/engine'
 require 'json'
-require 'gamefic/html_to_ansi'
+require 'gamefic/text'
 
 module Gamefic
 
   # Extend User::Base to convert HTML into ANSI text.
   #
   class User::Tty < User::Base
-    include HtmlToAnsi
-
     def save filename, snapshot
       data = snapshot.merge(:metadata => @character.plot.metadata)
       json = JSON.generate data
@@ -48,7 +46,7 @@ module Gamefic
     end
 
     def flush
-      html_to_ansi(super)
+      Gamefic::Text::Html::Conversions.html_to_ansi(super)
     end
   end
 

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -134,13 +134,11 @@ files:
 - bin/gamefic
 - lib/gamefic.rb
 - lib/gamefic/action.rb
-- lib/gamefic/ansi.rb
 - lib/gamefic/character.rb
 - lib/gamefic/command.rb
 - lib/gamefic/core_ext/array.rb
 - lib/gamefic/core_ext/string.rb
 - lib/gamefic/describable.rb
-- lib/gamefic/direction.rb
 - lib/gamefic/director.rb
 - lib/gamefic/director/delegate.rb
 - lib/gamefic/director/order.rb
@@ -159,14 +157,16 @@ files:
 - lib/gamefic/grammar/verb_set.rb
 - lib/gamefic/grammar/verbs.rb
 - lib/gamefic/grammar/word_adapter.rb
-- lib/gamefic/html.rb
-- lib/gamefic/html_to_ansi.rb
 - lib/gamefic/keywords.rb
 - lib/gamefic/node.rb
 - lib/gamefic/plot.rb
 - lib/gamefic/plot/article_mount.rb
+- lib/gamefic/plot/callbacks.rb
 - lib/gamefic/plot/command_mount.rb
-- lib/gamefic/plot/entity_mount.rb
+- lib/gamefic/plot/entities.rb
+- lib/gamefic/plot/host.rb
+- lib/gamefic/plot/playbook.rb
+- lib/gamefic/plot/players.rb
 - lib/gamefic/plot/query_mount.rb
 - lib/gamefic/plot/scene_mount.rb
 - lib/gamefic/plot/snapshot.rb
@@ -184,7 +184,6 @@ files:
 - lib/gamefic/query/self.rb
 - lib/gamefic/query/siblings.rb
 - lib/gamefic/query/text.rb
-- lib/gamefic/rule.rb
 - lib/gamefic/scene.rb
 - lib/gamefic/scene/active.rb
 - lib/gamefic/scene/base.rb
@@ -213,6 +212,11 @@ files:
 - lib/gamefic/subplot.rb
 - lib/gamefic/syntax.rb
 - lib/gamefic/tester.rb
+- lib/gamefic/text.rb
+- lib/gamefic/text/ansi.rb
+- lib/gamefic/text/html.rb
+- lib/gamefic/text/html/conversions.rb
+- lib/gamefic/text/html/entities.rb
 - lib/gamefic/tty.rb
 - lib/gamefic/user.rb
 - lib/gamefic/user/base.rb

data/lib/gamefic/direction.rb

@@ -1,46 +0,0 @@
-module Gamefic
-
-  class Direction
-    attr_accessor :name, :adjective, :adverb, :reverse
-    def initialize args = {}
-      args.each { |key, value|
-        send "#{key}=", value
-      }
-      if !reverse.nil?
-        reverse.reverse = self
-      end
-      proper_named = true
-    end
-    def adjective
-      @adjective || @name
-    end
-    def adverb
-      @adverb || @name
-    end
-    def reverse=(dir)
-      @reverse = dir
-    end
-    def synonyms
-      "#{adjective} #{adverb}"
-    end
-    def to_s
-      @name
-    end
-    def self.find(str)
-      x = { "north" => NORTH, "south" => SOUTH, "west" => WEST, "east" => EAST, "up" => UP, "down" => DOWN, "northwest" => NORTHWEST, "northeast" => NORTHEAST, "southwest" => SOUTHWEST, "southeast" => SOUTHEAST }
-      x[str]
-    end
-  end
-
-  NORTH = Direction.new(:name => 'north', :adjective => 'northern')
-  SOUTH = Direction.new(:name => 'south', :adjective => 'southern', :reverse => NORTH)
-  WEST = Direction.new(:name => 'west', :adjective => 'western')
-  EAST = Direction.new(:name => 'east', :adjective => 'eastern', :reverse => WEST)
-  NORTHWEST = Direction.new(:name => 'northwest', :adjective => 'northwestern')
-  SOUTHEAST = Direction.new(:name => 'southeast', :adjective => 'southeastern', :reverse => NORTHWEST)
-  NORTHEAST = Direction.new(:name => 'northeast', :adjective => 'northeastern')
-  SOUTHWEST = Direction.new(:name => 'southwest', :adjective => 'southwestern', :reverse => NORTHEAST)
-  UP = Direction.new(:name => 'up', :adjective => 'upwards')
-  DOWN = Direction.new(:name => 'down', :adjective => 'downwards', :reverse => UP)
-
-end

data/lib/gamefic/html.rb

@@ -1,68 +0,0 @@
-require 'rexml/document'
-
-module Gamefic
-
-  module Html
-    # Convert ampersands to &
-    #
-    # @param text [String]
-    # @return [String]
-    def self.fix_ampersands(text)
-      codes = []
-      ENTITIES.keys.each { |e|
-        codes.push e[1..-1]
-      }
-      piped = codes.join('|')
-      re = Regexp.new("&(?!(#{piped}))")
-      text.gsub(re, '&\1')
-    end
-    
-    # Encode a String with HTML entities
-    #
-    # @param text [String]
-    # @return [String]
-    def self.encode(text)
-      encoded = text
-      Gamefic::Html::ENTITIES.each { |k, v|
-        encoded = encoded.gsub(v, k)
-      }
-      encoded
-    end
-    
-    # Decode a String's HTML entities
-    #
-    # @param text [String]
-    # @return [String]
-    def self.decode(text)
-      Gamefic::Html::ENTITIES.each { |k, v|
-        text = text.gsub(k, v)
-      }
-      text
-    end
-    
-    # Parse a String into an XML document
-    #
-    # @param code [String]
-    # @return [REXML::Document]
-    def self.parse(code)
-      code = fix_ampersands(code).strip
-      last = nil
-      begin
-        doc = REXML::Document.new code
-      rescue REXML::ParseException => e
-        # Convert invalid < characters to &lt;
-        if e.source.buffer != last and e.source.buffer[0,1] == '<'
-          code = code[0,(code.length - e.source.buffer.length)] + '&lt;' + e.source.buffer[1..-1]
-          last = e.source.buffer
-          retry
-        end
-        raise e
-      end
-    end
-  end
-
-  module Html
-    ENTITIES = { "&quot;" => "\"", "&amp;" => "&", "&lt;" => "<", "&gt;" => ">", "&nbsp;" => " ", "&iexcl;" => "¡", "&cent;" => "¢", "&pound;" => "£", "&curren;" => "¤", "&yen;" => "¥", "&brvbar;" => "¦", "&sect;" => "§", "&uml;" => "¨", "&copy;" => "©", "&ordf;" => "ª", "&laquo;" => "«", "&not;" => "¬", "&shy;" => "­", "&reg;" => "®", "&macr;" => "¯", "&deg;" => "°", "&plusmn;" => "±", "&sup2;" => "²", "&sup3;" => "³", "&acute;" => "´", "&micro;" => "µ", "&para;" => "¶", "&middot;" => "·", "&cedil;" => "¸", "&sup1;" => "¹", "&ordm;" => "º", "&raquo;" => "»", "&frac14;" => "¼", "&frac12;" => "½", "&frac34;" => "¾", "&iquest;" => "¿", "&Agrave;" => "À", "&Aacute;" => "Á", "&Acirc;" => "Â", "&Atilde;" => "Ã", "&Auml;" => "Ä", "&Aring;" => "Å", "&AElig;" => "Æ", "&Ccedil;" => "Ç", "&Egrave;" => "È", "&Eacute;" => "É", "&Ecirc;" => "Ê", "&Euml;" => "Ë", "&Igrave;" => "Ì", "&Iacute;" => "Í", "&Icirc;" => "Î", "&Iuml;" => "Ï", "&ETH;" => "Ð", "&Ntilde;" => "Ñ", "&Ograve;" => "Ò", "&Oacute;" => "Ó", "&Ocirc;" => "Ô", "&Otilde;" => "Õ", "&Ouml;" => "Ö", "&times;" => "×", "&Oslash;" => "Ø", "&Ugrave;" => "Ù", "&Uacute;" => "Ú", "&Ucirc;" => "Û", "&Uuml;" => "Ü", "&Yacute;" => "Ý", "&THORN;" => "Þ", "&szlig;" => "ß", "&agrave;" => "à", "&aacute;" => "á", "&acirc;" => "â", "&atilde;" => "ã", "&auml;" => "ä", "&aring;" => "å", "&aelig;" => "æ", "&ccedil;" => "ç", "&egrave;" => "è", "&eacute;" => "é", "&ecirc;" => "ê", "&euml;" => "ë", "&igrave;" => "ì", "&iacute;" => "í", "&icirc;" => "î", "&iuml;" => "ï", "&eth;" => "ð", "&ntilde;" => "ñ", "&ograve;" => "ò", "&oacute;" => "ó", "&ocirc;" => "ô", "&otilde;" => "õ", "&ouml;" => "ö", "&divide;" => "÷", "&oslash;" => "ø", "&ugrave;" => "ù", "&uacute;" => "ú", "&ucirc;" => "û", "&uuml;" => "ü", "&yacute;" => "ý", "&thorn;" => "þ", "&yuml;" => "ÿ", "&OElig;" => "Œ", "&oelig;" => "œ", "&Scaron;" => "Š", "&scaron;" => "š", "&Yuml;" => "Ÿ", "&fnof;" => "ƒ", "&circ;" => "ˆ", "&tilde;" => "˜", "&Alpha;" => "Α", "&Beta;" => "Β", "&Gamma;" => "Γ", "&Delta;" => "Δ", "&Epsilon;" => "Ε", "&Zeta;" => "Ζ", "&Eta;" => "Η", "&Theta;" => "Θ", "&Iota;" => "Ι", "&Kappa;" => "Κ", "&Lambda;" => "Λ", "&Mu;" => "Μ", "&Nu;" => "Ν", "&Xi;" => "Ξ", "&Omicron;" => "Ο", "&Pi;" => "Π", "&Rho;" => "Ρ", "&Sigma;" => "Σ", "&Tau;" => "Τ", "&Upsilon;" => "Υ", "&Phi;" => "Φ", "&Chi;" => "Χ", "&Psi;" => "Ψ", "&Omega;" => "Ω", "&alpha;" => "α", "&beta;" => "β", "&gamma;" => "γ", "&delta;" => "δ", "&epsilon;" => "ε", "&zeta;" => "ζ", "&eta;" => "η", "&theta;" => "θ", "&iota;" => "ι", "&kappa;" => "κ", "&lambda;" => "λ", "&mu;" => "μ", "&nu;" => "ν", "&xi;" => "ξ", "&omicron;" => "ο", "&pi;" => "π", "&rho;" => "ρ", "&sigmaf;" => "ς", "&sigma;" => "σ", "&tau;" => "τ", "&upsilon;" => "υ", "&phi;" => "φ", "&chi;" => "χ", "&psi;" => "ψ", "&omega;" => "ω", "&thetasym;" => "ϑ", "&upsih;" => "ϒ", "&piv;" => "ϖ", "&ensp;" => " ", "&emsp;" => " ", "&thinsp;" => " ", "&zwnj;" => "‌", "&zwj;" => "‍", "&lrm;" => "‎", "&rlm;" => "‏", "&ndash;" => "–", "&mdash;" => "—", "&lsquo;" => "‘", "&rsquo;" => "’", "&sbquo;" => "‚", "&ldquo;" => "“", "&rdquo;" => "”", "&bdquo;" => "„", "&dagger;" => "†", "&Dagger;" => "‡", "&bull;" => "•", "&hellip;" => "…", "&permil;" => "‰", "&prime;" => "′", "&Prime;" => "″", "&lsaquo;" => "‹", "&rsaquo;" => "›", "&oline;" => "‾", "&frasl;" => "⁄", "&euro;" => "€", "&image;" => "ℑ", "&weierp;" => "℘", "&real;" => "ℜ", "&trade;" => "™", "&alefsym;" => "ℵ", "&larr;" => "←", "&uarr;" => "↑", "&rarr;" => "→", "&darr;" => "↓", "&harr;" => "↔", "&crarr;" => "↵", "&lArr;" => "⇐", "&uArr;" => "⇑", "&rArr;" => "⇒", "&dArr;" => "⇓", "&hArr;" => "⇔", "&forall;" => "∀", "&part;" => "∂", "&exist;" => "∃", "&empty;" => "∅", "&nabla;" => "∇", "&isin;" => "∈", "&notin;" => "∉", "&ni;" => "∋", "&prod;" => "∏", "&sum;" => "∑", "&minus;" => "−", "&lowast;" => "∗", "&radic;" => "√", "&prop;" => "∝", "&infin;" => "∞", "&ang;" => "∠", "&and;" => "∧", "&or;" => "∨", "&cap;" => "∩", "&cup;" => "∪", "&int;" => "∫", "&there4;" => "∴", "&sim;" => "∼", "&cong;" => "≅", "&asymp;" => "≈", "&ne;" => "≠", "&equiv;" => "≡", "&le;" => "≤", "&ge;" => "≥", "&sub;" => "⊂", "&sup;" => "⊃", "&nsub;" => "⊄", "&sube;" => "⊆", "&supe;" => "⊇", "&oplus;" => "⊕", "&otimes;" => "⊗", "&perp;" => "⊥", "&sdot;" => "⋅", "&lceil;" => "⌈", "&rceil;" => "⌉", "&lfloor;" => "⌊", "&rfloor;" => "⌋", "&lang;" => "〈", "&rang;" => "〉", "&loz;" => "◊", "&spades;" => "♠", "&clubs;" => "♣", "&hearts;" => "♥", "&diams;" => "♦" }
-  end
-
-end

data/lib/gamefic/html_to_ansi.rb

@@ -1,185 +0,0 @@
-require 'gamefic/ansi'
-require 'gamefic/html'
-require 'io/console'
-
-module Gamefic
-
-  module HtmlToAnsi
-    include Ansi
-    include Ansi::Code
-
-    def html_to_ansi text, wrap: true, width: nil
-      return '' if text.strip == ''
-      output = ''
-      begin
-        doc = Html.parse("<body>#{text.strip}</body>")
-        format_recursively doc
-        texts = REXML::XPath.match(doc, './/text()')
-        output = texts.join('').gsub(/&apos;/, "'").gsub(/&quot;/, '"').gsub(/&lt;/, '<').gsub(/&gt;/, '>')
-        output += Ansi.graphics_mode(Attribute::NORMAL)
-        output = Html.decode(output)
-      rescue REXML::ParseException => e
-        output = Html.encode(text) + "\n\n"
-        #output = data
-      end
-      output.gsub!(/(\n\n)+/, "\n\n")
-      calc_width = size[0] || width
-      if calc_width.nil? or !wrap
-        output
-      else
-        terminalize(output, calc_width - 1)
-      end
-      output
-    end
-
-    private
-    
-    def format_recursively(top, stack = nil)
-      ol_index = 1
-      stack ||= [Attribute::NORMAL]
-      top.elements.each { |element|
-        formats = [Attribute::NORMAL]
-        classes = element.attribute('class').to_s.split(' ')
-        if classes.include?('hint')
-          formats.push Foreground::YELLOW
-        end
-        case element.name
-          when 'strong', 'b'
-            formats.push Attribute::BOLD
-          when 'em', 'i', 'u'
-            formats.push Attribute::UNDERSCORE
-          when 'a'
-            if element.attributes['rel'].to_s == 'gamefic'
-              element.attributes['href'] = element.attributes['href'][5..-1]
-              formats.push [Attribute::UNDERSCORE, Extra::COMMAND]
-            else
-              formats.push [Attribute::UNDERSCORE, Extra::HREF]
-            end
-          when 'li'
-            if top.name == 'ol'
-              element.text = "#{ol_index}. #{element.text}"
-              ol_index += 1
-            else
-              element.text = "* #{element.text}"
-            end
-            formats.push [Extra::LINE]
-          when 'img'
-            formats.push [Extra::IGNORED]
-          when 'body', 'p', 'ol', 'ul'
-            formats.push Extra::BLOCK
-          when 'pre'
-            formats.push [Extra::BLOCK, Extra::PRE]
-          when 'nav'
-            formats.push Extra::BLOCK
-          when 'h1', 'h2', 'h3', 'h4', 'h5'
-            formats.push [Attribute::BOLD, Extra::BLOCK, Extra::UPPERCASE]
-          when 'kbd'
-            formats.push [Foreground::GREEN]
-        end
-        if has_code?(stack, Extra::IGNORED)
-          element.parent.delete_element(element)
-        end
-        stack.push formats
-        if has_code?(stack, Extra::UPPERCASE)
-          element.texts.each { |text|
-            text.value.upcase!
-          }
-        end
-        element.texts.each { |text|
-          text.value = "#{Ansi.graphics_mode(*stack)}#{text.value}"
-        }
-        if has_code?(stack.last, Extra::IMAGE)
-          element.text = "#{element.attribute('alt') ? element.attribute('alt') : '[Image]'}"
-        end
-        format_recursively element, stack
-        if has_code?(stack.last, Extra::COMMAND)
-          if element.attribute('data-command').to_s != ''
-            tmp = stack.pop
-            element.add_text "#{Ansi.graphics_mode(*stack)}"
-            element.add_text " [#{element.attribute('data-command')}]"
-            stack.push tmp
-            element.add_text "#{Ansi.graphics_mode(*stack)}"
-          end
-        end
-        if has_code?(stack.last, Extra::BLOCK) and !has_code?(stack.last, Extra::PRE)
-          element.texts.first.value.lstrip! unless element.texts.first.nil?
-          element.texts.last.value.rstrip! unless element.texts.last.nil?
-          element.texts.each { |t|
-            t.value = t.value.gsub(/ +/, ' ').strip
-          }
-        end
-        if has_code?(stack.last, Extra::BLOCK)
-          element.add_text("\n\n")
-        elsif has_code?(stack.last, Extra::LINE)
-          if !has_code?(stack[-2], Extra::BLOCK) || element != top.elements.to_a.last
-            element.add_text("\n")
-          end
-        end
-        if has_code?(stack.last, Extra::HREF)
-          if element.attribute('href').to_s != "#"
-            tmp = stack.pop
-            element.add_text "#{Ansi.graphics_mode(*stack)}"
-            element.add_text(" [#{element.attribute('href')}]")
-            stack.push tmp
-            element.add_text "#{Ansi.graphics_mode(*stack)}"
-          end
-        end
-        if has_code?(stack.last, Extra::IMAGE)
-          element.add_text(" [#{element.attribute('src')}]")
-          if !has_code?(stack, Extra::BLOCK)
-            element.add_text("\n\n")
-          end
-        end
-        stack.pop
-      }
-    end
-    
-    def terminalize string, max_length
-      i = 0
-      output = ''
-      line_length = 0
-      while i < string.length
-        line_length += 1
-        char = string[i,1]
-        if char == "\e"
-          # Right now, graphics modes are the only supported ANSI sequences.
-          end_of_seq = string.index("m", i)
-          output += string[i..end_of_seq]
-          i = end_of_seq + 1
-        elsif char == " "
-          next_space = string.index(/[\s]/, i + 1)
-          if !next_space.nil? and line_length + (next_space - i) > max_length
-            output += "\n"
-            line_length = 0
-          else
-            output += char
-          end
-          i += 1
-        else
-          if char == "\n"
-            line_length = 0
-          end
-          output += char
-          i += 1
-        end
-      end
-      output #output.strip
-    end
-
-    def has_code?(fmt, code)
-      if fmt.kind_of?(Array)
-        return fmt.flatten.include?(code)
-      end
-      return fmt == code
-    end
-
-    def size
-      begin
-        return STDOUT.winsize.reverse
-      rescue
-        return [nil,nil]
-      end
-    end
-  end
-
-end

data/lib/gamefic/plot/entity_mount.rb

@@ -1,45 +0,0 @@
-module Gamefic
-
-  module Plot::EntityMount
-    # Make a new Entity with the provided properties.
-    #
-    # @example Create an Entity
-    #   chair = make Entity, :name => 'red chair'
-    #   chair.name #=> 'red chair'
-    #
-    # @param cls [Class] The Class of the Entity to be created.
-    # @param args [Hash] The entity's properties.
-    # @return The Entity instance.
-    def make(cls, args = {}, &block)
-      ent = cls.new(self, args, &block)
-      if ent.kind_of?(Entity) == false
-        raise "Invalid entity class"
-      end
-      ent
-    end
-    # Pick an entity based on its description.
-    # The description provided must match exactly one entity; otherwise
-    # an error is raised.
-    #
-    # @example Select the Entity that matches the description
-    #   red_chair = make Entity, :name => 'red chair'
-    #   blue_chair make Entity, :name => 'blue chair'
-    #   pick "red chair" #=> red_chair
-    #   pick "blue chair" #=> blue_chair
-    #   pick "chair" #=> IndexError: description is ambiguous
-    #
-    # @param @description [String] The description of the entity
-    # @return [Entity] The entity that matches the description
-    def pick(description)
-      query = Gamefic::Query::Base.new
-      result = query.match(description, entities)
-      if result.objects.length == 0
-        raise IndexError.new("Unable to find entity from '#{description}'")
-      elsif result.objects.length > 1
-        raise IndexError.new("Ambiguous entities found from '#{description}'")
-      end
-      result.objects[0]
-    end
-  end
-
-end