ruboto 1.0.0 → 1.0.1

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -132,17 +132,18 @@ public class JRubyAdapter {
             // END Ruboto HeapAlloc
             setDebugBuild(appContext);
             Log.d("Setting up JRuby runtime (" + (isDebugBuild ? "DEBUG" : "RELEASE") + ")");
-            System.setProperty("jruby.compile.mode", "OFF"); // OFF OFFIR JITIR? FORCE FORCEIR
-            // System.setProperty("jruby.compile.backend", "DALVIK");
+            System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
             System.setProperty("jruby.bytecode.version", "1.6");
+            // System.setProperty("jruby.compat.version", "RUBY2_0"); // RUBY1_9 is the default in JRuby 1.7
+            // System.setProperty("jruby.compile.backend", "DALVIK");
+            System.setProperty("jruby.compile.mode", "OFF"); // OFF OFFIR JITIR? FORCE FORCEIR
             System.setProperty("jruby.interfaces.useProxy", "true");
+            System.setProperty("jruby.ir.passes", "LocalOptimizationPass,DeadCodeElimination");
             System.setProperty("jruby.management.enabled", "false");
+            System.setProperty("jruby.native.enabled", "false");
             System.setProperty("jruby.objectspace.enabled", "false");
+            System.setProperty("jruby.rewrite.java.trace", "true");
             System.setProperty("jruby.thread.pooling", "true");
-            System.setProperty("jruby.native.enabled", "false");
-            // System.setProperty("jruby.compat.version", "RUBY2_0"); // RUBY1_9 is the default in JRuby 1.7
-            System.setProperty("jruby.ir.passes", "LocalOptimizationPass,DeadCodeElimination");
-            System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
 
             // Uncomment these to debug/profile Ruby source loading
             // System.setProperty("jruby.debug.loadService", "true");

data/assets/src/org/ruboto/ScriptLoader.java

@@ -106,6 +106,7 @@ public class ScriptLoader {
                 }
                 component.getScriptInfo().setRubyInstance(rubyInstance);
             }
+            persistObjectProxy(component);
         } catch(IOException e){
             e.printStackTrace();
             if (component instanceof android.content.Context) {
@@ -114,40 +115,12 @@ public class ScriptLoader {
         }
     }
 
-    public static final void callOnCreate(final RubotoComponent component, Object... args) {
-        persistObjectProxy(component);
-        if (component instanceof android.content.Context) {
-            Log.d("Call onCreate on: " + component.getScriptInfo().getRubyInstance());
-            // FIXME(uwe):  Simplify when we stop support for snake case aliasing interface callback methods.
-            if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :onCreate}")) {
-                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onCreate", args);
-            } else if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(true).any?{|m| m.to_sym == :on_create}")) {
-                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "on_create", args);
-            } else {
-                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onCreate", args);
-            }
-            // EMXIF
-        }
-    }
-
-    public static final void callOnDestroy(final RubotoComponent component) {
-        String rubyClassName = component.getScriptInfo().getRubyClassName();
-        if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :onDestroy}")) {
-            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onDestroy");
-        } else if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(true).any?{|m| m.to_sym == :on_destroy}")) {
-            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "on_destroy");
-        } else {
-            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onDestroy");
-        }
-        releaseObjectProxy(component);
-    }
-
     private static void persistObjectProxy(RubotoComponent component) {
         JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
         ((Map)JRubyAdapter.get("RUBOTO_JAVA_PROXIES")).put(component.getScriptInfo().getRubyInstance(), component.getScriptInfo().getRubyInstance());
     }
 
