gamefic 0.2.0 → 0.6.0

data/lib/gamefic/syntax.rb

@@ -1,134 +1,116 @@
+require 'gamefic/command'
+
 module Gamefic
 
-	class Syntax
-		attr_reader :template, :command, :arguments
-		@@defaults = Array.new
-		def initialize(story, *arguments)
-			if arguments.length < 2
-				raise "Syntax.new requires at least two arguments (template and command)"
-			end
-      if arguments.length == 2 and arguments[0].kind_of?(Array) and arguments[1].kind_of?(Array)
-        @template = arguments[0]
-        @command = arguments[1].shift
-        @arguments = arguments[1]
+  class Syntax
+    attr_reader :token_count, :first_word, :verb, :template, :command
+    @@phrase = '([\w\W\s\S]*?)'
+    
+    def initialize plot, template, *command
+      command = command.join(' ')
+      words = template.split_words
+      @token_count = words.length
+      command_words = command.split_words
+      @verb = nil
+      if words[0][0] == ':'
+        @token_count -= 1
+        @first_word = ''
       else
-        @template = []
-        string = arguments.shift
-        string.split_words.each { |word|
-          if word[0,1] == ":"
-            @template.push word[1..-1].to_sym
+        @verb = command_words[0].to_sym if !command_words[0].nil?
+        @first_word = words[0].to_s
+      end
+      @command = command_words.join(' ')
+      @template = words.join(' ')
+      tokens = []
+      variable_tokens = []
+      last_token_is_reg = false
+      words.each { |w|
+        if w.match(/^:[a-z0-9_]+$/i)
+          variable_tokens.push w
+          if last_token_is_reg
+            next
           else
-            @template.push word
+            tokens.push @@phrase
+            last_token_is_reg = true
           end
-        }
-        #@template = arguments.shift
-        @command = arguments.shift
-        @arguments = arguments
-        if story == nil
-          #@@defaults.push self
-          raise "Default syntaxes are deprecated"
         else
-          story.send :add_syntax, self
-          @story = story
+          tokens.push w
+          last_token_is_reg = false
+        end
+      }
+      subs = []
+      index = 0
+      command_words.each { |t|
+        if t[0] == ':'
+          index = variable_tokens.index(t) + 1
+          subs.push "{$#{index}}"
+        else
+          subs.push t
         end
+      }
+      @replace = subs.join(' ')
+      @regexp = Regexp.new("^#{tokens.join(' ')}$", Regexp::IGNORECASE)
+      if !plot.nil?
+        plot.send :add_syntax, self
       end
