reflexion 0.1.3 → 0.1.4

data/lib/reflex/bounds.rb

@@ -1,133 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-require 'reflex/point'
+require 'rays/bounds'
 
 
 module Reflex
 
 
-  class Bounds
-
-    include Comparable
-
-    attr_accessor :x, :y, :width, :height
-
-    def initialize (*args)
-      case args.size
-      when 0 then @x = @y = @width = @height = 0
-      when 1 then @x = @y = 0; @width = @height = args[0]
-      when 2 then @x = @y = 0; @width, @height = args
-      when 4 then @x, @y, @width, @height = args
-      else raise ArgumentError
-      end
-    end
-
-    def right ()
-      @x + @width - 1
-    end
-
-    def right= (right)
-      @width = right + 1 - @x
-    end
-
-    def bottom ()
-      @y + @height - 1
-    end
-
-    def bottom= (bottom)
-      @height = bottom + 1 - @y
-    end
-
-    alias w  width
-    alias w= width=
-
-    alias h  height
-    alias h= height=
-
-    alias left  x
-    alias left= x=
-
-    alias top   y
-    alias top=  y=
-
-    alias l  left
-    alias l= left=
-
-    alias t  top
-    alias t= top=
-
-    alias r  right
-    alias r= right=
-
-    alias b  bottom
-    alias b= bottom=
-
-    def offset_to! (*args)
-      @x, @y = case args.size
-      when 1 then args * 2
-      when 2 then args
-      else raise ArgumentError
-      end
-      self
-    end
-
-    def offset_to (*args)
-      dup.offset_to! *args
-    end
-
-    def offset_by! (*args)
-      dx, dy = case args.size
-      when 1 then args * 2
-      when 2 then args
-      else raise ArgumentError
-      end
-      @x += dx
-      @y += dy
-      self
-    end
-
-    def offset_by (*args)
-      dup.offset_by! *args
-    end
-
-    def inset_by! (*args)
-      dx, dy = case args.size
-      when 1 then args * 2
-      when 2 then args
-      else raise ArgumentError
-      end
-      @x      += dx
-      @y      += dy
-      @width  -= dx * 2
-      @height -= dy * 2
-      self
-    end
-
-    def inset_by (*args)
-      dup.inset_by! *args
-    end
-
-    def to_a ()
-      [@x, @y, @width, @height]
-    end
-
-    def [] (index)
-      case index
-      when 0 then Point.new(left,  top)
-      when 1 then Point.new(right, bottom)
-      else raise IndexError
-      end
-    end
-
-    def <=> (o)
-      ret = @x    <=> o.x;     return ret if ret != 0
-      ret = @y    <=> o.y;     return ret if ret != 0
-      ret = right <=> o.right; return ret if ret != 0
-      bottom <=> o.bottom
-    end
-
-  end# Bounds
+  Bounds = Rays::Bounds
 
 
 end# Reflex

data/lib/reflex/ext.rb

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/native'
+require 'reflex/native'

data/lib/reflex/helpers.rb

@@ -1,52 +1,57 @@
 # -*- coding: utf-8 -*-
 
 
+require 'reflex/point'
+require 'reflex/bounds'
+
+
 module Reflex
 
 
-  module Hookable
+  module HasBounds
 
-    def hook (name, &hookblock)
-      klass = class << self; self; end
-      original = klass.instance_method(name).bind self
-      obj = self
-      klass.__send__ :define_method, name do |*args, &methodblock|
-        hookblock.call self, original, *args, &methodblock
-      end
-      self
+    def bounds (*args)
+      b = get_bounds
+      b.move_to! *args unless args.empty?
+      b
     end
 
-    def before (name, &beforeblock)
-      hook name do |obj, org, *args, &methodblock|
-        beforeblock.call(obj, *args, &methodblock)
-        org.call(*args, &methodblock)
+    def bounds= (*args)
+      case args[0]
+      when Bounds
+        set_bounds *args[0].to_a
+      when Point
+        set_bounds *args.map{|p| p.to_a}.flatten
+      when Array
+        set_bounds *args[0]
+      when Integer, Float
+        set_bounds *args
       end
     end
 
-    def after (name, &afterblock)
-      hook name do |obj, org, *args, &methodblock|
-        ret = org.call(*args, &methodblock)
-        afterblock.call(obj, *args, &methodblock)
-        ret
-      end
+    def move_to (x, y)
+      b = self.bounds
+      b.x, b.y = x, y
+      self.bounds = b
     end
 
