sottolio 0.1.4 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2bbfd7861b599ec96ba13cec50a24646223d20
-  data.tar.gz: 03f6041c3a0b834e26be3f4da961a00857026479
+  metadata.gz: b73cfc781b858b0c57d0af83350cfe79a9cc3f5a
+  data.tar.gz: 6a73dbf6d587e0d75e828b1b5477a98980942d47
 SHA512:
-  metadata.gz: 02573a9fbb94f4a0bf0206e1c5c492522ec93249388e50f694047437e6fd38082b785a418844e0fe4bc166d4607185715d7a643cace1f848e464ff5b45f5736b
-  data.tar.gz: a8eb6f6aa726802af102c4775fbdeeff13d9e96d14e3d3efd6fde4de2aaaeac8d302915ebf480a12ba39fd01c5f164fce1159269048c5a46bba2828eab599203
+  metadata.gz: 4d067d963c9d6cce25a5acd680d6dc381bbc2b14ecc60b0af0d7d55a5ed5322b5d3f9fa37e6b730d144c5a7a773735f74f2e9eece22dd450599ca58c896eba23
+  data.tar.gz: 9cdcea0dcb220ff9b388649ea95bf62b26d302c43a919cecc30d92dffb24399c6577f42c0dea5dcbb19c0f6f39a0dce783cd8c3935768b28b710d548e6a69b7d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sottolio (0.1.4)
+    sottolio (0.2)
       opal (~> 0.8)
 
 GEM

data/example/scripts/chapter_1.rb

@@ -1,64 +1,66 @@
 (@scripts ||= []) << Proc.new do
-background  :id        => 'city',                               # it's the placeholder for #remove
-            :resource  => 'resources/backgrounds/city.jpg'
+background  :id          => 'city',                               # it's the placeholder for #remove
+            :resource    => 'resources/backgrounds/city.jpg'
 
-play_sound  :id        => 'background_theme',
-            :resource  => 'resources/sounds/Classmate.m4a',
-            :loop      => true,
-            :volume    => 0.5                                   # 0.0 - 1.0
+play_sound  :id          => 'background_theme',
+             :resource   => 'resources/sounds/Classmate.m4a',
+             :loop       => true,
+             :volume     => 0.5                                   # 0.0 - 1.0
 
-character   :id        => 'Rosalinda',
-            :resource  => 'resources/characters/rosalinda.png',
-            :x         => 800,
-            :y         => 120
+character   :id          => 'Rosalinda',
+            :resource    => 'resources/characters/rosalinda.png',
+            :x           => 800,
+            :y           => 120
 
-character   :id        => 'Ambrogia',
-            :resource  => 'resources/characters/ambrogia.png',
-            :x         => 10,
-            :y         => 120
+character   :id          => 'Ambrogia',
+            :resource    => 'resources/characters/ambrogia.png',
+            :x           => 10,
+            :y           => 120
 
-dialogue    :name      => 'Ambrogia',                           # optional
-            :text      => 'Hi!'
+dialogue    :name        => 'Ambrogia',                           # optional
+            :text        => 'Hi!'
 
-input       :name      => 'Ambrogia',
-            :text      => 'My name is Ambrogia, and yours?',
-            :id        => 'name',                               # the variable where the input will be saved
-            :request   => 'Your name'
+input       :name        => 'Ambrogia',
+            :text        => 'My name is Ambrogia, and yours?',
+            :id          => 'name',                               # the variable where the input will be saved
+            :placeholder => 'Your name:',
+            :constraint  => '#name# =~ /^[a-zA-Z]{3,10}$/',
+            :on_fail     => 'Your name has to be contained in 3-10 chars.' # printed if the input won't match the constraint
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'Oh, hai #name#!',
-            :if        => '#name# =~ /^[a-zA-Z]+$/'
+dialogue    :name        => 'Ambrogia',
+            :text        => 'Oh, hai #name#!',
+            :if          => '#name# =~ /^[a-zA-Z]+$/'
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'Don\'t tease me >:(',
-            :if_not    => '#name# =~ /^[a-zA-Z]+$/'
+dialogue    :name        => 'Ambrogia',
+            :text        => 'Don\'t tease me >:(',
+            :unless      => '#name# =~ /^[a-zA-Z]+$/'
 
