glimmer-dsl-gtk 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28805ba1382c7a6ce2bb2c7d98c376141f8b2cd0ffc03941b305722ae622c3c7
-  data.tar.gz: 71112f59b18d77e1dfcd7c56fb365844e3a92026eecfc86adcfcea2efd88c764
+  metadata.gz: 908b538188d1ca4fd8c7b96bcc1a890febf29a55d2f37d09a81fa1849b15e7fa
+  data.tar.gz: c88057203f02fed224707cf1ee12f5b66f71d6b9b4632986f0ac3b7f973fd59c
 SHA512:
-  metadata.gz: 57b97588b9dcbe3de56952abafa445891ed267499e9776e1b20b2703f89524aa5ba908c28cd1eafd0076ee3a74ceb253e2a7c1c190ba517c9723f64101e37ffa
-  data.tar.gz: 1d7808d2298c7babbb244545d98e6c5c6d42f8a9e9d7a2578480dbe24ce7e0f55987396b26fd9a531c814e9a1272442759fde6773961578db4cccb887ca9c742
+  metadata.gz: ec820ca1c3782e2b7311bf917bf97f2369da65fff6cf110f887a60e164775ad2b41df9f25a9c904beffd67f3ebd9b6e7decd57f6a222f1a24a5725c5f396d8c1
+  data.tar.gz: 759f1b973090ed6df0ef78daee7a4220b0261090b300a4a9164fcda5a3779d3a831048fa25d9936848903e639358d5942fec4694e6174bb950f908b7abaeec0b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.0.3
+
+- samples/elaborate/tetris.rb (basic Tetris implementation)
+- `observe` keyword for observing Model attributes to update the View
+- Ensure `fill`/`stroke` properties in `drawin_area` shapes accept 255-based rgb colors (or rgba with 1-based transparency)
+- Support setting all cairo shape attributes (e.g. `line_width`, `line_cap`, etc...) with declarative syntax (whichever is specified)
+- Upgrade to glimmer 2.6.0
+
 ## 0.0.2
 
 - Support re-opening any widget proxy content with `#content {}` block to add more nested widgets inside

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for GTK 0.0.2
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for GTK 0.0.3
 ## Ruby-GNOME Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-gtk.svg)](http://badge.fury.io/rb/glimmer-dsl-gtk)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -30,7 +30,7 @@ Linux | Mac | Windows
 ------|-----|--------
 ![hello world screenshot Windows](/screenshots/glimmer-dsl-gtk-linux-hello-world.png) | ![hello world screenshot Mac](/screenshots/glimmer-dsl-gtk-mac-hello-world.png) | ![hello world screenshot Windows](/screenshots/glimmer-dsl-gtk-windows-hello-world.png)
 
