swing 0.1.5 → 0.1.7

data/.gitignore

@@ -13,13 +13,15 @@ tmtags
 ## VIM
 *.swp
 
+## IDEA
+*.iml
+.idea
+
 ## PROJECT::GENERAL
 coverage
 rdoc
 pkg
 log
-.iml
-.idea
 .bundle
 
 ## PROJECT::SPECIFIC

data/HISTORY

@@ -45,3 +45,11 @@
 == 0.1.5 / 2011-05-26
 
 * Attributes speced
+
+== 0.1.6 / 2011-05-26
+
+* JMenuBar fixed
+
+== 0.1.7 / 2011-05-26
+
+* Minor fixes

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.7

data/lib/swing/j_frame.rb

@@ -5,25 +5,13 @@ class Swing::JFrame
   attr_setter :layout, :background, :size, :title,
               :default_close_operation => EXIT_ON_CLOSE #DISPOSE_ON_CLOSE, HIDE_ON_CLOSE
 
-#  def attributes
-#    a = super
-#    a.delete :tool_tip_text
-#    a
-#  end
-
   def initialize *args
-    p args
     super *args
 
-    setup
+    # Yielding self to set up contents before making frame visible
+    yield self if block_given?
 
     self.location_relative_to = nil
     self.visible = true
   end
-
-  # Method that subclasses should override to set up their contents before
-  # JFrame is made visible
-  def setup
-  end
-
 end

data/lib/swing/j_menu_bar.rb

@@ -7,30 +7,28 @@ class Swing::JMenuBar
   attr_setter :tool_tip_text
 
   # Override post-processing (non-setter) options given to initialize
-  def self.post_process component, opts
+  def post_process opts
+    super
     # Create menu structure from :structure opt
     if opts[:structure]
       [opts[:structure]].flatten.each do |element|
         case element
           when Hash # Hash defines menu structure
             element.each do |menu_name, menu_structure|
-              menu = JMenu.new menu_name.to_s, :parent => self
+              menu = Swing::JMenu.new menu_name.to_s, :parent => self
               menu_structure.each do |item_name, item_action|
-                JMenuItem.new item_name.to_s, :parent => menu, &item_action
+                Swing::JMenuItem.new item_name.to_s, :parent => menu, &item_action
               end
             end
           else
-            component.add element
+            self.add element
         end
       end
     end
-    add_component component, opts[:parent]
   end
 
   # Proper way to add menu bar to its parent
-  def self.add_component component, parent
-    parent.setJMenuBar component if parent and parent.respond_to? :setJMenuBar
+  def attach_to parent
+    parent.setJMenuBar self if parent and parent.respond_to? :setJMenuBar
   end
-
-
 end

data/lib/swing_support/extensions/attributes.rb

@@ -14,6 +14,16 @@ module SwingSupport
         end
       end
 
+      # Post-processing (non-setter) options given to initialize
+      def post_process opts
+        attach_to opts[:parent]
+      end
+
+      # Proper way to add generic component to its parent
+      def attach_to parent
+        parent.add self if parent
+      end
+
       module ClassMethods
         def attributes
           @attributes ||= (superclass.attributes.dup rescue {})
@@ -51,19 +61,9 @@ module SwingSupport
           attributes.each { |(name, value)| component.send "#{name}=", *value }
 
           # Post-process non-setter opts (setter opts are already consumed by now)
-          post_process component, opts
+          component.post_process 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
       end
     end
   end

data/spec/awt/component_spec.rb

@@ -3,16 +3,13 @@ require 'awt/component'
 
 describe 'java.awt.Component' do
   context 'defining new methods' do
-    it 'changes derived Ruby subclases' do
-      button = Swing::JButton.new 'Disconnect'
-      button.should respond_to :blah
-      button.blah
-    end
+    [Swing::JButton, javax.swing.JButton, Swing::JLabel, Swing::Box].each do |klass|
 
-    it 'changes derived pure Java subclases' do
-      button = javax.swing.JButton.new 'Disconnect'
-      button.should respond_to :blah
-      button.blah
+      it "changes derived subclases #{klass}" do
+        component = klass == Swing::Box ? klass.new(1) : klass.new('Test')
+        component.should respond_to :attach_to
+        component.should respond_to :post_process
+      end
     end
   end
 

data/spec/swing/j_menu_bar_spec.rb

@@ -9,5 +9,24 @@ describe Swing::JMenuBar do
     it_behaves_like 'enhanced awt component'
     it_behaves_like 'tool tipped component'
 
+    it 'allows to pass parent in as option' do
+      @frame = Swing::JFrame.new 'Menu Test'
+      bar = Swing::JMenuBar.new :parent => @frame
+      bar.parent.should == @frame.layered_pane
+      @frame.dispose
+    end
+
+    it 'allows to set menu structure via options' do
+      # Creating Connect/Disconnect buttons (parentless - detached, for now)
+      @connect_button = Swing::JButton.new('Connect')
+
+      # Creating Menu Bar with buttons
+      Swing::JMenuBar.new :structure =>
+                              [
+                                  @connect_button,
+                                  @beep_button = Swing::JButton.new('Beep'),
+                                  {:File => {:Exit => Proc.new { sleep 1 }}}
+                              ]
+    end
   end
 end

data/spec/swing/shared.rb

@@ -1,9 +1,5 @@
 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

metadata

@@ -2,7 +2,7 @@
 name: swing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors: 
   - arvicco