-choice      :name      => 'Ambrogia',
-            :text      => 'How do you feel?',
-            :id        => 'feel',
-            :options   => [
-                            { id: 'good', text: 'Good' },
-                            { id: 'bad',  text: 'Bad'  }
-                          ]
+choice      :name        => 'Ambrogia',
+            :text        => 'How do you feel?',
+            :id          => 'feel',
+            :options     => [
+                              { id: 'good', text: 'Good' },
+                              { id: 'bad',  text: 'Bad'  }
+                            ]
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'I\'m glad you feel good, my dear!',
-            :if        => [ '#feel# == good', '#name# == Patrizio' ]
+dialogue    :name        => 'Ambrogia',
+            :text        => 'I\'m glad you feel good, my dear!',
+            :if          => [ '#feel# == good', '#name# == Patrizio' ]
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'I\'m glad you feel good!',
-            :if        => [ '#feel# == good', '#name# != Patrizio' ]
+dialogue    :name        => 'Ambrogia',
+            :text        => 'I\'m glad you feel good!',
+            :if          => [ '#feel# == good', '#name# != Patrizio' ]
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'I\'m sorry you feel bad!',
-            :if        => '#feel# == bad'
+dialogue    :name        => 'Ambrogia',
+            :text        => 'I\'m sorry you feel bad!',
+            :if          => '#feel# == bad'
 
-dialogue    :name      => 'Ambrogia',
-            :text      => 'Ok, time to go, cya!'
+dialogue    :name        => 'Ambrogia',
+            :text        => 'Ok, time to go, cya!'
 
-remove      :id        => 'Ambrogia'
+remove      :id          => 'Ambrogia'
 
-remove      :id        => 'Rosalinda'
+remove      :id          => 'Rosalinda'
 
-stop_sound  :id        => 'background_theme'
+stop_sound  :id          => 'background_theme'
 end

data/example/scripts/chapter_2.rb

@@ -4,7 +4,7 @@ background  :id        => 'city',
 
 character   :id        => 'Rosalinda',
             :resource  => 'resources/characters/rosalinda.png',
-            :x         => 800,
+            :x         => 500,
             :y         => 120
 
 dialogue    :name      => 'Rosalinda',

data/lib/sottolio/version.rb

@@ -17,5 +17,5 @@
 # along with sottolio.  If not, see <http://www.gnu.org/licenses/>.
 #++
 module Sottolio
-  VERSION = '0.1.4'
+  VERSION = '0.2'
 end

data/opal/sottolio/bootstrapper.rb

@@ -27,8 +27,9 @@ module Sottolio
       go_next   = Sottolio.get 'next'
       canvas    = Canvas.new canvas_id
 
