fictive 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c86f83407c9ef024a85de5d16d203852f69f4bc
-  data.tar.gz: a87be8b3e9172621db702000f4ab7e07730a66d6
+  metadata.gz: e10d24622162519c183ce0b64b31c469146b2e37
+  data.tar.gz: f9bc6e85318bf025e2c786aef8d21597b1d0b90d
 SHA512:
-  metadata.gz: 9ed6521c08d33d7ce761c25465c0d189c6297e675fbdfbcad2ddd74193cdd8cce438a325d1e9fc4768209f3aba67453c36e0f92410277a17e736e451601acc81
-  data.tar.gz: 580dd582c9459c25fa7ad05c0bb30e954e4d16efbf96cb805615f9f113e233634e3b5a7c2277d8106ba4450aedc706cc09d1b7383b8d7800a8c044916c96401d
+  metadata.gz: bff9757ff374ea4813c7ba9b268e69d215bc9ffd614ab4685188c24cca62d4fa97a8530bb8c5d80d2c6f90fbd2387e0a4b55ba32349b9fa7a439bccd9e864d06
+  data.tar.gz: 992b80e2e7cb84e1261f96fcc9eb2eec63fb0d4a7f4a517bfba4405e623471d376b8b21d19c02c2e6426e9599b31ddf515bb9aa4d15e63aac0ee572ac9733975

data/fictive.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'mementus', '~> 0.5.2'
+
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

data/lib/fictive/choice.rb

@@ -1,11 +1,11 @@
 module Fictive
   class Choice
-    def initialize(metadata)
-      @metadata = metadata
+    def initialize(edge)
+      @edge = edge
     end
 
     def id
-      @metadata.fetch(:id)
+      @edge.id
     end
   end
 end

data/lib/fictive/passage.rb

@@ -1,18 +1,15 @@
 module Fictive
   class Passage
-    attr_reader :text
-
-    def initialize(metadata, text)
-      @metadata = metadata
-      @text = text
+    def initialize(node)
+      @node = node
     end
 
     def id
-      @metadata.fetch(:id)
+      @node.id
     end
 
     def choices
-      @metadata.fetch(:choices, [])
+      @node.out_e.all.map { |e| Choice.new(e) }
     end
   end
 end

data/lib/fictive/story.rb

@@ -1,32 +1,69 @@
 module Fictive
   class Story
-    def self.demo
+    def self._demo
       self.new([
         Passage.new({id: 'hello', choices: [Choice.new({id: 'goodbye'})]}, 'Hello world'),
         Passage.new({id: 'goodbye'}, 'Goodbye world')
       ])
     end
 
-    def initialize(passages)
-      @passages = passages
-      @passages_index = {}
-      @passages.each_with_index do |passage, id|
-        @passages_index[passage.id] = id
-      end
+    def self.demo
+      self.new(Mementus::Graph.new do
+        create_node do |node|
+          node.id = 'hello'
+          node[:text] = 'Hello world'
+          node.label = :passage
+        end
+
+        create_node do |node|
+          node.id = 'goodbye'
+          node[:text] = 'Goodbye world'
+          node.label = :passage
+        end
+
+        create_edge do |edge|
+          edge.id = 'say_goodbye'
+          edge.from = 'hello'
+          edge.to = 'goodbye'
+          edge.label = :choice
+        end
+      end, 'hello')
+    end
+
+    def initialize(graph, start_id)
+      # @passages = passages
+      # @passages_index = {}
+      # @passages.each_with_index do |passage, id|
+      #   @passages_index[passage.id] = id
+      # end
+      #
+      # @index = 0
+      @graph = graph
+      @current = graph.n(start_id)
+    end
+
+    # Initiate a new story graph traversal from the starting point.
+    def start
+      # TODO
+    end
 
-      @index = 0
+    # Resume a story graph traversal from a bookmarked place in the story.
+    def resume
+      # TODO
     end
 
     def has_next?
-      !@passages.at(@index).nil? && !@passages.at(@index + 1).nil?
+      #!@passages.at(@index).nil? && !@passages.at(@index + 1).nil?
+      @current.out_e.all.count > 0
     end
 
     def next
-      @passages.at(@index)
+      Passage.new(@current)
     end
 
     def choose_path(id)
-      @index = @passages_index[id]
+      @current = @graph.edge(id).to
+      Passage.new(@current)
     end
   end
 end

data/lib/fictive/text/compiler.rb