-    private static void releaseObjectProxy(RubotoComponent component) {
+    public static void unloadScript(RubotoComponent component) {
         ((Map)JRubyAdapter.get("RUBOTO_JAVA_PROXIES")).remove(component.getScriptInfo().getRubyInstance());
     }
 

data/lib/ruboto/util/build.rb

@@ -3,7 +3,7 @@ module Ruboto
     module Build
       include Verify
       SCRIPTS_DIR = 'src'
-      
+
       ###########################################################################
       #
       # Build Subclass or Interface:
@@ -19,9 +19,9 @@ module Ruboto
         Dir.mkdir(to) unless File.directory?(to)
 
         text = File.read(File.expand_path(Ruboto::GEM_ROOT + "/assets/src/#{src}.java"))
-        substitutions.each {|k,v| text.gsub!(k, v)}
+        substitutions.each { |k, v| text.gsub!(k, v) }
 
-        File.open(File.join(to, "#{name}.java"), 'w') {|f| f << text}
+        File.open(File.join(to, "#{name}.java"), 'w') { |f| f << text }
       end
 
       #
@@ -35,14 +35,11 @@ module Ruboto
         abort "ERROR: #{klass} not found" unless element
 
         unless force == 'include'
-          abort "#{klass} not available in minSdkVersion, added in #{element.attribute('api_added')}; use '--force include' to create it" if
-            element.attribute('api_added') and element.attribute('api_added').to_i > verify_min_sdk.to_i
-          abort "#{klass} deprecated for targetSdkVersion, deprecated in #{element.attribute('deprecated')}; use '--force include' to create it" if
-            element.attribute('deprecated') and element.attribute('deprecated').to_i <= verify_target_sdk.to_i
+          abort "#{klass} not available in minSdkVersion, added in #{element.attribute('api_added')}; use '--force include' to create it" if element.attribute('api_added') and element.attribute('api_added').to_i > verify_min_sdk.to_i
+          abort "#{klass} deprecated for targetSdkVersion, deprecated in #{element.attribute('deprecated')}; use '--force include' to create it" if element.attribute('deprecated') and element.attribute('deprecated').to_i <= verify_target_sdk.to_i
         end
 
-        abort "#{klass} removed for targetSdkVersion, removed in #{element.attribute('api_removed')}" if
-          element.attribute('api_removed') and element.attribute('api_removed').to_i <= verify_target_sdk.to_i
+        abort "#{klass} removed for targetSdkVersion, removed in #{element.attribute('api_removed')}" if element.attribute('api_removed') and element.attribute('api_removed').to_i <= verify_target_sdk.to_i
 
         element
       end
@@ -55,9 +52,9 @@ module Ruboto
         target_api = verify_target_sdk.to_i
 
         # Remove methods changed outside of the scope of the sdk versions
-        methods = methods.select{|i| !i.attribute('api_added') || (i.attribute('api_added').to_i <= target_api)}
+        methods = methods.select { |i| !i.attribute('api_added') || (i.attribute('api_added').to_i <= target_api) }
         # methods = methods.select{|i| !i.attribute('deprecated') || (i.attribute('deprecated').to_i > min_api)}
-        methods = methods.select{|i| !i.attribute('api_removed') || (i.attribute('api_removed').to_i > min_api)}
+        methods = methods.select { |i| !i.attribute('api_removed') || (i.attribute('api_removed').to_i > min_api) }
 
         # Inform and remove methods that do not exist in one of the sdk versions
         methods = methods.select do |i|
@@ -124,7 +121,7 @@ module Ruboto
             'THE_RUBOTO_CLASS' => params[:name],
             'THE_CONSTRUCTORS' => class_desc.name == 'class' ?
                 class_desc.get_elements('constructor').map { |i| i.constructor_definition(params[:name]) }.join("\n\n") : '',
-            'THE_METHODS' => methods.map { |i| i.method_definition(params[:name]) }.join("\n\n")
+            'THE_METHODS' => methods_header + methods.map { |i| i.method_definition(params[:name]) }.join("\n\n")
         }
       end
 
@@ -134,8 +131,8 @@ module Ruboto
       #
       def generate_core_classes(params)
         hash = {:package => 'org.ruboto'}
-        %w(method_base method_include implements force).inject(hash) {|h, i| h[i.to_sym] = params[i.to_sym]; h}
-        hash[:method_exclude] = params[:method_exclude].split(',').push('onCreate').push('onDestroy').push('onBind').push('onStartCommand').join(',')
+        %w(method_base method_include implements force).inject(hash) { |h, i| h[i.to_sym] = params[i.to_sym]; h }
+        hash[:method_exclude] = params[:method_exclude]
 
         %w(android.app.Activity android.app.Service android.content.BroadcastReceiver).each do |i|
           name = i.split('.')[-1]