-    def on (name, &onblock)
-      hook name do |obj, org, *args, &methodblock|
-        onblock.call(obj, *args, &methodblock)
-      end
+    def move_by (dx, dy)
+      b = self.bounds
+      move_to b.x + dx, b.y + dy
     end
 
-  end# Hookable
-
-
-  module Setter
+    def resize_to (width, height)
+      b = self.bounds
+      b.width, b.height = width, height
+      self.bounds = b
+    end
 
-    def set (name, *value)
-      __send__ name.to_s + '=', *value
+    def resize_by (dwidth, dheight)
+      b = self.bounds
+      resize_to b.width + dwidth, b.height + dheight
     end
 
-  end# Setter
+  end# HasBounds
 
 
-end# Helpers
+end# Reflex

data/lib/reflex/image.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/image'
+
+
+module Reflex
+
+
+  Image = Rays::Image
+
+
+end# Reflex

data/lib/reflex/module.rb

@@ -22,8 +22,15 @@ module Reflex
       File.join root_dir, 'task'
     end
 
-    def load_tasks ()
-      Dir["#{task_dir}/**/*.rake"].each {|path| load path}
+    def load_tasks (*names)
+      if names.empty?
+        Dir["#{task_dir}/**/*.rake"].each {|path| load path}
+      else
+        names.each do |name|
+          path = "#{task_dir}/#{name}.rake"
+          load path if File.exist? path
+        end
+      end
     end
 
     def version ()

data/lib/reflex/painter.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/painter'
+
+
+module Reflex
+
+
+  Painter = Rays::Painter
+
+
+end# Reflex

data/lib/reflex/point.rb

@@ -1,69 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-module Reflex
-
-
-  class Point
-
-    include Comparable
-
-    attr_accessor :x, :y
-
-    def initialize (*args)
-      case args.size
-      when 0 then @x = @y = 0
-      when 1 then @x = @y = args[0]
-      when 2 then @x, @y = args
-      else raise ArgumentError
-      end
-    end
+require 'rays/point'
 
-    def offset_to! (*args)
-      case args.size
-      when 1 then @x = @y = args[0]
-      when 2 then @x, @y = args
-      else raise ArgumentError
-      end
-      self
-    end
 
-    def offset_to (*args)
-      dup.offset_to! *args
-    end
-
-    def offset_by! (*args)
-      case args.size
-      when 1 then @x += args[0]; @y += args[0]
-      when 2 then @x += args[0]; @y += args[1]
-      else raise ArgumentError
-      end
-      self
-    end
-
-    def offset_by (*args)
-      dup.offset_by! *args
-    end
-
-    def to_a ()
-      [@x, @y]
-    end
-
-    def [] (index)
-      case index
-      when 0 then @x
-      when 1 then @y
-      else raise IndexError
-      end
-    end
+module Reflex
 
-    def <=> (o)
-      ret = @x <=> o.x
-      return ret if ret != 0
-      @y <=> o.y
-    end
 
-  end# Point
+  Point = Rays::Point
 
 
 end# Reflex

data/lib/reflex/reflex.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require 'reflex/native'
+require 'reflex/ext'
 
 
 module Reflex

data/lib/reflex/texture.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/texture'
+
+
+module Reflex
+
+
+  Texture = Rays::Texture
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/hookable'
+require 'xot/setter'
+require 'xot/blockutil'
+require 'reflex/ext'
+require 'reflex/helpers'
+
+
+module Reflex
+
+
+  class View
+
+    include Xot::Hookable
+    include Xot::Setter
+    include HasBounds
+
+    alias add    add_child
+    alias remove remove_child
+    alias find   find_child
+
+    def initialize (opts = {}, &block)
+      super()
+      set opts
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+  end# View
+
+
+end# Reflex

data/lib/reflex/visuals/string.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+
+require 'reflex/image'
+require 'reflex/bitmap'
+require 'reflex/view'
+
+
+module Reflex
+
+
+  module Visuals
+
+
+    class String < View
+
+      attr_reader :data
+
+      def data= (data)
+        if data != @data
+          @data = data
+          @image = nil
+        end
+        @data
+      end
+
+      def draw (painter, bounds)
+        return unless @image ||= create_image(painter)
+        painter.fill = 0
+        painter.image @image
+      end
+
+      private
+
+        def create_image (painter)
+          dat = self.data
+          return nil unless dat
+          str = dat.to_s
+          font = painter.font
+          size = font.width(str), font.height * 10
+          resize_to *size
+          bmp = Bitmap.new *size, :GRAY
+          bmp.draw_string str
+          Image.new bmp, true
+        end
+
+    end# String
+
+
+  end# Visuals
+
+
+end# Reflex

