purple_shoes 0.0.101 → 0.0.115

data/README.md

@@ -49,6 +49,8 @@ jruby -J-XstartOnFirstThread --1.9 sample2.rb
 Open the built-in manual
 -----------------------
 
+**Note**: Need to install Hpricot: `jruby --1.9 -S gem install hpricot`
+
 ```
 jruby --1.9 -S pshoes -m
 ```

data/VERSION

@@ -1 +1 @@
-0.0.101
+0.0.115

data/lib/purple_shoes.rb

@@ -9,6 +9,7 @@ Types = module Shoes; self end
 
 module Shoes
   DIR = Pathname.new(__FILE__).realpath.dirname.to_s
+  FONTS = []
   SHOES_VERSION = IO.read(File.join(DIR, '../VERSION')).chomp
   BASIC_ATTRIBUTES_DEFAULT = {left: 0, top: 0, width: 0, height: 0, angle: 0, curve: 0}
   SLOT_ATTRIBUTES_DEFAULT = {left: nil, top: nil, width: 1.0, height: 0}

data/lib/shoes/app.rb

@@ -19,7 +19,15 @@ class Shoes
 
     def visit url
       if url =~ /^(http|https):\/\//
-        system "start #{url}"
+        require 'rbconfig'
+        Thread.new do
+          case RbConfig::CONFIG['host_os']
+          when /mswin/; system "start #{url}"
+          when /linux/; system("/etc/alternatives/x-www-browser #{url} &")
+          else
+            puts "Sorry, your platform [#{RUBY_PLATFORM}] is not supported..."
+          end
+        end
       else
         $urls.each{|k, v| clear{init_app_vars; @location = url; v.call self, $1} if k =~ url}
       end
@@ -87,7 +95,7 @@ class Shoes
           instance_eval do
             define_method :paintControl do |e|
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               tl.setText s.markup
               s.app.set_styles s, args
               tl.setWidth s.width if s.width > 0
@@ -125,7 +133,7 @@ class Shoes
         instance_eval do
           define_method :paintControl do |e|
             gc = e.gc
-            s.dps << gc
+            Shoes.dps_reset s.dps, gc
             unless s.hided
               Shoes.set_rotate e.gc, *s.rotate do
                 if s.initials[:width].zero? and s.initials[:height].zero?
@@ -273,7 +281,7 @@ class Shoes
           define_method :paintControl do |e|
             unless s.hided
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
               sw, pat1, pat2 = s.strokewidth, s.stroke, s.fill
               Shoes.set_rotate gc, *s.rotate do
@@ -324,7 +332,7 @@ class Shoes
           define_method :paintControl do |e|
             unless s.hided
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
               sw, pat1, pat2 = s.strokewidth, s.stroke, s.fill
               Shoes.set_rotate gc, *s.rotate do
@@ -374,7 +382,7 @@ class Shoes
           define_method :paintControl do |e|
             unless s.hided
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
               sw, pat1, pat2 = s.strokewidth, s.stroke, s.fill
               Shoes.set_rotate gc, *s.rotate do
@@ -442,7 +450,7 @@ class Shoes
           define_method :paintControl do |e|
             unless s.hided
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
               sw, pat = s.strokewidth, s.stroke
               Shoes.set_rotate gc, *s.rotate do
@@ -485,7 +493,7 @@ class Shoes
           define_method :paintControl do |e|
             unless s.hided
               gc = e.gc
-              s.dps << gc
+              Shoes.dps_reset s.dps, gc
               gc.setAntialias Swt::SWT::ON
               sw, pat1, pat2 = s.strokewidth, s.stroke, s.fill
               outer, inner, points, left, top = s.outer, s.inner, s.points, s.left, s.top
@@ -588,7 +596,7 @@ class Shoes
             define_method :paintControl do |e|
               unless s.hided
                 gc = e.gc
-                s.dps << gc
+                Shoes.dps_reset s.dps, gc
                 gc.setAntialias Swt::SWT::ON
                 Shoes.set_pattern s, gc, pat
                 gc.fillRoundRectangle s.left, s.top, s.width, s.height, s.curve*2, s.curve*2
@@ -619,7 +627,7 @@ class Shoes
             define_method :paintControl do |e|
               unless s.hided
                 gc = e.gc
-                s.dps << gc
+                Shoes.dps_reset s.dps, gc
                 gc.setAntialias Swt::SWT::ON
                 Shoes.set_pattern s, gc, pat, :Foreground
                 if sw > 0
