ruboto 0.5.2 → 0.5.3

data/assets/src/ruboto/preference.rb

@@ -0,0 +1,78 @@
+#######################################################
+#
+# ruboto/preference.rb
+#
+# Basic set up for preferences (activity and widgets).
+#
+#######################################################
+
+require 'ruboto/activity'
+
+java_import "android.preference.PreferenceScreen"
+java_import "android.preference.Preference"
+ruboto_import "org.ruboto.RubotoPreferenceActivity"
+ruboto_configure_activity(RubotoPreferenceActivity)
+
+RubotoPreferenceActivity.class_eval do
+    def preference_screen(params={})
+      rv = self.getPreferenceManager.createPreferenceScreen(self)
+      rv.configure self, params
+      @parent.addPreference(rv) if @parent
+      if block_given?
+        old_parent, @parent = @parent, rv
+        yield
+        @parent = old_parent
+      end
+      rv
+    end
+
+    def setup_preference_screen &block
+      @preference_screen_block = block
+    end
+
+    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
+    end
+end
+
+Preference.class_eval do
+    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)
+        else
+          self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}", v)
+        end
+      end
+    end
+end
+
+#
+# RubotoPreferenceActivity Preference Generation
+#
+
+def ruboto_import_preferences(*preferences)
+  preferences.each { |i| ruboto_import_preference i }
+end
+
+def ruboto_import_preference(class_name, package_name="android.preference")
+  klass = java_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
+  return unless klass
+
+  RubotoPreferenceActivity.class_eval "
+     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
+        if block_given?
+          old_parent, @parent = @parent, rv
+          yield
+          @parent = old_parent
+        end
+        rv
+     end
+   "
+end
+

data/assets/src/ruboto/service.rb

@@ -0,0 +1,74 @@
+require 'ruboto/base'
+
+#######################################################
+#
+# ruboto/service.rb
+#
+# Basic service set up and callback configuration.
+#
+#######################################################
+
+#
+# Context
+#
+
+module Ruboto
+  module Context
+    def initialize_ruboto()
+      eval("#{$new_context_global} = self")
+      $new_context_global = nil
+
+      instance_eval &$context_init_block if $context_init_block
+      $context_init_block = nil
+      setup_ruboto_callbacks 
+
+      @initialized = true
+      self
+    end
+  
+    def start_ruboto_service(global_variable_name = '$service', klass=RubotoService, &block)
+      $context_init_block = block
+      $new_context_global = global_variable_name
+  
+      if @initialized or (self == $service) or ($service == nil) # FIx mix between activity and service
+        self.startService Java::android.content.Intent.new(self, klass.java_class)
+      else
+        initialize_ruboto
+        on_create
+      end
+  
+      self
+    end
+  end
+end
+
+java_import "android.content.Context"
+Context.class_eval do
+  include Ruboto::Context
+end
+
+#
+# Leave for legacy Service Subclass Setup
+#
+
+module Ruboto
+  module Service
+  end
+end
+
+#
+# Basic Service Setup
+#
+
+def ruboto_configure_service(klass)
+  klass.class_eval do
+    include Ruboto::Service
+    
+    def on_create
+    end
+  end
+end
+
+ruboto_import "org.ruboto.RubotoService"
+ruboto_configure_service(RubotoService)
+

data/assets/src/ruboto/util/stack.rb

@@ -0,0 +1,34 @@
+#######################################################
+#
+# ruboto/util/stack.rb
+#
+# Utility methods for running code in a separate 
+# thread with a larger stack.
+#
+#######################################################
+
+class Object
+  def with_large_stack(opts = {}, &block)
+    opts = {:size => opts} if opts.is_a? Integer
+    opts = {:name => 'Block with large stack'}.update(opts)
+    exception = nil
+    result = nil
+    t = Thread.with_large_stack(opts, &proc{result = block.call rescue exception = $!})
+    t.join
+    raise exception if exception
+    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
+

data/assets/src/ruboto/util/toast.rb

@@ -0,0 +1,18 @@
+#######################################################
+#
+# ruboto/util/toast.rb
+#
+# Utility methods for doing a toast.
+#
+#######################################################
+
+Java::android.content.Context.class_eval do
+  def toast(text, duration=5000)
+    Java::android.widget.Toast.makeText(self, text, duration).show
+  end
+
+  def toast_result(result, success, failure, duration=5000)
+    toast(result ? success : failure, duration)
+  end
+end
+

data/assets/src/ruboto/widget.rb

