gamefic 1.5.1 → 1.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,20 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.3.0
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +121,11 @@ files:
 - lib/gamefic.rb
 - lib/gamefic/action.rb
 - lib/gamefic/character.rb
+- lib/gamefic/character/state.rb
 - lib/gamefic/command.rb
 - lib/gamefic/core_ext/array.rb
 - lib/gamefic/core_ext/string.rb
 - lib/gamefic/describable.rb
-- lib/gamefic/director.rb
-- lib/gamefic/director/delegate.rb
-- lib/gamefic/director/order.rb
-- lib/gamefic/director/parser.rb
 - lib/gamefic/engine.rb
 - lib/gamefic/engine/base.rb
 - lib/gamefic/engine/tty.rb
@@ -157,31 +140,29 @@ files:
 - lib/gamefic/grammar/verb_set.rb
 - lib/gamefic/grammar/verbs.rb
 - lib/gamefic/grammar/word_adapter.rb
-- lib/gamefic/keywords.rb
+- lib/gamefic/matchable.rb
+- lib/gamefic/messaging.rb
 - lib/gamefic/node.rb
 - lib/gamefic/plot.rb
-- lib/gamefic/plot/article_mount.rb
+- lib/gamefic/plot/articles.rb
 - lib/gamefic/plot/callbacks.rb
-- lib/gamefic/plot/command_mount.rb
+- lib/gamefic/plot/commands.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/scenes.rb
 - lib/gamefic/plot/snapshot.rb
+- lib/gamefic/plot/theater.rb
 - lib/gamefic/plot/you_mount.rb
 - lib/gamefic/query.rb
-- lib/gamefic/query/ambiguous_children.rb
 - lib/gamefic/query/base.rb
 - lib/gamefic/query/children.rb
-- lib/gamefic/query/expression.rb
+- lib/gamefic/query/descendants.rb
 - lib/gamefic/query/family.rb
-- lib/gamefic/query/many_children.rb
+- lib/gamefic/query/itself.rb
 - lib/gamefic/query/matches.rb
 - lib/gamefic/query/parent.rb
-- lib/gamefic/query/plural_children.rb
-- lib/gamefic/query/self.rb
 - lib/gamefic/query/siblings.rb
 - lib/gamefic/query/text.rb
 - lib/gamefic/scene.rb
@@ -193,22 +174,15 @@ files:
 - lib/gamefic/scene/multiple_scene.rb
 - lib/gamefic/scene/pause.rb
 - lib/gamefic/scene/yes_or_no.rb
-- lib/gamefic/scene_data.rb
-- lib/gamefic/scene_data/base.rb
-- lib/gamefic/scene_data/multiple_choice.rb
-- lib/gamefic/scene_data/multiple_scene.rb
-- lib/gamefic/scene_data/yes_or_no.rb
 - lib/gamefic/script.rb
 - lib/gamefic/script/base.rb
 - lib/gamefic/script/file.rb
 - lib/gamefic/script/text.rb
-- lib/gamefic/serialized.rb
 - lib/gamefic/shell.rb
 - lib/gamefic/source.rb
 - lib/gamefic/source/base.rb
 - lib/gamefic/source/file.rb
 - lib/gamefic/source/text.rb
-- lib/gamefic/stage.rb
 - lib/gamefic/subplot.rb
 - lib/gamefic/syntax.rb
 - lib/gamefic/tester.rb

data/lib/gamefic/director.rb

@@ -1,23 +0,0 @@
-module Gamefic
-
-  module Director
-    autoload :Parser, 'gamefic/director/parser'
-    autoload :Delegate, 'gamefic/director/delegate'
-    autoload :Order, 'gamefic/director/order'
-    
-    def self.dispatch(actor, *args)
-      orders = []
-      if args.length > 1
-        orders = Parser.from_tokens(actor, args)
-      end
-      if orders.length == 0
-        orders = Parser.from_string(actor, args.join(' ').strip)
-      end
-      first_order = orders[0]
-      del = Delegate.new(actor, orders)
-      del.execute
-      first_order
-    end
-  end
-
-end

data/lib/gamefic/director/delegate.rb