@@ -669,6 +677,10 @@ class Shoes
       shell.getVerticalBar.getMaximum - 10
     end
 
+    def close
+      @shell.close
+    end
+
     def flush
       unless @cs.isDisposed
         Shoes.call_back_procs self
@@ -684,5 +696,16 @@ class Shoes
         @cs.redraw unless @cs.isDisposed
       end
     end
+
+    [:append, :prepend].each do |m|
+      define_method m do |*args, &blk|
+        top_slot.send m, *args, &blk
+      end
+    end
+
+    def gray *attrs
+      g, a = attrs
+      g ? rgb(g*255, g*255, g*255, a) : rgb(128, 128, 128)[0..2]
+    end
   end
 end

data/lib/shoes/basic.rb

@@ -155,7 +155,17 @@ class Shoes
   class Rect < ShapeBase; end
   class Oval < ShapeBase; end
   class Line < ShapeBase; end
-  class Star < ShapeBase; end
+  class Star < ShapeBase
+    def move3 x, y
+      unless @app.cs.isDisposed
+        w, h = @width + 1, @height + 1
+        hw, hh = w / 2, h / 2
+        @app.cs.redraw @left - hw, @top - hh, w, h, false
+        @app.cs.redraw x-hw, y - hh, w, h, false
+      end
+      @left, @top = x, y
+    end
+  end
   class Shape < ShapeBase
     def move_to x, y
       real.moveTo x + left, y + top

data/lib/shoes/help.rb

@@ -120,6 +120,7 @@ class Manual < Shoes
         $1.split(/^ \* /).each do |txt|
           image File.join(DIR, '../static/purple_shoes-icon.png'), width: 20, height: 20
           flow(width: 510){show_paragraph txt, intro, i, term}
+          para NL
         end
       else
         show_paragraph text, intro, i, term
@@ -129,9 +130,7 @@ class Manual < Shoes
   end
   
   def show_paragraph txt, intro, i, term = nil
-    txt = txt.gsub("\n", ' ').gsub(/`(.+?)`/m){fg code($1), rgb(255, 30, 0)}.
-      gsub(/\^(.+?)\^/m, '\1').gsub(/'''(.+?)'''/m){strong($1)}.gsub(/''(.+?)''/m){em($1)}.
-      gsub(/\[\[BR\]\]/i, "\n")
+    txt = txt.gsub("\n", ' ').gsub(/\^(.+?)\^/m, '\1').gsub(/\[\[BR\]\]/i, "\n")
     txts = txt.split(/(\[\[\S+?\]\])/m).map{|s| s.split(/(\[\[\S+? .+?\]\])/m)}.flatten
     case txts[0]
     when /\A==== (.+) ====/; caption *marker($1, term), size: 24
@@ -141,7 +140,7 @@ class Manual < Shoes
     when /\A\{COLORS\}/; flow{color_page}
     when /\A\{SAMPLES\}/; flow{sample_page}
     else
-      para *mk_links(txts, term).flatten, NL, (intro and i.zero?) ? {size: 16} : ''
+      para *mk_deco(mk_links(txts, term).flatten), NL, (intro and i.zero?) ? {size: 16} : ''
       txt.gsub IMAGE_RE do
         para NL
         image File.join(DIR, "../static/#{$3}"), eval("{#{$2 or "margin_left: 50"}}")
@@ -457,6 +456,27 @@ class Manual < Shoes
       [txt]
     end
   end
