ruboto 0.6.0 → 0.7.0

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.6.0'
-end
+  VERSION = '0.7.0'
+end

data/test/activity/image_button_activity.rb

@@ -1,21 +1,24 @@
-require 'ruboto'
+require 'ruboto/activity'
 
 ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
-  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+class ImageButtonActivity
+  include Ruboto::Activity
 
-  setup_content do
-    linear_layout :orientation => LinearLayout::VERTICAL do
-      @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
-      image_button :image_resource => $package.R::drawable::icon, :width => :wrap_content, :id => 43
-    end
-  end
+  def on_create(bundle)
+    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
-  handle_click do |view|
-    if view.id == 43
+    click_handler = proc do |view|
       @text_view.setText 'What hath Matz wrought!'
       toast 'Flipped a bit via butterfly'
     end
+
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER_HORIZONTAL do
+          @text_view = text_view :text    => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
+                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
+          image_button :image_resource    => $package.R::drawable::get_ruboto_core, :width => :wrap_content, :id => 43,
+                       :on_click_listener => click_handler
+        end
   end
 end

data/test/activity/image_button_activity_test.rb

@@ -10,12 +10,8 @@ setup do |activity|
   assert @text_view
 end
 
-test('initial setup') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
-end
-
 test('button changes text') do |activity|
-  button = activity.findViewById(43)
-  button.performClick
+  assert_equal "What hath Matz wrought?", @text_view.text
+  activity.findViewById(43).performClick
   assert_equal "What hath Matz wrought!", @text_view.text
 end

data/test/activity/image_button_and_button_activity.rb

@@ -1,24 +1,22 @@
-require 'ruboto'
+require 'ruboto/activity'
 
 ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
-  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+class ImageButtonAndButtonActivity
+  include Ruboto::Activity
 
-  setup_content do
-    linear_layout :orientation => LinearLayout::VERTICAL do
-      @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
-      button :text => 'Button', :width => :wrap_content, :id => 44
-      image_button :image_resource => $package.R::drawable::icon, :width => :wrap_content, :id => 43
-    end
-  end
+  def on_create(bundle)
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
-  handle_click do |view|
-    if view.id == 43
-      @text_view.text = 'Image button pressed'
-    elsif view.id == 44
-      @text_view.text = 'Button pressed'
-    end
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER_HORIZONTAL do
+          @text_view = text_view :text  => 'What hath Matz wrought?', :id => 42, :text_size => 48.0,
+                                 :width => :fill_parent, :gravity => android.view.Gravity::CENTER
+          button :text              => 'Button', :id => 44, :text_size => 48.0,
+                 :width             => :fill_parent, :gravity => android.view.Gravity::CENTER,
+                 :on_click_listener => proc { @text_view.text = 'Button pressed' }
+          image_button :image_resource    => $package.R::drawable::get_ruboto_core, :id => 43, :width => :wrap_content,
+                       :on_click_listener => proc { @text_view.text = 'Image button pressed' }
+        end
   end
-
 end

data/test/activity/image_button_and_button_activity_test.rb

@@ -10,18 +10,14 @@ setup do |activity|
   assert @text_view
 end
 
-test('initial setup') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
-end
-
 test('button changes text') do |activity|
-  button = activity.find_view_by_id 44
-  button.perform_click
+  assert_equal "What hath Matz wrought?", @text_view.text
+  activity.find_view_by_id(44).perform_click
   assert_equal 'Button pressed', @text_view.text
 end
 
 test('image button changes text') do |activity|
-  image_button = activity.find_view_by_id 43
-  image_button.perform_click
+  assert_equal "What hath Matz wrought?", @text_view.text
+  activity.find_view_by_id(43).perform_click
   assert_equal 'Image button pressed', @text_view.text
 end

data/test/activity/option_menu_activity.rb

@@ -1,23 +1,28 @@
 require 'ruboto/activity'
 require 'ruboto/widget'
-require 'ruboto/legacy'
-require 'ruboto/menu'
 require 'ruboto/util/toast'
 
-ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
+ruboto_import_widgets :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
-  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+class OptionMenuActivity
+  include Ruboto::Activity
 
-  setup_content do
-    linear_layout :orientation => LinearLayout::VERTICAL do
-      @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
-    end
+  def on_create(bundle)
+    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 do
+          @text_view = text_view :text  => 'What hath Matz wrought?', :id => 42, :text_size => 48.0,
+                                 :width => :fill_parent, :gravity => android.view.Gravity::CENTER
+        end
   end
 
-  handle_create_options_menu do |menu|
-    add_menu('Test') do
-      @text_view.setText 'What hath Matz wrought!'
+  def on_create_options_menu(menu)
+    mi = menu.add('Test')
+    # mi.icon = $package.R::drawable::get_ruboto_core
+    mi.setIcon($package.R::drawable::get_ruboto_core)
+    mi.set_on_menu_item_click_listener do |menu_item|
+      @text_view.text = 'What hath Matz wrought!'
       toast 'Flipped a bit via butterfly'
     end
     true