-      database  = Database.new
-      scripts   = Script.new @scripts
+      database = Database.new
+      scripts  = Script.new @scripts
+      Utils.database = database
 
       config = {
         canvas_id:   'game',
@@ -44,17 +45,26 @@ module Sottolio
       image_manager = ImageManager.new
       input         = nil
 
+      previous_dialogue = nil
       next_dialogue = -> {
         if lock.free? && (!input || input.destroyed? || (input.present? && !input.empty?)) && scripts.any?
-          input.save_and_destroy if input.is_a?(CanvasInput) && input.present?
+          if input.is_a?(CanvasInput) && input.present?
+            input.save_and_destroy
+
+            if !input.valid? && !previous_dialogue.nil?
+              previous_dialogue[:input][:failed] = true
+              scripts << previous_dialogue
+            end
+          end
 
           canvas.fill_style = '#fff'
 
-          script          = scripts.pop
-          current_command = script.keys.first
+          script            = scripts.pop
+          previous_dialogue = script
+          current_command   = script.keys.first
           case current_command
           when :play_sound
-            if script[:play_sound].true? database
+            if Utils.command_conditions_passes? script[:play_sound]
               sound = Sound.new script[:play_sound][:resource], script[:play_sound][:loop], script[:play_sound][:volume]
               sound_manager.add script[:play_sound][:id], sound
               sound_manager.play script[:play_sound][:id]
@@ -62,13 +72,13 @@ module Sottolio
 
             next_dialogue.call
           when :stop_sound
-            if script[:stop_sound].true? database
+            if Utils.command_conditions_passes? script[:stop_sound]
               sound_manager.stop script[:stop_sound][:id]
             end
 
             next_dialogue.call
           when :background
-            if script[:background].true? database
+            if Utils.command_conditions_passes? script[:background]
               background = Background.new canvas_id, script[:background][:resource], script[:background][:id]
               image_manager.add background
               image_manager.draw script[:background][:id]
@@ -76,7 +86,7 @@ module Sottolio
 
             next_dialogue.call
           when :character
-            if script[:character].true? database
+            if Utils.command_conditions_passes? script[:character]
               character = Character.new canvas_id, script[:character][:resource], script[:character][:id]
               image_manager.add character
               image_manager.draw script[:character][:id], script[:character][:x], script[:character][:y]
@@ -88,7 +98,7 @@ module Sottolio
 
             next_dialogue.call
           when :dialogue
-            if script[:dialogue].true? database
+            if Utils.command_conditions_passes? script[:dialogue]
               canvas.clear
 
               if script[:dialogue].include? :name
@@ -100,7 +110,7 @@ module Sottolio
               next_dialogue.call
             end
           when :input
-            if script[:input].true? database
+            if Utils.command_conditions_passes? script[:input]
               canvas.clear
 
               if script[:input].include? :name
@@ -109,12 +119,14 @@ module Sottolio
                 canvas_text.write script[:input][:text].apply(database)
               end
 
-              input = CanvasInput.new canvas_id, database, script[:input][:id], script[:input][:request].apply(database)
+              placeholder = (script[:input][:failed] == true ? script[:input][:on_fail] || 'Please check your input' : script[:input][:placeholder]).apply(database)
+              input = CanvasInput.new canvas_id, database, script[:input][:id], placeholder, script[:input][:constraint]
+              input.focus! if script[:input][:failed] != true
             else
               next_dialogue.call
             end
           when :choice
-            if script[:choice].true? database
+            if Utils.command_conditions_passes? script[:choice]
               canvas.clear
 
               if script[:choice].include? :name

data/opal/sottolio/script.rb

@@ -29,8 +29,12 @@ module Sottolio
       @var.reverse!
     end
 
-    def <<(block)
-      instance_eval &block
+    def <<(obj)
+      if obj.is_a?(Proc)
+        instance_eval &obj
+      else
+        @var << obj
+      end
     end
 
     def_delegators :@var, :pop, :any?

data/opal/sottolio/utils.rb

@@ -35,23 +35,35 @@ class String
   end
 end
 
-class Hash
-  # TODO: Find a better name for this (tl;dr eval conditional keys in the script's commands)
-  def true?(database)
-    return true unless self.include?(:if) || self.include?(:if_not)
-
-    res = []
-    sym = self.include?(:if) ? :if : :if_not
-    [self[sym]].flatten.each { |c| # i.e.: [ '#feel# == good', '#name# == Patrizio' ]
-      statement = c.apply(database).split(/(.+)(==|!=|=~)(.+)/).delete_if { |s| s.strip.empty? }.map(&:strip)
-      eval = case statement[1] # #send won't work with !=
-        when '==' then statement[0] == statement[2]
-        when '!=' then statement[0] != statement[2]
-        when '=~' then statement[0] =~ statement[2].to_regex
+module Utils
+  class << self
+    def database=(database)
+      @@database = database
+    end
+
+    def command_conditions_passes?(command)
+      return true unless command.include?(:if) || command.include?(:unless)
+
+      sym = command.include?(:if) ? :if : :unless
+      res = acceptable_constraint? [command[sym]]
+      sym == :if ? res : !res
+    end
+
+    def acceptable_constraint?(constraint)
+      res = []
+
+      [constraint].flatten.each do |c| # i.e.: [ '#feel# == good', '#name# == Patrizio' ]
+        statement = c.apply(@@database).split(/(.+)(==|!=|=~)(.+)/).delete_if { |s| s.strip.empty? }.map(&:strip)
+        eval = case statement[1] # #send won't work with !=
+          when '==' then statement[0] == statement[2]
+          when '!=' then statement[0] != statement[2]
+          when '=~' then !!(statement[0] =~ statement[2].to_regex)
+        end
+
+        res << eval
       end
-      res << eval # actually this is totally not safe
-    }
-    res << res.inject { |sum, x| sum && x }
-    return sym == :if ? res.last : !res.last
+
+      res.inject { |sum, x| sum && x }
+    end
   end
 end

data/opal/sottolio/wrapper/canvas/canvas_input.rb

@@ -18,26 +18,25 @@
 #++
 module Sottolio
   class CanvasInput
-    def initialize(id, database, key, text = '', x = 10, y = 800)
-      @database  = database
-      @key       = key
-      @destroyed = false
+    def initialize(canvas_id, database, key, placeholder, constraint, x = 500, y = 800)
+      @database   = database
+      @key        = key
+      @constraint = constraint
+      @destroyed  = false
 
       %x{
-        #@canvas_input = new CanvasText(id, {
-          x: x,
-          y: y,
-          placeHolder: text,
-          width: 300,
-          padding: 8
+        #@canvas_input = new CanvasText(canvas_id, {
+          x:           x,
+          y:           y,
+          placeholder: placeholder,
+          width:       300,
+          padding:     8
         });
       }