-NOTE: Glimmer DSL for GTK is currently in early alpha mode (incomplete proof-of-concept). If you want it developed faster, then [open an issue report](https://github.com/AndyObtiva/glimmer-dsl-gtk/issues/new). I have completed some GitHub project features much faster before due to [issue reports](https://github.com/AndyObtiva/glimmer-dsl-gtk/issues) and [pull requests](https://github.com/AndyObtiva/glimmer-dsl-gtk/pulls). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
+NOTE: Glimmer DSL for GTK is currently in early alpha mode (incomplete proof-of-concept). If you want it developed faster, then [open an issue report](https://github.com/AndyObtiva/glimmer-dsl-gtk/issues/new). I have completed some GitHub project features much faster before due to [issue reports](https://github.com/AndyObtiva/glimmer-dsl-gtk/issues) and [pull requests](https://github.com/AndyObtiva/glimmer-dsl-gtk/pulls). Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
 Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interested in:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -79,7 +79,7 @@ gem install glimmer-dsl-gtk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-gtk', '~> 0.0.2'
+gem 'glimmer-dsl-gtk', '~> 0.0.3'
 ```
 
 And, then run:
@@ -135,6 +135,18 @@ SomeGlimmerApplication.new.launch
   - Properties: All GTK widget properties can be set via lowercase underscored names (without the 'set_' prefix) nested under widget keywords (e.g. `window {title 'Hello, World'}` sets `title` property of `window`)
   - Signals: All GTK signals can be wired with `on(signal) { ... }` syntax (e.g. `on(:activate) { do_something }`)
 
+#### MVC Observer Pattern
+
+In Smalltalk-MVC ([Model View Controller](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) Architectural Pattern), the View is an active View that observes the Model for changes and updates itself.
+
+![MVC](http://3.bp.blogspot.com/-4eW59Ao0ess/ToiBzAiYdZI/AAAAAAAAAOg/SiYa6XHwBFE/s320/Screen+shot+2011-10-02+at+10.22.11+AM.png)
+
+This can be achieved with the Glimmer GUI DSL using the `observe` keyword, which takes a model (any object, including `self`) and attribute Symbol or String expression (e.g. `:count` or `'address.street'`).
+
+The model is automatically enhanced as an `Glimmer::DataBinding::ObservableModel` / `Glimmer::DataBinding::ObservableHash` / `Glimmer::DataBinding::ObservableArray` depending on its type to support notifying observers of attribute changes (when performed using the attribute writer, which automatically calls added method `notify_observers(attribute)`)
+
+Note that it is usually recommended to observe external model objects (not `self`), but `self` is OK in very simple cases or presentation-related attributes only.
+
 ## Girb (Glimmer IRB)
 
 You can run the `girb` command (`bin/girb` if you cloned the project locally):
@@ -779,6 +791,198 @@ application('org.glimmer.hello-application') {
 }.run
 ```
 
+#### Tetris
+
+[samples/elaborate/tetris.rb](/samples/elaborate/tetris.rb)
+
+Linux | Mac | Windows
+------|-----|--------
+![tetris](/screenshots/glimmer-dsl-gtk-linux-tetris.png) | ![tetris](/screenshots/glimmer-dsl-gtk-mac-tetris.png) | ![tetris](/screenshots/glimmer-dsl-gtk-windows-tetris.png)
+
+Run (via installed gem):
+
+```
+ruby -r glimmer-dsl-gtk -e "require 'samples/elaborate/tetris'"
+```
+
+Run (via locally cloned project):
+
+```
+ruby -r ./lib/glimmer-dsl-gtk.rb samples/elaborate/tetris.rb
+```
+
+Code:
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+require_relative 'tetris/model/game'
+
+class Tetris
+  include Glimmer
+  
+  BLOCK_SIZE = 25
+  BEVEL_CONSTANT = 20
+  COLOR_GRAY = [192, 192, 192]
+    
+  def initialize
+    @game = Model::Game.new
+  end
+  
+  def launch
+    create_gui
+    register_observers
+    @game.start!
+    @main_window.show
+  end
+  
+  def create_gui
+    @main_window = window {
+      title 'Glimmer Tetris'
+      default_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE # + 98
+      
+      box(:vertical) {
+        @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+      }
+      
+      on(:key_press_event) do |widget, key_event|
+        case key_event.keyval
+        when 65364 # down arrow
+          @game.down!
+        when 32 # space
+          @game.down!(instant: true)
+        when 65362 # up arrow
+          case @game.up_arrow_action
+          when :instant_down
+            @game.down!(instant: true)
+          when :rotate_right
+            @game.rotate!(:right)
+          when :rotate_left
+            @game.rotate!(:left)
+          end
+        when 65361 # left arrow
+          @game.left!
+        when 65363 # right arrow
+          @game.right!
+        when 65506 # right shift
+          @game.rotate!(:right)
+        when 65505 # left shift
+          @game.rotate!(:left)
+        else
+          # Do Nothing
+        end
+      end
+    }
+  end
+  
+  def register_observers
+    observe(@game, :game_over) do |game_over|
+      if game_over
+        show_game_over_dialog
+      else
+        start_moving_tetrominos_down
+      end
+    end
+    
+    @game.playfield_height.times do |row|
+      @game.playfield_width.times do |column|
+        observe(@game.playfield[row][column], :color) do |new_color|
+          color = new_color
+          block = @playfield_blocks[row][column]
+          block[:background_square].fill = color
+          block[:top_bevel_edge].fill = [color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT]
+          block[:right_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:bottom_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:left_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          block[:drawing_area].queue_draw
+          false
+        end
+      end
+    end
+  end
+  
+  def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
+    blocks = []
+    box(:vertical) {
+      playfield_height.times.map do |row|
+        blocks << []
+        box(:horizontal) {
+          playfield_width.times.map do |column|
+            blocks.last << block(row: row, column: column, block_size: block_size)
+          end
+        }
+      end
+      
+      extra_content&.call
+    }
+    blocks
+  end
+  
+  def block(row: , column: , block_size: , &extra_content)
+    block = {}
+    bevel_pixel_size = 0.16 * block_size.to_f
+    color = Model::Block::COLOR_CLEAR
+    block[:drawing_area] = drawing_area {
+      size_request block_size, block_size
+      
+      block[:background_square] = square(0, 0, block_size) {
+        fill *color
+      }
+      
+      block[:top_bevel_edge] = polygon(0, 0, block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+        fill color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT
+      }
+       
+      block[:right_bevel_edge] = polygon(block_size, 0, block_size - bevel_pixel_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size, block_size) {
+        fill color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+       
+      block[:bottom_bevel_edge] = polygon(block_size, block_size, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size, block_size - bevel_pixel_size) {
+        fill color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+      
+      block[:left_bevel_edge] = polygon(0, 0, 0, block_size, bevel_pixel_size, block_size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+        fill color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT
+      }
+      
+      block[:border_square] = square(0, 0, block_size) {
+        stroke *COLOR_GRAY
+      }
+      
+      extra_content&.call
+    }
+    block
+  end
+  
+  def start_moving_tetrominos_down
+    unless @tetrominos_start_moving_down
+      @tetrominos_start_moving_down = true
+      GLib::Timeout.add(@game.delay*1000) do
+        @game.down! if !@game.game_over? && !@game.paused?
+        true
+      end
+    end
+  end
+  
+  def show_game_over_dialog
+    message_dialog(@main_window) { |md|
+      title 'Game Over!'
+      text "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}"
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+    
+    @game.restart!
+    false
+  end
+end
+
+Tetris.new.launch
+```
+
 ## Resources
 
 - Ruby-Gnome Project: https://github.com/ruby-gnome/ruby-gnome

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/glimmer/dsl/gtk/observe_expression.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2021-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/observe_expression'
+
+module Glimmer
+  module DSL
+    module Gtk
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
+      end
+    end
+  end
+end

data/lib/glimmer/gtk/shape/square.rb

@@ -0,0 +1,76 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# GNU LESSER GENERAL PUBLIC LICENSE
+# Version 3, 29 June 2007
+#
+# Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+#
+# Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+#
+# This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
+#
+# 0. Additional Definitions.
+# As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.
+#
+# “The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+#
+# An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+#
+# A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.
+#
+# The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+#
+# The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+#
+# 1. Exception to Section 3 of the GNU GPL.
+# You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+#
+# 2. Conveying Modified Versions.
+# If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+#
+# a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+# b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+# 3. Object Code Incorporating Material from Library Header Files.
+# The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+#
+# a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+# b) Accompany the object code with a copy of the GNU GPL and this license document.
+# 4. Combined Works.
+# You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+#
+# a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+# b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+# c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+# d) Do one of the following:
+# 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+# 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+# e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+# 5. Combined Libraries.
+# You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+#
+# a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+# b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+# 6. Revised Versions of the GNU Lesser General Public License.
+# The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+#
+# Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+#
+# If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
+
+module Glimmer
+  module Gtk
+    # Represents Gtk shape objects drawn on area widget, like rectangle, arc, and path
+    class Shape
+      class Square < Shape
+        def draw_shape(drawing_area_widget, cairo_context)
+          # expecting 3 args (x, y, length), so duplicate length again to become width/height for rectangle
+          draw_args = args.dup
+          draw_args << draw_args.last
+          cairo_context.rectangle(*draw_args)
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/gtk/shape.rb

@@ -104,8 +104,13 @@ module Glimmer
         end
       end
       
+      SHAPE_FILL_PROPERTIES = [:fill_rule]
+      SHAPE_STROKE_PROPERTIES = [:dash, :font_face, :font_matrix, :font_options, :font_size, :line_cap, :line_join, :line_width, :miter_limit, :scaled_font]
+      SHAPE_GENERAL_PROPERTIES = [:matrix, :operator, :tolerance]
+      
       attr_reader :parent, :args, :keyword, :block
-      attr_accessor :fill, :stroke, :dash, :fill_rule, :font_face, :font_matrix, :font_options, :font_size, :line_cap, :line_join, :line_width, :matrix, :miter_limit, :operator, :scaled_font, :source, :source_color, :source_color_row, :source_gdk_color, :source_gdk_rgba, :source_pixbuf, :source_pixbuf_raw, :source_rgb, :source_rgba, :source_rgba_raw, :source_window, :tolerance
+      attr_accessor :fill, :stroke
+      attr_accessor *(SHAPE_FILL_PROPERTIES + SHAPE_STROKE_PROPERTIES + SHAPE_GENERAL_PROPERTIES)
       # TODO consider automatically setting attribute accessors by looking up set_xyz methods on cairo context
       
       def initialize(keyword, parent, args, &block)
@@ -158,24 +163,35 @@ module Glimmer
       end
       
       def draw_fill(drawing_area_widget, cairo_context)
-        if fill.size == 3
-          cairo_context.set_source_rgb(*fill)
-        elsif fill.size == 4
-          cairo_context.set_source_rgba(*fill)
+        the_fill = normalize_one_based_color(fill)
+        if the_fill.size == 3
+          cairo_context.set_source_rgb(*the_fill)
+        elsif the_fill.size == 4
+          cairo_context.set_source_rgba(*the_fill)
+        end
+        (SHAPE_FILL_PROPERTIES + SHAPE_GENERAL_PROPERTIES).each do |property|
+          cairo_context.send("set_#{property}", send(property)) if send(property)
         end
         cairo_context.fill
       end
       
       def draw_stroke(drawing_area_widget, cairo_context)
-        if stroke.size == 3
-          cairo_context.set_source_rgb(*stroke)
-        elsif stroke.size == 4
-          cairo_context.set_source_rgba(*stroke)
+        the_stroke = normalize_one_based_color(stroke)
+        if the_stroke.size == 3
+          cairo_context.set_source_rgb(*the_stroke)
+        elsif the_stroke.size == 4
+          cairo_context.set_source_rgba(*the_stroke)
+        end
+        (SHAPE_STROKE_PROPERTIES + SHAPE_GENERAL_PROPERTIES).each do |property|
+          cairo_context.send("set_#{property}", send(property)) if send(property)
         end
-        cairo_context.set_line_width(line_width)
         cairo_context.stroke
       end
       
+      def normalize_one_based_color(rgb)
+        rgb.each_with_index.map {|single_color, i| i == 3 ? single_color : single_color / 255.0}
+      end
+      
       def respond_to?(method_name, include_private = false, &block)
         method_name = method_name.to_s
         (method_name.start_with?('set_') && super("#{method_name.sub('set_', '')}=", include_private)) ||

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

@@ -0,0 +1,48 @@
+# Copyright (c) 2021-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = [255, 255, 255]
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
+      def clear
+        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end