data/test/activity/option_menu_activity_test.rb

@@ -10,11 +10,8 @@ setup do |activity|
   assert @text_view
 end
 
-test('initial setup') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
-end
-
 test('option_menu changes text') do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
   activity.window.performPanelIdentifierAction(android.view.Window::FEATURE_OPTIONS_PANEL, 0, 0)
   assert_equal "What hath Matz wrought!", @text_view.text
 end

data/test/activity/psych_activity.rb

@@ -1,5 +1,5 @@
-# TODO(uwe): Remove when we stop supporting Ruby 1.8 mode
-if RUBY_VERSION < "1.9"
+# TODO(uwe): Remove when we stop supporting psych with Ruby 1.8 mode
+if RUBY_VERSION < '1.9'
   require 'jruby'
   require 'rbconfig'
   org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
@@ -8,23 +8,30 @@ if RUBY_VERSION < "1.9"
 end
 # TODO end
 
-with_large_stack{require 'psych.rb'}
+require 'ruboto/activity'
+require 'ruboto/util/stack'
+with_large_stack { require 'psych.rb' }
 
 Psych::Parser
 Psych::Handler
 
-require 'ruboto'
-
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
-  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+class PsychActivity
+  include Ruboto::Activity
 
-  setup_content do
-    linear_layout :orientation => LinearLayout::VERTICAL do
-      @decoded_view = text_view :id => 42, :text => Psych.load('--- foo')
-      # @encoded_view = text_view :id => 43, :text => Psych.dump("foo")
-    end
-  end
+  def on_create(bundle)
+    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
+          @decoded_view = text_view :id        => 42, :text => with_large_stack { Psych.load('--- foo') },
+                                    :text_size => 48.0, :gravity => android.view.Gravity::CENTER
 
+          # TODO(uwe): Simplify when we stop supporting Psych in Ruby 1.8 mode
+          if RUBY_VERSION >= '1.9'
+            @encoded_view = text_view :id        => 43, :text => with_large_stack { Psych.dump('foo') },
+                                      :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          end
+        end
+  end
 end

data/test/activity/psych_activity_test.rb

@@ -12,5 +12,7 @@ end
 
 test('psych_encode_decode') do |activity|
   assert_equal 'foo', activity.find_view_by_id(42).text.to_s
-  #assert_equal "--- foo\n...\n", activity.find_view_by_id(43).text.to_s
+  if RUBY_VERSION >= '1.9'
+    assert_equal "--- foo\n", activity.find_view_by_id(43).text.to_s
+  end
 end

data/test/activity/stack_activity.rb

@@ -1,21 +1,24 @@
 STACK_DEPTH_SCRIPT = java.lang.Thread.current_thread.stack_trace.length.to_s
-require 'ruboto'
+
+require 'ruboto/activity'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
-  STACK_DEPTH_HANDLE_CREATE = java.lang.Thread.current_thread.stack_trace.length.to_s
-  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map{|s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+class StackActivity
+  STACK_DEPTH_CLASS = java.lang.Thread.current_thread.stack_trace.length.to_s
+  include Ruboto::Activity
 
-  setup_content do
-    STACK_DEPTH_SETUP_CONTENT = java.lang.Thread.current_thread.stack_trace.length.to_s
-    linear_layout :orientation => LinearLayout::VERTICAL do
-      STACK_DEPTH_LINEAR_LAYOUT = java.lang.Thread.current_thread.stack_trace.length.to_s
-      @script_view        = text_view :id => 42, :text => STACK_DEPTH_SCRIPT
-      @handle_create_view = text_view :id => 43, :text => STACK_DEPTH_HANDLE_CREATE
-      @setup_content_view = text_view :id => 44, :text => STACK_DEPTH_SETUP_CONTENT
-      @linear_layout_view = text_view :id => 45, :text => STACK_DEPTH_LINEAR_LAYOUT
-    end
-  end
+  def on_create(bundle)
+    stack_depth_on_create = java.lang.Thread.current_thread.stack_trace.length.to_s
+    setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => android.view.Gravity::CENTER do
+          stack_depth_linear_layout = java.lang.Thread.current_thread.stack_trace.length.to_s
+          text_view :id => 42, :text => STACK_DEPTH_SCRIPT, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view :id => 43, :text => STACK_DEPTH_CLASS, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view :id => 44, :text => stack_depth_on_create, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+          text_view :id => 45, :text => stack_depth_linear_layout, :text_size => 48.0, :gravity => android.view.Gravity::CENTER
+        end
+  end
 end

data/test/activity/stack_activity_test.rb

@@ -11,21 +11,22 @@ setup do |activity|
 end
 
 test('stack depth') do |activity|
-  os_offset = {13 => 1, 15 => 1}[android.os.Build::VERSION::SDK_INT].to_i
-  if org.ruboto.Script.uses_platform_apk?
+  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.8.dev' => [0, -1, -1, -1],
-    }[org.ruboto.Script.platform_version_name] || [0, 0, 0, 0]
-  else
+        '0.4.8.dev' => [0, 0, 0, 0],
+    }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
+  else # STANDALONE
     jruby_offset = {
-        '1.5.6' => [-2, -5, -6, -8],
-        '1.7.0.dev' => [0, -1, -1, -1],
+        '1.7.0.dev' => [1, 1, 1, 1],
+        '1.7.0.preview1' => [0, -1, -1, -1],
+        '1.7.0.preview2.dev' => [0, 0, 0, 0],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
-  version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.Script.uses_platform_apk ? org.ruboto.Script.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
-  assert_equal 44 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message
-  assert_equal 68 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
-  assert_equal 77 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message
-  assert_equal 93 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
+  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], activity.find_view_by_id(42).text.to_i, version_message
+  assert_equal 48 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
+  assert_equal 46 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message
+  assert_equal 79 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
 end