-
-      focus
     end
 
-    def focus
-      `#@canvas_input.focus();`
+    def focus!
+      `#@canvas_input.focus()`
     end
 
     def value
@@ -63,6 +62,10 @@ module Sottolio
       }
     end
 
+    def valid?
+      Utils.acceptable_constraint?(@constraint)
+    end
+
     def present?
       not destroyed?
     end

data/opal/sottolio/wrapper/canvas/canvas_text.rb

@@ -21,11 +21,8 @@ module Sottolio
     def initialize(element, hash = nil)
       super element, '2d'
 
-      @canvas_id = element
-
-      %x{
-        #@canvas_text = new CanvasText;
-      }
+      @canvas_id   = element
+      @canvas_text = `new CanvasText()`
 
       config hash if hash
     end
@@ -36,7 +33,8 @@ module Sottolio
           canvasId:   #{hash[:canvas_id]},
           fontFamily: #{hash[:font_family]},
           fontSize:   #{hash[:font_size]},
-          fontColor:  #{hash[:font_color]}
+          fontColor:  #{hash[:font_color]},
+          lineHeight: 30
         });
       }
     end
@@ -44,20 +42,19 @@ module Sottolio
     def draw_text(hash)
       %x{
         #@canvas_text.drawText({
-          x: #{hash[:x]},
-          y: #{hash[:y]},
-          text: #{hash[:text]},
-          boxWidth: #{hash[:box_width] || '130px'}
+          x:        #{hash[:x]},
+          y:        #{hash[:y]},
+          text:     #{hash[:text]},
+          boxWidth: 1280
         });
       }
     end
 
     def write(what, keep = false)
       draw_text({
-        :x         => 5,
-        :y         => 760,
-        :text      => what,
-        :box_width => '130px'
+        :x    => 10,
+        :y    => 760,
+        :text => what
       })
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sottolio
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
 platform: ruby
 authors:
 - Giovanni Capuano