Neurogami-jimpanzee 1.0.2.1 → 1.0.3.2

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.3.1 / 2009-05-30
+
+ * Fixed bug in have_focus? and in generator code
+
+== 1.0.2.2 / 2009-05-29
+ * Updated generator to include UI filem using SwingSet
+
 == 1.0.2.1 / 2009-05-16
  * Glommed source from Monkeybars gitorious repo
 

data/Manifest.txt

@@ -22,14 +22,14 @@ lib/monkeybars/view_nesting.rb
 lib/monkeybars/view_positioning.rb
 lib/jimpanzee_version.rb
 skeleton/Rakefile
-skeleton/lib/java/monkeybars-1.0.2.1.jar
+skeleton/lib/java/monkeybars-1.0.3.1.jar
 skeleton/lib/ruby/README.txt
 skeleton/src/application_controller.rb
 skeleton/src/application_view.rb
 skeleton/src/main.rb
 skeleton/src/manifest.rb
 skeleton/src/resolver.rb
-skeleton/tasks/monkeybars.rake
+skeleton/tasks/jimpanzee.rake
 spec/spec_helper.rb
 spec/unit/component_mixin_spec.rb
 spec/unit/controller_spec.rb

data/README.md

@@ -1,4 +1,4 @@
-Jimpanzee 1.0.2.1
+Monkeybars 1.0.3.1
 
 http://github.com/Neurogami/Jimpanzee/tree/master
 

data/bin/jimpanzee

@@ -2,7 +2,7 @@
 
 require 'fileutils'
 require 'rubygems'
-require 'monkeybars_version'
+require 'jimpanzee_version'
 
 def help(message = nil)
   $stdout << message + "\n-----------------------------------\n" unless message.nil?

data/lib/jimpanzee_version.rb

@@ -0,0 +1,9 @@
+# :main: /home/james/ngprojects/Jimpanzee/README.md
+#
+module Jimpanzee
+  VERSION = "1.0.3.2"
+  
+  def self.version
+    VERSION
+  end
+end

data/lib/monkeybars/controller.rb

@@ -84,10 +84,11 @@ module Monkeybars
   class Controller
     include TaskProcessor
     include EventHandlerRegistrationAndDispatchMixin
+
     
     @@instance_list ||= Hash.new {|hash, key| hash[key] = []}
     @@instance_lock ||= Hash.new {|hash, key| hash[key] = Mutex.new }
-    
+
     # Controllers cannot be instantiated via a call to new, instead use instance
     # to retrieve the instance of the view.  Currently only one instance of a
     # controller is created but in the near future a configurable limit will be
@@ -102,7 +103,7 @@ module Monkeybars
         end
       end
     end
-    
+
     # Always returns a new instance of the controller. 
     # 
     #   controller1 = MyController.create_instance
@@ -113,7 +114,7 @@ module Monkeybars
     def self.create_instance
       new
     end
-    
+
     # Declares the view class (as a symbol) to use when instantiating the controller.
     # 
     #   set_view :MyView
@@ -175,7 +176,7 @@ module Monkeybars
       raise "'Update' is a reserved method name" if :update == method
       self.send(:class_variable_set, :@@update_method_name, method)
     end
-    
+
     # Valid close actions are
     # * :nothing
     # * :close (default)
@@ -195,7 +196,7 @@ module Monkeybars
     def self.set_close_action(action)
       self.send(:class_variable_set, :@@close_action, action)
     end
-    
+
     # Returns a frozen hash of ControllerName => [instances] pairs. This is
     # useful if you need to iterate over all active controllers to call update
     # or to check for a status.
@@ -208,29 +209,29 @@ module Monkeybars
     def self.active_controllers
       @@instance_list.clone.freeze     
     end
-    
+
     # See EventHandlerRegistrationAndDispatchMixin::ClassMethods#add_listener
     class << self
-       alias_method :original_add_listener, :add_listener
+      alias_method :original_add_listener, :add_listener
     end
     def self.add_listener(details)
       original_add_listener(details)
       hide_protected_class_methods #workaround for JRuby bug #1283
     end
-    
-  private
+
+    private
     def self.hide_protected_class_methods #JRuby bug #1283
       private_class_method :new
     end
     hide_protected_class_methods
-    
+
     def self.__new__
       object = new
       @@instance_list[self] << object
       @@instance_list[self].uniq!
       object
     end
