ruboto 0.8.0 → 0.8.1

data/lib/ruboto/util/xml_element.rb

@@ -63,7 +63,7 @@ module Ruboto
 
       def all_methods(method_base="all", method_include="", method_exclude="", implements="")
         # get all the methogs
-        all_methods = get_elements("method")
+        all_methods = get_elements('method').select{|m| m.attribute('static') != 'true'}
 
         # establish the base set of methods
         working_methods = case method_base.to_s
@@ -147,7 +147,7 @@ module Ruboto
 
       def super_return
         rv = super_string
-        return rv unless attribute("return")
+        return "{#{rv} return;}" unless attribute("return")
         rv ? "return #{rv}" : default_return
       end
 
@@ -172,7 +172,7 @@ module Ruboto
             return_class = attribute("return").capitalize
           end
           return_cast = "return (#{return_class.gsub("&lt;", "<").gsub("&gt;", ">")}) " if return_class
-          convert_return = "#{return_class}.class, "
+          convert_return = "#{return_class.sub(/<.*>$/, '')}.class, "
         end
 
         if on_ruby_instance
@@ -183,17 +183,17 @@ module Ruboto
                   "JRubyAdapter.isJRubyPreOneSeven()",
                   params.map{|i| "JRubyAdapter.put(\"$arg_#{i[0]}\", #{i[0]});"} +
                   [
-                      'JRubyAdapter.put("$ruby_instance", rubyInstance);',
+                      'JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());',
                       "#{return_cast}#{'((Number)' if return_int}JRubyAdapter.runScriptlet(\"$ruby_instance.#{method_name}(#{global_args})\")#{').intValue()' if return_int};",
                   ],
                   if_else(
                       "JRubyAdapter.isJRubyOneSeven()",
-                      ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}rubyInstance, \"#{method_name}\"#{args});"],
+                      ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getRubyInstance(), \"#{method_name}\"#{args});"],
                       ['throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));']
                   )
               )
         else
