gamefic-standard 2.4.0 → 3.0.0

data/lib/gamefic-standard/queries.rb

@@ -1,25 +1,12 @@
-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 do |c|
-      result.push c
-      result.concat subquery_accessible(c)
-    end
-    result
+class Gamefic::Scope::Room < Gamefic::Scope::Base
+  def matches
+    [context.room].compact
   end
 end
 
-class Gamefic::Query::Room < Gamefic::Query::Base
-  def context_from(subject)
-    subject.room ? [subject.room] : []
+# @todo Monkey patch
+module Gamefic::Scriptable::Queries
+  def room *args
+    Gamefic::Query::Scoped.new Gamefic::Scope::Room, *([Room] + args)
   end
 end
-
-Gamefic.script do
-  set_default_query Gamefic::Query::Available
-end

data/lib/gamefic-standard/version.rb

@@ -2,6 +2,6 @@
 
 module Gamefic
   module Standard
-    VERSION = '2.4.0'
+    VERSION = '3.0.0'
   end
 end

data/lib/gamefic-standard.rb

@@ -1,10 +1,28 @@
+# frozen_string_literal: true
+
 require 'gamefic'
 
-require 'gamefic-standard/version'
-require 'gamefic-standard/grammar'
-require 'gamefic-standard/articles'
-require 'gamefic-standard/queries'
-require 'gamefic-standard/modules'
-require 'gamefic-standard/direction'
-require 'gamefic-standard/entities'
-require 'gamefic-standard/actions'
+module Gamefic
+  # The Gamefic standard library provides a base collection of entities and
+  # rules for interactive fiction.
+  #
+  module Standard
+    extend Gamefic::Scriptable
+
+    require 'gamefic-standard/version'
+    require 'gamefic-standard/grammar'
+    require 'gamefic-standard/articles'
+    require 'gamefic-standard/queries'
+    require 'gamefic-standard/modules'
+    require 'gamefic-standard/direction'
+    require 'gamefic-standard/entities'
+    require 'gamefic-standard/actions'
+    require 'gamefic-standard/introduction'
+
+    require 'gamefic-standard/give'
+
+    def connect(origin, destination, direction = nil, type: Portal, two_way: true)
+      origin.connect destination, direction: direction, type: type, two_way: two_way
+    end
+  end
+end

data/spec-opal/spec_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'gamefic-standard'
+
+class TestPlot < Gamefic::Plot
+  include Gamefic::Standard
+end
+
+RSpec.configure do |config|
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.after :each do
+    TestPlot.blocks.clear
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-standard
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,7 @@ files:
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
+- ".rspec-opal"
 - ".travis.yml"
 - ".vscode/launch.json"
 - CHANGELOG.md
@@ -103,19 +118,24 @@ files:
 - gamefic-standard.gemspec
 - lib/gamefic-standard.rb
 - lib/gamefic-standard/actions.rb
+- lib/gamefic-standard/actions/attack.rb
 - lib/gamefic-standard/actions/close.rb
 - lib/gamefic-standard/actions/drop.rb
 - lib/gamefic-standard/actions/enter.rb
 - lib/gamefic-standard/actions/go.rb
+- lib/gamefic-standard/actions/help.rb
 - lib/gamefic-standard/actions/insert.rb
 - lib/gamefic-standard/actions/inventory.rb
 - lib/gamefic-standard/actions/leave.rb
 - lib/gamefic-standard/actions/lock.rb
 - lib/gamefic-standard/actions/look.rb
+- lib/gamefic-standard/actions/move.rb
 - lib/gamefic-standard/actions/nil.rb
 - lib/gamefic-standard/actions/open.rb
 - lib/gamefic-standard/actions/place.rb
 - lib/gamefic-standard/actions/quit.rb
+- lib/gamefic-standard/actions/repeat.rb
+- lib/gamefic-standard/actions/save-restore-undo.rb
 - lib/gamefic-standard/actions/search.rb
 - lib/gamefic-standard/actions/take.rb
 - lib/gamefic-standard/actions/talk.rb
@@ -140,16 +160,16 @@ files:
 - lib/gamefic-standard/grammar.rb
 - lib/gamefic-standard/grammar/attributes.rb
 - lib/gamefic-standard/grammar/pronoun.rb
+- lib/gamefic-standard/introduction.rb
 - lib/gamefic-standard/modules.rb
 - lib/gamefic-standard/modules/enterable.rb
 - lib/gamefic-standard/modules/lockable.rb
 - lib/gamefic-standard/modules/openable.rb
 - lib/gamefic-standard/modules/standardized.rb
-- lib/gamefic-standard/modules/use.rb
 - lib/gamefic-standard/pathfinder.rb
 - lib/gamefic-standard/queries.rb
-- lib/gamefic-standard/test.rb
 - lib/gamefic-standard/version.rb
+- spec-opal/spec_helper.rb
 homepage: http://gamefic.com
 licenses:
 - MIT
@@ -162,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/gamefic-standard/modules/use.rb

@@ -1,45 +0,0 @@
-module 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.available *args
-    Gamefic::Query::Available.new *args
-  end
-
-  def self.reachable *args
-    available *args
-  end
-
-  def self.visible *args
-    available *args
-  end
-
-  def self.room *args
-    Gamefic::Query::Room.new *args
-  end
-
-  def self.itself *args
-    Gamefic::Query::Itself.new *args
-  end
-
-  def self.from objects, *args
-    Gamefic::Query::External.new objects, *args
-  end
-end

data/lib/gamefic-standard/test.rb

@@ -1,34 +0,0 @@
-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 = []
-    test_procs[name].call(actor, queue)
-    actor.queue.concat queue
-  end
-end
-
-class Gamefic::Plot
-  include Tester
-end
-
-class Gamefic::Subplot
-  include Tester
-end
-
-Gamefic.script do
-  meta :test, Gamefic::Query::Text.new do |actor, name|
-    sym = name.to_sym
-    if test_procs[sym].nil?
-      actor.tell "There's no test named '#{name}' in this game."
-    else
-      run_test sym, actor
-    end
-  end
-end