ruboto-core 0.1.0 → 0.2.1

data/Gemfile.lock

@@ -3,13 +3,14 @@ GEM
   specs:
     arrayfields (4.7.4)
     fattr (2.1.0)
-    jruby-jars (1.5.6)
+    jruby-jars (1.6.3)
     main (4.2.0)
       arrayfields (>= 4.7.4)
       fattr (>= 2.1.0)
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   jruby-jars

data/README.md

@@ -163,7 +163,7 @@ You can update various portions of your generated Ruboto app through the ruboto
 
     $ ruboto gen core Activity --method_base all-on-or-none --method_include specific-methods-to-include --method_include specific-methods-to-exclude
 
-4) The generator will load up the SDK information and find the specified methods. The generator will abort around methods that were added or deprecated based on the SDK levels. You can either exclude those methods or add --force to create them anyway (added methods are created without calling super to avoid crashin on legacy hardware).
+4) The generator will load up the SDK information and find the specified methods. The generator will abort around methods that were added or deprecated based on the SDK levels. You can either use method_exclude to remove methods individually or add '--force exclude' to remove the all. You can also us '--force include' to create them anyway (added methods are created without calling super to avoid crashin on legacy hardware).
 
 Scripts
 -------

data/Rakefile

@@ -5,11 +5,11 @@ task :gem do
 end
 
 task :release do
-  `gem push #{Dir['ruboto-core-*.gem'][-1]}`
+  sh "gem push #{Dir['ruboto-core-*.gem'][-1]}"
 end
 
 task :test do
   Dir['test/*_test.rb'].each do |f|
-    load f
+    require f.chomp('.rb')
   end
 end

data/assets/Rakefile

@@ -1,59 +1,35 @@
-# callback_reflection.rb creates the interfaces.txt (JRuby can't do YAML with ruby 1.8, so it's just
-# and inspect on the hash) on a device. Bring it off the device and put it in the callback_gen dir.
-#
-# Move this into a rake task later.
-#
+require 'time'
 
+def manifest() @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE)) end
+def package() manifest.root.attribute('package') end
+def build_project_name() @build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value end
 
-if RUBY_PLATFORM =~ /java/
-  puts "Detected JRuby.  Loading ANT."
-  require 'ant'
-  ant_loaded = true
-end
+UPDATE_MARKER_FILE = File.expand_path(File.join('tmp', 'LAST_UPDATE'), File.dirname(__FILE__))
+BUNDLE_JAR = 'libs/bundle.jar'
+BUNDLE_PATH = 'tmp/bundle'
 
 require 'rake/clean'
 require 'rexml/document'
 
-generated_libs     = 'generated_libs'
 jars = Dir['libs/*.jar']
 stdlib             = jars.grep(/stdlib/).first #libs/jruby-stdlib-VERSION.jar
 jruby_jar          = jars.grep(/core/).first   #libs/jruby-core-VERSION.jar
-stdlib_precompiled = File.join(generated_libs, 'jruby-stdlib-precompiled.jar')
-jruby_ruboto_jar   = File.join(generated_libs, 'jruby-ruboto.jar')
-ant.property :name=>'external.libs.dir', :value => generated_libs if ant_loaded
-dirs = ['tmp/ruby', 'tmp/precompiled', generated_libs]
-dirs.each { |d| directory d }
-
-CLEAN.include('tmp', 'bin', generated_libs)
-
-ant_import if ant_loaded
-
-file stdlib_precompiled => :compile_stdlib
-file jruby_ruboto_jar => generated_libs do
-  ant.zip(:destfile=>jruby_ruboto_jar) do
-    zipfileset(:src=>jruby_jar) do
-      exclude(:name=>'jni/**')
-      # dx chokes on some of the netdb classes, for some reason
-      exclude(:name=>'jnr/netdb/**')
-    end
-  end
-end
+MANIFEST_FILE      = 'AndroidManifest.xml'
+APK_FILE           = "bin/#{build_project_name}-debug.apk"
 
-desc "precompile ruby stdlib"
-task :compile_stdlib => [:clean, *dirs] do
-  ant.unzip(:src=>stdlib, :dest=>'tmp/ruby')
-  Dir.chdir('tmp/ruby') { sh "jrubyc . -t ../precompiled" }
-  ant.zip(:destfile=>stdlib_precompiled, :basedir=>'tmp/precompiled')
-end
+CLEAN.include('tmp', 'bin')
 