@@ -193,6 +190,21 @@ module Ruboto
           puts "Added file #{test_file}."
         end
       end
+
+      def methods_header
+        <<EOF
+    private final ScriptInfo scriptInfo = new ScriptInfo();
+    public ScriptInfo getScriptInfo() {
+        return scriptInfo;
+    }
+
+    /****************************************************************************************
+     *
+     *  Generated Methods
+     */
+EOF
+      end
+
     end
   end
 end

data/lib/ruboto/util/emulator.rb

@@ -83,21 +83,37 @@ module Ruboto
             end
           end
 
-          if [17, 16, 15, 13, 11].include? sdk_level
-            abi_opt = '--abi armeabi-v7a'
-          elsif sdk_level == 10
-            abi_opt = '--abi armeabi'
-          end
-
           avd_home = "#{ENV['HOME'].gsub('\\', '/')}/.android/avd/#{avd_name}.avd"
+
           unless File.exists? avd_home
             puts "Creating AVD #{avd_name}"
-            if ON_MAC_OS_X
-              abis = `android list target`.split(/----------\n/).
-                  find { |l| l =~ /android-#{sdk_level}/ }.slice(/(?<=ABIs : ).*/).split(', ')
-              abi = abis.find { |a| a =~ /x86/ }
+
+            target = `android list target`.split(/----------\n/).
+                find { |l| l =~ /android-#{sdk_level}/ }
+
+            if target.nil?
+              puts "Target android-#{sdk_level} not found.  You should run"
+              puts "\n    ruboto setup -y -t #{sdk_level}\n\nto install it."
+              exit 3
+            end
+
+            if ON_MAC_OS_X || ON_WINDOWS
+              abis = target.slice(/(?<=ABIs : ).*/).split(', ')
+              has_haxm = abis.find { |a| a =~ /x86/ }
             end
-            puts `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA #{"--abi #{abi}" if abi}`
+
+            if has_haxm
+              abi_opt = '--abi x86'
+            else
+              if [17, 16, 15, 13, 11].include? sdk_level
+                abi_opt = '--abi armeabi-v7a'
+              elsif sdk_level == 10
+                abi_opt = '--abi armeabi'
+              end
+            end
+
+            puts `echo n | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA`
+
             if $? != 0
               puts 'Failed to create AVD.'
               exit 3

data/lib/ruboto/util/update.rb

@@ -17,7 +17,11 @@ module Ruboto
       def update_android
         root = Dir.getwd
         build_xml_file = "#{root}/build.xml"
-        name = REXML::Document.new(File.read(build_xml_file)).root.attributes['name']
+        if File.exists? build_xml_file
+          name = REXML::Document.new(File.read(build_xml_file)).root.attributes['name']
+        else
+          name = File.basename(root)
+        end
 
         prop_file = "#{root}/project.properties"
         version_regexp = /^(target=android-)(\d+)$/
@@ -286,14 +290,14 @@ module Ruboto
             puts "Regenerating subclass #{package}.#{subclass_name}"
             generate_inheriting_file 'Class', subclass_name
             generate_subclass_or_interface(:package => package, :template => 'InheritingClass', :class => class_name,
-                                           :name => subclass_name, :method_base => method_base, :force => force)
+                :name => subclass_name, :method_base => method_base, :force => force)
             # FIXME(uwe): Remove when we stop updating from Ruboto 0.7.0 and older
           elsif source_code =~ /^\s*package\s+(\S+?)\s*;.*public\s+class\s+(\S+?)\s+extends\s+(.*?)\s\{.*^\s*private Object\[\] callbackProcs = new Object\[\d+\];/m
             package, subclass_name, class_name = $1, $2, $3
             puts "Regenerating subclass #{package}.#{subclass_name}"
             generate_inheriting_file 'Class', subclass_name
             generate_subclass_or_interface(:package => package, :template => 'InheritingClass', :class => class_name,
-                                           :name => subclass_name, :method_base => 'on', :force => force)
+                :name => subclass_name, :method_base => 'on', :force => force)
             # EMXIF
           end
         end
@@ -411,7 +415,8 @@ module Ruboto
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
-              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('9000.dev')
+              gem_version = Gem::Version.new(jruby_core_version.tr('-', '.'))
+              if gem_version >= Gem::Version.new('9000.dev')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
                     '**/*Darwin*',
@@ -459,17 +464,17 @@ module Ruboto
                     # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
                     'org/yecht',
                 ]
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.5')
+              elsif gem_version >= Gem::Version.new('1.7.5')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.4')
+              elsif gem_version >= Gem::Version.new('1.7.4')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/ripper org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3')
+              elsif gem_version >= Gem::Version.new('1.7.3')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht)
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.2')
+              elsif gem_version >= Gem::Version.new('1.7.2')
                 excluded_core_packages = %w(**/*Darwin* **/*Ruby20* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf)
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.1')
+              elsif gem_version >= Gem::Version.new('1.7.1')
                 excluded_core_packages = %w(**/*Darwin* **/*Ruby20* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/openssl org/jruby/javasupport/bsf org/jruby/org/bouncycastle)
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.0')
+              elsif gem_version >= Gem::Version.new('1.7.0')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.0
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/bouncycastle org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/openssl org/jruby/javasupport/bsf)
                 # ODOT