-		end
-		def self.defaults
-			@@defaults.clone
-		end
-		def self.match(input, context)
-			# Given the input, return all the syntaxes that potentially match it.
-      syntaxes = (context.kind_of?(Plot) ? context.syntaxes : context)
-			matches = Array.new
-			words = input.split_words
-			syntaxes.each { |syntax|
-				input_words = words.clone
-				tokens = Hash.new
-				syntax_words = syntax.template.clone
-				while syntax_words.length > 0
-					if input_words.length == 0
-						# No more input. Break with an imbalance.
-						break
-					end
-					symbol = syntax_words.shift
-					if symbol.kind_of?(Symbol)
-						if syntax_words.length == 0
-							# Last syntax word.
-							tokens[symbol] = input_words.join(' ')
-							input_words.clear
-							break
-						elsif input_words.length == 0
-							# Last input word.
-							break
-						else
-							non_vars = syntax_words.clone.delete_if { |w|
-								w.kind_of?(Symbol)
-							}
-							if non_vars.length == 0
-								# All remaining words in the syntax are variables. Dump everything now.
-								tokens[symbol] = input_words.join(' ')
-								syntax_words.clear
-								input_words.clear
-							else
-								next_syntax_word = syntax_words.shift
-								token = ''
-								if syntax_words.length == 0
-									last_input_word = input_words.pop
-									if last_input_word == next_syntax_word
-										tokens[symbol] = input_words.join(' ')
-										input_words.clear
-									end
-									break
-								end
-								next_input_word = input_words.shift
-								while next_input_word != next_syntax_word and input_words.length > 0
-									token = token + " #{next_input_word}"
-									next_input_word = input_words.shift
-								end
-								if input_words.length == 0 and syntax_words.length > 0
-									break
-								else
-									tokens[symbol] = token.strip
-								end
-							end
-						end
-					else
-						if input_words[0].downcase == symbol.downcase
-							input_words.shift
-						else
-							break
-						end
-					end
-				end
-				if input_words.length == 0 and syntax_words.length == 0
-					arguments = Array.new
-					syntax.arguments.each { |a|
-						if a.kind_of?(Symbol)
-							if tokens[a] != nil and tokens[a] != ''
-								arguments.push(tokens[a])
-							end						
-						else
-							if a != nil and a != ''
-								arguments.push(a)
-							end
-						end
-					}
-					if syntax.arguments.length == arguments.length
-						matches.push CommandHandler.new(syntax.command, arguments)
-					end
-				end
-			}
-			matches.uniq!    # TODO: Is this necessary?
-			return matches
-		end
-	end
-	
-	class CommandHandler
-		attr_reader :command, :arguments
-		def initialize command, arguments
-			@command = command
-			@arguments = arguments
-		end
-	end
+    end
+    
+    # Convert a String into a Command.
+    #
+    # @param text [String]
+    # @return [Command]
+    def tokenize text
+      m = text.match(@regexp)
+      return nil if m.nil?
+      arguments = []
+      @replace.to_s.split_words.each { |r|
+        if r.match(/^\{\$[0-9]+\}$/)
+          arguments.push m[r[2..-2].to_i]
+        else
+          arguments.push r
+        end
+      }
+      Command.new @verb, arguments
+    end
+    
+    # Get a signature that identifies the form of the Syntax.
+    # Signatures are used to compare Syntaxes to each other.
+    #
+    def signature
+      [@regexp, @replace]
+    end
+    
+    def ==(other)
+      signature == other.signature
+    end
+    
+    # Tokenize an Array of Commands from the specified text.
+    #
+    # @param text [String] The text to tokenize.
+    # @param syntaxes [Array<Syntax>] The Syntaxes to use.
+    # @return [Array<Command>] The tokenized commands.
+    def self.tokenize text, syntaxes
+      matches = []
+      syntaxes.each { |syntax|
+        result = syntax.tokenize text
+        matches.push(result) if !result.nil?
+      }
+      # Sort matches having the most populated arguments first
+      matches.sort! { |a, b|
+        ca = 0
+        cb = 0
+        a.arguments.each { |t|
+          break if t.nil?
+          ca += 1
+        }
+        b.arguments.each { |t|
+          break if t.nil?
+          cb += 1
+        }
+        cb <=> ca
+      }
+      matches      
+    end
+  end
 
 end

data/lib/gamefic/tester.rb

@@ -0,0 +1,20 @@
+module Gamefic
+
+  module Tester
+    def test_procs
+      @test_procs ||= Hash.new
+    end
+    def on_test name = :me, &block
+      test_procs[name] = block
+    end
+    def run_test name, actor
+      queue = []
+      actor.plot.stage actor, queue, &test_procs[name]
+      actor[:test_queue] = queue
+      actor[:test_queue_length] = queue.length
+      actor[:test_queue_scene] = actor.scene
+      actor[:testing] = true
+    end
+  end
+
+end

data/lib/gamefic/version.rb

@@ -0,0 +1,3 @@
+module Gamefic
+  VERSION = '0.6.0'
+end

data/lib/gamefic.rb

@@ -1,17 +1,23 @@
-require "gamefic/core_ext/array"
-require "gamefic/core_ext/string"
-require "gamefic/optionset"
-require "gamefic/keywords"
-require "gamefic/entity"
-require "gamefic/thing"
-require "gamefic/character"
+require 'gamefic/core_ext/array'
+require 'gamefic/core_ext/string'
+
+require 'gamefic/grammar'
+require 'gamefic/keywords'
+require 'gamefic/serialized'
+require 'gamefic/entity'
+require 'gamefic/character'
+require "gamefic/scene"
+require "gamefic/scene/active"
+require "gamefic/scene/concluded"
+require "gamefic/scene/paused"
+require "gamefic/scene/multiplechoice"
+require "gamefic/scene/yesorno"
+require "gamefic/query"
 require "gamefic/action"
-require "gamefic/before"
-require "gamefic/meta"
-require "gamefic/requirement"
 require "gamefic/syntax"
-require "gamefic/query"
+require "gamefic/rule"
 require "gamefic/director"
 require "gamefic/plot"