-    
+
     def initialize
       @model_has_block = false
       @__model = create_new_model unless self.class.model_class.nil?
@@ -239,25 +240,25 @@ module Monkeybars
       @__transfer = {}
       @__view_state = nil
       setup_implicit_and_explicit_event_handlers
-      
+
       action = close_action
       unless [:nothing, :close, :exit, :dispose, :hide].include?(action)
         raise "Unknown close action: #{action}.  Only :nothing, :close, :exit, :dispose, and :hide are supported"
       end
-      
+
       window_type = if @__view.instance_variable_get(:@main_view_component).kind_of? javax.swing.JInternalFrame
         "internalFrame"
-      else
+                    else
         "window"
-      end
-      
+                    end
+
       unless @__view.nil?
         @__view.close_action(Monkeybars::View::CloseActions::METHOD, MonkeybarsWindowAdapter.new(:"#{window_type}Closing" => self.method(:built_in_close_method)))
       end
-      
+
       @closed = true
     end
-    
+
     def close_action
       if self.class.class_variables.member?("@@close_action")
         action = self.class.send(:class_variable_get, :@@close_action)
@@ -266,7 +267,7 @@ module Monkeybars
       end
       action
     end
-    
+
     public
     # Calls the method that was set using Controller.set_update_method.  If no method has been set defined, this call is ignored.
     def update
@@ -281,7 +282,7 @@ module Monkeybars
     def update_view
       @__view.update(model, transfer)
     end
-    
+
     # Sends a signal to the view.  The view will process the signal (if it is
     # defined in the view via View.define_signal) and optionally invoke the 
     #callback that is passed in as a block.
@@ -294,7 +295,7 @@ module Monkeybars
     def signal(signal_name, &callback)
       @__view.process_signal(signal_name, model, transfer, &callback)
     end
-    
+
     # Nests a controller under this controller with the given key
     #   def add_user_button_action_performed
     #     @controllers << UserController.create_instance
@@ -308,7 +309,7 @@ module Monkeybars
       nested_view = sub_controller.instance_variable_get(:@__view)
       @__view.add_nested_view(name, nested_view, nested_view.instance_variable_get(:@main_view_component), model, transfer)
     end
-    
+
     # Removes the nested controller with the given key
     # This does not do any cleanup on the nested controller's instance.
     #
@@ -326,6 +327,13 @@ module Monkeybars
       @__view.remove_nested_view(name, nested_view, nested_view.instance_variable_get(:@main_view_component), model, transfer)
     end
 
+
+   # You cannot jusrt call the Rubty 'exit' to exit the application process, you need the Java exit.
+    #
+    def application_exit
+      java.lang.System.exit(0)
+    end
+
     # Returns true if the view is visible, false otherwise
     def visible?
       @__view.visible?
@@ -335,7 +343,7 @@ module Monkeybars
     def hide
       @__view.hide
     end
-    
+
     # Disposes the view
     def dispose
       @__view.dispose
@@ -345,7 +353,7 @@ module Monkeybars
     def show
       @__view.show         
     end
-    
+
     # True if close has been called on the controller
     def closed?
       @closed
@@ -370,19 +378,19 @@ module Monkeybars
           @@instance_list[self.class] << self
         end
       end
-      
+
       if closed?
         load(*args, &block) 
         @__view.on_first_update(model, transfer)
         clear_view_state
         @closed = false
       end
-      
+
       show
-      
+
       self #allow var assignment off of open, i.e. screen = SomeScreen.instance.open
     end
-    
+
     # Stub to be overriden in sub-class.  This is where you put the code you would
     # normally put in initialize, it will be called the first time open is called
     # on the controller.
@@ -397,9 +405,16 @@ module Monkeybars
       original_handle_event(component_name, event_name, event)
       clear_view_state
     end
+
+
     
+    def have_focus?
+       !@__view.have_focus?.nil?
+    end
+    alias_method  :focused?, :have_focus?
+
     private
-    
+
     # Returns the model object.  This is the object that is passed to the view
     # when update_view is called.  This model is *not* the same model that you
     # get from #view_state.  Values that you want to propogate from the 
@@ -407,7 +422,7 @@ module Monkeybars
     def model #:doc:
       @__model
     end
-    
+
     # Returns the transfer object which is a transient hash passed to the view
     # whenever #update_view is called.  The transfer is cleared after each call 
     # to #update_view.  The transfer is used to pass data to and