@@ -1,126 +0,0 @@
-module Gamefic
-  module Director
-    class Delegate
-
-      class << self
-        def proceed_for actor
-          return if stack_map[actor].nil?
-          stack_map[actor].last.proceed unless stack_map[actor].last.nil?
-        end
-
-        private
-
-        def stack_map
-          @stack_map ||= {}
-        end
-      end
-
-      def initialize(actor, orders)
-        @actor = actor
-        @orders = orders
-        @did = []
-        @validated = false
-      end
-
-      def proceed
-        return if @orders.length == 0
-        executed = false
-        while !executed
-          order = @orders.shift
-          break if order.nil?
-          # HACK: Make sure Character#proceed does not repeat an action
-          next if @did.include?(order.action)
-          @did.push order.action
-          @last_action = order.action
-          executed = attempt(order)
-          return if order.canceled?
-        end
-      end
-
-      def execute
-        return if @orders.length == 0
-        stack_map[@actor] ||= []
-        stack_map[@actor].push self
-        proceed
-        stack_map[@actor].pop
-        stack_map.delete @actor if stack_map[@actor].empty?
-      end
-
-      private
-
-      def attempt order
-        executed = false
-        arg_i = 0
-        final_arguments = []
-        order.arguments.each { |argument|
-          if argument.length > 1 and !order.action.queries[arg_i].allow_many?
-            if argument[0].kind_of?(Array)
-              # This thing refers to multiple items. Just keep going.
-              final_arguments = nil
-              break
-            else
-              ambiguous = argument
-            end
-            order = Order.new(@actor, @actor.playbook.disambiguator, [])
-            final_arguments = [ambiguous]
-            break
-          end
-          if order.action.queries[arg_i].allow_ambiguous?
-            valid = argument.flatten
-          else
-            valid = validate(argument, arg_i, order)
-            if valid.nil?
-              final_arguments = nil
-              break
-            end
-          end
-          if order.action == @actor.playbook.disambiguator or final_arguments.nil?
-            break
-          end
-          if order.action.queries[arg_i].allow_many?
-            final_arguments.push valid.flatten
-          elsif valid.length == 1
-            final_arguments.push valid[0]
-          else
-            final_arguments = nil
-            break
-          end
-          arg_i += 1
-        }
-        if !final_arguments.nil?
-          unless @validated or order.action.meta?
-            @actor.playbook.validators.each { |v|
-              v.call order
-              return false if order.canceled?
-            }
-          end
-          @validated = true
-          # The actor is always the first argument to an Action proc
-          final_arguments.unshift @actor
-          order.action.execute(*final_arguments)
-          executed = true
-        end
-        executed
-      end
-
-      def validate argument, arg_i, order
-        valid = []
-        argument.each { |m|
-          if order.action.queries[arg_i].validate(@actor, m)
-            valid.push m
-          else
-            valid = nil
-            break
-          end
-        }
-        valid
-      end
-
-      private
-
-      def stack_map
-        Delegate.send(:stack_map)
-      end
-    end
-  end
-end

data/lib/gamefic/director/order.rb

@@ -1,17 +0,0 @@
-module Gamefic
-  class Director::Order
-    attr_reader :actor, :action, :arguments
-    def initialize(actor, action, arguments)
-      @actor = actor
-      @action = action
-      @arguments = arguments
-      @canceled = false
-    end
-    def cancel
-      @canceled = true
-    end
-    def canceled?
-      @canceled
-    end
-  end
-end

data/lib/gamefic/director/parser.rb