+  
+  def mk_deco datas
+    datas = decoration(datas, /`(.+?)`/m){|s| fg code(s), rgb(255, 30, 0)}
+    datas = decoration(datas, /'''(.+?)'''/m){|s| strong s}
+    decoration(datas, /''(.+?)''/m){|s| em s}
+  end
+  
+  def decoration datas, re, &blk
+    datas.map do |data|
+      if data.is_a? String
+        txts = [data]
+        data.match re do |md|
+          n = data.index md[0]
+          txts = [data[0...n], blk[md[1]], decoration([data[n+md[0].length..-1]], re, &blk)]
+        end
+        txts
+      else
+        data
+      end
+    end.flatten  
+  end
 
   IMAGE_RE = /\!(\{([^}\n]+)\})?([^!\n]+\.\w+)\!/
   CODE_RE = /\{{3}(?:\s*\#![^\n]+)?(.+?)\}{3}/m

data/lib/shoes/helper_methods.rb

@@ -292,4 +292,10 @@ class Shoes
     tr.translate -left, -top
     gc.setTransform tr
   end
+
+  def self.dps_reset dps, gc
+    dps.each{|dp| dp.dispose if dp}
+    dps.clear
+    dps << gc
+  end
 end

data/lib/shoes/main.rb

@@ -14,6 +14,7 @@ class Shoes
     args[:top] ||= 0
 
     @display ||= Swt::Display.new
+    (@display.getFontList(nil, true).each{|f| FONTS << f.getName}; FONTS.uniq!) if FONTS.empty?
     shell = Swt::Shell.new @display, Swt::SWT::SHELL_TRIM | Swt::SWT::V_SCROLL
     shell.setSize args[:width] + 16, args[:height] + 38
     shell.setText args[:title]
@@ -51,6 +52,7 @@ class Shoes
     shell.addControlListener cl
 
     vb = shell.getVerticalBar
+    vb.setIncrement 10
     vb.setVisible false
     ln = Swt::SelectionListener.new
     class << ln; self end.

data/lib/shoes/ruby.rb

@@ -15,6 +15,13 @@ class Object
     mb.open
   end
 
+  def confirm msg
+    shell = Swt::Shell.new Shoes.display
+    mb = Swt::MessageBox.new shell, Swt::SWT::YES | Swt::SWT::NO | Swt::SWT::ICON_QUESTION
+    mb.setMessage msg.to_s
+    mb.open == Swt::SWT::YES ? true : false
+  end
+
   def ask_open_file
     dialog_chooser 'Open File...'
   end
@@ -37,6 +44,18 @@ class Object
     fd.setText title
     fd.open
   end
+
+  def ask_color title = 'Pick a color...'
+    shell = Swt::Shell.new Shoes.display
+    cd = Swt::ColorDialog.new shell
+    cd.setText title
+    color = cd.open
+    color ? [color.red, color.green, color.blue] : [255, 255, 255]
+  end
+
+  def ask msg, args={}
+    AskDialog.new(Swt::Shell.new, msg, args).open
+  end
 end
 
 class Array
@@ -59,3 +78,40 @@ class Array
     r + g + b > 0xAA * 3
   end
 end
+
+class AskDialog < Swt::Dialog
+  def initialize shell, msg, args
+    @shell, @msg, @args= shell, msg, args
+    super shell
+  end
+
+  def open
+    display = getParent.getDisplay
+    icon = Swt::Image.new display, File.join(DIR, '../static/purple_shoes-icon.png')
+    @shell.setImage icon
+    @shell.setSize 300, 125
+    @shell.setText 'Purple Shoes asks:'
+    label = Swt::Label.new @shell, Swt::SWT::NONE
+    label.setText @msg
+    label.setLocation 10, 10
+    label.pack
+    text = Swt::Text.new @shell, Swt::SWT::BORDER | Swt::SWT::SINGLE
+    text.setLocation 10, 30
+    text.setSize 270, 20
+    b = Swt::Button.new @shell, Swt::SWT::NULL
+    b.setText 'OK'
+    b.setLocation 180, 55
+    b.pack
+    b.addSelectionListener{|e| @ret = text.getText; @shell.close}
+    b = Swt::Button.new @shell, Swt::SWT::NULL
+    b.setText 'CANCEL'
+    b.setLocation 222, 55
+    b.pack
+    b.addSelectionListener{|e| @ret = nil; @shell.close}
+    @shell.open
+    while !@shell.isDisposed do
+      display.sleep unless display.readAndDispatch
+    end
+    @ret
+  end
+end

data/lib/shoes/slot.rb

@@ -77,6 +77,19 @@ class Shoes
       end
       @app.flush
     end
+
+    def append &blk
+      prepend contents.length, &blk
+    end
+    
+    def prepend n = 0
+      self.contents, tmp = contents[0...n], contents[n..-1]
+      cslot, @app.cslot = @app.cslot, self
+      yield
+      self.contents += tmp
+      @app.cslot = cslot
+      Shoes.call_back_procs @app
+    end
     
     def show
       @hided = true

data/static/manual-en.txt

@@ -38,7 +38,7 @@ just check out some screenshots, to give you an idea of what you can do.
 
 ==== Mac OS X ====
 
-Purple Shoes is confirmed on Apple Mac OSX10.5 PPC via X11. 
+Purple Shoes is confirmed on Apple Mac OS X. 
 !{margin_left: 100}../snapshots/sample3-osx.png!
 
 This is the `sample3.rb` on Mac OS X.  
@@ -48,19 +48,16 @@ All circles are drawn randomly. You can draw and animate shapes in Purple Shoes.
 ==== Windows ====
 
 Purple Shoes is confirmed to run on '''Microsoft Windows XP''' and '''Windows 7'''.
-!{margin_left: 0}../snapshots/sample33.png!
+!{margin_left: 100}../snapshots/sample21.png!
 
-Above is pictured the `sample33.rb` running on Windows 7.  Purple Shoes 
-has three extended libraries for chipmunk physics, bloopsaphone and 3D texture 
-mapping. First two are binary libraries, so far work on Windows only.
+Above is pictured the `sample21.rb` running on Windows 7. 
 
 ==== Linux ====
 
-Here's a screenshot of the `sample44.rb` running on '''Ubuntu
-on VirtualBox for Windows'''. !{margin_left: 130}../snapshots/sample44-linux.png!
+Here's a screenshot of the `sample44.rb` running on '''Ubuntu'''. !{margin_left: 130}../snapshots/sample44-linux.png!
 
 This example is also draws ovals and lines to build the clock, which is animated to
-show or hide itself several times each second.
+rotate clock hands several times each second.
 
 Notice the text on the top of the app, showing the current time. Purple Shoes has the
 skills to layout words using any color, bold, italics, underlines, and supports
@@ -71,22 +68,22 @@ loading fonts.
 Okay, on to installing Purple Shoes. I'm sure you're wondering: do I need to install
 Ruby? Do I need to unzip anything? What commands do I need to type?
 
-Yeah. You need to install Ruby and Gems. But, no need to worry about it.
+Yeah. You need to install JRuby and Gems. But, no need to worry about it.
 We'll talk through all the steps.
 
 ==== Step 1: Installing Purple Shoes ====
 
-At first, install Ruby. On '''Windows''', 
-visit the site of [[http://rubyinstaller.org/ RubyInstaller for Windows]] to 
-download the latest '''RubyInstaller 1.9.2 or 1.9.3'''.
+At first, install JRuby. On '''Windows''', 
+visit the site of [[http://jruby.org/download JRuby Downloads]] to 
+download the latest '''JRuby 1.6.7 Windows Executable'''.
 
 Then just do the following one line.
 
- * gem install green_shoes
+ * jruby --1.9 -S gem install purple_shoes
 
 That's all. Too easy?
 
-'''Note:''' green_shoes gem is on [[http://rubygems.org/gems/green_shoes RubyGems.org]].
+'''Note:''' purple_shoes gem is on [[http://rubygems.org/gems/purple_shoes RubyGems.org]].
 If you get some errors of rdoc, try to add `--no-ri --no-rdoc` option.
 
 ==== Step 2: Start a New Text File ====
@@ -102,7 +99,7 @@ Here are a few ways to create a blank text file:
 Now, in your blank window, type in the following:
 
 {{{
- require 'green_shoes'
+ require 'purple_shoes'
  Shoes.app do
    para "Welcome to Shoes"
  end
@@ -114,7 +111,7 @@ Save to your desktop as `welcome.rb`.
 
 To run your program, just open console window and run the following.
 
- * ruby welcome.rb !man-editor-osx.png!
+ * jruby --1.9 welcome.rb !man-editor-osx.png!
 
 So, not much of a program yet.  But it's something!  You've got the knack of it, at least!
 
@@ -129,10 +126,9 @@ Still, Shoes does have a few widgets like buttons and edit boxes. And many
 missing elements (like tabbed controls or toolbars) can be simulated with
 images.
 
-Shoes is written in part thanks to a very good art engine called Cairo, which
-is used for drawing with shapes and colors. Also thanks to an awesome text 
-lay out engine called Pango. In this way, Shoes is inspired by
-NodeBox and Processing, two very good languages for drawing animated graphics.
+Shoes is written in part thanks to a very good graphical widget toolkit called '''SWT'''. 
+In this way, Shoes is inspired by NodeBox and Processing, two very good languages 
+for drawing animated graphics.
 
 == The Rules of Purple Shoes ==
 
@@ -186,7 +182,7 @@ block changes `self`.
 
 The other block is the `stack` block.  That block does NOT change self.
 
-'''For what reason does the `app` block change self?'''  Let's start by
+'''For what reason does the''' `app` '''block change self?'''  Let's start by
 spelling out that last example completely.
 
 {{{
@@ -217,7 +213,7 @@ All of the `self`s in the above example are the App object.  Purple Shoes uses R
 
 These instance variables will all end up inside the App object.
 
-'''Whenever you create a new Shoes.app window, `self` is also changed.'''
+'''Whenever you create a new Shoes.app window,''' `self` '''is also changed.'''
 
 {{{
  Shoes.app title: "MAIN" do
@@ -311,7 +307,7 @@ As you can imagine, the `app` object changes `self` to the App object.
 
 So the rules here are:
 
-1. '''Methods named "app" or which create new windows alter `self` to the App
+1. '''Methods named "app" or which create new windows alter''' `self` '''to the App
 object.'''[[BR]](This is true for both Shoes.app and Slot.app, as well as
 [[Element.window]] and [[Element.dialog]].)[[BR]]
 2. '''Blocks attached to stacks, flows or any manipulation method (such as
@@ -352,6 +348,7 @@ One difference between normal slots and nested window slots is that the latter
 can have scrollbars.
 
 {{{
+ # Not yet available
  Shoes.app do
    stack width: 200, height: 200, scroll: true do
      background "#DFA"
@@ -367,8 +364,8 @@ These nested windows require more memory.  They tax the application a bit more.
 So if you're experiencing some slowness with hundreds of fixed-height slots,
 try a different approach.
 
-'''Note:''' Fixed height magic (the slot becomes a nested window) is implemented 
-in Purple Shoes as a trial so far. Need to add `flush` method.
+'''Note:''' Fixed height magic (the slot becomes a nested window) is not implemented 
+in Purple Shoes.
 
 {{{
  Shoes.app do
@@ -628,19 +625,20 @@ are trying to sniff out what release of Purple Shoes is running.
 
 '''FONTS''' is a complete list of fonts available to the app. 
 
-'''VERSION''' is a Purple Shoes version. 
+'''SHOES_VERSION''' is a Purple Shoes version. 
 
 {{{
  Shoes.app do
-   para VERSION
+   para SHOES_VERSION
    para fg(DIR, red)
-   image File.join(DIR, '../static/gshoes-icon.png')
+   image File.join(DIR, 
+     '../static/purple_shoes-icon.png')
    para fg(FONTS.join(', '), green)
    para COLORS.map{|k, v| [k, v]}
  end
 }}}
 
-=== alert(message: a string, :block => true or false, title: a string) » nil ===
+=== alert(message: a string) » nil ===
 
 Pops up a window containing a short message.
 
@@ -653,9 +651,6 @@ Please use alerts sparingly, as they are incredibly annoying!  If you are using
 alerts to show messages to help you debug your program, try checking out the
 standard Ruby method `puts` or `p` methods.
 
-If you want to make alert() thread safe, i.e. unblock main thread, use `:block => false` option.
-If you want to change window title, use `:title => a string` option.
-
 === ask(message: a string) » a string ===
 
 Pops up a window and asks a question. For example, you may want to ask someone
@@ -757,9 +752,6 @@ you'll get back a `true`. If not, you'll get back `false`.
 
 Stops your program. Call this anytime you want to suddenly call it quits.
 
-'''PLEASE NOTE:''' If you need to use Ruby's own `exit` method (like in a
-forked Ruby process,) call `Kernel.exit`.
-
 === font(message: a string) » an array of font family names ===
 
 Loads a TrueType (or other type of font) from a file.  While TrueType is
@@ -841,7 +833,7 @@ When passing in a whole number, use values from 0 to 255.
    blueviolet = rgb(138, 43, 226, 0.5)
    darkgreen = rgb(0, 100, 0, 0.5)
    oval 100, 100, 100,
-     fill: [blueviolet, darkgreen].sample(1)
+     fill: [blueviolet, darkgreen].sample
  end
 }}}
 
@@ -852,7 +844,7 @@ Or, use a decimal number from 0.0 to 1.0.
    blueviolet = rgb(0.54, 0.17, 0.89)
    darkgreen = rgb(0, 0.4, 0)
    oval 100, 100, 100,
-     fill: [blueviolet, darkgreen].sample(1)
+     fill: [blueviolet, darkgreen].sample
  end
 }}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purple_shoes
 version: !ruby/object:Gem::Version
-  version: 0.0.101
+  version: 0.0.115
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: swt
-  requirement: &18043236 !ruby/object:Gem::Requirement
+  requirement: &18076020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18043236
-description: Purple Shoes is one of colorful Shoes, written in JRuby ans SWT.
+  version_requirements: *18076020
+description: Purple Shoes is one of colorful Shoes, written in JRuby and SWT.
 email: ashbbb@gmail.com
 executables:
 - pshoes