@@ -427,7 +442,7 @@ module Monkeybars
     def transfer #:doc:
       @__transfer      
     end
-    
+
     # Returns a ViewState object which contains a model and a transfer hash of the 
     # view's current contents as defined by the view's mappings.  This is for use in 
     # event handlers. The contents of the model and transfer are *not* the same as 
@@ -463,19 +478,19 @@ module Monkeybars
     def view_model # :doc:
       view_state.model
     end
-    
+
     # Equivalent to view_state.transfer
     def view_transfer
       view_state.transfer
     end
-    
+
     # Resets memoized view_state value. This is called automatically after each
     # event so it would only need to be called if view_state is used outside
     # of an event handler.
     def clear_view_state # :doc:
       @__view_state = nil
     end
-    
+
     # This method is almost always used from within an event handler to propogate
     # the view_state to the model. Updates the model from the source provided 
     # (typically from view_state). The list of properties defines what is modified 
@@ -492,7 +507,7 @@ module Monkeybars
     def update_model(source, *properties) # :doc:
       update_provided_model(source, @__model, *properties)
     end
-    
+
     # This method works just like Controller#update_model except that the target
     # is not implicitly the model.  The second parameter is a target object for
     # the properties to be propogated to.  This is useful if you have a composite
@@ -511,29 +526,29 @@ module Monkeybars
         destination.send("#{property}=", source.send(property))
       end
     end
-    
+
     @@model_class_for_child_controller ||= {}
     def self.model_class
       @@model_class_for_child_controller[self]
     end
-    
+
     def self.model_class=(model)
       @@model_class_for_child_controller[self] = model
     end
-    
+
     @@view_class_for_child_controller ||= {}
     def self.view_class
       @@view_class_for_child_controller[self]
     end
-    
+
     def self.view_class=(view)
       @@view_class_for_child_controller[self] = view
     end
-    
+
     def sub_controllers
       @__sub_controllers ||= {}
     end
-    
+
     def create_new_model
       begin
         unless self.class.model_class.first.nil?
@@ -548,7 +563,7 @@ module Monkeybars
         self.class.model_class.first.constantize.new
       end
     end
-    
+
     def create_new_view
       begin
         self.class.view_class.constantize.new
@@ -581,11 +596,11 @@ module Monkeybars
   # an array so we emulate the array methods that are in common usage.
   class ViewState
     attr_reader :model, :transfer
-    
+
     def initialize(model, transfer)
       @model, @transfer = model, transfer
     end
-    
+
     def [](index)
       case index
       when 0
@@ -596,11 +611,11 @@ module Monkeybars
         nil
       end
     end
-    
+
     def first
       @model
     end
-    
+
     def last
       @transfer
     end

data/lib/monkeybars/view.rb

@@ -71,6 +71,8 @@ module Monkeybars
       METHOD = :method
     end
 
+
+
     private
     @@view_nestings_for_child_view ||= {}
     def self.view_nestings
@@ -437,6 +439,13 @@ module Monkeybars
       }
     end
 
+    def have_focus?
+      !@main_view_component.focus_owner?.nil?
+    end
+    alias_method  :focused?, :have_focus?
+
+
+
     def update(model, transfer)
       self.class.view_mappings.select{|mapping| mapping.maps_to_view?}.each {|mapping| mapping.to_view(self, model, transfer)}
       transfer.clear

data/skeleton/src/manifest.rb

@@ -22,9 +22,19 @@ end
 
 require 'resolver'
 
+
+# Good for when you replace an old version with a new version.
+# Not good if you have more than one version in the same directory. :)
+# But if take care to have only one monkeybars jar in the folder,
+# then you don not need to re-edit this file.
+def monkeybars_jar path
+  Dir.glob(path).select { |f| f =~ /(monkeybars-)(.+).jar$/}.first
+end
+
 case Monkeybars::Resolver.run_location
 when Monkeybars::Resolver::IN_FILE_SYSTEM
-  add_to_classpath '../lib/java/monkeybars-1.0.2.jar'
+  here = File.expand_path File.dirname(__FILE__)
+  add_to_classpath monkeybars_jar( here + '/../lib/java/*.jar' )
 end
 
 require 'monkeybars'

data/skeleton/tasks/jimpanzee.rake

