gamefic-sdk 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20b6887b332594e4cde84b2d7f0d9025a166c0b
-  data.tar.gz: 05c6b161dd96f67108d10eb8feeeae723f118f82
+  metadata.gz: 35c508e4dd9e43547d441742324b0cc6b0ec4a65
+  data.tar.gz: 0f27b939bb4792bfb2089d60fe501d390db3cdad
 SHA512:
-  metadata.gz: c12d01760d7f7867221d9dc2edc6b6a6d03466d1135f12d57e5adc780de09ea851f0b966b1e502163c2f6125ace483dc047d3e165d41bb7d8f20728acca45a58
-  data.tar.gz: 46b23e73019583f9ff5abb4943c6e401fc27b82bd9432386ed93005c9842797f05847193168f3aa57e8037ff4b804591342895af2506fa8b6ab5cf6ccbe82669
+  metadata.gz: 7ad44738b0f41716518caa6e47d17bf48246ff1adf9a8a5db34abc1c11e07b86d575007665ed748080dee9ff33e0e25de8b5b914f6bf97afd6032f1d8a99830b
+  data.tar.gz: 68f1a505049cd573c61c611247f89a85cfae8d50c2abc82dbe39acedd16c41a04103383bf5be371a7920ac059aad321236cd4520a9840f80026e0f4095918c0e

data/html/core/engine.js