-          ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}callbackProcs[#{constant_string}], \"call\" #{args});"]
+          ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getCallbackProcs()[#{constant_string}], \"call\" #{args});"]
         end
       end
 
@@ -205,20 +205,22 @@ module Ruboto
         method_call(
             (attribute("return") ? attribute("return") : "void"),
             attribute("name"), parameters,
+            get_elements('exception').map{|m| m.attribute('type')},
+            ["if (ScriptLoader.isCalledFromJRuby()) #{super_return}",
             if_else(
                 "JRubyAdapter.isInitialized()",
                 if_else(
-                    "callbackProcs != null && callbackProcs[#{constant_string}] != null",
+                    "scriptInfo.getCallbackProcs() != null && scriptInfo.getCallbackProcs()[#{constant_string}] != null",
                     [super_string] + ruby_call,
-                    ['String rubyClassName = Script.toCamelCase(scriptName);'] +
+                    ['String rubyClassName = scriptInfo.getRubyClassName();'] +
                         if_else(
                             # TODO(uwe):  Remove defined?(rubyClassName) if we remove non-class-based class definitions
                             "(Boolean)JRubyAdapter.runScriptlet(\"defined?(\" + rubyClassName + \") == 'constant' && \" + rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
-                            [super_string] + ruby_call(true),
+                            ruby_call(true),
                             if_else(
                                 # TODO(uwe):  Remove defined?(rubyClassName) if we remove non-class-based class definitions
                                 "(Boolean)JRubyAdapter.runScriptlet(\"defined?(\" + rubyClassName + \") == 'constant' && \" + rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
-                                [super_string] + ruby_call(true, true),
+                                ruby_call(true, true),
                                 [super_return]
                             )
                         )
@@ -228,11 +230,12 @@ module Ruboto
                     super_return,
                 ]
             )
+            ]
         ).indent.join("\n")
       end
 
       def constructor_definition(class_name)
-        method_call(nil, class_name, parameters, [super_string]).indent.join("\n")
+        method_call(nil, class_name, parameters, nil, [super_string]).indent.join("\n")
       end
     end
   end

data/lib/ruboto/version.rb

@@ -1,3 +1,4 @@
 module Ruboto
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
+  UPDATE_VERSION_LIMIT = '0.5.2'
 end

data/test/activity/generate_activity.rb

@@ -0,0 +1,35 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/generate'
+
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+ruboto_generate("android.widget.ArrayAdapter" => $package_name + ".MyArrayAdapter")
+
+class GenerateActivity
+  def on_create(bundle)
+    super
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+    adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , AndroidIds::text1, ['Record one', 'Record two'])
+    adapter.initialize_ruboto_callbacks do
+      def get_view(position, convert_view, parent)
+        puts "IN get_view!!!"
+        @inflater ||= context.getSystemService(Context::LAYOUT_INFLATER_SERVICE)
+        row = convert_view ? convert_view : @inflater.inflate(mResource, nil)
+        row.findViewById(mFieldId).text = get_item(position)
+        row
+      rescue Exception
+        puts "Exception getting list item view: #$!"
+        puts $!.backtrace.join("\n")
+        convert_view
+      end
+    end
+
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view_margins = text_view :text => 'What hath Matz wrought?', :id => 42
+          @list_view = list_view :adapter => adapter, :id => 43
+        end
+  end
+end

data/test/activity/generate_activity_test.rb

@@ -0,0 +1,17 @@
+activity Java::org.ruboto.test_app.GenerateActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    @list_view = activity.findViewById(43)
+    break if (@text_view && @list_view) || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+  assert @list_view
+end
+
+test("activity starts") do |activity|
+  assert true
+end

data/test/activity/image_button_activity.rb

@@ -5,6 +5,7 @@ ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 
 class ImageButtonActivity
   def on_create(bundle)
+    super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     click_handler = proc do |view|

data/test/activity/image_button_and_button_activity.rb

@@ -5,6 +5,7 @@ ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
 
 class ImageButtonAndButtonActivity
   def on_create(bundle)
+    super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =

data/test/activity/margins_activity.rb

@@ -5,6 +5,7 @@ ruboto_import_widgets :LinearLayout, :TextView
 
 class MarginsActivity
   def on_create(bundle)
+    super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =

data/test/activity/navigation_activity.rb

@@ -3,8 +3,9 @@ require 'ruboto/widget'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
-class NavigationActivity
+class NavigationActivity < Java::OrgRuboto::EntryPointActivity
   def on_create(bundle)
+    super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =
@@ -15,7 +16,8 @@ class NavigationActivity
           button :text => 'Next by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { start_next_ruby_activity }
           button :text => 'Next by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { start_activity_by_script_name }
           button :text => 'Inline block', :width => :match_parent, :id => 46, :on_click_listener => proc { start_inline_activity }
-          button :text => 'Infile class', :width => :match_parent, :id => 47, :on_click_listener => proc { start_infile_activity }
+          button :text => 'Inline block with options', :width => :match_parent, :id => 47, :on_click_listener => proc { start_inline_activity_with_options }
+          button :text => 'Infile class', :width => :match_parent, :id => 48, :on_click_listener => proc { start_infile_activity }
         end
   end
 
@@ -46,10 +48,24 @@ class NavigationActivity
   end
 
   def start_inline_activity
-    start_ruboto_activity('$inline_activity') do
+    start_ruboto_activity do
       def on_create(bundle)
+        super
         set_title 'Inline Activity'
+        self.content_view =
+            linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+              text_view :text => 'This is an inline activity.', :id => 42, :width => :match_parent,
+                        :gravity => :center, :text_size => 48.0
+            end
+      end
+    end
+  end
 
+  def start_inline_activity_with_options
+    start_ruboto_activity(:class_name => 'InlineActivity') do
+      def on_create(bundle)
+        super
+        set_title 'Inline Activity'
         self.content_view =
             linear_layout :orientation => :vertical, :gravity => :center_horizontal do
               text_view :text => 'This is an inline activity.', :id => 42, :width => :match_parent,
@@ -71,9 +87,8 @@ class NavigationActivity
 end
 
 class InfileActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
+    super
     set_title 'Infile Activity'
 
     self.content_view =

data/test/activity/navigation_activity_test.rb

@@ -60,10 +60,22 @@ end
 
 test('button starts inline activity', :ui => false) do |activity|
   assert_equal "What hath Matz wrought?", @text_view.text
-  activity.run_on_ui_thread { activity.find_view_by_id(46).perform_click }
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(46).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    assert current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  ensure
+    puts "Removing monitor"
+    removeMonitor(monitor)
+  end
+
   start = Time.now
   loop do
-    @text_view = activity.find_view_by_id(42)
+    @text_view = current_activity.find_view_by_id(42)
     break if (@text_view && @text_view.text == 'This is an inline activity.') || (Time.now - start > 10)
     puts 'wait for text'
     sleep 0.5
@@ -72,17 +84,44 @@ test('button starts inline activity', :ui => false) do |activity|
   assert_equal 'This is an inline activity.', @text_view.text
 end
 
-test('button starts infile class activity', :ui => false) do |activity|
+test('button starts inline activity with options', :ui => false) do |activity|
   assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(47).perform_click }
     current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    assert current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  ensure