@@ -1,137 +0,0 @@
-require 'gamefic/director/order'
-
-module Gamefic
-  module Director
-  
-    module Parser
-      def self.from_tokens(actor, tokens)
-        options = []
-        command = tokens.shift
-        actions = actor.playbook.actions_for(command.to_sym)
-        actions.each { |action|
-          if action.queries.length == tokens.length
-            valid = true
-            index = 0
-            action.queries.each { |query|
-              if query.validate(actor, tokens[index]) == false
-                valid = false
-                break
-              end
-              index += 1
-            }
-            if valid
-              arguments = []
-              tokens.each { |token|
-                  arguments.push [token]
-              }
-              options.push Order.new(actor, action, arguments)
-            end
-          end
-        }
-        if options.length == 0
-          tokens.unshift command
-        end
-        # HACK: This sort is necessary for a problem on Windows.
-        options.sort{ |a,b|
-          if a.action.specificity == b.action.specificity
-            # Newer action takes precedence
-            b.action.order_key <=> a.action.order_key
-          else
-            # Higher specificity takes precedence
-            b.action.specificity <=> a.action.specificity
-          end
-        }
-      end
-      def self.from_string(actor, command)
-        options = []
-        if command.to_s == ''
-          return options
-        end
-        matches = Syntax.tokenize(command, actor.playbook.syntaxes)
-        matches.each { |match|
-          actions = actor.playbook.actions_for(match.verb)
-          actions.each { |action|
-            options.concat bind_contexts_in_result(actor, match.arguments, action)
-          }
-        }
-        # HACK: This sort is necessary for a problem on Windows.
-        options.sort{ |a,b|
-          if a.action.specificity == b.action.specificity
-            # Newer action takes precedence
-            b.action.order_key <=> a.action.order_key
-          else
-            # Higher specificity takes precedence
-            b.action.specificity <=> a.action.specificity
-          end
-        }
-      end
-      class << self
-        private
-        def bind_contexts_in_result(actor, handler, action)
-          queries = action.queries.clone
-          objects = execute_query(actor, handler.clone, queries, action)
-          num_nil = 0
-          #while objects.length == 0 and queries.last.optional?
-          #  num_nil +=1
-          #  queries.pop
-          #  objects = execute_query(actor, handler.clone, queries, action, num_nil)
-          #end
-          return objects
-        end
-        def execute_query(actor, arguments, queries, action, num_nil = 0)
-          # If the action verb is nil, treat the first argument as a query
-          #arguments.shift unless action.verb.nil?
-          prepared = []
-          objects = []
-          valid = true
-          last_remainder = nil
-          queries.clone.each { |context|
-            arg = arguments.shift.to_s
-            if last_remainder.to_s > ''
-              arg = (last_remainder + " " + arg).strip
-            end
-            if arg.nil? or arg == ''
-              valid = false
-              next
-            end
-            if context == String
-              prepared.push [arg]
-            elsif context.kind_of?(Query::Base)
-              result = context.execute(actor, arg)
-              if result.objects.length == 0
-                valid = false
-                next
-              else
-                prepared.push result.objects
-                last_remainder = result.remainder
-              end
-            else
-              raise TypeError.new("Action parameters must inherit from Query::Base")
-            end
-          }
-          if valid == true
-            if last_remainder.nil? or last_remainder.empty?
-              prepared.each { |p|
-                p.uniq!
-              }
-              num_nil.times do
-                prepared.push [nil]
-              end
-              objects.push Order.new(actor, action, prepared)
-            else
-              if !action.queries.last.allow_many? or action.queries.last.allow_ambiguous?
-                misunderstood = Action.new nil, Query::Text.new do |actor, text|
-                  actor.tell "I understand the first part of your command but not \"#{text}.\""
-                end
-                misunderstood.meta = true
-                objects.push Order.new(actor, misunderstood, [[last_remainder]])
-              end
-            end
-          end
-          objects
-        end
-      end
-    end
-
-  end
-end

data/lib/gamefic/keywords.rb

@@ -1,67 +0,0 @@
-# Arrays of keywords that can be compared for matches.
-
-module Gamefic
-
-  class Keywords < Array
-    def initialize(statement = '')
-      if statement.kind_of?(Keywords)
-        self.concat statement
-      else
-        if statement.kind_of?(Array)
-          statement = statement.join(' ')
-        end
-        self.concat statement.to_s.gsub(/[^a-z0-9]/i, ' ').strip.downcase.split(' ')
-      end
-      self
-    end
-
-    # Count the number of matching words in another Keywords array.
-    # The total includes partial matches; for example, "gre" is a 0.6 match
-    # for "green".
-    #
-    # @return [Float] The total number of matches
-    def found_in(other, fuzzy = false)
-      matches = 0.0
-      self.each { |my_word|
-        if other.include?(my_word)
-          matches = matches + 1.0
-        else
-          other.each { |other_word|
-            if my_word.length < other_word.length
-              if other_word[0, my_word.length] == my_word and my_word.length > 2
-                matches = matches + (my_word.length.to_f / other_word.length.to_f)
-              end
-            elsif fuzzy
-              fuzzy_word = fuzzify my_word
-              if other_word[0, fuzzy_word.length] == fuzzy_word and fuzzy_word.length > 2
-                matches = matches + (fuzzy_word.length.to_f / other_word.length.to_f)
-              elsif fuzzy_word[0, other_word.length] == other_word and other_word.length > 2
-                matches = matches + (fuzzy_word.length.to_f / other_word.length.to_f)
-              end
-            end
-          }
-        end
-      }
-      matches
-    end
-
-    def to_s
-      self.join(' ')
-    end
-
-    private
-    
-    def fuzzify word
-      if word.end_with?('ies')
-        word[0..-4]
-      elsif word.end_with?('ae')
-        word[0..-3]
-      elsif word.end_with?('s') or word.end_with?('i')
-        word[0..-2]
-      else
-        word
-      end
-    end
-  end
-
-end