Remove texplay dependency, all specs are green

jlnr · jlnr · commit 1881ccb2a724 · 2019-10-06T11:47:10.000+02:00
diff --git a/README.md b/README.md
@@ -7,14 +7,12 @@ Fidgit is a GUI framework built on [Gosu](http://libgosu.org/) and [Chingu](http
 Description
 -----------
 
-The API is inspired by [Shoes](http://shoesrb.com/), but since Shoes is very simplistic, the level of functionality is
-based around [FXRuby](http://www.fxruby.org/) and other GUI APIs.
+The API is inspired by [Shoes](https://shoesrb.com/), but since Shoes is very simplistic, the level of functionality is
+based around [FXRuby](https://www.fxruby.org/) and other GUI APIs.
 Fidgit was originally developed as a part of the Sidney game, but as it got more complex, it was obvious it would be
 useful to separate them.
 
-_WARNING: THIS PROJECT IS IN EARLY ALPHA DEVELOPMENT AND THE API IS LIABLE TO CONTINUOUS CHANGE AND IT IS QUITE UNSTABLE!_
-
-Read the Yard documentation at [rubydoc.info](http://rubydoc.info/github/Spooner/fidgit/master)
+Read the Yard documentation at [rubydoc.info](https://rubydoc.info/github/gosu/fidgit/master)
 
 
 Aim
@@ -30,16 +28,6 @@ License
 MIT (see COPYING.txt)
 
 
-Requirements
-------------
-
-* Ruby 1.9.2 or higher.
-* Gosu gem 0.7.27.1
-  * [Installing Gosu dependencies on Linux](http://code.google.com/p/gosu/wiki/GettingStartedOnLinux) (On Win32 and OS X there are binary gems available)
-* Chingu gem 0.9rc4.
-* Clipboard gem
-
-
 Example
 -------
 
diff --git a/examples/text_area_example.rb b/examples/text_area_example.rb
@@ -4,9 +4,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    Gosu.register_entity(:entity, Gosu::Image["head_icon.png"])
-
-    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the&entity;&entity;snail!"
+    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the snail!"
     horizontal do
       vertical do
         label 'disabled'
diff --git a/fidgit.gemspec b/fidgit.gemspec
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'fidgit/version'
 
@@ -8,28 +7,22 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Bil Bas (Spooner)']
   s.email       = ['bil.bagpuss@gmail.com']
-  s.homepage    = 'http://github.com/Spooner/fidgit/'
+  s.homepage    = 'https://github.com/gosu/fidgit/'
   s.summary     = 'Fidgit is a GUI library built on Gosu/Chingu'
   s.description = 'Fidgit is a GUI library built on Gosu/Chingu'
 
-  s.rubyforge_project = 'fidgit'
-  s.has_rdoc = true
-  s.required_ruby_version = '>= 1.9.2'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   s.license       = 'MIT'
 
-  s.add_runtime_dependency('gosu', '~> 0.7', '>= 0.7.41')
+  s.add_runtime_dependency('gosu', '~> 0.7')
   s.add_runtime_dependency('chingu', '~> 0.9rc9')
-  s.add_runtime_dependency('clipboard', '~> 0.9', '>= 0.9.9')
-  s.add_runtime_dependency('ffi', '~> 1.0', '>= 1.0.11')
+  s.add_runtime_dependency('clipboard', '~> 0.9')
 
-  s.add_development_dependency('rspec', '~> 2.8', '>= 2.8.0')
-  s.add_development_dependency('texplay', '~> 0.4', '>= 0.4.3')
-  s.add_development_dependency('rake', '~> 10.3', '>= 10.3.2')
-  s.add_development_dependency('yard', '~> 0.8.7', '>= 0.8.7.4')
+  s.add_development_dependency('rspec', '~> 2.8')
+  s.add_development_dependency('rake', '~> 10.3')
+  s.add_development_dependency('yard', '~> 0.9.11')
   s.add_development_dependency('RedCloth', '~> 4.2', '>= 4.2.9')
 end
diff --git a/lib/fidgit.rb b/lib/fidgit.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'chingu'
 require 'clipboard'
 
@@ -13,7 +12,7 @@
 
 require_relative "fidgit/chingu_ext/window"
 require_relative "fidgit/gosu_ext/color"
-require_relative "fidgit/gosu_ext/gosu_module"
+require_relative "fidgit/gosu_ext/image"
 require_relative "fidgit/standard_ext/hash"
 
 require_relative "fidgit/elements/element"
diff --git a/lib/fidgit/cursor.rb b/lib/fidgit/cursor.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class Cursor < Chingu::GameObject
     ARROW = 'arrow.png'
diff --git a/lib/fidgit/elements/button.rb b/lib/fidgit/elements/button.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class Button < Label
     # @param (see Label#initialize)
diff --git a/lib/fidgit/elements/color_picker.rb b/lib/fidgit/elements/color_picker.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class ColorPicker < Composite
     CHANNELS = [:red, :green, :blue]
diff --git a/lib/fidgit/elements/color_well.rb b/lib/fidgit/elements/color_well.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class ColorWell < RadioButton
     alias_method :color, :value
diff --git a/lib/fidgit/elements/combo_box.rb b/lib/fidgit/elements/combo_box.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'forwardable'
 
 module Fidgit
diff --git a/lib/fidgit/elements/composite.rb b/lib/fidgit/elements/composite.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A composite element, made up of other elements (but manages them internally).
   class Composite < Packer
diff --git a/lib/fidgit/elements/container.rb b/lib/fidgit/elements/container.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'forwardable'
 
 module Fidgit
diff --git a/lib/fidgit/elements/element.rb b/lib/fidgit/elements/element.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # The Fidgit GUI framework for Gosu.
 module Fidgit
   class << self
diff --git a/lib/fidgit/elements/file_browser.rb b/lib/fidgit/elements/file_browser.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class FileBrowser < Composite
     VALID_TYPES = [:open, :save]
diff --git a/lib/fidgit/elements/grid.rb b/lib/fidgit/elements/grid.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A vertically aligned element packing container.
 
diff --git a/lib/fidgit/elements/horizontal.rb b/lib/fidgit/elements/horizontal.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A vertically aligned element packing container.
   class Horizontal < Grid
diff --git a/lib/fidgit/elements/label.rb b/lib/fidgit/elements/label.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class Label < Composite
     ICON_POSITIONS = [:top, :bottom, :left, :right]
diff --git a/lib/fidgit/elements/list.rb b/lib/fidgit/elements/list.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class List < Composite
     class Item < RadioButton
diff --git a/lib/fidgit/elements/packer.rb b/lib/fidgit/elements/packer.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # Container that auto-packs elements.
   #
diff --git a/lib/fidgit/elements/radio_button.rb b/lib/fidgit/elements/radio_button.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class RadioButton < Button
     attr_reader :group, :value
diff --git a/lib/fidgit/elements/scroll_area.rb b/lib/fidgit/elements/scroll_area.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A basic scrolling area. It is not managed in any way (use ScrollWindow for that).
   class ScrollArea < Container
diff --git a/lib/fidgit/elements/scroll_bar.rb b/lib/fidgit/elements/scroll_bar.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # @abstract
   class ScrollBar < Composite
diff --git a/lib/fidgit/elements/scroll_window.rb b/lib/fidgit/elements/scroll_window.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class ScrollWindow < Composite
     def content; @view.content; end
diff --git a/lib/fidgit/elements/slider.rb b/lib/fidgit/elements/slider.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class Slider < Composite
     # @private
diff --git a/lib/fidgit/elements/text_area.rb b/lib/fidgit/elements/text_area.rb
@@ -1,9 +1,6 @@
-# encoding: utf-8
-
 module Fidgit
   class TextArea < Element
-    ENTITY_PLACEHOLDER = "*"
-    ENTITIES_AND_TAGS_PATTERN = %r%<[a-z](?:=[a-f0-9]+)?>|</[a-z]>|&\w+;%i
+    TAGS_PATTERN = %r%<[a-z](?:=[a-f0-9]+)?>|</[a-z]>%i
 
     # @return [Number]
     attr_reader :min_height
@@ -38,7 +35,7 @@ def editable?
     # Text within the element.
     # @return [String]
     def text
-      @text_input.text.force_encoding 'UTF-8'
+      @text_input.text.force_encoding '-8'
     end
 
     # Returns the range of the selection.
@@ -71,7 +68,7 @@ def selection_text=(str)
       tags_length_before = (0...from).inject(0) {|m, i| m + @tags[i].length }
       tags_length_inside = (from...to).inject(0) {|m, i| m + @tags[i].length }
       range = (selection_range.first + tags_length_before)...(selection_range.last + tags_length_before + tags_length_inside)
-      full_text[range] = str.encode('UTF-8', undef: :replace)
+      full_text[range] = str.encode('-8', undef: :replace)
       @text_input.text = full_text
 
       @text_input.selection_start = @text_input.caret_pos = from + new_length
@@ -329,12 +326,6 @@ def layout
       stripped_text.each_char.with_index do |char, i|
         tag = @tags[i]
 
-        # \x0 is just a place-holder for an entity: &entity;
-        if char == ENTITY_PLACEHOLDER
-          char = tag
-          tag = ""
-        end
-
         case char
           when "\n"
             char_width = 0
@@ -469,25 +460,15 @@ def post_init_block(&block)
     end
 
     protected
-    # Strip XML tags and entities ("<c=000000></c>" and "&entity;")
-    # @note Entities will mess up the system because we don't know how wide they are.
+    # Strip XML tags ("<c=000000></c>")
     def strip_tags
       tags_length = 0
       @tags = Hash.new('')
 
-      @stripped_text = text.gsub(ENTITIES_AND_TAGS_PATTERN) do |tag|
+      @stripped_text = text.gsub(TAGS_PATTERN) do |tag|
         pos = $`.length - tags_length
         tags_length += tag.length
         @tags[pos] += tag
-
-        # Entities need to have a non-printing character that can represent them.
-        # Still not right, but does mean there are the right number of characters.
-        if tag[0] == '&'
-          tags_length -= 1
-          ENTITY_PLACEHOLDER # Will be expanded later.
-        else
-          '' # Tags don't use up space, so ignore them.
-        end
       end
     end
   end
diff --git a/lib/fidgit/elements/toggle_button.rb b/lib/fidgit/elements/toggle_button.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A button that toggles its value from false<->true when clicked.
   class ToggleButton < Button
diff --git a/lib/fidgit/elements/tool_tip.rb b/lib/fidgit/elements/tool_tip.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class ToolTip < TextLine
     def x=(value); super(value); recalc; value; end
diff --git a/lib/fidgit/elements/vertical.rb b/lib/fidgit/elements/vertical.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # A vertically aligned element packing container.
   class Vertical < Grid
diff --git a/lib/fidgit/event.rb b/lib/fidgit/event.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # Adds simple event handling methods to an object (subscribe/publish pattern).
   #
diff --git a/lib/fidgit/gosu_ext/color.rb b/lib/fidgit/gosu_ext/color.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Gosu
   class Color
     # Is the color completely transparent?
diff --git a/lib/fidgit/gosu_ext/gosu_module.rb b/lib/fidgit/gosu_ext/gosu_module.rb
diff --git a/lib/fidgit/gosu_ext/image.rb b/lib/fidgit/gosu_ext/image.rb
@@ -0,0 +1,13 @@
+module Gosu
+  EmptyImageSource = Struct.new(:columns, :rows) do
+    def to_blob
+      "\0\0\0\0" * (columns * rows)
+    end
+  end
+  
+  class Image
+    def self.create(width, height)
+      self.new(EmptyImageSource.new(width, height))
+    end
+  end
+end
diff --git a/lib/fidgit/history.rb b/lib/fidgit/history.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # Manages a history of actions, along with doing, undoing and redoing those actions.
   class History
diff --git a/lib/fidgit/schema.rb b/lib/fidgit/schema.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   # An object that manages Schema values. Usually loaded from a YAML file.
   #
diff --git a/lib/fidgit/selection.rb b/lib/fidgit/selection.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class Selection
     MIN_DRAG_DISTANCE = 2
diff --git a/lib/fidgit/states/gui_state.rb b/lib/fidgit/states/gui_state.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'forwardable'
 
 module Fidgit
diff --git a/lib/fidgit/states/message_dialog.rb b/lib/fidgit/states/message_dialog.rb
@@ -1,4 +1,3 @@
-
 module Fidgit
   # A simple dialog that manages a message with a set of buttons beneath it.
   class MessageDialog < DialogState
diff --git a/lib/fidgit/version.rb b/lib/fidgit/version.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Fidgit
   VERSION = '0.2.7'
 end
diff --git a/lib/fidgit/window.rb b/lib/fidgit/window.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   module Window
 
diff --git a/spec/fidgit/elements/helpers/tex_play_helper.rb b/spec/fidgit/elements/helpers/tex_play_helper.rb
diff --git a/spec/fidgit/elements/image_frame_spec.rb b/spec/fidgit/elements/image_frame_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# encoding: utf-8`
`2`		`-`
`3`	`1`	`module Fidgit`
`4`	`2`	`class Cursor < Chingu::GameObject`
`5`	`3`	`ARROW = 'arrow.png'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# encoding: utf-8`
`2`	`1`	`require 'forwardable'`
`3`	`2`
`4`	`3`	`module Fidgit`