+    puts "Removing monitor"
+    removeMonitor(monitor)
+  end
+
+  start = Time.now
+  loop do
+    @text_view = current_activity.find_view_by_id(42)
+    break if (@text_view && @text_view.text == 'This is an inline activity.') || (Time.now - start > 10)
+    puts 'wait for text'
+    sleep 0.5
+  end
+  assert @text_view
+  assert_equal 'This is an inline activity.', @text_view.text
+end
+
+test('button starts infile class activity', :ui => false) do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(48).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
   ensure
     removeMonitor(monitor)
   end
+  puts "new activity: #{current_activity.inspect}"
   assert current_activity
-  puts "new activity: #{current_activity}"
+  assert current_activity.is_a? Java::OrgRuboto::RubotoActivity
   start = Time.now
   loop do
     @text_view = current_activity.find_view_by_id(42)

data/test/activity/option_menu_activity.rb

@@ -6,6 +6,7 @@ ruboto_import_widgets :LinearLayout, :TextView
 
 class OptionMenuActivity
   def on_create(bundle)
+    super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =

data/test/activity/psych_activity.rb

@@ -6,7 +6,7 @@ if RUBY_VERSION < '1.9'
   $LOADED_FEATURES << 'psych.so'
   $LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
 end
-# TODO end
+# ODOT
 
 require 'ruboto/util/stack'
 with_large_stack { require 'psych.rb' }
@@ -20,6 +20,7 @@ ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class PsychActivity
   def on_create(bundle)
+    super
     set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER do

data/test/activity/stack_activity.rb

@@ -11,6 +11,7 @@ class StackActivity
   STACK_DEPTH_CLASS = java.lang.Thread.current_thread.stack_trace.length.to_s
   def on_create(bundle)
     stack_depth_on_create = java.lang.Thread.current_thread.stack_trace.length.to_s
+    super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     self.content_view =

data/test/activity/stack_activity_test.rb

@@ -10,8 +10,14 @@ setup do |activity|
   assert @text_view
 end
 
+# ANDROID: 10, PLATFORM: 0.4.7, JRuby: 1.7.0.dev '28334966' expected, but got '28335067'
+
 test('stack depth') do |activity|
-  os_offset = {13 => 1, 15 => 1, 16 => 1}[android.os.Build::VERSION::SDK_INT].to_i
+  os_offset = {
+      13 => [1]*4,
+      15 => [0, 0, 1, 1],
+      16 => [1]*4,
+  }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
         '0.4.7' => [0, 0, 0, 0],
