fidgit 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Fidgit changelog
 ================
 
+v0.2.2
+------
+
+* Prevented ToggleButton border colour changing.
+* More careful about stripping out html tags in TextArea.
+
 v0.2.1
 ------
 

data/lib/fidgit/elements/button.rb

@@ -82,7 +82,7 @@ module Fidgit
 
     protected
     def update_colors
-      [:color, :background_color, :border_color].each do |attribute|
+      [:color, :background_color].each do |attribute|
         send :"#{attribute.to_s}=", enabled? ? default(attribute) : default(:disabled, attribute)
       end
 

data/lib/fidgit/elements/text_area.rb

@@ -3,6 +3,7 @@
 module Fidgit
   class TextArea < Element
     ENTITY_PLACEHOLDER = "*"
+    ENTITIES_AND_TAGS_PATTERN = %r%<[a-z](?:=[a-f0-9]+)?>|</[a-z]>|&\w+;%i
 
     # @return [Number]
     attr_reader :min_height
@@ -282,12 +283,13 @@ module Fidgit
       lines_number * (font.height + line_spacing)
     end
 
+
     protected
     # Helper for #recalc
     # @return [Integer]
     def position_letters_in_word(word, line_width)
       # Strip tags before measuring word.
-      word.gsub(/<[^>]*>|&[^;];/, '').each_char do |c|
+      word.gsub(ENTITIES_AND_TAGS_PATTERN, '').each_char do |c|
         char_width = font.text_width(c)
         line_width += char_width
         @caret_positions.push [line_width, y_at_line(@lines.size)]
@@ -473,7 +475,7 @@ module Fidgit
       tags_length = 0
       @tags = Hash.new('')
 
-      @stripped_text = text.gsub(%r[(<[^>]*?>|&[^;]+;)]) do |tag|
+      @stripped_text = text.gsub(ENTITIES_AND_TAGS_PATTERN) do |tag|
         pos = $`.length - tags_length
         tags_length += tag.length
         @tags[pos] += tag

data/lib/fidgit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Fidgit
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &28344852 !ruby/object:Gem::Requirement
+  requirement: &23198904 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *28344852
+  version_requirements: *23198904
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &28344576 !ruby/object:Gem::Requirement
+  requirement: &23198004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *28344576
+  version_requirements: *23198004
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &28344300 !ruby/object:Gem::Requirement
+  requirement: &23197164 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *28344300
+  version_requirements: *23197164
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &28344024 !ruby/object:Gem::Requirement
+  requirement: &23196276 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *28344024
+  version_requirements: *23196276
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28343748 !ruby/object:Gem::Requirement
+  requirement: &23195712 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *28343748
+  version_requirements: *23195712
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &28343472 !ruby/object:Gem::Requirement
+  requirement: &23195148 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *28343472
+  version_requirements: *23195148
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &28343244 !ruby/object:Gem::Requirement
+  requirement: &23194884 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28343244
+  version_requirements: *23194884
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &28342968 !ruby/object:Gem::Requirement
+  requirement: &23194524 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28342968
+  version_requirements: *23194524
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &28342668 !ruby/object:Gem::Requirement
+  requirement: &23193828 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 4.2.9
   type: :development
   prerelease: false
-  version_requirements: *28342668
+  version_requirements: *23193828
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fidgit
-rubygems_version: 1.8.11
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Fidgit is a GUI library built on Gosu/Chingu