-task :generate_libs => [generated_libs, jruby_ruboto_jar] do
-  cp stdlib, generated_libs
-end
+task :default => :debug
 
-task :debug   => :generate_libs
-task :release => :generate_libs
+desc 'build debug package'
+task :debug => [BUNDLE_JAR, :mark_update] do
+  sh 'ant debug'
+end
 
-task :default => :debug
+desc "build package and install it on the emulator or device"
+task :install => [BUNDLE_JAR, :mark_update] do
+  sh 'ant install'
+end
 
 task :tag => :release do
   unless `git branch` =~ /^\* master$/
@@ -78,6 +54,11 @@ task :publish => :align do
   puts "#{build_project_name}.apk is ready for the market!"
 end
 
+desc 'Start the emulator with larger disk'
+task :emulator do
+  system 'emulator -partition-size 1024 -avd Android_3.0'
+end
+
 task :start_app do
   `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
 end
@@ -86,33 +67,65 @@ task :stop_app do
   `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
 end
 
+desc 'Restart the application'
 task :restart => [:stop_app, :start_app]
 
 task :uninstall do
+  puts "Uninstalling package #{package}"
   system "adb uninstall #{package}"
 end
 
 namespace :install do
+  desc 'Uninstall, build, and install the application'
+  task :clean => [:uninstall, :install]
+
   desc 'Build, install, and restart the application'
   task :restart => [:install, :start_app]
+
   namespace :restart do
     desc 'Uninstall, build, install, and restart the application'
     task :clean => [:uninstall, :install, :start_app]
   end
 end
 
-desc 'Copy scripts to emulator'
-task :update_scripts do
-  manifest
+file MANIFEST_FILE
+
+file APK_FILE => MANIFEST_FILE do
+  puts "#{MANIFEST_FILE} changed.  Forcing rebuild of #{APK_FILE}."
+  Rake::Task['install:clean'].invoke
+end
+
+desc 'Copy scripts to emulator or device'
+task :update_scripts => [BUNDLE_JAR, APK_FILE] do
+  sdcard_path = "/mnt/sdcard/Android/data/#{package}/files"
+  app_files_path = "/data/data/#{package}/files"
+  if package_installed? && device_path_exists?(sdcard_path)
+    puts 'Pushing files to apk public file area.'
+    data_dir = sdcard_path
+  elsif package_installed? && device_path_exists?(app_files_path)
+    puts 'Pushing files to apk private file area.'
+    data_dir = app_files_path
+  else
+    puts 'Cannot find the scripts directory on the device.'
+    puts 'If you have a non-rooted device, you need to add'
+    puts %q{    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />}
+    puts 'to the AndroidManifest.xml file to enable the update_scripts rake task.'
+    puts "Reverting to uninstalling and re-installing the apk."
+    Rake::Task['install:clean'].invoke
+    next
+  end
+  last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
   Dir.chdir('assets') do
-    # Add more directories here if you want them copied to the emulator
-    ['scripts'].each do |script_dir|
-      Dir["#{script_dir}/*"].each do |script|
-        next if File.directory? script
-        `adb push #{script} /data/data/#{package}/files/#{script_dir}`
+    ['scripts'].each do |asset_dir|
+      Dir["#{asset_dir}/*"].each do |asset_file|
+        next if File.directory? asset_file
+        next if File.ctime(asset_file) < last_update
+        print "#{asset_file}: " ; $stdout.flush
+        `adb push #{asset_file} #{data_dir}/#{asset_file}`
       end
     end
   end
+  mark_update
 end
 
 namespace :update_scripts do
@@ -121,10 +134,19 @@ namespace :update_scripts do
 end
 
 task :update_test_scripts do
-  Dir['test/assets/scripts/*.rb'].each do |script|
-    `adb push #{script} /data/data/#{package}.tests/files/scripts/`
+  test_scripts_path = "/data/data/#{package}.tests/files/scripts"
+  # TODO(uwe): Investigate if we can just push the scripts instead of building and installing the instrumentation APK
+  if false && package_installed?(true) && device_path_exists?(test_scripts_path)
+    Dir['test/assets/scripts/*.rb'].each do |script|
+      print "#{script}: " ; $stdout.flush
+      `adb push #{script} #{test_scripts_path}`
+    end
+    `adb shell ps | grep #{package}.tests | awk '{print $2}' | xargs adb shell kill`
+  else
+    Dir.chdir 'test' do
+      sh 'ant install'
+    end
   end