@@ -24,10 +30,10 @@ test('stack depth') do |activity|
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
-  assert_equal [43 + os_offset + jruby_offset[0],
-                48 + os_offset + jruby_offset[1],
-                49 + os_offset + jruby_offset[2],
-                66 + os_offset + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
+  assert_equal [28 + os_offset[0] + jruby_offset[0],
+                33 + os_offset[1] + jruby_offset[1],
+                50 + os_offset[2] + jruby_offset[2],
+                67 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
                                                     activity.find_view_by_id(43).text.to_i,
                                                     activity.find_view_by_id(44).text.to_i,
                                                     activity.find_view_by_id(45).text.to_i], version_message

data/test/block_def_activity/margins_activity.rb

@@ -1,4 +1,5 @@
-require 'ruboto'
+require 'ruboto/activity'
+require 'ruboto/widget'
 
 ruboto_import_widgets :LinearLayout, :TextView
 

data/test/block_def_activity/psych_activity.rb

@@ -6,7 +6,7 @@ if RUBY_VERSION < '1.9'
   $LOADED_FEATURES << 'psych.so'
   $LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
 end
-# TODO end
+# ODOT
 
 require 'ruboto/activity'
 require 'ruboto/widget'

data/test/block_def_activity/stack_activity_test.rb

@@ -25,7 +25,7 @@ test('stack depth') do |activity|
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
   assert_equal [43 + os_offset + jruby_offset[0],
-                78 + os_offset + jruby_offset[1],
+                71 + os_offset + jruby_offset[1],
                 61 + os_offset + jruby_offset[2],
                 78 + os_offset + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
                                                     activity.find_view_by_id(43).text.to_i,

data/test/handle_activity/psych_activity.rb

@@ -6,7 +6,7 @@ if RUBY_VERSION < '1.9'
   $LOADED_FEATURES << 'psych.so'
   $LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
 end
-# TODO end
+# ODOT
 
 with_large_stack { require 'psych.rb' }
 

data/test/handle_activity/stack_activity_test.rb

@@ -10,26 +10,34 @@ setup do |activity|
   assert @text_view
 end
 
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.6.7          '44697894' expected, but got '44687793'
+# ANDROID: 15, PLATFORM: 0.4.8.dev,  JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
+# ANDROID: 10, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[43, 67, 76, 92]' expected, but got '[43, 66, 75, 91]'
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
+
 test('stack depth') do |activity|
   os_offset = {13 => 1, 15 => 1, 16 => 1}[android.os.Build::VERSION::SDK_INT].to_i
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
-        '0.4.7' => [0, 0, 0, 0],
+        '0.4.7'     => [0, 0, 0, 0],
         '0.4.8.dev' => [0, -1, -1, -1],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
-        '1.7.0.dev' => [1, 1, 1, 1],
+        '1.7.0.dev' => [1, 0, 0, 0],
         '1.7.0.preview1' => [0, -1, -1, -1],
         '1.7.0.preview2' => [0, -1, -1, -1],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
-  assert_equal [43 + os_offset + jruby_offset[0],
-                67 + os_offset + jruby_offset[1],
-                76 + os_offset + jruby_offset[2],
-                92 + os_offset + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
-                                                    activity.find_view_by_id(43).text.to_i,
-                                                    activity.find_view_by_id(44).text.to_i,
-                                                    activity.find_view_by_id(45).text.to_i], version_message
+  expected = [43 + os_offset + jruby_offset[0],
+              67 + os_offset + jruby_offset[1],
+              76 + os_offset + jruby_offset[2],
+              92 + os_offset + jruby_offset[3]]
+  actual = [activity.find_view_by_id(42).text.to_i,
+            activity.find_view_by_id(43).text.to_i,
+            activity.find_view_by_id(44).text.to_i,
+            activity.find_view_by_id(45).text.to_i]
+  assert_equal expected, actual, version_message
+  puts "handle stack: #{version_message} #{actual.inspect}"
 end