@@ -30,10 +30,10 @@ module Fictive
         if concat_fragment
           Fictive::Text::Node.new(Fictive::Text::TextNode.new(concat_fragment.gsub(/{/, '')), parse_substitution)
         else
-          concat_before_directive = scanner.scan_until(/~/)
+          concat_before_directive = scanner.scan_until(/\[/)
 
           if concat_before_directive
-            Fictive::Text::Node.new(Fictive::Text::TextNode.new(concat_before_directive.gsub(/~/, '')), parse_directive)
+            Fictive::Text::Node.new(Fictive::Text::TextNode.new(concat_before_directive.gsub(/\[/, '')), parse_directive)
           else
             fragment = scanner.scan(/.+/)
             Fictive::Text::TextNode.new(fragment)
@@ -64,7 +64,7 @@ module Fictive
         expression = parse_expression
         scanner.skip(/:/)
         scanner.skip(/\s/)
-        consequent = scanner.scan_until(/~/).gsub(/~/, '')
+        consequent = scanner.scan_until(/\]/).gsub(/\]/, '')
 
         Fictive::Text::ConditionalNode.new(
           Fictive::Text::ExpressionNode.new(
@@ -78,73 +78,5 @@ module Fictive
         Fictive::Text::TrueNode.new if scanner.scan(/true/)
       end
     end
-
-    class Node
-      def initialize(*nodes)
-        @nodes = nodes
-      end
-
-      def evaluate
-        @nodes.map do |node|
-          result = node.evaluate
-        end.join
-      end
-    end
-
-    class TextNode
-      def initialize(text)
-        @text = text
-      end
-
-      def evaluate
-        @text
-      end
-    end
-
-    class ReferenceNode
-      def initialize(reference, symbol_table)
-        @reference = reference.to_sym
-        @symbol_table = symbol_table
-      end
-
-      def evaluate
-        @symbol_table.fetch(@reference)
-      end
-    end
-
-    class ConditionalNode
-      # TODO: decide on array or explicit parameter convention
-      #       eg: initialize(condition, consequent, alternative)
-      def initialize(condition, consequent)
-        @condition = condition
-        @consequent = consequent
-      end
-
-      def evaluate
-        @consequent.evaluate if @condition.evaluate_boolean
-      end
-    end
-
-    class ExpressionNode
-      def initialize(expression)
-        @expression = expression
-      end
-
-      def evaluate_boolean
-        @expression.evaluate_boolean
-      end
-    end
-
-    class TrueNode
-      def evaluate_boolean
-        true
-      end
-    end
-
-    class FalseNode
-      def evaluate_boolean
-        false
-      end
-    end
   end
 end

data/lib/fictive/text/conditional_node.rb

@@ -0,0 +1,16 @@
+module Fictive
+  module Text
+    class ConditionalNode
+      # TODO: decide on array or explicit parameter convention
+      #       eg: initialize(condition, consequent, alternative)
+      def initialize(condition, consequent)
+        @condition = condition
+        @consequent = consequent
+      end
+
+      def evaluate
+        @consequent.evaluate if @condition.evaluate_boolean
+      end
+    end
+  end
+end

data/lib/fictive/text/expression_node.rb

@@ -0,0 +1,13 @@
+module Fictive
+  module Text
+    class ExpressionNode
+      def initialize(expression)
+        @expression = expression
+      end
+
+      def evaluate_boolean
+        @expression.evaluate_boolean
+      end
+    end
+  end
+end

data/lib/fictive/text/false_node.rb

@@ -0,0 +1,9 @@
+module Fictive
+  module Text
+    class FalseNode
+      def evaluate_boolean
+        false
+      end
+    end
+  end
+end

data/lib/fictive/text/node.rb

@@ -0,0 +1,15 @@
+module Fictive
+  module Text
+    class Node
+      def initialize(*nodes)
+        @nodes = nodes
+      end
+
+      def evaluate
+        @nodes.map do |node|
+          result = node.evaluate
+        end.join
+      end
+    end
+  end
+end

data/lib/fictive/text/reference_node.rb

@@ -0,0 +1,14 @@
+module Fictive
+  module Text
+    class ReferenceNode
+      def initialize(reference, symbol_table)
+        @reference = reference.to_sym
+        @symbol_table = symbol_table
+      end
+
+      def evaluate
+        @symbol_table.fetch(@reference)
+      end
+    end
+  end
+end

data/lib/fictive/text/text_node.rb

@@ -0,0 +1,13 @@
+module Fictive
+  module Text
+    class TextNode
+      def initialize(text)
+        @text = text
+      end
+
+      def evaluate
+        @text
+      end
+    end
+  end
+end

data/lib/fictive/text/true_node.rb

@@ -0,0 +1,9 @@
+module Fictive
+  module Text
+    class TrueNode
+      def evaluate_boolean
+        true
+      end
+    end
+  end
+end

data/lib/fictive/version.rb

@@ -1,3 +1,3 @@
 module Fictive
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

data/lib/fictive.rb

@@ -1,6 +1,15 @@
-require_relative 'fictive/version'
-require_relative 'fictive/story'
-require_relative 'fictive/choice'
-require_relative 'fictive/passage'
-require_relative 'fictive/syntax'
-require_relative 'fictive/text/compiler'
+require 'mementus'
+
+require 'fictive/version'
+require 'fictive/story'
+require 'fictive/choice'
+require 'fictive/passage'
+require 'fictive/syntax'
+require 'fictive/text/compiler'
+require 'fictive/text/node'
+require 'fictive/text/text_node'
+require 'fictive/text/reference_node'
+require 'fictive/text/conditional_node'
+require 'fictive/text/expression_node'
+require 'fictive/text/true_node'
+require 'fictive/text/false_node'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fictive
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mementus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +83,13 @@ files:
 - lib/fictive/story.rb
 - lib/fictive/syntax.rb
 - lib/fictive/text/compiler.rb
+- lib/fictive/text/conditional_node.rb
+- lib/fictive/text/expression_node.rb
+- lib/fictive/text/false_node.rb
+- lib/fictive/text/node.rb
+- lib/fictive/text/reference_node.rb
+- lib/fictive/text/text_node.rb
+- lib/fictive/text/true_node.rb
 - lib/fictive/version.rb
 homepage: https://github.com/maetl/fictive
 licenses:
@@ -90,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An authoring framework for choice fiction
 test_files: []
-has_rdoc: