glimmer-dsl-swt 4.20.0.1 → 4.20.1.0

data/samples/elaborate/calculator/model/command.rb

@@ -0,0 +1,105 @@
+class Calculator
+  module Model
+    class Command
+      class << self
+        attr_accessor :number1, :number2, :operation
+           
+        # Keyword string representing calculator command (e.g. '+' for Add command)
+        # Subclasses must call to define a single keyword
+        def keyword(keyword_text)
+          Command.keyword_to_command_class_mapping[keyword_text] = self
+        end
+        
+        # Keyword string array representing calculator command (e.g. ('0'..'9').to_a)
+        # Subclasses must call to define multiple keywords
+        def keywords(*keyword_text_array)
+          keyword_text_array.flatten.each do |keyword_text|
+            keyword(keyword_text)
+          end
+        end
+        
+        def keyword_to_command_class_mapping
+          @keyword_to_command_class_mapping ||= {}
+        end
+      
+        def command_history
+          @command_history ||= []
+        end
+        
+        def purge_command_history
+          Command.command_history.clear
+          self.number1 = nil
+          self.number2 = nil
+          self.operation = nil
+        end
+      
+        def for(button)
+          command_class = keyword_to_command_class_mapping[button]
+          command_class&.new(button)&.tap do |command|
+            command.execute
+            command_history << command
+          end
+        end
+      end
+      
+      attr_reader :button
+      attr_accessor :result
+      
+      def initialize(button)
+        @button = button
+      end
+      
+      def number1
+        Command.number1
+      end
+      
+      def number1=(value)
+        Command.number1 = value.to_f
+      end
+      
+      def number2
+        Command.number2
+      end
+      
+      def number2=(value)
+        Command.number2 = value.to_f
+      end
+      
+      def operation
+        Command.operation
+      end
+      
+      def operation=(op)
+        Command.operation = op
+      end
+      
+      def last_result
+        last_command&.result
+      end
+      
+      def last_command
+        command_history.last
+      end
+      
+      def command_history
+        Command.command_history
+      end
+      
+      def execute
+        raise 'Not implemented! Please override in a subclass.'
+      end
+    end
+  end
+end
+
+# Dir[File.join(File.dirname(__FILE__), 'command', '**', '*.rb')].each {|f| require(f)} # disabled for Opal compatibility
+
+require_relative 'command/all_clear'
+require_relative 'command/equals'
+require_relative 'command/number'
+require_relative 'command/operation'
+require_relative 'command/point'
+require_relative 'command/operation/add'
+require_relative 'command/operation/divide'
+require_relative 'command/operation/multiply'
+require_relative 'command/operation/subtract'

data/samples/elaborate/calculator/model/command/all_clear.rb

@@ -0,0 +1,17 @@
+class Calculator
+  module Model
+    class Command
+      class AllClear < Command
+        keywords 'AC', 'c', 'C', 8.chr, 27.chr, 127.chr
+  
+        def execute
+          self.result = '0'
+          self.number1 = nil
+          self.number2 = nil
+          self.operation = nil
+          command_history.clear
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/equals.rb

@@ -0,0 +1,18 @@
+class Calculator
+  module Model
+    class Command
+      class Equals < Command
+        keywords '=', "\r"
+
+        def execute
+          if number1 && number2 && operation
+            self.result = operation.calculate.to_s
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/number.rb

@@ -0,0 +1,20 @@
+class Calculator
+  module Model
+    class Command
+      class Number < Command
+        keywords ('0'..'9').to_a
+              
+        def execute
+          self.result = last_result.nil? || (!last_command.is_a?(Number) && !last_command.is_a?(Point)) ? button : last_result + button
+          if operation.nil? || last_command.is_a?(Equals)
+            self.number1 = self.result
+            self.number2 = nil
+            self.operation = nil
+          else
+            self.number2 = self.result
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation.rb

@@ -0,0 +1,27 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        def execute
+          if number1 && number2 && operation && !last_command.is_a?(Equals)
+            self.result = operation.calculate.to_s
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+            self.operation = self
+          end
+        end
+        
+        def calculate
+          calculation_result = BigDecimal.new(number1.to_s).send(operation_method, BigDecimal.new(number2.to_s)).to_f
+          calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+        end
+        
+        # Subclasses must implement to indicate operation method on number (e.g. :+ for addition)
+        def operation_method
+          raise 'Not implemented!'
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/add.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Add < Operation
+          keyword '+'
+          
+          def operation_method
+            :+
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/divide.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Divide < Operation
+          keywords '÷', '/'
+          
+          def operation_method
+            :/
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/multiply.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Multiply < Operation
+          keywords '×', '*'
+
+          def operation_method
+            :*
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/operation/subtract.rb

@@ -0,0 +1,15 @@
+class Calculator
+  module Model
+    class Command
+      class Operation < Command
+        class Subtract < Operation
+          keywords '−', '-'
+          
+          def operation_method
+            :-
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/command/point.rb

@@ -0,0 +1,20 @@
+class Calculator
+  module Model
+    class Command
+      class Point < Command
+        keyword '.'
+
+        def execute
+          self.result = last_result.nil? || !last_command.is_a?(Number) ? '0.' : "#{last_result}."
+          if operation.nil? || last_command.is_a?(Equals)
+            self.number1 = self.result
+            self.number2 = nil
+            self.operation = nil
+          else
+            self.number2 = self.result
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/calculator/model/presenter.rb

@@ -0,0 +1,30 @@
+require_relative 'command'
+
+class Calculator
+  module Model
+    class Presenter
+      FORMATTER = {
+        nil   => '0',
+        'NaN' => 'Not a number'
+      }
+    
+      attr_accessor :result
+      
+      def initialize
+        self.result = '0'
+      end
+      
+      def press(button)
+        command = Command.for(button)
+        if command
+          new_result = command.result
+          self.result = FORMATTER[new_result] || new_result
+        end
+      end
+      
+      def purge_command_history
+        Command.purge_command_history
+      end
+    end
+  end
+end

data/samples/elaborate/login.rb

@@ -35,24 +35,19 @@ class LoginPresenter
 
   def status=(status)
     @status = status
-
-    notify_observers("logged_in")
-    notify_observers("logged_out")
   end
   
   def valid?
     !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
   end
 
-  def logged_in
+  def logged_in?
     self.status == "Logged In"
   end
-  alias logged_in? logged_in
 
-  def logged_out
-    !self.logged_in
+  def logged_out?
+    !self.logged_in?
   end
-  alias logged_out? logged_out
 
   def login!
     return unless valid?
@@ -77,13 +72,15 @@ class Login
   body {
     shell {
       text "Login"
+      
       composite {
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
         @user_name_text = text {   # goes in column 2
           text <=> [@presenter, :user_name]
-          enabled <= [@presenter, :logged_out]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -92,7 +89,8 @@ class Login
         label { text "Password:" }
         @password_text = text(:password, :border) {
           text <=> [@presenter, :password]
-          enabled <= [@presenter, :logged_out]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_key_pressed { |event|
             @presenter.login! if event.keyCode == swt(:cr)
           }
@@ -103,16 +101,20 @@ class Login
 
         button {
           text "Login"
-          enabled <= [@presenter, :logged_out]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
           on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
-            @presenter.login! if event.keyCode == swt(:cr)
+            if event.keyCode == swt(:cr)
+              @presenter.login!
+            end
           }
         }
 
         button {
           text "Logout"
-          enabled <= [@presenter, :logged_in]
+          enabled <= [@presenter, :logged_in?, computed_by: :status]
+          
           on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)

data/samples/elaborate/tetris.rb

@@ -54,7 +54,7 @@ class Tetris
     Display.app_name = 'Glimmer Tetris'
 
     display {
-      @keyboard_down_listener = on_swt_keydown { |key_event|
+      on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
           game.down! if OS.mac?
@@ -82,7 +82,7 @@ class Tetris
 
       # invoke game.down! on keyup with Windows/Linux since they seem to group-render similar events, preventing intermediate renders (causing invisiblity while holding keys)
       if !OS.mac?
-        @keyboard_up_listener = on_swt_keyup { |key_event|
+        on_swt_keyup { |key_event|
           case key_event.keyCode
           when swt(:arrow_down), 's'.bytes.first
             game.down!
@@ -91,11 +91,11 @@ class Tetris
       end
       
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
-      @about_observer = on_about {
+      on_about {
         show_about_dialog
       }
       
-      @quit_observer = on_quit {
+      on_quit {
         exit(0)
       }
     }

data/samples/elaborate/tetris/model/game.rb

@@ -33,8 +33,6 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
-#       PLAYFIELD_WIDTH = 5
-#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -201,7 +199,6 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
-#         99999
       end
       
       def beep