-require "gamefic/story"
 require "gamefic/engine"
+require "gamefic/direction"
+require "gamefic/snapshots"

metadata

@@ -1,16 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
-dependencies: []
-description: An adventure game engine
+date: 2016-04-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: An adventure game and interactive fiction framework
 email: fsnyder@gamefic.com
 executables:
 - gamefic
@@ -18,74 +46,77 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/gamefic.rb
-- lib/gamefic/entity.rb
-- lib/gamefic/character.rb
-- lib/gamefic/requirement.rb
-- lib/gamefic/story.rb
-- lib/gamefic/shell.rb
-- lib/gamefic/optionset.rb
-- lib/gamefic/thing.rb
-- lib/gamefic/base.rb
-- lib/gamefic/query.rb
+- lib/gamefic/grammar.rb
 - lib/gamefic/action.rb
+- lib/gamefic/stage.rb
+- lib/gamefic/core_ext/array.rb
+- lib/gamefic/core_ext/string.rb
+- lib/gamefic/engine/cgi.rb
+- lib/gamefic/engine/tty.rb
+- lib/gamefic/html.rb
+- lib/gamefic/describable.rb
+- lib/gamefic/command.rb
+- lib/gamefic/script/base.rb
+- lib/gamefic/script/file.rb
+- lib/gamefic/script/text.rb
+- lib/gamefic/query/children.rb
+- lib/gamefic/query/family.rb
+- lib/gamefic/query/matches.rb
+- lib/gamefic/query/parent.rb
+- lib/gamefic/query/self.rb
+- lib/gamefic/query/siblings.rb
+- lib/gamefic/query/many_children.rb
+- lib/gamefic/query/ambiguous_children.rb
+- lib/gamefic/query/base.rb
+- lib/gamefic/query/expression.rb
+- lib/gamefic/query/plural_children.rb
+- lib/gamefic/query/text.rb
+- lib/gamefic/rule.rb
+- lib/gamefic/scene.rb
+- lib/gamefic/scene/concluded.rb
+- lib/gamefic/scene/multiplechoice.rb
+- lib/gamefic/scene/paused.rb
+- lib/gamefic/scene/yesorno.rb
+- lib/gamefic/scene/active.rb
+- lib/gamefic/shell.rb
+- lib/gamefic/snapshots.rb
+- lib/gamefic/tester.rb
+- lib/gamefic/version.rb
 - lib/gamefic/node.rb
-- lib/gamefic/director.rb
+- lib/gamefic/syntax.rb
+- lib/gamefic/source.rb
+- lib/gamefic/source/base.rb
+- lib/gamefic/source/file.rb
+- lib/gamefic/source/text.rb
+- lib/gamefic/ansi.rb
+- lib/gamefic/script.rb
+- lib/gamefic/character.rb
+- lib/gamefic/entity.rb
+- lib/gamefic/query.rb
 - lib/gamefic/engine.rb
-- lib/gamefic/plot.rb
+- lib/gamefic/direction.rb
+- lib/gamefic/director/order.rb
+- lib/gamefic/director/delegate.rb
+- lib/gamefic/director/parser.rb
+- lib/gamefic/plot/query_mount.rb
+- lib/gamefic/plot/article_mount.rb
+- lib/gamefic/plot/you_mount.rb
+- lib/gamefic/plot/command_mount.rb
+- lib/gamefic/plot/entity_mount.rb
+- lib/gamefic/plot/scene_mount.rb
+- lib/gamefic/director.rb
+- lib/gamefic/grammar/conjugator.rb
+- lib/gamefic/grammar/person.rb
+- lib/gamefic/grammar/plural.rb
+- lib/gamefic/grammar/tense.rb
+- lib/gamefic/grammar/verb_set.rb
+- lib/gamefic/grammar/verbs.rb
+- lib/gamefic/grammar/gender.rb
+- lib/gamefic/grammar/pronouns.rb
+- lib/gamefic/grammar/word_adapter.rb
+- lib/gamefic/serialized.rb
 - lib/gamefic/keywords.rb