data/lib/reflex/window.rb

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-require 'reflex/native'
-require 'reflex/bounds'
+require 'forwardable'
+require 'xot/hookable'
+require 'xot/setter'
+require 'xot/blockutil'
+require 'reflex/ext'
+require 'reflex/painter'
 require 'reflex/helpers'
-require 'rays/painter'
 
 
 module Reflex
@@ -12,51 +15,23 @@ module Reflex
 
   class Window
 
-    include Hookable
-    include Setter
+    include Xot::Hookable
+    include Xot::Setter
+    include HasBounds
 
-    attr_reader :painter
+    extend Forwardable
 
-    def initialize (opts = {}, &block)
-      @painter = Rays::Painter.new.canvas 0, 0, 1, 1
-      opts.each {|key, value| set key.intern, *value}
-      instance_eval &block if block
-    end
-
-    def paint ()
-      @painter.begin
-      yield @painter if block_given?
-      @painter.end
-    end
-
-    def bounds (*args)
-      b = Bounds.new *get_bounds
-      b.offset_to! *args unless args.empty?
-      b
-    end
-
-    def bounds= (*args)
-      case args[0]
-      when Bounds
-        set_bounds *args[0].to_a
-      when Point
-        set_bounds *args.map{|p| p.to_a}.flatten
-      when Array
-        set_bounds *args[0]
-      when Integer, Float
-        set_bounds *args
-      end
-    end
+    def_delegators :root,
+      :add, :remove, :find
 
-    def draw ()
-      paint
+    def initialize (opts = {}, &block)
+      super()
+      set opts
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    alias org_resized resized
-
-    def resized (width, height)
-      @painter.canvas 0, 0, width, height
-      org_resized width, height
+    def paint (&block)
+      painter.begin &block
     end
 
   end# Window

data/lib/reflex.rb

@@ -4,8 +4,8 @@
 require 'reflex/autoinit'
 require 'reflex/module'
 require 'reflex/reflex'
-require 'reflex/point'
-require 'reflex/bounds'
 require 'reflex/application'
 require 'reflex/window'
-require 'reflex/helpers'
+require 'reflex/view'
+
+require 'reflex/visuals/string'

data/reflex.gemspec

@@ -1,70 +1,44 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-$: << File.join(File.dirname(__FILE__), 'lib')
+$: << File.expand_path('../lib', __FILE__)
 
-require 'rake'
 require 'reflex/module'
 
 
-MODULE = Reflex
-NAME   = MODULE.name.downcase
-
-
-FILES = FileList[*%W[
-  README
-  ChangeLog
-  Rakefile
-  #{NAME}.gemspec
-  VERSION
-  task/**/*.rake
-  ext/**/*.rb
-  ext/**/*.h
-  ext/**/*.cpp
-  include/**/*.h
-  lib/**/*.rb
-  src/**/*.h
-  src/**/*.cpp
-  src/**/*.mm
-  examples/**/README
-  examples/**/Rakefile
-  examples/**/*.h
-  examples/**/*.cpp
-  examples/**/*.rb
-  test/**/*.rb
-]]
-
-RDOCS = FileList[*%W[
-  README
-  .doc/ext/**/*.cpp
-]]
+Gem::Specification.new do |s|
+  def glob (*patterns)
+    patterns.map {|pat| Dir.glob(pat).to_a}.flatten
+  end
 
+  mod   = Reflex
+  name  = mod.name.downcase
+  rdocs = glob *%w[README .doc/ext/**/*.cpp]
 
-Gem::Specification.new do |s|
-  s.name        = "#{NAME}ion"
+  s.name        = "#{name}ion"
   s.summary     = 'A Graphical User Interface Tool Kit.'
   s.description = 'This library helps you to develop interactive graphical user interface.'
-  s.version     = MODULE.version
+  s.version     = mod.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{NAME}"
+  s.homepage = "http://github.com/xord/#{name}"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
-  s.require_paths         << 'ext'
 
+  s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'xot'
   s.add_runtime_dependency 'rucy'
   s.add_runtime_dependency 'rays'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
-  s.files      = FILES.to_a
-  s.test_files = FileList['test/**/test_*.rb'].to_a
-
+  s.files            = `git ls-files`.split $/
+  s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
+  s.test_files       = s.files.grep %r{^(test|spec|features)/}
+  s.extra_rdoc_files = rdocs.to_a
   s.has_rdoc         = true
-  s.extra_rdoc_files = RDOCS.to_a
 
   s.extensions << 'Rakefile'
 end