@@ -1,74 +1,29 @@
 var Gamefic = (function() {
+	var updateCallbacks = [];
 	var startCallbacks = [];
-	var inputCallbacks = [];
-	var finishCallbacks = [];
-	var responseCallbacks = {};
-	var lastInput = null;
-	var lastPrompt = null;
-	var getResponse = function(withOutput) {
-		var r = {
-			output: (withOutput ? Opal.GameficOpal.$static_user().$flush() : null),
-			//state: Opal.GameficOpal.$static_plot().$scenes().$fetch(Opal.GameficOpal.$static_character().$scene()).$type(),
-			state: Opal.GameficOpal.$static_character().$scene().$type(),
-			prompt: lastPrompt,
-			input: lastInput,
-			testing: (Opal.GameficOpal.$static_character().$queue().$length() > 0)
-		}
-		return r;
-	}
-	var doReady = function(response) {
-		startCallbacks.forEach(function(callback) {
-			callback(response);
-		});
-	}
-	var handle = function(response) {
-		var handler = responseCallbacks[response.state] || responseCallbacks['Active'];
-		handler(response);
-	}
 	return {
 		start: function() {
-			Opal.GameficOpal.$load_scripts();
-			Opal.GameficOpal.$static_plot().$introduce(Opal.GameficOpal.$static_character());
-			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
-			this.update('');
-		},
-		update: function(input) {
-			if (input != null) {
-				Opal.GameficOpal.$static_character().$queue().$push(input);
-			}
-			lastInput = input;
-			var response = getResponse(false);
-			inputCallbacks.forEach(function(callback) {
-				callback(response);
+			startCallbacks.forEach((callback) => {
+				callback();
 			});
-			Opal.GameficOpal.$static_plot().$update();
-			Opal.GameficOpal.$static_plot().$ready();
-			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
-			response = getResponse(true);
-			var updateResponse = response;
-			doReady(response);
-			lastPrompt = Opal.GameficOpal.$static_character().$prompt();
-			response = getResponse(true);
-			response.output = updateResponse.output + response.output;
-			handle(response);
-			finishCallbacks.forEach(function(callback) {
-				callback(response);
+			Opal.gvars.engine.$run();
+		},
+		update: function(response) {
+			console.log('Called the Gamefic update');
+			var state = JSON.parse(response);
+			console.log('Output: ' + state.output);
+			updateCallbacks.forEach(function(callback) {
+				callback(state);
 			});
-			if (Opal.GameficOpal.$static_character().$queue().$length() > 0) {
-				setTimeout("Gamefic.update();", 1);
-			}
+		},
+		receive: function(input) {
+			Opal.gvars.engine.$receive(input);
 		},
 		onStart: function(callback) {
 			startCallbacks.push(callback);
 		},
-		onInput: function(callback) {
-			inputCallbacks.push(callback);
-		},
-		onFinish: function(callback) {
-			finishCallbacks.push(callback);
-		},
-		handleResponse: function(state, callback) {
-			responseCallbacks[state] = callback;
+		onUpdate: function(callback) {
+			updateCallbacks.push(callback);
 		},
 		save: function(filename, data) {
 			var json = Opal.JSON.$generate(data);

data/html/sinatra/engine.js

@@ -0,0 +1,51 @@
+var Gamefic = (function() {
+	var startCallbacks = [];
+	var updateCallbacks = [];
+	return {
+		start: function() {
+			var that = this;
+      $.post('/start', function(response) {
+				startCallbacks.forEach(function(callback) {
+					callback();
+				});
+				that.update(response);
+      });
+		},
+		update: function(response) {
+			updateCallbacks.forEach(function(callback) {
+				callback(response);
+			});
+		},
+		receive: function(input) {
+			var that = this;
+			$.post('/update', {command: input}, function(response) {
+				console.log(JSON.stringify(response));
+				that.update(response);
+			}).fail(function(response) {
+				console.log('An error occurred');
+			});
+		},
+		onUpdate: function(callback) {
+			updateCallbacks.push(callback);
+		},
+		onStart: function(callback) {
+			updateCallbacks.push(callback);
+		},
+		save: function(filename, data) {
+			var json = Opal.JSON.$generate(data);
+			localStorage.setItem(filename, json);
+			Opal.GameficOpal.$static_character().$tell('Game saved.');
+		},
+		restore: function(filename) {
+			var data = Opal.JSON.$parse(localStorage.getItem(filename));
+			var metadata = data.$fetch('metadata');
+			// HACK Converting hashes to strings for JavaScript comparison
+			if (metadata.$to_s() != Opal.GameficOpal.$static_plot().$metadata().$to_s()) {
+				Opal.GameficOpal.$static_character().$tell('The saved data is not compatible with this version of the game.');
+				return Opal.nil;
+			} else {
+				return data;
+			}
+		}
+	}
+})();

data/html/skins/standard/index.html.erb

@@ -9,7 +9,7 @@
 		<div id="gamefic_console">
 			<div id="gamefic_output">
 			</div>
-			<div id="gamefic_controls">
+			<div id="gamefic_controls" class="working">
 				<form action="">
 					<span id="gamefic_prompt"></span>
 					<input type="text" name="command" id="gamefic_command" autocomplete="off" />

data/html/skins/standard/play.js

@@ -1,9 +1,13 @@
 $(function() {
+	console.log('starting play');
 	$('#gamefic_controls form').submit(function(event) {
+		$('#gamefic_controls').addClass('working');
 		event.preventDefault();
-		Gamefic.update($('#gamefic_command').val());
+		Gamefic.receive($('#gamefic_command').val());
+		$('#gamefic_command').val('');
+		$('#gamefic_controls').removeClass('working');
 	});
-	Gamefic.onStart(function(response) {
+	/*Gamefic.onStart(function(response) {
 		var prompt = response.prompt;
 		if (prompt == '>') {
 			prompt = 'What do you want to do?'
@@ -18,7 +22,7 @@ $(function() {
 		$('#gamefic_controls').addClass('working');
 	});
 	Gamefic.onFinish(function(response) {
-		if (!response.testing) {
+		if (!response.busy) {
 			$('#gamefic_controls').removeClass('working');
 		}
 		$('#gamefic_command').val('');
@@ -62,7 +66,19 @@ $(function() {
 		if (!$(this).hasClass('disabled')) {
 			Gamefic.update($(this).attr('data-command'));
 		}
+	});*/
+	Gamefic.onUpdate((state) => {
+		console.log('Doing the update with ' + state['output']);
+		console.log(JSON.stringify(state));
+		$('#gamefic_output').append(state['output']);
+		if (state.scene == 'Conclusion') {
+			$('#gamefic_console').addClass('concluded');
+		}
 	});
+	console.log('Starting Gamefic');
 	Gamefic.start();
-	$('#gamefic_command').focus();
+	//console.log('Started!');
+	$('#gamefic_controls').removeClass('working');
+	//$('#gamefic_command').focus();
+	console.log('finished play');
 });

data/html/skins/standard/style.css

@@ -68,3 +68,6 @@ body {
 	color: #303030;
 	vertical-align: top;
 }
+#gamefic_controls.working {
+	display: none;
+}

data/lib/gamefic-sdk.rb

@@ -5,10 +5,10 @@ require 'gamefic-sdk/debug'
 require 'gamefic-sdk/version'
 
 module Gamefic::Sdk
+  autoload :Server, 'gamefic-sdk/server'
+
   HTML_TEMPLATE_PATH = File.realpath(File.dirname(__FILE__) + "/../html/")
   GLOBAL_SCRIPT_PATH = File.realpath(File.dirname(__FILE__) + "/../scripts/")
-  # @deprecated
-  GLOBAL_IMPORT_PATH = GLOBAL_SCRIPT_PATH
   LIB_PATH = File.dirname(__FILE__)
 end
 

data/lib/gamefic-sdk/debug/plot.rb

@@ -4,7 +4,7 @@ module Gamefic::Sdk::Debug
   class Plot < Gamefic::Plot
     attr_reader :main_dir
     def post_initialize
-      meta :debug, Query::Text.new("unused") do |actor, text|
+      meta :debug, Query::Text.new(/^unused$/) do |actor, text|
         unused = []
         actions.each { |a|
           if !a.standard? and !a.executed?

data/lib/gamefic-sdk/platform.rb

@@ -4,6 +4,7 @@ module Gamefic::Sdk
     autoload :Base, 'gamefic-sdk/platform/base'
     autoload :Gfic, 'gamefic-sdk/platform/gfic'
     autoload :Web, 'gamefic-sdk/platform/web'
+    autoload :Sinatra, 'gamefic-sdk/platform/sinatra'
   end
 
 end

data/lib/gamefic-sdk/platform/sinatra.rb

@@ -0,0 +1,100 @@
+require 'gamefic'
+require 'gamefic-sdk'
+
+module Gamefic::Sdk
+
+  class Platform::Sinatra < Platform::Web
+    autoload :AppConfig, 'gamefic-sdk/platform/web/app_config'
+
+    def build
+      STDERR.puts "Building for Sinatra"
+      target_dir = config['target_dir']
+      build_dir = config['build_dir']
+      html_dir = app_config.html_dir
+
+      FileUtils.mkdir_p target_dir
+      copy_html_files target_dir
+      render_index target_dir
+      copy_assets build_dir, target_dir
+      copy_media source_dir, target_dir
+      FileUtils.cp_r File.join(Gamefic::Sdk::HTML_TEMPLATE_PATH, 'sinatra', 'engine.js'), File.join(target_dir, 'core', 'engine.js')
+    end
+
+    def clean
+      FileUtils.remove_entry_secure config['build_dir'] if File.exist?(config['build_dir'])
+      FileUtils.mkdir_p config['build_dir']
+      puts "#{config['build_dir']} cleaned."
+    end
+
+    def app_config
+      @app_config ||= AppConfig.new source_dir, config, ["core/engine.js"]
+    end
+
+    private
+
+    def resolve filename, paths
+      absolute = nil
+      paths.each { |path|
+        if File.file?("#{path}/#{filename}")
+          absolute = File.join(path, filename)
+          break
+        end
+      }
+      raise "#{filename} not found" if absolute.nil?
+      absolute
+    end
+
+    # Copy everything in source except config and template
+    def copy_html_files target_dir
+      Dir.entries(app_config.html_dir).each { |entry|
+        if entry != 'index.rb' and entry != 'index.html.erb' and entry != '.' and entry != '..'
+          FileUtils.mkdir_p target_dir + '/' + File.dirname(entry)
+          FileUtils.cp_r "#{app_config.html_dir}/#{entry}", "#{target_dir}/#{entry}"
+        end
+      }
+    end
+
+    def render_index target_dir
+      # Render index
+      File.open(target_dir + "/index.html", "w") do |file|
+        file << app_config.render
+      end
+    end
+
+    def copy_assets build_dir, target_dir
+      paths = app_config.resource_paths
+      paths.push build_dir
+      app_config.javascripts.each { |js|
+        absolute = resolve(js, paths)
+        FileUtils.mkdir_p target_dir + "/" + File.dirname(js)
+        FileUtils.cp_r absolute, target_dir + "/" + js
+      }
+      app_config.stylesheets.each { |css|
+        absolute = resolve(css, paths)
+        FileUtils.mkdir_p target_dir + "/" + File.dirname(css)
+        FileUtils.cp_r absolute, target_dir + "/" + css
+      }
+    end
+
+    def copy_media source_dir, target_dir
+      # Copy media
+      pc = PlotConfig.new "#{source_dir}/config.yaml"
+      pc.media_paths.each { |path|
+        if File.directory?(path)
+          FileUtils.mkdir_p target_dir + "/media"
+          Dir.entries(path).each { |entry|
+            if entry != '.' and entry != '..'
+              FileUtils.mkdir_p target_dir + "/media/" + File.dirname(entry)
+              FileUtils.cp_r path + "/" + entry, target_dir + "/media/" + entry
+            end
+          }
+        end
+      }
+    end
+
+    def metadata_code
+      "\nGameficOpal.static_plot.metadata = JSON.parse('#{metadata.to_json}')"
+    end
+  end
+
+end

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

@@ -1,6 +1,7 @@
 require 'gamefic'
 require 'gamefic-sdk'
 require 'opal'
+require 'uglifier'
 
 module Gamefic::Sdk
 
@@ -15,7 +16,7 @@ module Gamefic::Sdk
     end
 
     def app_config
-      @app_config ||= AppConfig.new source_dir, config
+      @app_config ||= AppConfig.new source_dir, config, ["core/opal.js", "core/gamefic.js", "core/static.js", "core/scripts.js", "core/engine.js"]
     end
 
     def build
@@ -71,9 +72,9 @@ module Gamefic::Sdk
       # Opal core
       if !File.exist?(build_dir + "/core/opal.js")
         File.open(build_dir + "/core/opal.js", "w") do |file|
-          file << Opal::Builder.build('opal')
-          file << Opal::Builder.build('json')
-          file << Opal::Builder.build('native')
+          file << Uglifier.compile(
+            Opal::Builder.build('opal').to_s + "\n" + Opal::Builder.build('json').to_s + "\n" + Opal::Builder.build('native').to_s
+          )
         end
       end
     end
@@ -83,7 +84,7 @@ module Gamefic::Sdk
       Opal.use_gem 'gamefic'
       if !File.exist?(build_dir + "/core/gamefic.js")
         File.open(build_dir + "/core/gamefic.js", "w") do |file|
-          file << Opal::Builder.build('gamefic').to_s
+          file << Uglifier.compile(Opal::Builder.build('gamefic').to_s)
         end
       end
     end
@@ -93,26 +94,32 @@ module Gamefic::Sdk
       Opal.append_path Gamefic::Sdk::LIB_PATH
       if !File.exist?(build_dir + "/core/static.js")
         File.open(build_dir + "/core/static.js", "w") do |file|
-          file << Opal::Builder.build('gamefic-sdk/platform/web/gamefic_opal')
+          #file << Opal::Builder.build('gamefic-sdk/platform/web/gamefic_opal')
+          file << Uglifier.compile(
+            Opal::Builder.build('gamefic-sdk/platform/web/engine').to_s + "\n" + Opal::Builder.build('gamefic-sdk/platform/web/user').to_s
+          )
         end
       end
     end
 
     def build_scripts_js build_dir
-      # Plot scripts
       File.open("#{build_dir}/scripts.rb", 'w') do |file|
-        file << "def GameficOpal.load_scripts\n"
+        file << "module Gamefic\n"
+        file << "$scripts = {}\n"
         plot.imported_scripts.each { |script|
-          file << "GameficOpal.static_plot.stage do\n"
+          file << "$scripts['#{script.path}'] = proc {\n"
           file << script.read
-          file << "\nend\n"
+          file << "\n}\n"
         }
+        file << "$source = Gamefic::Source::Text.new($scripts)\n"
+        file << "$plot = Gamefic::Plot.new($source)\n"
+        file << "$plot.script 'main'\n"
+        file << "$engine = Gamefic::Engine::Web.new($plot)\n"
         file << "end\n"
-        file << metadata_code
       end
       Opal.append_path build_dir
       File.open(build_dir + "/core/scripts.js", 'w') do |file|
-        file << Opal::Builder.build('scripts')
+        file << Uglifier.compile(Opal::Builder.build('scripts').to_s)
       end
     end
 

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

@@ -1,15 +1,14 @@
 require 'erb'
-require 'gamefic/stage'
 
 module Gamefic
   module Sdk
 		class Gamefic::Sdk::Platform::Web::AppConfig
-		  include Stage
+		  include Plot::Theater
 		  attr_reader :javascripts, :stylesheets, :resource_paths, :source_dir, :config, :html_dir
-		  expose :javascripts, :stylesheets, :resource_paths
+		  #expose :javascripts, :stylesheets, :resource_paths
 		  
-		  # @param main_dir [String] The directory containing the resources (config file, HTML template, etc.) for this build
-		  def initialize source_dir, config
+		  # @param source_dir [String] The directory containing the resources (config file, HTML template, etc.) for this build
+		  def initialize source_dir, config, js
 		    @javascripts = []
 		    @stylesheets = []
 		    @source_dir = source_dir
@@ -19,7 +18,7 @@ module Gamefic
 		    @resource_paths = ["#{html_dir}", Gamefic::Sdk::HTML_TEMPLATE_PATH]
 		    config_file = "#{html_dir}/index.rb"
 		    stage File.read(config_file), config_file
-		    javascripts.push "core/opal.js", "core/gamefic.js", "core/static.js", "core/scripts.js", "core/engine.js"
+		    javascripts.concat js
 		  end
 		  
 		  # @return [BuildConfig::Data]