gamefic 1.5.1 → 1.6.0

data/lib/gamefic/query/children.rb

@@ -1,10 +1,9 @@
-module Gamefic::Query
-  class Children < Base
-    def base_specificity
-      50
-    end
-    def context_from(subject)
-      subject.children
+module Gamefic
+  module Query
+    class Children < Base
+      def context_from(subject)
+        subject.children
+      end
     end
   end
 end

data/lib/gamefic/query/descendants.rb

@@ -0,0 +1,15 @@
+module Gamefic
+  module Query
+    class Descendants < Children
+      def context_from(subject)
+        result = []
+        children = super
+        result.concat children
+        children.each { |c|
+          result.concat subquery_accessible(c)
+        }
+        result
+      end
+    end
+  end
+end

data/lib/gamefic/query/family.rb

@@ -1,10 +1,22 @@
-module Gamefic::Query
-  class Family < Base
-    def base_specificity
-      40
-    end
-    def context_from(subject)
-      subject.children + subject.parent.children #+ [subject.parent]
+module Gamefic
+  module Query
+    class Family < Base
+      def context_from(subject)
+        result = []
+        top = subject.parent
+        unless top.nil?
+          #until top.parent.nil?
+          #  top = top.parent
+          #end
+          result.concat subquery_accessible(top)
+        end
+        result.delete subject
+        subject.children.each { |c|
+          result.push c
+          result.concat subquery_accessible(c)
+        }
+        result
+      end
     end
   end
 end

data/lib/gamefic/query/itself.rb

@@ -0,0 +1,13 @@
+module Gamefic
+  module Query
+    class Itself < Base
+      def context_from(subject)
+        [subject]
+      end
+
+      def include?(subject, object)
+        return false unless accept?(object) and subject == object
+      end
+    end
+  end
+end

data/lib/gamefic/query/matches.rb

@@ -1,11 +1,67 @@
-module Gamefic::Query
-  class Matches
-    attr_reader :objects, :matching_text, :remainder
-    def initialize(objects, matching_text, remainder)
-      @objects = objects
-      @matching_text = matching_text
-      @remainder = remainder
-      @@last_match = self
-    end
-  end
-end
+module Gamefic
+  module Query
+    class Matches
+      attr_accessor :objects, :matching, :remaining
+
+      def initialize objects, matching, remaining
+        @objects = objects
+        @matching = matching
+        @remaining = remaining
+      end
+
+      def self.execute objects, description, continued: false
+        if continued
+          match_with_remainder objects, description
+        else
+          match_without_remainder objects, description
+        end
+      end
+
+      class << self
+        private
+
+        def match_without_remainder objects, description
+          matches = objects.select{ |e| e.match?(description) }
+          if matches.empty?
+            matching = ''
+            remaining = description
+          else
+            matching = description
+            remaining = ''
+          end
+          Matches.new(matches, matching, remaining)
+        end
+
+        def match_with_remainder objects, description
+          matching_objects = objects
+          matching_text = []
+          words = description.split(Matchable::SPLIT_REGEXP)
+          i = 0
+          #cursor = []
+          words.each { |w|
+            cursor = inner_match matching_objects, words, matching_text, i, w
+            break if cursor.empty? or (cursor & matching_objects).empty?
+            matching_objects = (cursor & matching_objects)
+            i += 1
+          }
+          objects = matching_objects
+          matching = matching_text.uniq.join(' ')
+          remaining = words[i..-1].join(' ')
+          m = Matches.new(objects, matching, remaining)
+          m
+        end
+
+        def inner_match matching_objects, words, matching_text, i, w
+          cursor = []
+          matching_objects.each { |o|
+            if o.match?(words[0..i].join(' '), fuzzy: true)
+              cursor.push o
+              matching_text.push w
+            end
+          }
+          cursor
+        end
+      end
+    end
+  end
+end

data/lib/gamefic/query/parent.rb

