gamefic-sdk 1.5.0 → 1.6.0

data/scripts/standard/modules/enterable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Enterable
+module Enterable
   attr_writer :enterable, :leave_verb, :enter_verb, :inside_verb
   def enterable?
     @enterable ||= false

data/scripts/standard/modules/explicit_exits.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::ExplicitExits
+module ExplicitExits
   attr_writer :explicit_exits
   def explicit_exits?
     @explicit_exits ||= ExplicitExits.default

data/scripts/standard/modules/itemizable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Itemizable
+module Itemizable
   attr_writer :itemized
   def itemized?
     if @itemized.nil?

data/scripts/standard/modules/lockable.plot.rb

@@ -1,6 +1,6 @@
 script 'standard/modules/openable'
 
-module Gamefic::Lockable
+module Lockable
   include Openable
   attr_reader :lock_key
   def locked=(bool)

data/scripts/standard/modules/openable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Openable
+module Openable
   attr_writer :openable
   def open= bool
     @open = bool
@@ -9,4 +9,7 @@ module Gamefic::Openable
   def closed?
     !open?
   end
+  def accessible?
+    open?
+  end
 end

data/scripts/standard/modules/parent-room.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::ParentRoom
+module ParentRoom
   def room
     p = parent
     while !p.kind_of?(Room) and !p.nil?

data/scripts/standard/modules/portable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Portable
+module Portable
   attr_writer :portable
   attr_writer :sticky
   attr_accessor :sticky_message

data/scripts/standard/modules/transparent.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Transparent
+module Transparent
   attr_writer :transparent
   def transparent?
     @transparent ||= false

data/scripts/standard/plural/actions/place.plot.rb