data/lib/ruboto/util/verify.rb

@@ -67,8 +67,7 @@ module Ruboto
       end
 
       def verify_strings
-        abort "cannot find your strings.xml to extract info from it. Make sure you're in the root directory of your app" unless
-        File.exists? 'res/values/strings.xml'
+        abort "cannot find your strings.xml to extract info from it. Make sure you're in the root directory of your app" unless File.exists? 'res/values/strings.xml'
         @strings ||= REXML::Document.new(File.read('res/values/strings.xml'))
       end
 

data/lib/ruboto/util/xml_element.rb

@@ -187,38 +187,68 @@ module Ruboto
       end
 
       def method_definition(class_name)
+        entry_point_guard = (activity_super_guard(class_name, attribute('name')) ||
+            service_super_guard(class_name, attribute('name')))
         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()',
-                     [%Q{Log.i("Method called before JRuby runtime was initialized: #{class_name}##{attribute('name')}");},
-                      super_return]),
-             'String rubyClassName = scriptInfo.getRubyClassName();',
-             "if (rubyClassName == null) #{super_return}",
-             if_else(
-                 "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
-                 ruby_call,
-                 if_else(
-                     "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
-                     ruby_call(true),
-                     if_else(
-                         "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
-                         ruby_call(true),
-                         # FIXME(uwe):  Can the method be unimplemented?  Is the Ruby instance always an instance of this class?
-                         #if_else(
-                         #    "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{attribute('name')}}\")",
-                             ruby_call,
-                         #    [super_return]
-                         #)
-                     )
-                 )
-             )
+                (entry_point_guard && (entry_point_guard + load_script)) ||
+                    if_else('!JRubyAdapter.isInitialized()',
+                        [%Q{Log.i("Method called before JRuby runtime was initialized: #{class_name}##{attribute('name')}");},
+                            super_return]),
+                'String rubyClassName = scriptInfo.getRubyClassName();',
+                "if (rubyClassName == null) #{super_return}",
+                if_else(
+                    "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
+                    ruby_call,
+                    if_else(
+                        "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
+                        ruby_call(true),
+                        if_else(
+                            "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
+                            ruby_call(true),
+                            # FIXME(uwe):  Can the method be unimplemented?  Is the Ruby instance always an instance of this class?
+                            #if_else(
+                            #    "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{attribute('name')}}\")",
+                            ruby_call,
+                        #    [super_return]
+                        #)
+                        )
+                    )
+                ),
+                ('ScriptLoader.unloadScript(this);' if attribute('name') == 'onDestroy'),
             ]
         ).indent.join("\n")
       end
 