@@ -0,0 +1,188 @@
+require 'ruboto/activity'
+
+#######################################################
+#
+# ruboto/widget.rb
+#
+# Import widgets and set up methods on activity to 
+# create and initialize. You do not need this if
+# you want to call the Android methods directly.
+#
+#######################################################
+
+#
+# Prepare View
+#
+
+java_import "android.view.View"
+
+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)
+      end
+    end
+
+    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
+
+      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
+
+#
+# Load ViewGroup constants
+#
+
+java_import "android.view.ViewGroup"
+View.add_constant_conversion :wrap_content, ViewGroup::LayoutParams::WRAP_CONTENT
+View.add_constant_conversion :fill_parent, ViewGroup::LayoutParams::FILL_PARENT
+
+#
+# RubotoActivity View Generation
+#
+
+def ruboto_import_widgets(*widgets)
+  widgets.each { |i| ruboto_import_widget i }
+end
+
+def ruboto_import_widget(class_name, package_name="android.widget")
+  klass = java_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
+  
+  return unless klass
+
+  RubotoActivity.class_eval "
+     def #{(class_name.to_s.gsub(/([A-Z])/) { '_' + $1.downcase })[1..-1]}(params={})
+        if force_style = params.delete(:default_style)
+          rv = #{class_name}.new(self, nil, force_style)
+        elsif api_key = params.delete(:apiKey)
+          rv = #{class_name}.new(self, api_key)
+        else
+          rv = #{class_name}.new(self)
+        end
+
+        if parent = (params.delete(:parent) || @view_parent)
+          parent.addView(rv, (params.delete(:parent_index) || parent.child_count))
+        end
+
+        rv.configure self, params
+
+        return rv unless block_given?
+
+        old_view_parent, @view_parent = @view_parent, rv
+        yield
+        @view_parent = old_view_parent
+
+        rv
+     end
+   "
+
+  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
+
+#
+# Special widget setup
+#
+
+def setup_linear_layout
+  Java::android.widget.LinearLayout.setup_constant_conversion
+end
+
+def setup_relative_layout
+  Java::android.widget.RelativeLayout.setup_constant_conversion
+end
+
+def setup_button
+  # legacy
+end
+
+def setup_image_button
+  # legacy
+end
+
+def setup_list_view
+  Java::android.widget.ListView.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_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
+      super(context, params)
+    end
+
+    def reload_list(list)
+      @adapter_list.clear
+      @adapter_list.addAll(list)
+      @adapter.notifyDataSetChanged
+      invalidate
+    end
+  end
+end
+
+def setup_spinner
+  Java::android.widget.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
+      super(context, params)
+    end
+
+    def reload_list(list)
+      @adapter.clear
+      @adapter.addAll(list)
+      @adapter.notifyDataSetChanged
+      invalidate
+    end
+  end
+end
+

data/assets/test/{assets/scripts → src}/test_helper.rb

@@ -11,3 +11,7 @@ end
 def assert_less_than_or_equal(limit, actual, message = nil)
   raise "#{"#{message}\n" if message}Expected '#{actual}' to be less than or equal to '#{limit}'" unless actual <= limit
 end
+
+def assert_matches(pattern, actual, message = nil)
+  raise "#{"#{message}\n" if message}'#{pattern}' expected, but got '#{actual}'" unless pattern =~ actual
+end

data/bin/ruboto

@@ -1,4 +1,11 @@
 #!/usr/bin/env ruby
+
+`android list`
+if $? != 0
+  puts "Android SDK not in path"
+  exit 1
+end
+
 require 'ruboto/commands/base'
 
 # Run Base, which will handle actual commands

data/lib/ruboto/commands/base.rb

@@ -55,10 +55,6 @@ module Ruboto
                 description "Generate the JRuby jars jar"
                 cast :boolean
               }
-              option("with-psych") {
-                description "Generate the Psych YAML parser jar"
-                cast :boolean
-              }
 
               def run
                 package = params['package'].value
@@ -94,7 +90,7 @@ module Ruboto
                   update_ruboto true
                   update_icons true
                   update_classes true
-                  update_jruby true, params['with-psych'].value if params['with-jruby'].value || params['with-psych'].value
+                  update_jruby true if params['with-jruby'].value
 #                  update_build_xml
                   update_manifest min_sdk[/\d+/], target[/\d+/], true
                   update_core_classes "exclude"
@@ -114,14 +110,9 @@ module Ruboto
               include Ruboto::Util::Update
               include Ruboto::Util::Verify
 
-              option("with-psych") {
-                description "Generate the Psych YAML parser jar"
-                cast :boolean
-              }
-
               def run
                 Dir.chdir root do
-                  update_jruby true, params['with-psych'].value
+                  update_jruby true
                 end
               end
             end
@@ -332,11 +323,6 @@ module Ruboto
               description "force and update even if the version hasn't changed"
             }
 
-            option("with-psych") {
-              description "Generate the Psych YAML parser jar"
-              cast :boolean
-            }
-
             def run
               case params['what'].value
               when "app" then
@@ -347,12 +333,12 @@ module Ruboto
                 update_ruboto force
                 update_icons force
                 update_classes force
-                update_jruby force, params['with-psych'].value
+                update_jruby force
                 update_manifest nil, nil, force
                 update_core_classes "exclude"
                 update_bundle
               when "jruby" then
-                update_jruby(params['force'].value, params['with-psych'].value) || abort
+                update_jruby(params['force'].value) || abort
               when "ruboto" then
                 update_ruboto(params['force'].value) || abort
               end