gamefic 1.3.2 → 1.4.0

data/lib/gamefic/tester.rb

@@ -10,7 +10,7 @@ module Gamefic
     def run_test name, actor
       queue = []
       actor.plot.stage actor, queue, &test_procs[name]
-      actor[:test_queue] = queue
+      actor.queue.push *queue
       actor[:test_queue_length] = queue.length
       actor[:test_queue_scene] = actor.scene
     end

data/lib/gamefic/tty.rb

@@ -0,0 +1,8 @@
+module Gamefic
+  module Engine
+    autoload :Tty, 'gamefic/engine/tty'
+  end
+  module User
+    autoload :Tty, 'gamefic/user/tty'
+  end
+end

data/lib/gamefic/user.rb

@@ -0,0 +1,8 @@
+module Gamefic
+
+  module User
+    autoload :Base, 'gamefic/user/base'
+    autoload :Buffer, 'gamefic/user/buffer'
+  end
+
+end

data/lib/gamefic/user/base.rb

@@ -0,0 +1,21 @@
+module Gamefic
+
+  # The base user provides methods for handling messages received from plots.
+  #
+  class User::Base
+    def send message
+      buffer.send message
+    end
+
+    def flush
+      buffer.flush
+    end
+
+    private
+
+    def buffer
+      @buffer ||= User::Buffer.new
+    end
+  end
+
+end

data/lib/gamefic/user/buffer.rb

@@ -0,0 +1,25 @@
+module Gamefic
+
+  # A simple buffer class for collecting and returning data received from
+  # plots.
+  class User::Buffer
+    def initialize
+      @data = ''
+    end
+
+    # Append a message to the buffer.
+    def send message
+      @data += message
+    end
+
+    # Get the current data and clear the buffer.
+    #
+    # @return [String]
+    def flush
+      tmp = @data
+      @data = ''
+      tmp
+    end
+  end
+
+end

data/lib/gamefic/user/tty.rb

@@ -0,0 +1,55 @@
+require 'gamefic/engine'
+require 'json'
+require 'gamefic/html_to_ansi'
+
+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
+      if json.nil?
+        @character.tell "Nothing to save."
+      end
+      if filename.nil?
+        stream.select "Enter the filename to save:"
+        filename = stream.queue.pop
+      end
+      if filename != ''
+        File.open(filename, 'w') do |f|
+          f.write json
+        end
+        @character.tell "Game saved."
+      end
+    end
+
+    def restore filename
+      if filename.nil?
+        stream.select "Enter the filename to restore:"
+        filename = stream.queue.pop
+      end
+      if filename != ''
+        if File.exists?(filename)
+          data = JSON.parse File.read(filename), symbolize_names: true
+          if (data[:metadata] != @character.plot.metadata)
+            @character.tell "The save file is not compatible with this version of the game."
+          else
+            return data
+          end
+        else
+          @character.tell "File \"#{filename}\" not found."
+        end
+      end
+      nil
+    end
+
+    def flush
+      html_to_ansi(super)
+    end
+  end
+
+end

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -146,7 +146,7 @@ files:
 - lib/gamefic/director/order.rb
 - lib/gamefic/director/parser.rb
 - lib/gamefic/engine.rb
-- lib/gamefic/engine/cgi.rb
+- lib/gamefic/engine/base.rb
 - lib/gamefic/engine/tty.rb
 - lib/gamefic/entity.rb
 - lib/gamefic/grammar.rb
@@ -160,6 +160,7 @@ files:
 - 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
@@ -190,11 +191,14 @@ files:
 - lib/gamefic/scene/conclusion.rb
 - lib/gamefic/scene/custom.rb
 - lib/gamefic/scene/multiple_choice.rb
-- lib/gamefic/scene/multiple_choice/input.rb
-- lib/gamefic/scene/passive.rb
+- lib/gamefic/scene/multiple_scene.rb
 - lib/gamefic/scene/pause.rb
-- lib/gamefic/scene/question.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
@@ -209,6 +213,11 @@ files:
 - lib/gamefic/subplot.rb
 - lib/gamefic/syntax.rb
 - lib/gamefic/tester.rb
+- lib/gamefic/tty.rb
+- lib/gamefic/user.rb
+- lib/gamefic/user/base.rb
+- lib/gamefic/user/buffer.rb
+- lib/gamefic/user/tty.rb
 - lib/gamefic/version.rb
 homepage: http://gamefic.com
 licenses:

data/lib/gamefic/engine/cgi.rb