+      def activity_super_guard(class_name, method_name)
+        if class_name == 'RubotoActivity' && method_name == 'onCreate'
+          "if (preOnCreate(#{parameters.map { |i| i[0] }.join(', ')})) #{super_return};"
+        end
+      end
+
+      def service_super_guard(class_name, method_name)
+        if class_name == 'RubotoService'
+          if method_name == 'onCreate'
+            'preOnCreate();'
+          elsif method_name == 'onStartCommand' || method_name == 'onBind'
+            '' # Trigger adding of load_script
+          end
+        end
+      end
+
+      def load_script
+        <<EOF
+if (JRubyAdapter.isInitialized() && scriptInfo.isReadyToLoad()) {
+        ScriptLoader.loadScript(this);
+    } else {
+        #{super_return}
+    }
+EOF
+      end
+
       def constructor_definition(class_name)
         method_call(nil, class_name, parameters, nil, [super_string]).indent.join("\n")
       end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/stack_activity_test.rb

@@ -12,6 +12,7 @@ end
 
 # ANDROID: 10, PLATFORM: 0.5.3,      JRuby: 1.7.3          '[28, 33, 46, 63]' expected, but got '[43, 48, 45, 62]'
 # ANDROID: 10, PLATFORM: 0.5.4,      JRuby: 1.7.3          '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
+# ANDROID: 16, PLATFORM: 0.5.6,      JRuby: 1.7.3          '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
 # ANDROID: 16, PLATFORM: 0.6.0,      JRuby: 9000.dev       '[28, 33, 45, 62]' expected, but got '[28, 33, 45, 63]'
 # ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0          '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 test('stack depth') do |activity|
@@ -27,8 +28,8 @@ test('stack depth') do |activity|
   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 [28 + os_offset[0] + jruby_offset[0],
                 33 + os_offset[1] + jruby_offset[1],
-                45 + os_offset[2] + jruby_offset[2],
-                63 + os_offset[3] + jruby_offset[3]], [
+                44 + os_offset[2] + jruby_offset[2],
+                62 + 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,

data/test/activity/subclass_activity.rb

@@ -4,7 +4,6 @@ ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
 class SubclassOfArrayAdapter < Java::AndroidWidget::ArrayAdapter
   def getView(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)}]"

data/test/arjdbc_test.rb

@@ -0,0 +1,119 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+# FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
+if RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE'
+
+class SqldroidTest < Test::Unit::TestCase
+  def setup
+    generate_app :bundle => [['activerecord', '<4.0.0'], 'activerecord-jdbcsqlite3-adapter', :sqldroid]
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_sqldroid
+    Dir.chdir APP_DIR do
+      File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
+require 'ruboto/widget'
+require 'ruboto/util/stack'
+with_large_stack do
+  require 'active_record'
+end
+
+ruboto_import_widgets :LinearLayout, :ListView, :TextView
+
+class MyArrayAdapter < android.widget.ArrayAdapter
+  def get_view(position, convert_view, parent)
+    @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
+
+class RubotoTestAppActivity
+  def onCreate(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, [])
+
+    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
+
+  def onResume
+    super
+
+    db_dir = "\#{application_context.files_dir}/sqlite"
+
+    with_large_stack do
+
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'jdbcsqlite3',
+        :driver => 'org.sqldroid.SQLDroidDriver',
+        :url => "jdbc:sqldroid:\#{db_dir}?timeout=60000&retry=1000",
+        :database => db_dir,
+      )
+
+      begin
+        ActiveRecord::Base.connection.execute "DROP TABLE companions"
+      rescue ActiveRecord::StatementInvalid
+        # Table does not exist
+      end
+      ActiveRecord::Base.connection.execute "CREATE TABLE companions (id INTEGER PRIMARY KEY, name VARCHAR(20) NOT NULL)"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (1, 'Frodo')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (2, 'Samwise')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (3, 'Meriadoc')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (4, 'Peregrin')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (5, 'Gandalf')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (6, 'Legolas')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (7, 'Gimli')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (8, 'Aragorn')"
+      ActiveRecord::Base.connection.execute "INSERT INTO companions VALUES (9, 'Boromir')"
+      companions = ActiveRecord::Base.connection.execute "SELECT name FROM companions"
+      run_on_ui_thread do
+        @adapter.add_all companions
+      end
+    end
+  end
+end
+EOF
+
+      File.open('test/src/ruboto_test_app_activity_test.rb', 'w'){|f| f << <<EOF}
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+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
+EOF
+
+    end
+
+    run_app_tests
+  end
+
+end
+
+end
+# EMXIF