@@ -0,0 +1,173 @@
+require 'fileutils'
+
+desc "ALL, CONTROLLER, VIEW, MODEL, UI are valid options."
+task 'generate'
+rule(/^generate/) do |t|
+  ARGV[1..-1].each do |generator_command|
+    command, argument = generator_command.split("=")
+    case command
+    when "ALL"
+      generate_tuple argument
+    when "VIEW"
+      generate_view argument
+    when "CONTROLLER"
+      generate_controller argument
+    when "MODEL"
+      generate_model argument 
+    when "UI"
+      generate_ui argument 
+      
+    else
+      $stdout << "Unknown generate target #{argument}"
+    end
+  end
+end
+
+def generate_tuple path
+  pwd = FileUtils.pwd
+  generate_controller path
+  FileUtils.cd pwd
+  generate_model path
+  FileUtils.cd pwd
+  generate_view path, using_ui = true
+  FileUtils.cd pwd
+  generate_ui path  
+end
+
+def generate_controller path
+  name = setup_directory path
+  file_name = "#{name}_controller.rb"
+  name = camelize name 
+  $stdout << "Generating controller #{name}Controller in file #{file_name}\n"
+  File.open(file_name, "w") do |controller_file|
+  controller_file << <<-ENDL
+class #{name}Controller < ApplicationController
+  set_model '#{name}Model'
+  set_view '#{name}View'
+  set_close_action :exit
+end
+  ENDL
+  end
+end
+
+def generate_model(path)
+  name = setup_directory(path)
+  file_name = "#{name}_model.rb"
+  name = camelize(name)
+  $stdout << "Generating model #{name}Model in file #{file_name}\n"
+  File.open(file_name, "w") do |model_file|
+  model_file << <<-ENDL
+class #{name}Model
+
+end
+  ENDL
+  end
+end
+
+def generate_view path, using_ui = false
+  name = setup_directory path
+  file_name = "#{name}_view.rb"
+  cname = camelize(name)
+  puts "Generating view #{cname}View in file #{file_name}"
+  
+  
+  require_ui = using_ui ? "require '#{name}_ui'" : ''
+  java_class = using_ui ? "#{cname}Frame" : "'REPLACE_ME' "
+  view_file = %~
+#{require_ui}
+
+class #{cname}View < ApplicationView
+  set_java_class  #{java_class}
+
+  # Put your load behavior here:
+  def load
+     move_to_center
+  end
+
+end
+  ~
+  
+  File.open(file_name, "w") {|f| f.puts view_file}
+  
+  
+end
+
+
+
+def generate_ui path 
+  name = setup_directory path 
+  file_name = "#{name}_ui.rb"
+  name = camelize(name)
+  $stdout << "Generating ui #{name}Frame in file #{file_name}\n"
+  source = %~# Must have the Neurogami::SwingSet files in your project
+require 'swingset'  
+
+include  Neurogami::SwingSet::Core
+
+class #{name}Frame < Frame   
+  FRAME_WIDTH  = 420
+  FRAME_HEIGHT = 430
+
+  LABEL_HEIGHT = 20
+  LABEL_WIDTH  = 200
+
+  # Need accessor methods for you UI components:  
+  attr_accessor :example_label, :example_value
+
+
+  def initialize *args
+    super
+    self.minimum_width  = FRAME_WIDTH
+    self.minimum_height = FRAME_HEIGHT
+    self.setSize FRAME_HEIGHT, FRAME_WIDTH 
+    set_up_components
+  end
+
+
+  def set_up_components
+    # Assumes you have the MiG layout jar in your project and
+    # bundled with the app.
+    
+    component_panel = Panel.new
+
+    component_panel.background_color 255, 255, 255
+    component_panel.size FRAME_WIDTH, FRAME_HEIGHT
+
+    @example_label = Label.new do |l|
+      l.font = Font.new "Lucida Grande", 0, 18
+      l.minimum_dimensions LABEL_WIDTH, LABEL_HEIGHT
+      l.text = "Example label"
+    end
+
+    @example_value = Label.new do |l|
+      l.font = Font.new "Lucida Grande", 0, 18
+      l.minimum_dimensions LABEL_WIDTH, LABEL_HEIGHT
+      l.text = "An example"
+    end
+
+    component_panel.add @example_label, 'grow x'
+    component_panel.add @example_value, "gap unrelated"
+
+    add component_panel
+
+  end
+end ~
+
+  File.open(file_name, "w"){ |f| f.puts source } 
+end
+
+def setup_directory(path)
+  FileUtils.mkdir_p path.gsub("\\", "/")
+  FileUtils.cd(path)
+  path.split("/").last
+end
+
+def camelize(name, first_letter_in_uppercase = true)
+  name = name.to_s
+  if first_letter_in_uppercase
+    name.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+  else
+    name[0..0] + camelize(name[1..-1])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Neurogami-jimpanzee
 version: !ruby/object:Gem::Version 