@@ -1,10 +1,9 @@
-module Gamefic::Query
-  class Parent < Base
-    def base_specificity
-      30
-    end
-    def context_from(subject)
-      [subject.parent]
+module Gamefic
+  module Query
+    class Parent < Base
+      def context_from(subject)
+        subject.parent.nil? ? [] : [subject.parent]
+      end
     end
   end
 end

data/lib/gamefic/query/siblings.rb

@@ -1,10 +1,13 @@
-module Gamefic::Query
-  class Siblings < Base
-    def base_specificity
-      40
-    end
-    def context_from(subject)
-      (subject.parent.children - [subject])
+module Gamefic
+  module Query
+    class Siblings < Base
+      def context_from(subject)
+        result = []
+        unless subject.parent.nil?
+          result.concat(subject.parent.children - [subject])
+        end
+        result
+      end
     end
   end
 end

data/lib/gamefic/query/text.rb

@@ -1,43 +1,47 @@
-module Gamefic::Query
-  class Text < Base
-    def base_specificity
-      10
-    end
-    def validate(subject, description)
-      return false unless description.kind_of?(String)
-      valid = false
-      words = description.split_words
-      words.each { |word|
-        if description.include?(word)
-          valid = true
-          break
-        end
-      }
-      valid
-    end
-    def execute(subject, description)
-      if @arguments.length == 0
-        return Matches.new([description], description, '')
+module Gamefic
+  module Query
+    class Text < Base
+      def initialize *arguments
+        arguments.each { |a|
+          if (a.kind_of?(Symbol) or a.kind_of?(String)) and !a.to_s.end_with?('?')
+            raise ArgumentError.new("Text query arguments can only be boolean method names (:method?) or regular expressions")
+          end
+        }
+        super
       end
-      keywords = Keywords.new(description)
-      args = Keywords.new(@arguments)
-      found = Array.new
-      remainder = keywords.clone
-      while remainder.length > 0
-        if args.include?(remainder.first)
-          found.push remainder.shift
+      def resolve(subject, token, continued: false)
+        parts = token.split(Matchable::SPLIT_REGEXP)
+        cursor = []
+        matches = []
+        i = 0
+        parts.each { |w|
+          cursor.push w
+          matches = cursor if accept?(cursor.join(' '))
+          i += 1
+        }
+        if continued
+          Matches.new([matches.join(' ')], matches.join(' '), parts[i..-1].join(' '))
         else
-          break
+          if matches.length == parts.length
+            Matches.new([matches.join(' ')], matches.join(' '), '')
+          else
+            Matches.new([], '', parts.join(' '))
+          end
         end
       end
-      if found.length > 0
-        return Matches.new(found, found.join(' '), remainder.join(' '))
-      else
-        return Matches.new([], '', description)
+
+      def include?(subject, token)
+        accept?(token)
+      end
+
+      def accept?(entity)
+        return false unless entity.kind_of?(String) and !entity.empty?
+        super
+      end
+
+      def precision
+        0
       end
-    end
-    def test_arguments arguments
-      # No test for text
     end
   end
 end

data/lib/gamefic/scene.rb

@@ -1,4 +1,4 @@
-require 'gamefic/scene_data'
+#require 'gamefic/scene_data'
 
 module Gamefic
 

data/lib/gamefic/scene/active.rb

@@ -5,16 +5,22 @@ module Gamefic
   # a Plot.
   #
   class Scene::Active < Scene::Base
-    attr_reader :plot
-
-    def initialize plot
-      @plot = plot
+    def post_initialize
+      self.type = 'Active'
     end
 
-    def finish actor, input
-      o = actor.perform input.strip
+    def finish
+      super
+      o = nil
+      o = actor.perform input.strip unless input.nil?
       actor.performed o
     end
+
+    class << self
+      def type
+        'Active'
+      end
+    end
   end
   
 end

data/lib/gamefic/scene/base.rb

@@ -4,21 +4,72 @@ module Gamefic
   # should inherit from it.
   #
   class Scene::Base
