smalruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b4e041e1339e93000745877678c14cef4a65259
-  data.tar.gz: 008b2e5051dbb6bb5c18a7f23befd3d7a68d9bc1
+  metadata.gz: a6ffd138d50392da1d959baaaf5434e0dbb8d498
+  data.tar.gz: e656644b4616ec34134827b4e8611e25200433ce
 SHA512:
-  metadata.gz: a063982bd0fa45e6aa5aa591899e15c501884ca2736c4c93fcceaec61c6b7325783535455a4c42c9ce22e9bd5334c5522bf5f89d4428a63c578cb35819188672
-  data.tar.gz: 67ed9dd5e0ac013130194208b35df444d7940387006a31d758ee9f86d364e5952b4dda1d13bc6f2d536b691f575fba1efc42ee7d8f390bc100c0dd0437b843e7
+  metadata.gz: 81c3ab25a45088f9d0b3d0d693e1c43d295ada2d76089646fd43ef9598fd0319a59164012a1cc4768dc11e54861202d6613c72f305d2fd2b0e7027bafd7aeee9
+  data.tar.gz: da6a8060951a5699c1ad67c3ddb58df91e7983dd62055c366155f3b1d1da49968a0c5ea2b34f7dc388cdc5db3c64b15130997b6226cb8bcb0beebe32355b7563

data/lib/smalruby/canvas.rb

@@ -4,84 +4,118 @@ module Smalruby
   # お絵かきを表現するクラス
   class Canvas < Character
     def initialize(option = {})
-      opt = {
+      defaults = {
         x: 0,
         y: 0,
         width: Window.width,
         height: Window.height,
-      }.merge(option)
+      }
+      opt = process_optional_arguments(option, defaults)
+
       opt[:costume] = Image.new(opt[:width], opt[:height])
-      super(opt)
+      super(opt.reject { |k, v| [:width, :height].include?(k) })
       image.set_color_key([0, 0, 0])
     end
 
     # @!group ペン
 
     def draw_font(option)
-      opt = {
+      defaults = {
         x: 0,
         y: 0,
         string: "",
         size: 32,
-        color: "white",
-      }.merge(option)
+      }.merge(DEFAULT_COLOR_OPTION)
+      opt = process_optional_arguments(option, defaults)
+
       image.draw_font(opt[:x], opt[:y], opt[:string], new_font(opt[:size]),
                       Color.smalruby_to_dxruby(opt[:color]))
     end
 
     def line(option)
-      opt = {
-        color: "white",
-      }.merge(verify_rect_option(option))
+      opt = process_rect_option(option)
+
       image.line(opt[:left], opt[:top], opt[:right], opt[:bottom],
                  Color.smalruby_to_dxruby(opt[:color]))
     end
 
     def box(option)
-      opt = {
-        color: "white",
-      }.merge(verify_rect_option(option))
+      opt = process_rect_option(option)
+
       image.box(opt[:left], opt[:top], opt[:right], opt[:bottom],
                 Color.smalruby_to_dxruby(opt[:color]))
     end
 
     def box_fill(option)
-      opt = {
-        color: "white",
-      }.merge(verify_rect_option(option))
+      opt = process_rect_option(option)
+
       image.box_fill(opt[:left], opt[:top], opt[:right], opt[:bottom],
                      Color.smalruby_to_dxruby(opt[:color]))
     end
 
     def circle(option)
-      opt = {
-        color: "white",
-      }.merge(option)
+      opt = process_circle_option(option)
+
       image.circle(opt[:x], opt[:y], opt[:r],
                    Color.smalruby_to_dxruby(opt[:color]))
     end
 
     def circle_fill(option)
-      opt = {
-        color: "white",
-      }.merge(option)
+      opt = process_circle_option(option)
+
       image.circle_fill(opt[:x], opt[:y], opt[:r],
                         Color.smalruby_to_dxruby(opt[:color]))
     end
 