-  `adb shell ps | grep #{package}.tests | awk '{print $2}' | xargs adb shell kill`
 end
 
 task :test => :uninstall do
@@ -139,13 +161,74 @@ namespace :test do
   task :quick => [:update_scripts, :update_test_scripts] do
     Dir.chdir('test') do
       puts 'Running quick tests'
-      system "ant run-tests-quick"
+      sh "ant run-tests-quick"
+    end
+  end
+end
+
+file 'Gemfile'
+
+desc 'Generate bundle jar from Gemfile'
+file BUNDLE_JAR => 'Gemfile' do
+  next unless File.exists? 'Gemfile'
+  puts "Generating #{BUNDLE_JAR}"
+
+  FileUtils.mkdir_p BUNDLE_PATH
+  sh "bundle install --path=#{BUNDLE_PATH}"
+
+  # FIXME(uwe):  Should not be necessary.  ARJDBC should not offer the same files as AR.
+
+  Dir.chdir "#{BUNDLE_PATH}/ruby/1.8/gems" do
+    scanned_files = []
+    Dir["*/lib/**/*"].each do |f|
+      raise "Malformed file name" unless f =~ %r{^(.*?)/lib/(.*)$}
+      gem_name, lib_file = $1, $2
+      if existing_file = scanned_files.find{|sf| sf =~ %r{(.*?)/lib/#{lib_file}}}
+        puts "Removing duplicate of file #{lib_file} in gem #{gem_name}"
+        puts "Already present in gem #{$1}"
+      end
     end
   end
+
+  # FIXME(uwe):  Remove when directory listing in apk subdirectories work.
+  # FIXME(uwe):  http://jira.codehaus.org/browse/JRUBY-5775
+  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/activesupport-*/lib/active_support/core_ext.rb"].each do |faulty_file|
+    faulty_code = <<-'EOF'
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  require "active_support/core_ext/#{File.basename(path, '.rb')}"
 end
+    EOF
+    replace_faulty_code(faulty_file, faulty_code)
+  end
 
-def manifest
-  @manifest ||= REXML::Document.new(File.read('AndroidManifest.xml'))
+  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/activemodel-*/lib/active_model/validations.rb"].each do |faulty_file|
+    faulty_code = <<-EOF
+Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path|
+  filename = File.basename(path)
+  require "active_model/validations/\#{filename}"
+end
+    EOF
+    replace_faulty_code(faulty_file, faulty_code)
+  end
+
+  FileUtils.rm_f BUNDLE_JAR
+  Dir["#{BUNDLE_PATH}/ruby/1.8/gems/*"].each_with_index do |gem_dir, i|
+    `jar #{i == 0 ? 'c' : 'u'}f #{BUNDLE_JAR} -C #{gem_dir}/lib .`
+  end
+  FileUtils.rm_rf BUNDLE_PATH
+
+  Rake::Task['install'].invoke
+end
+
+task :mark_update do
+  mark_update
+end
+
+# Methods
+
+def mark_update
+  FileUtils.mkdir_p File.dirname(UPDATE_MARKER_FILE)
+  File.open(UPDATE_MARKER_FILE, 'w'){|f| f << Time.now.iso8601}
 end
 
 def strings(name)
@@ -154,8 +237,46 @@ def strings(name)
   value.text
 end
 
-def package() manifest.root.attribute('package') end
 def version() strings :version_name end
+
 def app_name() strings :app_name end
-def main_activity() manifest.root.elements['application'].elements['activity'].attributes['android:name'] end
-def build_project_name() @build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value end
+
+def main_activity() manifest.root.elements['application'].elements["activity[@android:label='@string/app_name']"].attribute('android:name') end
+
+def device_path_exists?(path)
+  path_output =`adb shell ls #{path}`
+  result = path_output.chomp !~ /No such file or directory|opendir failed, Permission denied/
+  puts "Checking path on device: #{path}: #{result || path_output}"
+  result
+end
+
+def package_installed? test = false
+  package_name = "#{package}#{'.tests' if test}"
+  app_paths = ['', '-0', '-1', '-2'].map{|i| "/data/app/#{package_name}#{i}.apk"}
+  path_outputs = app_paths.map{|p| `adb shell ls #{p}`.chomp}
+  path_outputs.each_with_index do |o, i|
+    if o == app_paths[i]
+      puts "Found package #{app_paths[i]}"
+      return true
+    end
+  end
+  puts "Package not found: #{package_name}"
+  return false
+end
+
+private
+
+def replace_faulty_code(faulty_file, faulty_code)
+  explicit_requires = Dir["#{faulty_file.chomp('.rb')}/*.rb"].sort.map{|f| File.basename(f)}.map do |filename|
+    "require 'active_model/validations/#{filename}'"
+  end.join("\n")
+
+  old_code = File.read(faulty_file)
+  new_code = old_code.gsub faulty_code, explicit_requires
+  if new_code != old_code
+    puts "Replaced directory listing code in file #{faulty_file} with explicit requires."
+    File.open(faulty_file, 'w'){|f| f << new_code}
+  else
+    puts "Could not find expected faulty code\n\n#{faulty_code}\n\nin file #{faulty_file}\n\n#{old_code}\n\n"
+  end
+end

data/assets/assets/scripts/ruboto.rb

@@ -1,6 +1,6 @@
 #######################################################
 #
-# ruboto.rb (by Scott Moyer)
+# ruboto.rb
 #
 # - Wrapper for using RubotoActivity, RubotoService, and
 #     RubotoBroadcastReceiver. 
@@ -9,7 +9,7 @@
 #
 #######################################################
 
-$RUBOTO_VERSION = 7
+$RUBOTO_VERSION = 8
 
 def confirm_ruboto_version(required_version, exact=true)
   raise "requires $RUBOTO_VERSION=#{required_version} or greater, current version #{$RUBOTO_VERSION}" if $RUBOTO_VERSION < required_version and not exact
@@ -18,7 +18,15 @@ end
 
 require 'java'
 
-$package_name = "THE_PACKAGE"
+$package_name = ($activity || $service || $broadcast_receiver).package_name
+$package      = eval("Java::#{$package_name}")
+
+# Create convenience method for top-level android package so we do not need to prefix with 'Java::'.
+module Kernel
+  def android
+    JavaUtilities.get_package_module_dot_format('android')
+  end
+end
 
 java_import "android.R"
 
@@ -32,53 +40,77 @@ module Ruboto
 end
 AndroidIds = JavaUtilities.get_proxy_class("android.R$id")
 
+class Object
+  def with_large_stack(opts = {}, &block)
+    opts = {:size => opts} if opts.is_a? Integer
+    opts = {:name => 'Block with large stack'}.update(opts)
+    result = nil
+    t = Thread.with_large_stack(opts, &proc{result = block.call})
+    t.join
+    result
+  end
+end
+
+class Thread
+  def self.with_large_stack(opts = {}, &block)
+    opts = {:size => opts} if opts.is_a? Integer
+    stack_size_kb = opts.delete(:size) || 64
+    name = opts.delete(:name) || "Thread with large stack"
+    raise "Unknown option(s): #{opts.inspect}" unless opts.empty?
+    t = java.lang.Thread.new(nil, block, name, stack_size_kb * 1024)
+    t.start
+    t
+  end
+end
+
 #############################################################################
 #
 # Activity
 #
 
 def setup_activity
- java_import "android.app.Activity"
-
- Activity.class_eval do
-  def start_ruboto_dialog(remote_variable, &block)
-    start_ruboto_activity(remote_variable, RubotoDialog, &block)
-  end
+  java_import "android.app.Activity"
 
-  def start_ruboto_activity(remote_variable, klass=RubotoActivity, &block)
-    $activity_init_block = block
-
-    if @initialized or self == $activity
-      b = Java::android.os.Bundle.new
-      b.putString("Remote Variable", remote_variable)
-      b.putBoolean("Define Remote Variable", true)
-      b.putString("Initialize Script", "#{remote_variable}.initialize_activity")
-
-      i = Java::android.content.Intent.new
-      i.setClass self, klass.java_class
-      i.putExtra("RubotoActivity Config", b)
-
-      self.startActivity i
-    else
-      instance_eval "#{remote_variable}=self"
-      setRemoteVariable remote_variable
-      initialize_activity
-      on_create nil
+  Activity.class_eval do
+    def start_ruboto_dialog(remote_variable, theme=R.style::Theme_Dialog, &block)
+      start_ruboto_activity(remote_variable, RubotoDialog, theme, &block)
     end
 
-    self
-  end
+    def start_ruboto_activity(remote_variable, klass=RubotoActivity, theme=nil, &block)
+      $activity_init_block = block
 
-  #plugin
-  def toast(text, duration=5000)
-    Java::android.widget.Toast.makeText(self, text, duration).show
-  end
+      if @initialized or self == $activity
+        b = Java::android.os.Bundle.new
+        b.putInt("Theme", theme) if theme
+        b.putString("Remote Variable", remote_variable)
+        b.putBoolean("Define Remote Variable", true)
+        b.putString("Initialize Script", "#{remote_variable}.initialize_activity")
 
-  #plugin
-  def toast_result(result, success, failure, duration=5000)
-    toast(result ? success : failure, duration)
+        i = Java::android.content.Intent.new
+        i.setClass self, klass.java_class
+        i.putExtra("RubotoActivity Config", b)
+
+        self.startActivity i
+      else
+        instance_eval "#{remote_variable}=self"
+        setRemoteVariable remote_variable
+        initialize_activity
+        on_create nil
+      end
+
+      self
+    end
+
+    #plugin
+    def toast(text, duration=5000)
+      Java::android.widget.Toast.makeText(self, text, duration).show
+    end
+
+    #plugin
+    def toast_result(result, success, failure, duration=5000)
+      toast(result ? success : failure, duration)
+    end
   end
- end
 end
 
 #############################################################################
@@ -138,7 +170,7 @@ def ruboto_configure_activity(klass)
     def on_create(bundle)
       @view_parent = nil
       setContentView(instance_eval &@content_view_block) if @content_view_block
-      instance_eval {@finish_create_block.call} if @finish_create_block
+      instance_eval { @finish_create_block.call } if @finish_create_block
     end
 
     #
@@ -148,7 +180,7 @@ def ruboto_configure_activity(klass)
     def add_menu title, icon=nil, &block
       mi = @menu.add(title)
       mi.setIcon(icon) if icon
-      mi.class.class_eval {attr_accessor :on_click}
+      mi.class.class_eval { attr_accessor :on_click }
       mi.on_click = block
 
       # Seems to be needed or the block might get cleaned up
@@ -158,14 +190,21 @@ def ruboto_configure_activity(klass)
 
     def handle_create_options_menu &block
       p = Proc.new do |*args|
-        @menu, @context_menu = args[0], nil
-        instance_eval {block.call(*args)} if block
+        @menu = args[0]
+        instance_eval { block.call(*args) } if block
       end
       setCallbackProc(self.class.const_get("CB_CREATE_OPTIONS_MENU"), p)
 
-      p = Proc.new do |num,menu_item|
-        (instance_eval &(menu_item.on_click); return true) if @menu
-        false
+      p = Proc.new do |num, menu_item|
+        # handles a problem where this is called for context items
+        # JRUBY-5866 JRuby can't access nested Java class if the class is called 'id'
+        unless @just_processed_context_item == menu_item || menu_item.item_id == JavaUtilities.get_proxy_class('android.R$id').home
+          instance_eval &(menu_item.on_click)
+          @just_processed_context_item = nil
+          true
+        else
+          false
+        end
       end
       setCallbackProc(self.class.const_get("CB_MENU_ITEM_SELECTED"), p)
     end
@@ -176,7 +215,7 @@ def ruboto_configure_activity(klass)
 
     def add_context_menu title, &block
       mi = @context_menu.add(title)
-      mi.class.class_eval {attr_accessor :on_click}
+      mi.class.class_eval { attr_accessor :on_click }
       mi.on_click = block
 
       # Seems to be needed or the block might get cleaned up
@@ -186,14 +225,24 @@ def ruboto_configure_activity(klass)
 
     def handle_create_context_menu &block
       p = Proc.new do |*args|
-        @menu, @context_menu = nil, args[0]
-        instance_eval {block.call(*args)} if block
+        @context_menu = args[0]
+        instance_eval { block.call(*args) } if block
       end
       setCallbackProc(self.class.const_get("CB_CREATE_CONTEXT_MENU"), p)
 
       p = Proc.new do |menu_item|
-        (instance_eval {menu_item.on_click.call(menu_item.getMenuInfo.position)}; return true) if menu_item.on_click
-        false
+        if menu_item.on_click
+          arg = menu_item
+          begin
+            arg = menu_item.getMenuInfo.position
+          rescue
+          end
+          instance_eval { menu_item.on_click.call(arg) }
+          @just_processed_context_item = menu_item
+          true
+        else
+          false
+        end
       end
       setCallbackProc(self.class.const_get("CB_CONTEXT_ITEM_SELECTED"), p)
     end
@@ -212,14 +261,10 @@ def ruboto_setup(klass, init_method="create")
   ruboto_allow_handlers(klass)
 
   klass.class_eval do
-    def when_launched(&block)
-      instance_exec *args, &block
-      on_create nil
-    end
-
     eval %Q{
       def handle_#{init_method}(&block)
-        when_launched &block
+        instance_exec &block
+        #{klass == Java::org.ruboto.RubotoActivity ? "on_create(nil)" : ""}
       end
     }
   end
@@ -231,18 +276,43 @@ end
 #
 
 def ruboto_import_widgets(*widgets)
-  widgets.each{|i| ruboto_import_widget i}
+  widgets.each { |i| ruboto_import_widget i }
 end
 
 def ruboto_import_widget(class_name, package_name="android.widget")
   view_class = java_import "#{package_name}.#{class_name}"
-  return unless view_class
 
   RubotoActivity.class_eval "
-     def #{(class_name.to_s.gsub(/([A-Z])/) {'_' + $1.downcase})[1..-1]}(params={})
-        rv = #{class_name}.new self
-        @view_parent.addView(rv) if @view_parent
+     def #{(class_name.to_s.gsub(/([A-Z])/) { '_' + $1.downcase })[1..-1]}(params={})
+        force_style = params.delete(:default_style)
+        force_parent = params.delete(:parent)
+        force_index = params.delete(:parent_index)
+        if force_style
+          if params.any?
+            attributes = android.util.AttributeSet.impl do |method, *args|
+              puts 'Not implemented, yet.'
+              puts %Q{Unhandled AttributeSet method: \#{method}(\#{args.map{|a| a.inspect}.join(', ')})}
+            end
+          else
+            attributes = nil
+          end
+          rv = #{class_name}.new(self, attributes, force_style)
+        else
+          if api_key = params.delete(:apiKey)
+            rv = #{class_name}.new(self, api_key)
+          else
+            rv = #{class_name}.new(self)
+          end
+        end
+
+        if force_index
+          (force_parent || @view_parent).addView(rv, force_index) if (force_parent || @view_parent)
+        else
+          (force_parent || @view_parent).addView(rv) if (force_parent || @view_parent)
+        end
+
         rv.configure self, params
+
         if block_given?
           old_view_parent, @view_parent = @view_parent, rv
           yield
@@ -252,9 +322,11 @@ def ruboto_import_widget(class_name, package_name="android.widget")
      end
    "
 
-  setup_list_view       if class_name == :ListView
-  setup_button          if class_name == :Button
-  setup_linear_layout   if class_name == :LinearLayout
+  setup_list_view if class_name == :ListView
+  setup_spinner if class_name == :Spinner
+  setup_button if class_name == :Button
+  setup_image_button if class_name == :ImageButton
+  setup_linear_layout if class_name == :LinearLayout
   setup_relative_layout if class_name == :RelativeLayout
 end
 
@@ -264,52 +336,52 @@ end
 #
 
 def setup_view
- java_import "android.view.View"
- java_import "android.view.ViewGroup"
+  java_import "android.view.View"
+  java_import "android.view.ViewGroup"
 
- View.class_eval do
-  @@convert_constants ||= {}
+  View.class_eval do
+    @@convert_constants ||= {}
 
-  def self.add_constant_conversion(from, to)
-    @@convert_constants[from] = to
-  end
-
-  def self.convert_constant(from)
-    @@convert_constants[from] or from
-  end
-
-  def self.setup_constant_conversion
-    (self.constants - self.superclass.constants).each do |i|
-      View.add_constant_conversion i.downcase.to_sym, self.const_get(i)
+    def self.add_constant_conversion(from, to)
+      @@convert_constants[from] = to
     end
-  end
 
-  def configure(context, params = {})
-    if width = params.delete(:width)
-      getLayoutParams.width = View.convert_constant(width)
+    def self.convert_constant(from)
+      @@convert_constants[from] or from
     end
 
-    if height = params.delete(:height)
-      getLayoutParams.height = View.convert_constant(height)
+    def self.setup_constant_conversion
+      (self.constants - self.superclass.constants).each do |i|
+        View.add_constant_conversion i.downcase.to_sym, self.const_get(i)
+      end
     end
 
-    if layout = params.delete(:layout)
-      lp = getLayoutParams
-      layout.each do |k, v|
-        values = (v.is_a?(Array) ? v : [v]).map{|i| @@convert_constants[i] or i}
-        lp.send("#{k.to_s.gsub(/_([a-z])/) {$1.upcase}}", *values)
+    def configure(context, params = {})
+      if width = params.delete(:width)
+        getLayoutParams.width = View.convert_constant(width)
+      end
+
+      if height = params.delete(:height)
+        getLayoutParams.height = View.convert_constant(height)
+      end
+
+      if layout = params.delete(:layout)
+        lp = getLayoutParams
+        layout.each do |k, v|
+          values = (v.is_a?(Array) ? v : [v]).map { |i| @@convert_constants[i] or i }
+          lp.send("#{k.to_s.gsub(/_([a-z])/) { $1.upcase }}", *values)
+        end
       end
-    end
 
-    params.each do |k, v|
-      values = (v.is_a?(Array) ? v : [v]).map{|i| @@convert_constants[i] or i}
-      self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", *values)
+      params.each do |k, v|
+        values = (v.is_a?(Array) ? v : [v]).map { |i| @@convert_constants[i] or i }
+        self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}", *values)
+      end
     end
   end
- end
 
- View.add_constant_conversion :wrap_content, ViewGroup::LayoutParams::WRAP_CONTENT
- View.add_constant_conversion :fill_parent,  ViewGroup::LayoutParams::FILL_PARENT
+  View.add_constant_conversion :wrap_content, ViewGroup::LayoutParams::WRAP_CONTENT
+  View.add_constant_conversion :fill_parent, ViewGroup::LayoutParams::FILL_PARENT
 end
 
 #############################################################################
@@ -336,6 +408,17 @@ def setup_button
   ruboto_register_handler("org.ruboto.callbacks.RubotoOnClickListener", "click", Button, "setOnClickListener")
 end
 
+def setup_image_button
+  ImageButton.class_eval do
+    def configure(context, params = {})
+      setOnClickListener(context)
+      super(context, params)
+    end
+  end
+
+  ruboto_register_handler("org.ruboto.callbacks.RubotoOnClickListener", "click", ImageButton, "setOnClickListener")
+end
+
 def setup_list_view
   ListView.class_eval do
     attr_reader :adapter, :adapter_list
@@ -344,16 +427,20 @@ def setup_list_view
       if params.has_key? :list
         @adapter_list = Java::java.util.ArrayList.new
         @adapter_list.addAll(params[:list])
-        @adapter = Java::android.widget.ArrayAdapter.new(context, R::layout::simple_list_item_1, @adapter_list)
+        item_layout = params.delete(:item_layout) || R::layout::simple_list_item_1
+        @adapter    = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
         setAdapter @adapter
         params.delete :list
       end
+      if params.has_key? :adapter
+        @adapter = params[:adapter]
+      end
       setOnItemClickListener(context)
       super(context, params)
     end
 
     def reload_list(list)
-      @adapter_list.clear();
+      @adapter_list.clear
       @adapter_list.addAll(list)
       @adapter.notifyDataSetChanged
       invalidate
@@ -363,6 +450,35 @@ def setup_list_view
   ruboto_register_handler("org.ruboto.callbacks.RubotoOnItemClickListener", "item_click", ListView, "setOnItemClickListener")
 end
 
+def setup_spinner
+  Spinner.class_eval do
+    attr_reader :adapter, :adapter_list
+
+    def configure(context, params = {})
+      if params.has_key? :list
+        @adapter_list = Java::java.util.ArrayList.new
+        @adapter_list.addAll(params[:list])
+        item_layout = params.delete(:item_layout) || R::layout::simple_spinner_item
+        @adapter    = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
+        @adapter.setDropDownViewResource(params.delete(:dropdown_layout) || R::layout::simple_spinner_dropdown_item)
+        setAdapter @adapter
+        params.delete :list
+      end
+      setOnItemSelectedListener(context)
+      super(context, params)
+    end
+
+    def reload_list(list)
+      @adapter.clear
+      @adapter.addAll(list)
+      @adapter.notifyDataSetChanged
+      invalidate
+    end
+  end
+
+  ruboto_register_handler("org.ruboto.callbacks.RubotoOnItemSelectedListener", "item_selected", Spinner, "setOnItemSelectedListener")
+end
+
 #############################################################################
 #
 # Import a class and set it up for handlers
@@ -378,31 +494,31 @@ end
 #
 # Allows RubotoActivity to handle callbacks covering Class based handlers
 #
-
 def ruboto_register_handler(handler_class, unique_name, for_class, method_name)
-  klass_name = handler_class[/.+\.([A-Z].+)/,1]
-  klass = ruboto_import handler_class
-  return unless klass
-
-  RubotoActivity.class_eval "
-    attr_accessor :#{unique_name}_handler
+  klass_name = handler_class[/.+\.([A-Z].+)/, 1]
+  klass      = ruboto_import handler_class
 
-    def #{unique_name}_handler
-      @#{unique_name}_handler ||= #{klass_name}.new
-    end
+  unless RubotoActivity.method_defined? "#{unique_name}_handler"
+    RubotoActivity.class_eval "
+      def #{unique_name}_handler
+        @#{unique_name}_handler ||= #{klass_name}.new
+      end
 
-    def handle_#{unique_name}(&block)
-      #{unique_name}_handler.handle_#{unique_name} &block
-      self
-    end
-  "
+      def handle_#{unique_name}(&block)
+        #{unique_name}_handler.handle_#{unique_name} &block
+        self
+      end
+    "
+  end
 
-  for_class.class_eval "
-    alias_method :orig_#{method_name}, :#{method_name}
-    def #{method_name}(handler)
-      orig_#{method_name}(handler.kind_of?(RubotoActivity) ? handler.#{unique_name}_handler : handler)
-    end
-  "
+  unless for_class.method_defined? "orig_#{method_name}"
+    for_class.class_eval "
+      alias_method :orig_#{method_name}, :#{method_name}
+      def #{method_name}(handler)
+        orig_#{method_name}(handler.kind_of?(RubotoActivity) ? handler.#{unique_name}_handler : handler)
+      end
+    "
+  end
 end
 
 #############################################################################
@@ -411,7 +527,7 @@ end
 #
 
 def ruboto_import_preferences(*preferences)
-  preferences.each{|i| ruboto_import_preference i}
+  preferences.each { |i| ruboto_import_preference i }
 end
 
 def ruboto_import_preference(class_name, package_name="android.preference")
@@ -421,7 +537,7 @@ def ruboto_import_preference(class_name, package_name="android.preference")
   setup_preferences
 
   RubotoPreferenceActivity.class_eval "
-     def #{(class_name.to_s.gsub(/([A-Z])/) {'_' + $1.downcase})[1..-1]}(params={})
+     def #{(class_name.to_s.gsub(/([A-Z])/) { '_' + $1.downcase })[1..-1]}(params={})
         rv = #{class_name}.new self
         rv.configure self, params
         @parent.addPreference(rv) if @parent
@@ -464,7 +580,7 @@ def setup_preferences
     def on_create(bundle)
       @parent = nil
       setPreferenceScreen(instance_eval &@preference_screen_block) if @preference_screen_block
-      instance_eval {@finish_create_block.call} if @finish_create_block
+      instance_eval { @finish_create_block.call } if @finish_create_block
     end
   end
 
@@ -472,9 +588,9 @@ def setup_preferences
     def configure(context, params = {})
       params.each do |k, v|
         if v.is_a?(Array)
-          self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", *v)
+          self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}", *v)
         else
-          self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", v)
+          self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}", v)
         end
       end
     end
@@ -488,22 +604,22 @@ end
 #
 # Final set up depending on globals
 #
-
-if $activity
+# TODO(uwe): I think ruboto.rb should not contain any conditions so it does not matter when it is required.
+# TODO(uwe): Remove the commented lines after checking with Scott.
+# if $activity
   java_import "org.ruboto.RubotoActivity"
   setup_activity
   ruboto_configure_activity(RubotoActivity)
   ruboto_setup(RubotoActivity)
   setup_view
-end
+# end
 
-if $service
+# if $service
   java_import "org.ruboto.RubotoService"
   ruboto_setup(RubotoService)
-end
+# end
 
-if $broadcast_receiver
+# if $broadcast_receiver
   java_import "org.ruboto.RubotoBroadcastReceiver"
   ruboto_setup(RubotoBroadcastReceiver, "receive")
-end
-
+# end