-  version: 1.0.2.1
+  version: 1.0.3.2
 platform: ruby
 authors: 
 - James Britt
@@ -41,6 +41,7 @@ files:
 - bin/jimpanzee
 - lib/monkeybars.rb
 - lib/monkeybars/controller.rb
+- lib/jimpanzee_version.rb
 - lib/monkeybars/debug.rb
 - lib/monkeybars/event_handler.rb
 - lib/monkeybars/event_handler_registration_and_dispatch_mixin.rb
@@ -54,14 +55,14 @@ files:
 - lib/monkeybars/view_nesting.rb
 - lib/monkeybars/view_positioning.rb
 - lib/monkeybars/view.rb
-- skeleton/tasks/monkeybars.rake
+- skeleton/tasks/jimpanzee.rake
 - skeleton/src/application_view.rb
 - skeleton/src/main.rb
 - skeleton/src/application_controller.rb
 - skeleton/src/resolver.rb
 - skeleton/src/manifest.rb
 - skeleton/lib/java/README.txt
-- skeleton/lib/java/monkeybars-1.0.2.1.jar
+- skeleton/lib/java/monkeybars-1.0.3.1.jar
 - skeleton/lib/ruby/README.md
 - skeleton/lib/ruby/README.txt
 - skeleton/Rakefile

data/skeleton/tasks/monkeybars.rake

@@ -1,89 +0,0 @@
-require 'fileutils'
-
-desc "ALL, CONTROLLER, VIEW, MODEL are valid options."
-task 'generate'
-rule(/^generate/) do |t|
-  ARGV[1..-1].each do |generator_command|
-    command, argument = generator_command.split("=")
-    case command
-    when "ALL"
-      generate_tuple(argument)
-    when "VIEW"
-      generate_view(argument)
-    when "CONTROLLER"
-      generate_controller(argument)
-    when "MODEL"
-      generate_model(argument)
-    else
-      $stdout << "Unknown generate target #{argument}"
-    end
-  end
-end
-
-def generate_tuple(path)
-  pwd = FileUtils.pwd
-  generate_controller(path)
-  FileUtils.cd(pwd)
-  generate_model(path)
-  FileUtils.cd(pwd)
-  generate_view(path)
-end
-
-def generate_controller(path)
-  name = setup_directory(path)
-  file_name = "#{name}_controller.rb"
-  name = camelize(name)
-  $stdout << "Generating controller #{name}Controller in file #{file_name}\n"
-  File.open(file_name, "w") do |controller_file|
-  controller_file << <<-ENDL
-class #{name}Controller < ApplicationController
-  set_model '#{name}Model'
-  set_view '#{name}View'
-  set_close_action :exit
-end
-  ENDL
-  end
-end
-
-def generate_model(path)
-  name = setup_directory(path)
-  file_name = "#{name}_model.rb"
-  name = camelize(name)
-  $stdout << "Generating model #{name}Model in file #{file_name}\n"
-  File.open(file_name, "w") do |model_file|
-  model_file << <<-ENDL
-class #{name}Model
-
-end
-  ENDL
-  end
-end
-
-def generate_view(path)
-  name = setup_directory(path)
-  file_name = "#{name}_view.rb"
-  name = camelize(name)
-  $stdout << "Generating view #{name}View in file #{file_name}\n"
-  File.open(file_name, "w") do |view_file|
-  view_file << <<-ENDL
-class #{name}View < ApplicationView
-  set_java_class ''
-end
-  ENDL
-  end
-end
-
-def setup_directory(path)
-  FileUtils.mkdir_p path.gsub("\\", "/")
-  FileUtils.cd(path)
-  path.split("/").last
-end
-
-def camelize(name, first_letter_in_uppercase = true)
-  name = name.to_s
-  if first_letter_in_uppercase
-    name.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  else
-    name[0..0] + camelize(name[1..-1])
-  end
-end