@@ -1,221 +0,0 @@
-require 'rubygems'
-require 'json'
-
-module Gamefic
-
-  class Entity
-    attr_reader :cgi_key
-    @@cgi_key_index = 0
-    alias_method :orig_post_initialize, :post_initialize
-    def post_initialize
-      orig_post_initialize
-      @cgi_key = "entity_#{@@cgi_key_index}"
-      @@cgi_key_index += 1
-    end
-  end
-
-  module Cgi
-
-    class Key
-      def initialize(key_value)
-        @value = key_value
-      end
-      def value
-        @value
-      end
-    end
-
-    class Engine < Gamefic::Engine
-      attr_reader :user
-      def initialize(plot, args = {})
-        super(plot)
-        @session_file = args[:session_file] || 'save.dat'
-        @message_format = args[:message_format] || :html
-        @response_format = args[:response_format] || :json
-        @new_game = args[:new_game] || false
-        @entity_keys = Hash.new
-        @introducing = true
-      end
-      def post_initialize
-        @user = Cgi::User.new @plot
-      end
-      def begin_session
-        # Initialize keys for all entities
-        @plot.entities.each { |e|
-          @entity_keys[e.cgi_key] = e
-        }
-        @entity_keys['yourself'] = @user.character
-        if !@new_game and @session_file != nil
-          if File.exist?(@session_file)
-            load @session_file
-            @introducing = false
-          end
-        end
-      end
-      def run
-        if @introducing == true
-          @plot.introduce @user.character
-        else
-          @plot.instance_variable_get(:@players).push @user.character
-          tick
-        end
-        response = Hash.new
-        response[:output] = @user.stream.flush
-        response[:prompt] = @user.character.state.prompt
-        response[:state] = @user.character.state.class.to_s.split('::').last
-        return JSON.generate(response)
-      end
-      def end_session
-        save @session_file
-      end
-      private
-      def load(filename)
-        x = File.open(filename, "r")
-        ser = x.read
-        x.close
-        data = Marshal.restore(ser)
-        data.each { |k, h|
-          if k == 'yourself'
-            entity = @entity_keys['yourself']
-          else
-            entity = @entity_keys[k]
-          end
-          h.each { |s, v|
-            if s == :session
-              entity.instance_variable_set(:@session, v)
-            elsif s == :state
-              entity.state = v
-            elsif s == :options
-              v.each { |opt|
-                entity.is opt
-              }
-            else
-              writer = "#{s.to_s[1..-1]}="
-              writer.untaint
-              if entity.respond_to?(writer)
-                if v.kind_of?(Key)
-                  entity.send(writer, @entity_keys[v.value])
-                elsif v.kind_of?(CharacterState::Base)
-                  v.instance_variable_set(:@character, entity)
-                  entity.instance_variable_set(s, v)
-                elsif v.kind_of?(Array)
-                  entity.send(writer, decode_array(v))
-                else
-                  entity.send(writer, v)
-                end
-              end
-            end
-          }
-        }
-        @restored = true
-      end
-      def save(filename)
-        data = Hash.new
-        @plot.entities.each { |e|
-          data[e.cgi_key] = entity_hash(e)
-        }
-        f = File.new(filename, "w")
-        f.write Marshal.dump data
-        f.close
-      end
-      def entity_hash(e)
-        hash = Hash.new
-        e.instance_variables.each { |v|
-          next if v == :@state or v == :@option_array or v == :@update_procs
-          writer = "#{v.to_s[1..-1]}="
-          if e.respond_to?(writer)
-            value = e.instance_variable_get(v)
-            if value.kind_of?(String) or value.kind_of?(Numeric) or value.kind_of?(TrueClass) or value.kind_of?(FalseClass) or value.kind_of?(Entity) or value.kind_of?(Character) or value == nil or value.kind_of?(Array)
-              if value.kind_of?(Entity)
-                if value == @user.character
-                  hash[v] = Key.new('yourself')
-                else
-                  hash[v] = Key.new(value.cgi_key)
-                end
-              elsif value.kind_of?(CharacterState::Base)
-                value.instance_variable_set(:@character, nil)
-                hash[v] = value
-              elsif value.kind_of?(Array)
-                hash[v] = encode_array(value)
-              else
-                hash[v] = value
-              end
-            end
-          end
-        }
-        if e.respond_to?("state")
-          hash[:state] = e.state_name
-        end
-        if e.respond_to?("option_array")
-          hash[:options] = e.option_array
-        end
-        hash[:session] = Hash.new
-        e.session.each { |k, v|
-          if v.kind_of?(Entity)
-            hash[:session][k] = Key.new(v.cgi_key)
-          elsif v.kind_of?(Array)
-            hash[:session][k] = encode_array(v)
-          else
-            hash[:session][k] = v
-          end
-        }
-        hash
-      end
-      def encode_array(array)
-        result = Array.new
-        array.each { |item|
-          if item.kind_of?(Entity)
-            result.push Key.new(item.cgi_key)
-          else
-            result.push item
-          end
-        }
-        result
-      end
-      def decode_array(array)
-        result = Array.new
-        array.each { |item|
-          if item.kind_of?(Key)
-            result.push @entity_keys[item.value]
-          else
-            result.push item
-          end
-        }
-        result    
-      end
-    end
-    
-    class User < Gamefic::User
-      def post_initialize
-        @stream = Cgi::UserStream.new
-        @state = UserState.new self
-        #@character = @plot.make Character, :name => 'pWlayer'
-      end
-    end
-    
-    class UserStream < Gamefic::UserStream
-      def initialize
-        super
-        @output = ''
-      end
-      def flush
-        buffer = "#{@output}"
-        @output.clear
-        buffer
-      end
-      def send(data)
-        #if data.start_with?(Ansi::NEL)
-        #  data = "<p>#{data[Ansi::NEL.length..-1].rstrip}</p>"
-        #end
-        @output = "#{@output}#{data}"
-      end
-      def select(prompt)
-        # TODO: non-blocking read
-        line = STDIN.gets
-        @queue.push line
-      end
-    end
-
-  end
-
-end

data/lib/gamefic/scene/multiple_choice/input.rb

@@ -1,11 +0,0 @@
-module Gamefic
-  class Gamefic::Scene::MultipleChoice::Input
-    attr_reader :raw, :number, :index, :choice
-    def initialize raw, index, choice
-      @raw = raw
-      @index = index
-      @number = index + 1
-      @choice = choice
-    end
-  end
-end

data/lib/gamefic/scene/passive.rb

@@ -1,17 +0,0 @@
-module Gamefic
-
-  # Passive Scenes immediately cue another scene after they're finished. If no
-  # scene has been cued or prepared, it defaults to the :active scene.
-  #
-  class Scene::Passive < Scene::Custom
-    def initialize &block
-      @start = block
-    end
-    def start actor
-      this_scene = actor.scene
-      super
-      actor.cue :active if (actor.scene == this_scene and actor.next_scene.nil?)     
-    end
-  end
-    
-end