-- lib/gamefic/before.rb
-- lib/gamefic/meta.rb
-- lib/gamefic/syntax.rb
-- lib/gamefic/describable.rb
-- lib/gamefic/import/room_modes.rb
-- lib/gamefic/import/basics/actions/leave.rb
-- lib/gamefic/import/basics/actions/take.rb
-- lib/gamefic/import/basics/actions/drop-in.rb
-- lib/gamefic/import/basics/actions/drop-on.rb
-- lib/gamefic/import/basics/actions/commands.rb
-- lib/gamefic/import/basics/actions/look-under.rb
-- lib/gamefic/import/basics/actions/open.rb
-- lib/gamefic/import/basics/actions/look.rb
-- lib/gamefic/import/basics/actions/quit.rb
-- lib/gamefic/import/basics/actions/go.rb
-- lib/gamefic/import/basics/actions/nil.rb
-- lib/gamefic/import/basics/actions/look-in-at.rb
-- lib/gamefic/import/basics/actions/drop.rb
-- lib/gamefic/import/basics/actions/inventory.rb
-- lib/gamefic/import/basics/actions/close.rb
-- lib/gamefic/import/basics/actions/enter.rb
-- lib/gamefic/import/basics/rules/has-enough-light.rb
-- lib/gamefic/import/basics/queries/room.rb
-- lib/gamefic/import/basics/queries/reachable.rb
-- lib/gamefic/import/basics/queries/visible.rb
-- lib/gamefic/import/basics/entities/entity.rb
-- lib/gamefic/import/basics/entities/supporter.rb
-- lib/gamefic/import/basics/entities/fixture.rb
-- lib/gamefic/import/basics/entities/item.rb
-- lib/gamefic/import/basics/entities/scenery.rb
-- lib/gamefic/import/basics/entities/thing.rb
-- lib/gamefic/import/basics/entities/room.rb
-- lib/gamefic/import/basics/entities/portal.rb
-- lib/gamefic/import/basics/entities/container.rb
-- lib/gamefic/import/standard.rb
-- lib/gamefic/import/basics.old/room_modes.rb
-- lib/gamefic/import/basics.old/actions/look.rb
-- lib/gamefic/import/basics.old/actions/inventory.rb
-- lib/gamefic/import/basics.old/actions/container.rb
-- lib/gamefic/import/basics.old/actions/meta.rb
-- lib/gamefic/import/basics.old/actions/traversal.rb
-- lib/gamefic/import/basics.old/actions.rb
-- lib/gamefic/import/basics.old/entities/supporter.rb
-- lib/gamefic/import/basics.old/entities/fixture.rb
-- lib/gamefic/import/basics.old/entities/item.rb
-- lib/gamefic/import/basics.old/entities/scenery.rb
-- lib/gamefic/import/basics.old/entities/room.rb
-- lib/gamefic/import/basics.old/entities/portal.rb
-- lib/gamefic/import/basics.old/entities/container.rb
-- lib/gamefic/import/basics.old/entities.rb
-- lib/gamefic/import/basics.rb
-- lib/gamefic/core_ext/string.rb
-- lib/gamefic/core_ext/array.rb
+- lib/gamefic/plot.rb
 - bin/gamefic
 homepage: http://gamefic.com
 licenses:
@@ -99,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -107,8 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Gamefic
 test_files: []
+has_rdoc: 

data/lib/gamefic/base.rb

@@ -1,10 +0,0 @@
-module Gamefic
-
-	Dir[File.dirname(__FILE__) + '/entity_ext/*.rb'].each do |file|
-		require file
-	end
-	Dir[File.dirname(__FILE__) + '/action_ext/*.rb'].each do |file|
-		require file
-	end
-
-end

data/lib/gamefic/before.rb

@@ -1,12 +0,0 @@
-# Before Actions are processed before Rules. Their primary use is to determine
-# whether or not a particular Action (or thread of Actions) should be allowed
-# to happen. A Before Action's proc can use the pass and deny methods to
-# override the results of rule assertions.
-
-module Gamefic
-
-  class Before < Action
-
-  end
-
-end

data/lib/gamefic/import/basics/actions/close.rb

@@ -1,16 +0,0 @@
-respond :close, Query::Text.new() do |actor, string|
-  actor.tell "You don't see any \"#{string}\" here."
-end
-
-respond :close, Query::Reachable.new(Entity) do |actor, thing|
-  actor.tell "You can't close #{the thing}."
-end
-
-respond :close, Query::Reachable.new(Container, :openable) do |actor, container|
-  if container.is? :closed
-    actor.tell "It's already closed."
-  else
-    actor.tell "You close #{the container}."
-    container.is :closed
-  end
-end