+    def fill(option)
+      opt = process_optional_arguments(option, DEFAULT_COLOR_OPTION)
+
+      image.box_fill(0, 0, image.width, image.height,
+                     Color.smalruby_to_dxruby(opt[:color]))
+    end
+
     def_delegators :image, :clear
 
     # @!endgroup
 
     private
 
-    def verify_rect_option(option)
-      return {
+    DEFAULT_COLOR_OPTION = {
+      color: 'white',
+    }
+    private_constant :DEFAULT_COLOR_OPTION
+
+    DEFAULT_RECT_OPTION = {
+      left: nil,
+      top: nil,
+      right: nil,
+      bottom: nil,
+
+      x1: nil,
+      y1: nil,
+      x2: nil,
+      y2: nil,
+    }
+    private_constant :DEFAULT_RECT_OPTION
+
+    def process_rect_option(option)
+      defaults = DEFAULT_COLOR_OPTION.merge(DEFAULT_RECT_OPTION)
+      opt = {
         left: option[:x1],
         top: option[:y1],
         right: option[:x2],
         bottom: option[:y2],
       }.merge(option)
+      process_optional_arguments(opt, defaults)
+    end
+
+    def process_circle_option(option)
+      defaults = {
+        x: 5,
+        y: 5,
+        r: 5,
+      }.merge(DEFAULT_COLOR_OPTION)
+      process_optional_arguments(option, defaults)
     end
   end
 end

data/lib/smalruby/character.rb

@@ -16,12 +16,13 @@ module Smalruby
     attr_accessor :checking_hit_targets
 
     def initialize(option = {})
-      opt = {
+      defaults = {
         x: 0,
         y: 0,
         costume: nil,
         visible: true
-      }.merge(option)
+      }
+      opt = process_optional_arguments(option, defaults)
 
       # TODO: コスチュームの配列に対応する
       if opt[:costume].is_a?(String)
@@ -130,8 +131,13 @@ module Smalruby
     # @!group 音
 
     def play(option = {})
+      defaults = {
+        name: 'piano_do.wav',
+      }
+      opt = process_optional_arguments(option, defaults)
+
       @sound_cache ||= {}
-      (@sound_cache[option[:name]] ||= Sound.new(asset_path(option[:name])))
+      (@sound_cache[opt[:name]] ||= Sound.new(asset_path(opt[:name])))
         .play
     end
 
@@ -208,15 +214,27 @@ module Smalruby
       objects = check(@checking_hit_targets)
       return if objects.empty?
       @event_handlers[:hit].try(:each) do |h|
-        if h.options.length == 0 && !h.options.any? { |o| objects.include?(o) }
+        if h.options.length > 0 && !h.options.any? { |o| objects.include?(o) }
           next
         end
-        @threads << h.call(objects)
+        @threads << h.call(h.options & objects)
       end
     end
 
     def alive?
-      return @threads.any?(&:alive?)
+      @threads.delete_if { |t|
+        if t.alive?
+          false
+        else
+          begin
+            t.join
+          rescue => e
+            print_exception(e)
+          end
+          true
+        end
+      }
+      @threads.length > 0
     end
 
     def join
@@ -263,5 +281,19 @@ module Smalruby
         @balloon.draw
       end
     end
+
+    def process_optional_arguments(options, defaults)
+      unknown_keys = options.keys - defaults.keys
+      if unknown_keys.length > 0
+        s = unknown_keys.map { |k| "#{k}: #{options[k].inspect}" }.join(', ')
+        fail ArgumentError, "Unknown options: #{s}"
+      end
+      defaults.merge(options)
+    end
+
+    def print_exception(exception)
+      $stderr.puts("#{exception.class}: #{exception.message}")
+      $stderr.puts("        #{exception.backtrace.join("\n        ")}")
+    end
   end
 end

data/lib/smalruby/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Smalruby
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/smalruby.rb

@@ -168,7 +168,5 @@ end
 include Smalruby
 
 at_exit do
-  if !Smalruby.started?
-    Smalruby.start
-  end
+  Smalruby.start if !$ERROR_INFO && !Smalruby.started?
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler