swing 0.1.4 → 0.1.5

data/HISTORY

@@ -41,3 +41,7 @@
 == 0.1.4 / 2011-05-26
 
 * More specs
+
+== 0.1.5 / 2011-05-26
+
+* Attributes speced

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/awt/component.rb

@@ -16,7 +16,6 @@ class Awt::Component
   #    layout           LayoutManager � � BorderLayout( )
   #    locale           Locale � �
   #    location         Point � �
-  #    locationOnScreen Point � �
   #    name             String � � ""
   #    parent           Container � � null
   #    size             Dimension � �
@@ -27,9 +26,10 @@ class Awt::Component
   #    componentCount   int �
   #    components       Component[] �
   #    insets           Insets � Insets(0,0,0,0)
+  #    locationOnScreen Point � �
   #    showing          boolean � true
   #    valid            boolean �
 
-  attr_setter :background, :cursor, :enabled, :font, :foreground, :layout, :locale,
-              :location, :location_on_screen, :name, :parent, :size, :visible
+  attr_setter :background, :cursor, :enabled, :font, :foreground, :layout,
+              :locale, :location, :name, :size, :visible
 end

data/lib/swing/j_list.rb

@@ -1,7 +1,8 @@
 require 'swing'
 
 class Swing::JList
+
   attr_setter :tool_tip_text
 
-end # class List
+end # class JList
 

data/lib/swing/j_menu_bar.rb

@@ -6,9 +6,9 @@ class Swing::JMenuBar
 
   attr_setter :tool_tip_text
 
-  def initialize opts = {}
-    super opts
-
+  # Override post-processing (non-setter) options given to initialize
+  def self.post_process component, opts
+    # Create menu structure from :structure opt
     if opts[:structure]
       [opts[:structure]].flatten.each do |element|
         case element
@@ -20,15 +20,17 @@ class Swing::JMenuBar
               end
             end
           else
-            self.add element
+            component.add element
         end
       end
     end
+    add_component component, opts[:parent]
   end
 
-  # Post-processing (non-setter) options given to initialize
+  # Proper way to add menu bar to its parent
   def self.add_component component, parent
-    parent.setJMenuBar component if parent
+    parent.setJMenuBar component if parent and parent.respond_to? :setJMenuBar
   end
 
+
 end

data/lib/swing/j_menu_item.rb

@@ -1,10 +1,12 @@
 require 'swing'
 
 class Swing::JMenuItem
+
   attr_setter :tool_tip_text
 
-  def initialize text, opts = {}, &block
+  def initialize text, &block
     super text
-    self.addActionListener SwingHelper::ActionListener.new &block
+    self.addActionListener SwingSupport::ActionListener.new &block
   end
+
 end

data/lib/swing/j_panel.rb

@@ -3,4 +3,5 @@ require 'swing'
 class Swing::JPanel
 
   attr_setter :tool_tip_text
+
 end # class Panel

data/lib/swing/j_split_pane.rb

@@ -6,7 +6,11 @@ class Swing::JSplitPane
   attr_setter :one_touch_expandable, :orientation, :continuous_layout,
               :divider_size, :divider_location, :resize_weight
 
-  def initialize first, second, opts = {}
-    super(HORIZONTAL_SPLIT, first, second)
+  def initialize *args
+    if args.size == 2
+      super HORIZONTAL_SPLIT, *args
+    else
+      super *args
+    end
   end
 end # class JSplitPane

data/lib/swing_support/extensions/attributes.rb

@@ -50,12 +50,17 @@ module SwingSupport
           #      yield opts if block_given?
           attributes.each { |(name, value)| component.send "#{name}=", *value }
 
-          # Post-process non-setter opts
-          add_component component, opts[:parent]
+          # Post-process non-setter opts (setter opts are already consumed by now)
+          post_process component, opts
           component
         end
 
         # Post-processing (non-setter) options given to initialize
+        def post_process component, opts
+          add_component component, opts[:parent]
+        end
+
+        # Proper way to add this component to its parent
         def add_component component, parent
           parent.add component if parent
         end

data/spec/swing/j_button_spec.rb

@@ -7,15 +7,11 @@ describe Swing::JButton do
     let(:new_args) { ['Text'] }
 
     it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
 
     it 'is possible to set :enabled attribute to false' do
       button = Swing::JButton.new 'Disconnect', :enabled => false
       button.should_not be_enabled
     end
-
-    it 'is possible to set :tool_tip_text attribute' do
-      button = Swing::JButton.new 'Disconnect', :tool_tip_text => 'Blah'
-      button.tool_tip_text.should == 'Blah'
-    end
   end
 end

data/spec/swing/j_check_box_spec.rb

@@ -7,15 +7,11 @@ describe Swing::JCheckBox do
     let(:new_args) { ['Text'] }
 
     it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
 
     it 'is possible to set :selected attribute' do
       box = Swing::JCheckBox.new 'Disconnect', :selected => true
       box.should be_selected
     end
-
-    it 'is possible to set :tool_tip_text attribute' do
-      box = Swing::JCheckBox.new 'Disconnect', :tool_tip_text => 'Blah'
-      box.tool_tip_text.should == 'Blah'
-    end
   end
 end

data/spec/swing/j_frame_spec.rb

@@ -3,15 +3,18 @@ require 'swing/shared'
 
 describe Swing::JFrame do
 
-  context 'creation' do
-    let(:new_args) { ['Text'] }
+  context 'creating' do
+    after(:each) {@frame.dispose if @frame}
+    let(:new_args) { ['Frame'] }
 
     it_behaves_like 'enhanced awt component'
 
-    it 'is possible to create frame' do
-      f = Swing::JFrame.new "Swing GUI",
+    it 'is possible to create Frame with options' do
+      @frame = Swing::JFrame.new "Swing GUI",
                             :layout => Awt::FlowLayout.new(Awt::FlowLayout::LEFT),
                             :size => [1100, 1200]
     end
+
+
   end
 end

data/spec/swing/j_label_spec.rb

@@ -7,10 +7,6 @@ describe Swing::JLabel do
     let(:new_args) { ['Text'] }
 
     it_behaves_like 'enhanced awt component'
-
-    it 'is possible to set :tool_tip_text attribute' do
-      label = Swing::JLabel.new 'Disconnect', :tool_tip_text => 'Blah'
-      label.tool_tip_text.should == 'Blah'
-    end
+    it_behaves_like 'tool tipped component'
   end
 end

data/spec/swing/j_list_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JList do
+
+  context 'creation' do
+    let(:new_args) { [] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+  end
+end

data/spec/swing/j_menu_bar_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JMenuBar do
+
+  context 'creation' do
+    let(:new_args) { [] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/j_menu_item_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JMenuItem do
+
+  context 'creation' do
+    let(:new_args) { ['Text'] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/j_menu_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JMenu do
+
+  context 'creation' do
+    let(:new_args) { ['Text'] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/j_panel_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JPanel do
+
+  context 'creation' do
+    let(:new_args) { [] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/j_scroll_pane_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JScrollPane do
+
+  context 'creation' do
+    let(:new_args) { [] }
+    let(:layout) { Swing::ScrollPaneLayout.new   }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/j_split_pane_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JSplitPane do
+
+  context 'creation' do
+    let(:new_args) { [] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+    it 'is possible to use constructor with two children' do
+      b1 = Swing::JButton.new 'First'
+      b2 = Swing::JButton.new 'Second'
+      pane = Swing::JSplitPane.new b1, b2, :tool_tip_text => 'Blah'
+      pane.tool_tip_text.should == 'Blah'
+      pane.left_component.should == b1
+      pane.right_component.should == b2
+    end
+
+  end
+end

data/spec/swing/j_table_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JTable do
+
+  context 'creation' do
+    let(:new_args) { [2,2] }
+
+    it_behaves_like 'enhanced awt component'
+    it_behaves_like 'tool tipped component'
+
+  end
+end

data/spec/swing/shared.rb

@@ -1,40 +1,47 @@
 shared_examples_for 'enhanced awt component' do
 
+  def should_be_all_set component, attributes
+
+  end
+
+  after(:each) { @component.dispose if @component.respond_to? :dispose }
+
   context 'new with common options' do
-    it 'is possible to create components with settable attribute' do
-      p described_class.attributes
-      background = Awt::Color.new(1, 2, 3)
-      cursor = Awt::Cursor.new Awt::Cursor::HAND_CURSOR #DEFAULT_CURSOR
-      enabled = false
-      font = Awt::Font.new("Trebuchet", Awt::Font::PLAIN, 11)
-      new_args.push :background => background, :cursor => cursor, :enabled => enabled,
-                    :font => font, :name => 'Blah'
-      component = described_class.new *new_args
-      component.background.should == background
-      component.cursor.should == cursor
-      component.enabled?.should == false
-      component.font.should == font
-      component.name.should == 'Blah'
-      component.parent.should == nil
+    it 'is possible to create this component with settable attribute' do
+#      p described_class.attributes
+      component_attributes = {
+          :background => Awt::Color.new(1, 2, 3),
+          :foreground => Awt::Color.new(3, 2, 1),
+          :cursor => Awt::Cursor.new(Awt::Cursor::HAND_CURSOR),
+          :enabled => false,
+          :visible => false,
+          :font => Awt::Font.new("Trebuchet", Awt::Font::PLAIN, 11),
+          :layout => (defined?(layout) ? layout : Awt::FlowLayout.new),
+          :location => Awt::Point.new(10, 20),
+          :size => Awt::Dimension.new(300, 300),
+          :name => 'Blah',
+      }
+      @component = described_class.new *(new_args.push component_attributes)
+      component_attributes.each do |name, value|
+        @component.send(name).should == value
+      end
     end
   end
 
-#  context 'new with options (without parent)' do
-#    {Swing::JLabel => 'Text', Swing::JButton => 'Text', Swing::JCheckBox => 'Text',
-#     Swing::JFrame => 'Text', Swing::JList => [], Swing::JMenu => [], Swing::JMenuBar=> [],
-#     Swing::JMenuItem => [], Swing::JPanel => [], Swing::JScrollPane => [],
-#     Swing::JSplitPane => [], Swing::JTable => [2, 2]}.each do |klass, args|
-#      it 'is possible to create components with settable attribute' do
-#        p klass.attributes
-#        constructor_args.push constructor_options
-#        component = klass.new(*args, :name => 'Blah')
-#        component.name.should == 'Blah'
-#        component.parent.should == nil
-#      end
-#    end
-#  end
+  context 'new with parent' do
+    unless described_class == Swing::JFrame || described_class == Swing::JMenuBar
+      it 'is possible to set parent via options' do
+        parent = Swing::JPanel.new
+        @component = described_class.new *(new_args.push :parent => parent)
+        @component.parent.should == parent
+      end
+    end
+  end
+end
+
+shared_examples_for 'tool tipped component' do
+  it 'is possible to set :tool_tip_text attribute' do
+    @component = described_class.new *(new_args.push :tool_tip_text => 'Blah')
+    @component.tool_tip_text.should == 'Blah'
+  end
 end
-#{Swing::JLabel => 'Text', Swing::JButton => 'Text', Swing::JCheckBox => 'Text',
-# Swing::JFrame => 'Text', Swing::JList => [], Swing::JMenu => [], Swing::JMenuBar=> [],
-# Swing::JMenuItem => [], Swing::JPanel => [], Swing::JScrollPane => [],
-# Swing::JSplitPane => [], Swing::JTable => [2, 2]}.each do |klass, args|

metadata

@@ -2,7 +2,7 @@
 name: swing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
   - arvicco
@@ -90,6 +90,14 @@ files:
   - spec/swing/j_check_box_spec.rb
   - spec/swing/j_frame_spec.rb
   - spec/swing/j_label_spec.rb
+  - spec/swing/j_list_spec.rb
+  - spec/swing/j_menu_bar_spec.rb
+  - spec/swing/j_menu_item_spec.rb
+  - spec/swing/j_menu_spec.rb
+  - spec/swing/j_panel_spec.rb
+  - spec/swing/j_scroll_pane_spec.rb
+  - spec/swing/j_split_pane_spec.rb
+  - spec/swing/j_table_spec.rb
   - spec/swing/shared.rb
   - features/swing.feature
   - features/step_definitions/swing_steps.rb
@@ -148,4 +156,12 @@ test_files:
   - spec/swing/j_check_box_spec.rb
   - spec/swing/j_frame_spec.rb
   - spec/swing/j_label_spec.rb
+  - spec/swing/j_list_spec.rb
+  - spec/swing/j_menu_bar_spec.rb
+  - spec/swing/j_menu_item_spec.rb
+  - spec/swing/j_menu_spec.rb
+  - spec/swing/j_panel_spec.rb
+  - spec/swing/j_scroll_pane_spec.rb
+  - spec/swing/j_split_pane_spec.rb
+  - spec/swing/j_table_spec.rb
   - spec/swing/shared.rb