ruboto 1.1.2 → 1.2.0

data/assets/src/RubotoService.java

@@ -9,8 +9,25 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
      * Called at the start of onCreate() to prepare the Activity.
      */
     private void preOnCreate() {
-        System.out.println("RubotoService onCreate(): " + getClass().getName());
-        getScriptInfo().setRubyClassName(getClass().getSimpleName());
+        if (!getClass().getSimpleName().equals("RubotoService")) {
+          System.out.println("RubotoService preOnCreate(): " + getClass().getName());
+          getScriptInfo().setRubyClassName(getClass().getSimpleName());
+          JRubyAdapter.setUpJRuby(this);
+        }
+    }
+
+    private void preOnStartCommand(android.content.Intent intent) {
+        if (getClass().getSimpleName().equals("RubotoService")) {
+          System.out.println("RubotoService preOnStartCommand(): " + getClass().getName());
+          scriptInfo.setFromIntent(intent);
+        }
+    }
+
+    private void preOnBind(android.content.Intent intent) {
+        if (getClass().getSimpleName().equals("RubotoService")) {
+          System.out.println("RubotoService preOnBind(): " + getClass().getName());
+          scriptInfo.setFromIntent(intent);
+        }
     }
 
 THE_METHODS

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

@@ -303,6 +303,10 @@ public class JRubyAdapter {
                 System.out.println("JRuby version: " + Class.forName("org.jruby.runtime.Constants", true, scriptingContainerClass.getClassLoader())
                         .getDeclaredField("VERSION").get(String.class));
 
+                // TODO(uwe):  Add a way to display startup progress.
+                put("$application_context", appContext.getApplicationContext());
+                runScriptlet("begin\n  require 'environment'\nrescue LoadError => e\n  puts e\nend");
+
                 initialized = true;
             } catch (ClassNotFoundException e) {
                 handleInitException(e);

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

@@ -46,7 +46,7 @@ public class SplashActivity extends Activity {
     }
 
     public void onResume() {
-        Log.d("onResume: ");
+        Log.d("SplashActivity onResume: ");
         if (!JRubyAdapter.isInitialized() && receiver == null) {
             registerPackageInstallReceiver();
         }
@@ -54,7 +54,7 @@ public class SplashActivity extends Activity {
     }
     
     public void onPause() {
-        Log.d("onPause: ");
+        Log.d("SplashActivity onPause: ");
         if (receiver != null) {
             unregisterReceiver(receiver);
             receiver = null;
@@ -63,7 +63,7 @@ public class SplashActivity extends Activity {
     }
 
     public void onDestroy() {
-        Log.d("onDestroy: ");
+        Log.d("SplashActivity onDestroy: ");
         super.onDestroy();
         if (dialogCancelled) {
             System.runFinalizersOnExit(true);
@@ -77,7 +77,7 @@ public class SplashActivity extends Activity {
             public void run() {
                 final boolean jrubyOk = JRubyAdapter.setUpJRuby(SplashActivity.this);
                 if (jrubyOk) {
-                    Log.d("onResume: JRuby OK");
+                    Log.d("SplashActivity onResume: JRuby OK");
                     startUserActivity();
                 } else {
                     registerPackageInstallReceiver();
@@ -87,7 +87,7 @@ public class SplashActivity extends Activity {
                                 installDownload();
                             } else {
                                 if (firstTime) {
-                                    Log.d("onResume: Checking JRuby - IN UI thread");
+                                    Log.d("SplashActivity onResume: Checking JRuby - IN UI thread");
                                     try {
                                         setContentView(Class.forName(getPackageName() + ".R$layout").getField("get_ruboto_core").getInt(null));
                                         if (hasInternetPermission()) {
@@ -99,7 +99,7 @@ public class SplashActivity extends Activity {
                                 } else {
                                     Toast.makeText(SplashActivity.this,"Failed to initialize Ruboto Core.",Toast.LENGTH_LONG).show();
                                     try {
-                                        TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
+                                        TextView textView = (TextView) findViewById(android.R.id.text1);
                                         textView.setText("Woops!  Ruboto Core was installed, but it failed to initialize properly!  I am not sure how to proceed from here.  If you can, please file an error report at http://ruboto.org/");
                                     } catch (Exception e) {
                                     }
@@ -134,7 +134,7 @@ public class SplashActivity extends Activity {
                                 try {
                                     Thread.sleep(1000);
                                 } catch (InterruptedException ie) {
-                                    Log.e("Interupted!");
+                                    Log.e("SplashActivity Interupted!");
                                 }
                             }
                         }
@@ -164,10 +164,10 @@ public class SplashActivity extends Activity {
     private void showProgress() {
         if (loadingDialog == null) {
             if (splash > 0) {
-                Log.i("Showing splash");
+                Log.i("SplashActivity Showing splash");
                 setContentView(splash);
             } else {
-                Log.i("Showing progress");
+                Log.i("SplashActivity Showing progress");
                 loadingDialog = ProgressDialog.show(this, null, "Starting...", true, true);
                 loadingDialog.setCanceledOnTouchOutside(false);
                 loadingDialog.setOnCancelListener(new OnCancelListener() {
@@ -183,10 +183,10 @@ public class SplashActivity extends Activity {
     private void showDownloadProgress(String message) {
         if (loadingDialog == null) {
             if (splash > 0) {
-                Log.i("Showing splash");
+                Log.i("SplashActivity Showing splash");
                 setContentView(splash);
             } else {
-                Log.i("Showing progress");
+                Log.i("SplashActivity Showing progress");
                 loadingDialog = new ProgressDialog(this);
                 loadingDialog.setTitle(null);
                 loadingDialog.setMessage(message);
@@ -210,7 +210,7 @@ public class SplashActivity extends Activity {
 
     private void hideProgress() {
         if (loadingDialog != null) {
-            Log.d("Hide progress");
+            Log.d("SplashActivity Hide progress");
             loadingDialog.dismiss();
             loadingDialog = null;
         }
@@ -327,13 +327,13 @@ public class SplashActivity extends Activity {
     // EMXIF
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.d("onActivityResult: " + requestCode + ", " + resultCode + ", " + data);
-        Log.d("onActivityResult: " + INSTALL_REQUEST_CODE + ", " + RESULT_OK + ", " + RESULT_CANCELED);
+        Log.d("SplashActivity onActivityResult: " + requestCode + ", " + resultCode + ", " + data);
+        Log.d("SplashActivity onActivityResult: " + INSTALL_REQUEST_CODE + ", " + RESULT_OK + ", " + RESULT_CANCELED);
         if (requestCode == INSTALL_REQUEST_CODE) {
             if (resultCode == RESULT_OK) {
-                Log.d("onActivityResult: Install OK.");
+                Log.d("SplashActivity onActivityResult: Install OK.");
             } else if (resultCode == RESULT_CANCELED) {
-                Log.d("onActivityResult: Install canceled.");
+                Log.d("SplashActivity onActivityResult: Install canceled.");
                 // FIXME(uwe): Maybe show a dialog explaining that RubotoCore is needed and try again?
                 deleteFile(RUBOTO_APK);
                 if (!JRubyAdapter.isInitialized()) {
@@ -341,7 +341,7 @@ public class SplashActivity extends Activity {
                 }
                 // EMXIF
             } else {
-                Log.e("onActivityResult: resultCode: " + resultCode);
+                Log.e("SplashActivity onActivityResult: resultCode: " + resultCode);
             }
         }
         super.onActivityResult(requestCode, resultCode, data);

data/assets/src/ruboto/base.rb

@@ -11,18 +11,27 @@ require 'java'
 # 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')
+    Java::Android
   end
 
   alias :old_method_missing :method_missing
   def method_missing(method, *args, &block)
-    return @ruboto_java_instance.send(method, *args, &block) if @ruboto_java_instance && @ruboto_java_instance.respond_to?(method)
+    if @ruboto_java_instance && @ruboto_java_instance.respond_to?(method)
+      return @ruboto_java_instance.send(method, *args, &block)
+    end
     old_method_missing(method, *args, &block)
   end
 end
 
-java_import 'android.R'
-AndroidIds = JavaUtilities.get_proxy_class('android.R$id')
+class Java::Android::R
+  def self.attr
+    JavaUtilities.get_proxy_class("android.R$attr")
+  end
+end
+
+# FIXME(uwe):  DEPRECATED(2014-07-29):  Remove since we can access the value directly with "android.R.id", ie. "android.R.id.text1"
+AndroidIds = android.R.id
+# EMXIF
 
 module Ruboto
   CLASS_NAME_KEY = org.ruboto.ScriptInfo::CLASS_NAME_KEY

data/assets/src/ruboto/package.rb

@@ -1,10 +1,19 @@
-$package = eval("Java::#{$package_name}")
+$package = JavaUtilities.get_package_module_dot_format($package_name)
+R = $package.R
 
+class R
+  def self.attr
+    JavaUtilities.get_proxy_class("#{$package_name}.R$attr")
+  end
+end
+
+# FIXME(uwe):  DEPRECATED(2014-07-29):  Use R and R.id instead.
 module Ruboto
-  java_import "#{$package_name}.R"
+  R = ::R
   begin
-    Id = JavaUtilities.get_proxy_class("#{$package_name}.R$id")
+    Id = R.id
   rescue NameError
     Java::android.util.Log.d 'RUBOTO', 'no R$id'
   end
 end
+# EMXIF

data/assets/src/ruboto/service.rb

@@ -14,30 +14,67 @@ java_import 'org.ruboto.RubotoService'
 
 module Ruboto
   module Context
-    def start_ruboto_service(global_variable_name='$service', klass=RubotoService, options={}, &block)
-      # FIXME(uwe): Translate old positional signature to new options-based signature.
-      # FIXME(uwe): Remove when we stop supporting Ruboto 0.8.0 or older.
+    def start_ruboto_service(class_name = nil, options = nil, &block)
       if options.nil?
-        if global_variable_name.is_a?(Hash)
-          options = global_variable_name
+        if class_name.is_a?(Hash)
+          options = class_name
+          class_name = nil
         else
           options = {}
         end
       end
+      
+      # FIXME(uwe):  Deprecated.  Remove august 2014.
+      if options[:class_name]
+        puts "\nDEPRECATION: The ':class_name' option is deprecated.  Put the class name in the first argument instead."
+        class_name_option = options.delete(:class_name)
+        class_name ||= class_name_option
+      end
+      
+      java_class = options.delete(:java_class) || RubotoService
+      script_name = options.delete(:script)
+      extras = options.delete(:extras)
+      flags = options.delete(:flags)
+
+      raise "Unknown options: #{options}" unless options.empty?
+      
+      if class_name.nil?
+        if block_given?
+          src_desc = source_descriptor(block)
+          class_name =
+              "#{java_class.name.split('::').last}_#{src_desc[0].split('/').last.gsub(/[.-]+/, '_')}_#{src_desc[1]}"
+        else
+          class_name = java_class.name.split('::').last
+        end
+      end
+
+      class_name = class_name.to_s
 
-      class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split('/').last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
       if Object.const_defined?(class_name)
         Object.const_get(class_name).class_eval(&block) if block_given?
       else
         Object.const_set(class_name, Class.new(&block))
       end
+
       i = android.content.Intent.new
-      i.setClass self, klass.java_class
+      i.setClass self, java_class.java_class
+      i.add_flags(flags) if flags
       i.putExtra(Ruboto::CLASS_NAME_KEY, class_name)
-      i.putExtra(Ruboto::SCRIPT_NAME_KEY, options[:script]) if options[:script]
+      i.putExtra(Ruboto::SCRIPT_NAME_KEY, script_name) if script_name
+      extras.each { |k, v| i.putExtra(k.to_s, v) } if extras
+      puts "starting Ruboto service: #{i.inspect}"
       self.startService i
       self
     end
+    
+    private
+
+    def source_descriptor(src_proc)
+      if (md = /^#<Proc:0x[0-9A-Fa-f-]+@(.+):(\d+)(?: \(lambda\))?>$/.match(src_proc.inspect))
+        filename, line = md.captures
+        return filename, line.to_i
+      end
+    end
   end
 end
 

data/assets/src/ruboto/widget.rb

@@ -17,8 +17,62 @@ require 'ruboto/activity'
 
 java_import 'android.view.View'
 
+# Set an attribute value by name on the given target.  This method is used by
+# all the widget methods generated by "ruboto_import_widget" and
+# "ruboto_import_widgets":
+#
+#     button text: 'Click me!', layout: {weight: 1, gravity: :center}
+#
+# The attribute can be a public field, a JavaBean attribute, or a setter method.
+#
+# set_attribute button, :text, 'Click me!'
+# set_attribute button.layout_attributes, :weight, 1
+#
+# The given attribute name can match the attribute name exactly or be accessed
+# by the snake_case version of the attribute.  It can also be accessed by the
+# setter name, either snake_case or camelCase.
+#
+# set_attribute button, :textAlignment, android.view.View::TEXT_ALIGNMENT_CENTER
+# set_attribute button, :text_alignment, android.view.View::TEXT_ALIGNMENT_CENTER
+# set_attribute button, :set_text_alignment, android.view.View::TEXT_ALIGNMENT_CENTER
+# set_attribute button, :setTextAlignment, android.view.View::TEXT_ALIGNMENT_CENTER
+#
+# You can use symbols as values for common constants.  Currently constants for
+# the following classes are enabled using symbols:
+#
+# * android.view.Gravity
+# * android.view.ViewGroup::LayoutParams
+# * android.widget.LinearLayout
+# * android.widget.RelativeLayout
+#
+# set_attribute button, :text_alignment, :text_alignment_center
+# set_attribute button.layout_attributes, :gravity, :center
+# set_attribute button.layout_attributes, :width, :fill_parent
+#
+# Integer values in the range 0x80000000..0xFFFFFFFF are converted to a negative
+# Integer value enabling setting of 4-byte color values as Ruby integer literals.
+#
+# set_attribute button, :background_color, 0x0000FF00
+#
+# You can use an array as a value for multi-value attributes like margins and
+# padding.
+#
+# set_attribute button, :padding, [10, 20, 10, 30]
+#
+def set_attribute(target, k, v)
+  assign_method = "#{k}="
+  field_assign_method = "#{k.to_s.gsub(/(_)([a-z])/) { $2.upcase }}="
+  setter_method = "set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}"
+  method_name =
+      (target.respond_to?(assign_method) && assign_method) ||
+      (target.respond_to?(field_assign_method) && field_assign_method) ||
+      (target.respond_to?(setter_method) && setter_method) ||
+      k
+  invoke_with_converted_arguments(target, method_name, v)
+end
+
 def invoke_with_converted_arguments(target, method_name, values)
-  converted_values = [*values].map { |i| @@convert_constants[i] || i }
+  converted_values = [*values].map { |i| View.convert_constant(i) }
   scaled_values = converted_values.map.with_index do |v, i|
     v.is_a?(Integer) && v >= 0x80000000 && v <= 0xFFFFFFFF ?
         v.to_i - 0x100000000 : v
@@ -30,77 +84,66 @@ View.class_eval do
   @@convert_constants ||= {}
 
   def self.add_constant_conversion(from, to)
-    @@convert_constants[from] = to
+    symbol = from.to_s.downcase.to_sym
+    if @@convert_constants.include?(symbol)
+      puts "WARNING: Overwriting symbol to constant conversion for #{symbol.inspect}:  #{@@convert_constants[symbol].inspect} => #{to.inspect}"
+    end
+    @@convert_constants[symbol] = to
   end
 
   def self.convert_constant(from)
     return from unless from.is_a?(Symbol)
-    @@convert_constants[from] or raise "Symbol #{from.inspect} doesn't have a corresponding View constant #{from.to_s.upcase}"
+    unless @@convert_constants.include?(from)
+      raise "Symbol #{from.inspect} doesn't have a corresponding View constant #{from.to_s.upcase}."
+    end
+    @@convert_constants[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)
+      View.add_constant_conversion i, self.const_get(i)
     end
   end
 
   def configure(context, params = {})
-    if width = params.delete(:width)
+    if (width = params.delete(:width))
       getLayoutParams.width = View.convert_constant(width)
       puts "\nDEPRECATION: The ':width' option is deprecated.  Use :layout => {:width => XX} instead."
     end
 
-    if height = params.delete(:height)
+    if (height = params.delete(:height))
       getLayoutParams.height = View.convert_constant(height)
-      puts "\nDEPRECATION: The ':height' option is deprecated.  Use :height => {:width => XX} instead."
+      puts "\nDEPRECATION: The ':height' option is deprecated.  Use :layout => {:height => XX} instead."
     end
 
-    if margins = params.delete(:margins)
+    if (margins = params.delete(:margins))
       getLayoutParams.set_margins(*margins)
-      puts "\nDEPRECATION: The ':margins' option is deprecated.  Use :layout => {:margins => XX} instead."
+      puts "\nDEPRECATION: The ':margins' option is deprecated.  Use :layout => {:margins => [L, T, R, B]} instead."
     end
 
-    if layout = params.delete(:layout)
+    if (layout = params.delete(:layout))
       lp = getLayoutParams
-      layout.each do |k, v|
-        method_name = k.to_s
-        if lp.respond_to?("#{k}=")
-          method_name = "#{k}="
-        elsif method_name.include?("_")
-          method_name = method_name.gsub(/_([a-z])/){$1.upcase}
-          method_name = "#{method_name}=" if lp.respond_to?("#{method_name}=")
-        end
-          
-        invoke_with_converted_arguments(lp, method_name, v)
-      end
+      layout.each { |k, v| set_attribute(lp, k, v) }
     end
 
-    params.each do |k, v|
-      setter_method = "set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}"
-      assign_method = "#{k}="
-      method_name = self.respond_to?(assign_method) ? assign_method :
-          (self.respond_to?(setter_method) ? setter_method : k)
-      invoke_with_converted_arguments(self, method_name, v)
-    end
+    params.each { |k, v| set_attribute(self, k, v) }
   end
 end
 
 #
 # Load ViewGroup constants
 #
-
 java_import 'android.view.ViewGroup'
 ViewGroup::LayoutParams.constants.each do |i|
-  View.add_constant_conversion i.downcase.to_sym, ViewGroup::LayoutParams.const_get(i)
+  View.add_constant_conversion i, ViewGroup::LayoutParams.const_get(i)
 end
 
 #
 # Load Gravity constants
 #
-
 java_import 'android.view.Gravity'
 Gravity.constants.each do |i|
-  View.add_constant_conversion i.downcase.to_sym, Gravity.const_get(i)
+  View.add_constant_conversion i, Gravity.const_get(i)
 end
 
 #
@@ -190,15 +233,15 @@ def setup_list_view
   android.widget.ListView.class_eval do
     def configure(context, params = {})
       if (list = params.delete(:list))
-        item_layout = params.delete(:item_layout) || R::layout::simple_list_item_1
+        item_layout = params.delete(:item_layout) || android.R::layout::simple_list_item_1
         params[:adapter] = android.widget.ArrayAdapter.new(context, item_layout, list)
       end
       super(context, params)
     end
 
     def reload_list(list)
-      @adapter_list.clear
-      @adapter_list.addAll(list)
+      adapter.clear
+      adapter.addAll(list)
       adapter.notifyDataSetChanged
       invalidate
     end
@@ -211,7 +254,7 @@ def setup_spinner
     def configure(context, params = {})
       if (list = params.delete(:list))
         item_layout = params.delete(:item_layout)
-        params[:adapter] = android.widget.ArrayAdapter.new(context, item_layout || R::layout::simple_spinner_item, list)
+        params[:adapter] = android.widget.ArrayAdapter.new(context, item_layout || android.R::layout::simple_spinner_item, list)
         dropdown_layout = params.delete(:dropdown_layout)
         params[:adapter].setDropDownViewResource(dropdown_layout) if dropdown_layout
       end
@@ -219,9 +262,9 @@ def setup_spinner
     end
 
     def reload_list(list)
-      @adapter.clear
-      @adapter.addAll(list)
-      @adapter.notifyDataSetChanged
+      adapter.clear
+      adapter.addAll(list)
+      adapter.notifyDataSetChanged
       invalidate
     end
   end