data/test/app_test_methods.rb

@@ -4,37 +4,30 @@ module AppTestMethods
   include RubotoTest
 
   def test_activity_tests
-    # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
-    if Test::Unit::TestCase::ON_JRUBY_JARS_1_5_6
-      puts "Skipping YAML tests on jruby-jars-1.5.6"
-    else
-      assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
-    end
-
+    assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
     assert_code 'ReadSourceFile', 'File.read(__FILE__)'
     assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
     assert_code 'RepeatRubotoImport', 'ruboto_import :TextView ; ruboto_import :TextView'
+    run_activity_tests('activity')
+  end
 
-    Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
-      # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
-      next if Test::Unit::TestCase::ON_JRUBY_JARS_1_5_6 && test_src =~ /psych_activity_test.rb$/
+  def test_block_def_activity_tests
+    run_activity_tests('block_def_activity')
+  end
 
-      snake_name = test_src.chomp('_test.rb')
-      activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join
-      Dir.chdir APP_DIR do
-        system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}"
-        FileUtils.cp "#{snake_name}.rb", "src/"
-        FileUtils.cp test_src, "test/src/"
-      end
+  def test_handle_activity_tests
+    Dir.chdir APP_DIR do
+      FileUtils.rm "src/ruboto_test_app_activity.rb"
+      FileUtils.rm "test/src/ruboto_test_app_activity_test.rb"
     end
-    run_app_tests
+    run_activity_tests('handle_activity')
   end
 
   private
 
   def assert_code(activity_name, code)
     snake_name = activity_name.scan(/[A-Z]+[a-z]+/).map { |s| s.downcase }.join('_')
-    filename = "src/#{snake_name}_activity.rb"
+    filename   = "src/#{snake_name}_activity.rb"
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
       s = File.read(filename)
@@ -43,4 +36,17 @@ module AppTestMethods
     end
   end
 
+  def run_activity_tests(activity_dir)
+    Dir[File.expand_path("#{activity_dir}/*_test.rb", File.dirname(__FILE__))].each do |test_src|
+      snake_name    = test_src.chomp('_test.rb')
+      activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join
+      Dir.chdir APP_DIR do
+        system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}"
+        FileUtils.cp "#{snake_name}.rb", "src/"
+        FileUtils.cp test_src, "test/src/"
+      end
+    end
+    run_app_tests
+  end
+
 end

data/test/block_def_activity/image_button_activity.rb

@@ -0,0 +1,23 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/util/toast'
+
+ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
+
+$activity.start_ruboto_activity do
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  def on_create(bundle)
+    click_handler = proc do |view|
+      @text_view.setText 'What hath Matz wrought!'
+      toast 'Flipped a bit via butterfly'
+    end
+
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+          image_button :image_resource    => $package.R::drawable::get_ruboto_core, :width => :wrap_content, :id => 43,
+                       :on_click_listener => click_handler
+        end
+  end
+end

data/test/block_def_activity/image_button_activity_test.rb

@@ -0,0 +1,21 @@
+activity Java::org.ruboto.test_app.ImageButtonActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test('initial setup') do |activity|
+  assert_equal "What hath Matz wrought?", @text_view.text
+end
+
+test('button changes text') do |activity|
+  button = activity.findViewById(43)
+  button.performClick
+  assert_equal "What hath Matz wrought!", @text_view.text
+end

data/test/block_def_activity/image_button_and_button_activity.rb

@@ -0,0 +1,20 @@
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/util/toast'
+
+ruboto_import_widgets :Button, :ImageButton, :LinearLayout, :TextView
+
+$activity.start_ruboto_activity do
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  def on_create(bundle)
+    self.content_view =
+        linear_layout :orientation => LinearLayout::VERTICAL do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+          button :text              => 'Button', :width => :wrap_content, :id => 44,
+                 :on_click_listener => proc { @text_view.text = 'Button pressed' }
+          image_button :image_resource    => $package.R::drawable::get_ruboto_core, :width => :wrap_content, :id => 43,
+                       :on_click_listener => proc { @text_view.text = 'Image button pressed' }
+        end
+  end
+end