@@ -17,12 +17,12 @@ respond :place, Use.any_expression, Use.ambiguous_children, Use.reachable(Suppor
   actor.perform :place, children, supporter
 end
 
-respond :place, Use.text("all", "everything"), Use.reachable(Supporter) do |actor, _, supporter|
+respond :place, Use.text(/(all|everything)/), Use.reachable(Supporter) do |actor, _, supporter|
   children = Use.children.context_from(actor).that_are_not(:attached?)
   actor.perform :place, children, supporter
 end
 
-respond :place, Use.text("all", "everything"), Use.text("except", "but"), Use.ambiguous_children, Use.reachable(Supporter) do |actor, _, _, exceptions, supporter|
+respond :place, Use.text(/(all|everything)/), Use.text(/(except|but)/), Use.ambiguous_children, Use.reachable(Supporter) do |actor, _, _, exceptions, supporter|
   children = Use.children.context_from(actor).that_are_not(:attached?)
   actor.perform :place, children - exceptions, supporter
 end

data/scripts/standard/queries.plot.rb

@@ -1,4 +1,21 @@
-script 'standard/queries/reachable'
-script 'standard/queries/room'
-script 'standard/queries/visible'
-script 'standard/queries/from_expression'
+class Gamefic::Query::Available < Gamefic::Query::Base
+  def context_from(subject)
+    result = []
+    top = subject.room || subject.parent
+    unless top.nil?
+      result.concat subquery_accessible(top)
+    end
+    result.delete subject
+    subject.children.each { |c|
+      result.push c
+      result.concat subquery_accessible(c)
+    }
+    result
+  end
+end
+
+class Gamefic::Query::Room < Gamefic::Query::Base
+  def context_from(subject)
+    subject.room ? [subject.room] : []
+  end
+end

data/scripts/standard/use.plot.rb

@@ -2,28 +2,46 @@ module Gamefic::Use
   def self.children *args
     Gamefic::Query::Children.new *args
   end
+
   def self.family *args
     Gamefic::Query::Family.new *args
   end
+
   def self.parent *args
     Gamefic::Query::Parent.new *args
   end
+
   def self.siblings *args
     Gamefic::Query::Siblings.new *args
   end
+
   def self.text *args
     Gamefic::Query::Text.new *args
   end
-  def self.expression *args
-    Gamefic::Query::Expression.new *args
+
+  # @todo This query is a candidate for deprecation. It's probably not worth
+  # the trouble to maintain a separate query just for transparent containers.
+  #
+  def self.visible *args
+    Gamefic::Query::Family.new *args
+  end
+
+  # @todo This query is a candidate for deprecation. For now it's an alias for
+  # Use.available.
+  #
+  def self.reachable *args
+    Gamefic::Query::Available.new *args
   end
-  def self.many_children *args
-    Gamefic::Query::ManyChildren.new *args
+
+  def self.available *args
+    Gamefic::Query::Available.new *args
   end
-  def self.ambiguous_children *args
-    Gamefic::Query::AmbiguousChildren.new *args
+
+  def self.room *args
+    Gamefic::Query::Room.new *args
   end
-  def self.plural_children *args
-    Gamefic::Query::PluralChildren.new *args
+
+  def self.itself *args
+    Gamefic::Query::Room.new *args
   end
 end

data/scripts/suggestible.plot.rb

@@ -3,20 +3,19 @@ class Gamefic::Suggestions
     @current ||= []
   end
 
-  def future
-    @future ||= []
+  def previous
+    @previous ||= []
   end
 
   def update
+    previous.clear
+    previous.concat current
     current.clear
-    current.concat future
-    puts current.join(',')
-    future.clear
   end
 
   def clear
+    previous.clear
     current.clear
-    future.clear
   end
 end
 
@@ -26,28 +25,29 @@ module Gamefic::Suggestible
   end
 
   def suggest command
-    suggestions.future.push command unless suggestions.future.include? command
+    suggestions.current.push command unless suggestions.current.include? command
+  end
+
+  def state
+    super.merge(suggestions: suggestions.current.map{|s| s.cap_first})
   end
 end
 
 class Gamefic::Character
   include Suggestible
-  serialize :suggestions
 end
 
-on_ready do
-  players.each { |player|
-    if player.scene == :active or player.next_scene == :active
-      player.suggestions.update
-    else
-      player.suggestions.clear
-    end
-  }
+before_player_update do |player|
+  if player.scene == default_scene or player.next_scene == default_scene
+    player.suggestions.update
+  else
+    player.suggestions.clear
+  end
 end
 
 respond :suggest do |actor|
   actor.stream '<ul>'
-  actor.suggestions.current.sort.each { |s|
+  actor.suggestions.previous.sort.each { |s|
     actor.stream "<li>#{s}</li>"
   }
   actor.stream '</ul>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-sdk
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -44,6 +44,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -65,19 +93,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.4'
 description: Development tools for Gamefic
 email: fsnyder@gamefic.com
 executables:
@@ -91,6 +139,7 @@ files:
 - html/core/jquery.modal.css
 - html/core/jquery.modal.js
 - html/core/js.cookie.js
+- html/sinatra/engine.js
 - html/skins/hypertext/compass.png
 - html/skins/hypertext/index.html
 - html/skins/hypertext/style.css
@@ -115,10 +164,13 @@ files:
 - lib/gamefic-sdk/platform.rb
 - lib/gamefic-sdk/platform/base.rb
 - lib/gamefic-sdk/platform/gfic.rb
+- lib/gamefic-sdk/platform/sinatra.rb
 - lib/gamefic-sdk/platform/web.rb
 - lib/gamefic-sdk/platform/web/app_config.rb
-- lib/gamefic-sdk/platform/web/gamefic_opal.rb
+- lib/gamefic-sdk/platform/web/engine.rb
+- lib/gamefic-sdk/platform/web/user.rb
 - lib/gamefic-sdk/plot_config.rb
+- lib/gamefic-sdk/server.rb
 - lib/gamefic-sdk/shell.rb
 - lib/gamefic-sdk/shell/init.rb
 - lib/gamefic-sdk/shell/test.rb
@@ -218,10 +270,6 @@ files:
 - scripts/standard/plural/queries/not_expression.plot.rb
 - scripts/standard/plural/queries/plural_visible.plot.rb
 - scripts/standard/queries.plot.rb
-- scripts/standard/queries/from_expression.plot.rb
-- scripts/standard/queries/reachable.plot.rb
-- scripts/standard/queries/room.plot.rb
-- scripts/standard/queries/visible.plot.rb
 - scripts/standard/test.plot.rb
 - scripts/standard/use.plot.rb
 - scripts/suggestible.plot.rb

data/lib/gamefic-sdk/platform/web/gamefic_opal.rb

@@ -1,45 +0,0 @@
-# HACK Explicit requires to fix Opal's failure to resolve autoloads
-require 'gamefic/query/expression'
-require 'gamefic/query/matches'
-require 'gamefic/grammar/verb_set'
-require 'gamefic/plot/playbook'
-
-# HACK Opal doesn't recognize classes and modules declared from scripts
-def Object.const_missing sym
-  Gamefic.const_get sym
-end
-
-module GameficOpal
-  def self.static_plot
-    @@static_plot ||= WebPlot.new(Gamefic::Source::Text.new)
-  end
-  def self.static_character
-    if @@static_character.nil?
-      @@static_character = static_plot.make Gamefic::Character, name: 'player', synonyms: 'me you myself yourself self'
-      @@static_character.connect static_user
-    end
-    @@static_character
-  end
-  def self.static_user
-    @@static_user ||= WebUser.new
-  end
-  class WebPlot < Gamefic::Plot
-    def script path
-      # Stub
-    end
-  end
-
-  class WebUser < Gamefic::User::Base
-    def save filename, data
-      data[:metadata] = GameficOpal.static_plot.metadata
-      `Gamefic.save(filename, data);`
-    end
-    def restore filename
-      data = `Gamefic.restore(filename);`
-      return data
-    end
-    def test_queue
-      GameficOpal.static_character[:test_queue] || []
-    end
-  end
-end

data/scripts/standard/queries/from_expression.plot.rb

@@ -1,16 +0,0 @@
-class Gamefic::Query::FromExpression < Gamefic::Query::Expression
-  def initialize
-    super(
-      /^(from|in|of|inside|on)$/
-    )
-  end
-  def signature
-    "#{self.class}"
-  end
-end
-
-module Gamefic::Use
-  def self.from_expression
-    Gamefic::Query::FromExpression.new
-  end
-end

data/scripts/standard/queries/reachable.plot.rb

@@ -1,48 +0,0 @@
-# This query filters for objects that the player might be able to handle or
-# manipulate, including the following:
-#
-#   * Siblings (other entities with the same parent)
-#   * The subject's children
-#   * Entities on reachable supporters
-#   * Entities in reachable open containers
-#   * Entities attached to reachable entities
-#
-# It excludes anything that may be visible but are not reachable:
-#   * Entities inside closed transparent containers
-#   * Entities that share the same room as the subject, but not the same parent.
-
-module Gamefic::Query
-  class Reachable < Family
-    def context_from(subject)
-      array = super
-      if subject.parent.kind_of?(Container) || subject.parent.kind_of?(Supporter)
-        array.push subject.parent
-      end
-      if subject.parent != subject.room
-        array += subject.room.children
-      end
-      array.each { |thing|
-        if thing.kind_of?(Container)
-          if thing.open?
-            array += thing.children.that_are_not(:attached?)
-          end
-        elsif thing.kind_of?(Supporter) or thing.kind_of?(Receptacle) or thing == subject
-          array += thing.children.that_are_not(:attached?)
-        end
-        thing.children.that_are(:attached?).each { |att|
-          array.push att
-          if att.kind_of?(Supporter) or (att.kind_of?(Container) and att.open?)
-            array += att.children
-          end
-        }
-      }
-      array.uniq - [subject]
-    end
-  end
-end
-
-module Gamefic::Use
-  def self.reachable *args
-    Gamefic::Query::Reachable.new *args
-  end  
-end