-    def start actor
+    attr_reader :actor
+    attr_writer :type
+    attr_writer :prompt
+    attr_reader :input
+
+    def initialize actor
+      @actor = actor
+      post_initialize
+    end
+
+    def post_initialize
+    end
+
+    def on_finish &block
+      @finish_block = block
     end
 
-    def finish actor, input
+    def update
+      @input = actor.queue.shift
+      finish
+    end
+
+    def start
+      self.class.initialize_block.call @actor, self unless self.class.initialize_block.nil?
+    end
+
+    def finish
+      @finish_block.call @actor, self unless @finish_block.nil?
+    end
+
+    def flush
+      @state.clear
+    end
+
+    def state
+      {
+        scene: type, prompt: prompt, input: input #, output: actor.messages, busy: !actor.queue.empty?
+      }
+    end
+
+    def self.subclass &block
+      c = Class.new(self) do
+        on_initialize &block
+      end
+      c
     end
     
     # Get the prompt to be displayed to the user when accepting input.
     #
     # @return [String] The text to be displayed.
-    def prompt_for actor
-      '>'
+    def prompt
+      @prompt ||= '>'
     end
 
     def type
-      self.class.to_s.split('::').last
+      @type ||= 'Scene'
+    end
+
+    def self.on_initialize &block
+      @initialize_block = block
+    end
+
+    class << self
+      def initialize_block
+        @initialize_block
+      end
     end
   end
 

data/lib/gamefic/scene/conclusion.rb

@@ -3,6 +3,9 @@ module Gamefic
   # A Conclusion ends the Plot (or the character's participation in it).
   #
   class Scene::Conclusion < Scene::Custom
+    def type
+      @type ||= 'Conclusion'
+    end
   end
   
 end

data/lib/gamefic/scene/custom.rb

@@ -4,89 +4,6 @@ module Gamefic
   # instantiation. It is suitable for direct instantiation or subclassing.
   #
   class Scene::Custom < Scene::Base
-    def initialize
-      yield self if block_given?
-    end
-
-    def data_class
-      SceneData::Base
-    end
-
-    # Define a block to be executed at the start of the scene.
-    # Unlike on_finish, start blocks may be executed more than once per turn,
-    # and more than one scene may be started in a single turn.
-    # It always gets executed in a plot's on_ready event and whenever it gets
-    # cued. (If the character is already in the scene being cued, on_start
-    # does not get repeated.)
-    #
-    # @yieldparam [Character]
-    # @yieldparam [SceneData::Base]
-    def on_start &block
-      @start = block
-    end
-
-    # Define a block to be executed at the end of the scene.
-    # The scene data passed to this block will include the character's input
-    # for this turn.
-    # Unlike on_start, finish only gets executed once per turn, during the
-    # plot's on_update event.
-    #
-    # @yieldparam [Character]
-    # @yieldparam [SceneData::Base]
-    def on_finish &block
-      @finish = block
-    end
-
-    # Start the scene.
-    # This method typically gets called from the plot during the on_ready
-    # event and whenever a character cues a scene.
-    #
-    def start actor
-      data = start_data_for(actor)
-      do_start_block actor, data
-      data
-    end
-
-    # End the scene.
-    # This method typically gets called from the plot during the on_update
-    # event.
-    #
-    def finish actor, input
-      data = finish_data_for(actor, input)
-      do_finish_block actor, data
-    end
-
-    # Get the text to be displayed to the user when receiving input.
-    #
-    # @return [String]
-    def prompt_for actor
-      return character_data[actor].prompt unless character_data[actor].nil?
-      '>'
-    end
-
-    private
-
-    def do_start_block actor, data
-      @start.call actor, data unless @start.nil?
-    end
-
-    def do_finish_block actor, data
-      @finish.call actor, data unless @finish.nil?
-    end
-
-    def character_data
-      @character_data ||= {}
-    end
-
-    def start_data_for actor
-      character_data[actor] ||= data_class.new
-    end
-
-    def finish_data_for actor, input
-      data = character_data[actor]
-      data.input = input.strip
-      data
-    end
   end
   
 end