data/lib/gamefic/import/basics/actions/commands.rb

@@ -1,3 +0,0 @@
-meta :commands do |actor|
-  actor.tell actor.plot.commandwords.sort.join(", ")
-end

data/lib/gamefic/import/basics/actions/drop-in.rb

@@ -1,17 +0,0 @@
-respond :drop_in, Query::Children.new(), Query::Reachable.new() do |actor, thing, target|
-  puts "You can't put #{the thing} inside #{the target}."
-end
-
-respond :drop_in, Query::Children.new(), Query::Reachable.new(Container) do |actor, thing, container|
-  if container.is? :closed
-    actor.tell "#{The container} is closed."
-  else
-    thing.parent = container
-    thing.is :contained
-    actor.tell "You put #{the thing} in #{the container}."
-  end
-end
-
-xlate "drop :item in :container", :drop_in, :item, :container
-xlate "put :item in :container", :drop_in, :item, :container
-xlate "place :item in :container", :drop_in, :item, :container

data/lib/gamefic/import/basics/actions/drop-on.rb

@@ -1,16 +0,0 @@
-respond :drop_on, Query::Children.new(), Query::Reachable.new() do |actor, thing, supporter|
-  actor.tell "You can't put #{the thing} on #{the supporter}."
-end
-
-respond :drop_on, Query::Children.new(), Query::Reachable.new(Supporter) do |actor, thing, supporter|
-  thing.parent = supporter
-  thing.is :supported
-  actor.tell "You put #{the thing} on #{the supporter}."
-end
-
-xlate "put :thing on :supporter", :drop_on, :thing, :supporter
-xlate "put :thing down on :supporter", :drop_on, :thing, :supporter
-xlate "set :thing on :supporter", :drop_on, :thing, :supporter
-xlate "set :thing down on :supporter", :drop_on, :thing, :supporter
-xlate "drop :thing on :supporter", :drop_on, :thing, :supporter
-xlate "place :thing on :supporter", :drop_on, :thing, :supporter

data/lib/gamefic/import/basics/actions/drop.rb

@@ -1,30 +0,0 @@
-respond :drop, Query::Visible.new() do |actor, thing|
-  actor.tell "You're not carrying #{the thing}."
-end
-
-respond :drop, Query::Children.new() do |actor, thing|
-  thing.parent = actor.parent
-  actor.tell "You drop #{the thing}.", true
-end
-
-xlate "put down :thing", :drop, :thing
-xlate "put :thing down", :drop, :thing
-
-#respond :drop, Query::Family.new(Thing), Query::Reachable.new(Thing) do |actor, thing, supporter|
-#  actor.tell "You're not carrying #{thing}."
-#end
-#respond :drop, Query::Text.new(), Query::Text.new() do |actor, thing, supporter|
-#  actor.tell "You don't see anything called '#{thing}.'"
-#end
-#respond :drop, Query::Children.new(Thing), Query::Visible.new(Thing) do |actor, thing, target|
-#  if actor.parent != target.parent
-#    if actor.is?(:supported) or actor.is?(:container)
-#      actor.tell "You can't reach #{the target} from #{the actor.parent}."
-#      next
-#    end
-#  end
-#  passthru
-#end
-#respond :drop, Query::Children.new(Thing), Query::Text.new() do |actor, thing, supporter|
-#  actor.tell "You don't see anything called '#{supporter}.'"
-#end

data/lib/gamefic/import/basics/actions/enter.rb

@@ -1,16 +0,0 @@
-respond :enter, Query::Siblings.new(Supporter, :enterable) do |actor, supporter|
-  actor.parent = supporter
-  actor.tell "You get on #{the supporter}."
-end
-respond :enter, Query::Siblings.new(Container, :enterable) do |actor, container|
-  actor.parent = container
-  actor.tell "You get in #{the container}."
-end
-respond :enter, Query::Siblings.new(Thing) do |actor, thing|
-  actor.tell "#{The thing} can't accommodate you."
-end
-xlate "sit :thing", :enter, :thing
-xlate "sit on :thing", :enter, :thing
-xlate "get on :thing", :enter, :thing
-xlate "get in :thing", :enter, :thing
-xlate "stand on :thing", :enter, :thing