swing 0.1.14 → 0.1.15

data/HISTORY

@@ -77,3 +77,7 @@
 == 0.1.14 / 2011-05-28
 
 * Block given to JComponent constructor is now yielded to
+
+== 0.1.15 / 2011-05-28
+
+* Blocks given to constructor processed

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/awt/component.rb

@@ -1,8 +1,10 @@
 require 'swing_support/extensions/attributes'
+require 'swing_support/extensions/blocks'
 
 class Awt::Component
 
   include SwingSupport::Extensions::Attributes
+  include SwingSupport::Extensions::Blocks
 
   #    background       Color � �
   #    cursor           Cursor � � Cursor.DEFAULT_CURSOR

data/lib/swing/j_button.rb

@@ -2,9 +2,8 @@ require 'swing'
 
 class Swing::JButton
 
-  def initialize *args, &block
-    super *args
-
+  def add_block_listener &block
     self.addActionListener SwingSupport::ActionListener.new &block
   end
+
 end # class JButton

data/lib/swing/j_check_box.rb

@@ -4,10 +4,9 @@ class Swing::JCheckBox
 
   attr_setter :selected
 
-  def initialize *args, &block
-    super *args
-
+  def add_block_listener &block
     # TODO: Probably need to implement ItemListener as well?
     self.addActionListener SwingSupport::ActionListener.new &block
   end
+
 end # class JCheckBox

data/lib/swing/j_menu_item.rb

@@ -2,8 +2,7 @@ require 'swing'
 
 class Swing::JMenuItem
 
-  def initialize text, &block
-    super text
+  def add_block_listener &block
     self.addActionListener SwingSupport::ActionListener.new &block
   end
 

data/lib/swing_support/extensions/attributes.rb

@@ -1,5 +1,3 @@
-import java.awt.Dimension
-
 module SwingSupport
   module Extensions
     # Module allows including classes to receive attribute values in an *opts* Hash
@@ -44,7 +42,7 @@ module SwingSupport
         # Sets attributes after calling original new
         def new_with_attributes(*args, &block)
           opts = args.last.is_a?(Hash) ? args.pop.dup : {}
-          component = self.new_without_attributes(*args) #, &block)
+          component = self.new_without_attributes(*args, &block)
 
           # Extract known attributes given in opts,
           # run default actions on them, or return known defaults
@@ -78,8 +76,6 @@ module SwingSupport
           # Raises exception if any of the given options left unprocessed
           raise "Unrecognized options: #{opts}" unless opts.empty?
 
-          yield component if block_given?
-
           component
         end
       end

data/lib/swing_support/extensions/blocks.rb

@@ -0,0 +1,31 @@
+module SwingSupport
+  module Extensions
+    # Module allows including classes to process blocks given to constructor
+    # If the class defines #add_block_listener method, block is treated as default listener,
+    # otherwise, newly constructed object is just yielded to the block
+    module Blocks
+      def self.included host
+        host.send :extend, ClassMethods
+        host.instance_eval do
+          alias :new_without_blocks :new
+          alias :new :new_with_blocks
+        end
+      end
+
+      module ClassMethods
+        def new_with_blocks(*args, &block)
+          component = self.new_without_blocks(*args)
+          if block_given?
+            if component.respond_to? :add_block_listener
+              component.add_block_listener &block
+            else
+              # TODO: some kind of fancy processing of nested blocks/components
+              yield component
+            end
+          end
+          component
+        end
+      end
+    end
+  end
+end

data/lib/swing_support.rb

@@ -2,4 +2,5 @@ module SwingSupport
 end
 
 require 'swing_support/extensions/attributes'
+require 'swing_support/extensions/blocks'
 require 'swing_support/action_listener'

data/spec/swing/j_button_spec.rb

@@ -10,8 +10,16 @@ describe Swing::JButton do
     it_behaves_like 'enhanced Swing::JComponent'
 
     it 'is possible to set :enabled attribute to false' do
-      button = Swing::JButton.new 'Disconnect', :enabled => false
+      button = Swing::JButton.new 'Test', :enabled => false
       button.should_not be_enabled
     end
+
+    it 'accepts action listener block' do
+      button = Swing::JButton.new('Test') { @block_called = true}
+      @block_called.should be_false
+
+      button.do_click
+      @block_called.should be_true
+    end
   end
 end

data/spec/swing/j_menu_item_spec.rb

@@ -9,5 +9,13 @@ describe Swing::JMenuItem do
     it_behaves_like 'enhanced Awt::Component'
     it_behaves_like 'enhanced Swing::JComponent'
 
+    it 'accepts action listener block' do
+      item = Swing::JMenuItem.new('Test') { @block_called = true}
+      @block_called.should be_false
+
+      item.do_click
+      @block_called.should be_true
+    end
+
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: swing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
   - arvicco
@@ -84,6 +84,7 @@ files:
   - lib/swing_support/extensions.rb
   - lib/swing_support/extensions/attr_setter.rb
   - lib/swing_support/extensions/attributes.rb
+  - lib/swing_support/extensions/blocks.rb
   - spec/spec_helper.rb
   - spec/swing_spec.rb
   - spec/awt/component_spec.rb