droiuby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108871acdcd1b66a9b5053135da790d76c5f455f
-  data.tar.gz: 9eea77086a4b774bad27968287208a3a284c53ec
+  metadata.gz: ce87cde422d9ebb2f0f949ab85450c340fd0aa74
+  data.tar.gz: 90aff58a442cc8e44ee403047f50d9316ba5c0a4
 SHA512:
-  metadata.gz: e513de3ca8fb4d523949b5a7eed566035660bc2be16df4edb4f311b1b3b7e14b5cce8be103eb46b8e0c0b5656e9ea669f99ceccf6c638b1b74e452925fe8d393
-  data.tar.gz: fd51d02e8959d9bebc29df6c4feb566e6577f9ddfedcde4ca40dcf8f87f30bbd6bd70e5b82382b0e30539e9f1c2d490d74422878b299f4faec1df20a45db87ec
+  metadata.gz: 57c6929c77f1b4d104f7fbc3d29fbce16b5a6fb4e1370aef119261dc8c21efa499c8b88debdbaf02232ec5ecdc045d88cacd3979f324eddd81966831aab116c8
+  data.tar.gz: bb9a593939a623ff47a5bd98a00fb6d50273e6231215fe57ee300b38f7b860d3bde972e11427d1a69156cdb1d08a43d75c0ae71777a1491fb22e98d58bb88c09

data/bin/drby

@@ -78,15 +78,21 @@ case command
 
       begin
           while !Ripper.sexp(buf) || !valid_statement?(buf)
-              buf = buf + "\n" + Readline.readline("?> ", true) + "\n"
+              buf = buf + "\n" + Readline.readline("droiuby ?> ", true) + "\n"
           end
       rescue Interrupt
         puts "\n"
         next
       end
       next if buf.blank?
-      res = JSON.parse(project.command(buf, $device_ip))
-      puts res['result']
+
+      begin
+        res = JSON.parse(project.command(buf, $device_ip))
+        puts res['result']
+      rescue EOFError=>e
+        puts 'cannot communicate with the device. make sure it is connected and the WebConsole is started'
+      end
+      
     end
   when 'list'
     project.list($device_ip)

data/lib/droiuby/android.rb

@@ -31,26 +31,17 @@ module Droiuby
 
     def self.when_api(verb, level, &block)
       current_api_level = Java::android.os.Build::VERSION::SDK_INT
-      case verb
+      case verb.to_sym
+      when :is
+        return DummyOtherwise.new(block.call) if current_api_level == level
       when :greater_than
-        if current_api_level > level
-          return DummyOtherwise.new(block.call)
-        end
+        return DummyOtherwise.new(block.call) if current_api_level > level
       when :less_than
-        if current_api_level < level
-          block.call
-          return DummyOtherwise.new(block.call)
-        end
+        return DummyOtherwise.new(block.call) if current_api_level < level
       when :at_least
-        if current_api_level >= level
-          block.call
-          return DummyOtherwise.new(block.call)
-        end
+        return DummyOtherwise.new(block.call) if current_api_level >= level
       when :at_most
-        if current_api_level <= level
-          block.call
-          return DummyOtherwise.new(block.call)
-        end
+        return DummyOtherwise.new(block.call) if current_api_level <= level
       end
       return Otherwise.new
     end

data/lib/droiuby/bootstrap.rb

@@ -24,6 +24,10 @@ def _scripting_container
   PayloadWrapper.java_getContainer
 end
 
+def _runtime
+   _scripting_container.getProvider.getRuntime
+end
+
 def _current_app
   PayloadWrapper.java_getActiveApp
 end

data/lib/droiuby/droiuby.rb

@@ -33,12 +33,22 @@ class DroiubyFramework
   end
 
   def resolve_view(name, node)
-    klass = name.constantize
-    instance = klass.new
-    if instance < ViewWrapper
+    name_parts = name.split('#')
+
+    klass_str = if name_parts.size > 1
+      "#{name_parts[0].camelize}::#{name_parts[1].camelize}"
+    else
+      name.camelize
+    end
+
+    puts klass_str
+    klass = klass_str.constantize
+
+    instance = klass.new(_current_activity)
+    if instance.class < ViewWrapper
       instance.native
     else
-      instance
+      instance._proxy_class([Java::android.content.Context.java_class], [_current_activity])
     end
   end
 

data/lib/droiuby/loader.rb

@@ -1,7 +1,8 @@
 require 'java'
 require 'droiuby/support/utils'
 require 'droiuby/support/fixnum'
-require 'droiuby/wrappers/activity'
+require 'droiuby/support/autoload'
+require 'droiuby/support/java'
 require 'droiuby/wrappers/collection/view_array'
 require 'droiuby/wrappers/proxy_builder/interface_builder'
 require 'droiuby/wrappers/listeners/auto_wrap'
@@ -9,28 +10,11 @@ require 'droiuby/wrappers/listeners/on_web_console_ready_listener'
 require 'droiuby/support/string'
 require 'droiuby/support/thread'
 require 'droiuby/support/object'
-require 'droiuby/support/autoload'
 require 'droiuby/support/to_query'
 require 'droiuby/support/asset'
 require 'droiuby/wrappers/java_helpers/java_method_helper'
+require 'droiuby/wrappers/java_helpers/view_helper'
 require 'droiuby/support/system'
-require 'droiuby/wrappers/async'
-require 'droiuby/wrappers/view_group_wrapper'
-require 'droiuby/wrappers/linear_layout'
-require 'droiuby/wrappers/text_view'
-require 'droiuby/wrappers/button'
-require 'droiuby/wrappers/edit_text'
-require 'droiuby/wrappers/preferences'
-require 'droiuby/wrappers/web_view'
-require 'droiuby/wrappers/compound_button_wrapper'
-require 'droiuby/wrappers/motion_events'
-require 'droiuby/wrappers/intent'
-require 'droiuby/wrappers/canvas'
-require 'droiuby/wrappers/surface_view_wrapper'
-require 'droiuby/wrappers/thread_pool'
-require 'droiuby/wrappers/list_adapter_wrapper'
-require 'droiuby/wrappers/accelerometer'
-require 'droiuby/wrappers/runnable_wrapper'
 require 'droiuby/plugins/plugins'
 require 'droiuby/application'
 require 'droiuby/android'

data/lib/droiuby/support/autoload.rb

@@ -1,22 +1,44 @@
+$autoload_path = [nil,File.join('droiuby','wrappers')]
+
+
+module MissingHandler
+  def const_missing(name)
+    @looked_for ||= {}
+    str_name = name.to_s
+    raise "Class not found: #{name}" if @looked_for[str_name] == :missing
+    
+    
+    name_parts = name.to_s.split('::').collect { |n| n.underscore }
+    
+    
+    $autoload_path.each do |path|
+      path_array = unless path.nil? 
+        [path] + name_parts
+      else
+        name_parts
+      end 
+      require_path = File.join(*path_array)
+
+      begin
+        require require_path
+        klass = const_get(name)
+        return klass if klass
+      rescue LoadError=>e
+      end
+      
+    end
+    
+    @looked_for[str_name] = :missing
+
+    raise "Class not found: #{name}"
+  end
+
+end
 
 class Object
   class << self
     alias :const_missing_old :const_missing
-    def const_missing(name)
-      puts "constant missing #{name}"
-      @looked_for ||= {}
-      str_name = name.to_s
-      raise "Class not found: #{name}" if @looked_for[str_name]
-      @looked_for[str_name] = 1
-      
-      name_parts = name.to_s.split('::').collect { |n| n.underscore }
-      require_path = File.join(*name_parts)
-      
-      puts "autoloading #{require_path}"
-      require require_path
-      klass = const_get(name)
-      return klass if klass
-      raise "Class not found: #{name}"
-    end
+    
+    include MissingHandler
   end
 end

data/lib/droiuby/support/fixnum.rb

@@ -7,5 +7,9 @@ class Fixnum
   def to_px
   	Java::com.droiuby.client.core.builder.ActivityBuilder.toPixelsFromDip(_current_activity, self)
   end
+
+  def to_dip
+  	(self / Java::com.droiuby.client.core.builder.ActivityBuilder.toDeviceIndependentPixels(_current_activity, 1))
+  end
   
 end

data/lib/droiuby/support/java.rb

@@ -0,0 +1,53 @@
+require 'java'
+
+module JavaExtends
+
+	def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+	def _ruby_object
+		Java::org.jruby.javasupport.JavaUtil.convertJavaToRuby(_runtime, self)
+	end
+
+	def native
+		@native
+	end
+
+	module ClassMethods
+
+		def extend_java_class(klass)
+
+			puts "creating auto proxy for #{klass}"
+			klass_name = klass.to_s
+			wrapper_klass = Java::com.droiuby.client.core.wrappers.InvocationHandlerRubyWrapper
+			interface_generator = Java::com.droiuby.client.core.InterfaceGenerator
+			converter = Java::org.jruby.javasupport.JavaUtil
+
+			define_method(:_proxy_class) do |arg_types, arg_values|
+				handler = wrapper_klass.new(_execution_bundle, _ruby_object, true)
+				interface_generator.wrapperForInstance(_current_activity, klass_name, handler, arg_types, arg_values)
+			end
+
+			current_class = self
+
+			define_method(:invoke) do |object, method, params|
+	      method_name = method.getName.to_sym
+	      if current_class.instance_methods(false).include? method_name
+	      	native = object
+	      	send(method_name, *params)
+	      else
+	      	Java::com.google.dexmaker.stock.ProxyBuilder.callSuper(object, method, params)
+	    	end
+	    end
+	  end
+
+	end
+
+	private
+
+	def native=(object)
+		@native = object
+	end
+
+end

data/lib/droiuby/support/string.rb

@@ -27,12 +27,34 @@ class String
   def constantize
     names = self.split('::')
     names.shift if names.empty? || names.first.empty?
-  
-    constant = Object
-    names.each do |name|
-      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    index = 1
+    names.inject(Object) do |constant, name|
+      if constant == Object
+        constant.const_get(name)
+      else
+        begin
+          candidate = constant.const_get(name)
+        rescue NameError => e
+          Object.const_missing(names[0..index].join('::'))
+          candidate = constant.const_get(name)
+        end
+        index += 1
+        next candidate if constant.const_defined?(name, false)
+        next candidate unless Object.const_defined?(name)
+
+        # Go down the ancestors to check it it's owned
+        # directly before we reach Object or the end of ancestors.
+        constant = constant.ancestors.inject do |const, ancestor|
+          break const    if ancestor == Object
+          break ancestor if ancestor.const_defined?(name, false)
+          const
+        end
+
+        # owner is in Object, so raise
+        constant.const_get(name, false)
+
+      end
     end
-    constant
   end
   
 end

data/lib/droiuby/wrappers/activity.rb

@@ -21,32 +21,36 @@ class Activity
     end
     
     def portrait_mode_only
-      add_before_content_task { _current_activity.setRequestedOrientation(ActivityInfo::SCREEN_ORIENTATION_PORTRAIT) }  
+      add_before_content_render_task { |instance| _current_activity.setRequestedOrientation(ActivityInfo::SCREEN_ORIENTATION_PORTRAIT) }  
     end
 
     def landscape_mode_only
-      add_before_content_task { _current_activity.setRequestedOrientation(ActivityInfo::SCREEN_ORIENTATION_LANDSCAPE) }  
+      add_before_content_render_task { |instance| _current_activity.setRequestedOrientation(ActivityInfo::SCREEN_ORIENTATION_LANDSCAPE) }  
     end
 
     def no_action_bar
-      add_before_content_task { _current_activity.requestWindowFeature(Java::android.view.Window::FEATURE_NO_TITLE) }
+      add_before_content_render_task { |instance| _current_activity.requestWindowFeature(Java::android.view.Window::FEATURE_NO_TITLE) }
     end
 
     def set_theme(theme, namespace = nil)
       namespace = "#{namespace}." unless namespace.nil?
 
-      add_before_content_task do  
+      add_before_content_render_task do |instance|
         _current_activity.setTheme(_R("#{namespace}R.style.#{theme}"))
       end
     end
 
-    private 
-
-    def add_before_content_task(&block) 
+    def add_before_content_render_task(&block) 
       @@before_content_blocks = @@before_content_blocks || []
       @@before_content_blocks << block  
     end
 
+    def before_render(*symbols)
+      add_before_content_render_task do |instance|
+        symbols.each { |sym| instance.send(sym.to_sym) }
+      end
+    end
+
   end
 
   def on_activity_result(request_code, result_code, intent)
@@ -54,7 +58,7 @@ class Activity
   end
   
   def before_content_render
-    @@before_content_blocks.each { |block| block.call }
+    @@before_content_blocks.each { |block| block.call(self) }
     _current_activity.setContentView(_R('R.layout.canvas'))
   end
 

data/lib/droiuby/wrappers/compound_button_wrapper.rb

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class CompoundButtonWrapper < ViewWrapper
   
   

data/lib/droiuby/wrappers/{edit_text.rb → edit_text_wrapper.rb}

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class EditTextWrapper < TextViewWrapper
   
   java_attr_accessor :hint

data/lib/droiuby/wrappers/{intent.rb → intent_wrapper.rb}

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/java_helpers/view_helper'
-
 class IntentWrapper
   
   include Droiuby::ViewHelper

data/lib/droiuby/wrappers/{linear_layout.rb → linear_layout_wrapper.rb}

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class LinearLayoutWrapper < ViewGroupWrapper
   
   java_attr_accessor :baseline_algined, :orientation

data/lib/droiuby/wrappers/proxy_builder/interface_builder.rb

@@ -4,10 +4,9 @@ module Droiuby
       class InvocationHandler
         
         def initialize(klass_name, backing_object)
-          puts "autowrap using dexmaker"
-          handler = Java::com.droiuby.wrappers.InvocationHandlerRubyWrapper.new(_execution_bundle, self)
+          handler = Java::com.droiuby.client.core.wrappers.InvocationHandlerRubyWrapper.new(_execution_bundle, self)
           @backing_object = backing_object
-          @native = Java::com.droiuby.client.core.InterfaceGenerator.wrapperForClass(_current_activity, klass_name, handler)
+          @native = Java::com.droiuby.client.core.InterfaceGenerator.wrapperForClassOrInterface(_current_activity, klass_name, handler)
         end
 
         def invoke(object, method, params)

data/lib/droiuby/wrappers/surface_view_wrapper.rb

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/canvas'
-
 class SurfaceHolderWrapper
   
   include JavaMethodHelper

data/lib/droiuby/wrappers/{text_view.rb → text_view_wrapper.rb}

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class TextViewWrapper < ViewWrapper
   
   java_attr_accessor :cursor_visible, :text_color, :text_scale_x

data/lib/droiuby/wrappers/view_group_wrapper.rb

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class ViewGroupWrapper < ViewWrapper
   def inner=(markup)
     _activity_builder.parsePartialReplaceChildren(@view, markup, _execution_bundle)

data/lib/droiuby/wrappers/view_wrapper.rb

@@ -1,6 +1,3 @@
-require 'droiuby/wrappers/animation'
-require 'droiuby/wrappers/java_helpers/view_helper'
-
 class ViewWrapper
 
   include JavaMethodHelper
@@ -172,7 +169,7 @@ class ViewWrapper
     end
 
     extra_attributes.each do |attr|
-      data_attribute_list << "#{attr.to_sym}=\"#{self.send(attr.to_sym)}\""  
+      data_attribute_list << "#{attr.to_sym}=\"#{p_format(attr,self.send(attr.to_sym))}\""  
     end
 
     puts "#{spaces}#{self.class.name} id=\"#{id_attr}\" name=\"#{name_attr}\" class=\"#{class_attr}\" #{data_attribute_list.join(' ')}\n"
@@ -202,6 +199,17 @@ class ViewWrapper
 
   protected
 
+  def p_format(attribute, value)
+    case attribute.to_sym
+      when :measured_width
+        "#{value.to_dip}dp #{value}px"
+      when :measured_height
+        "#{value.to_dip}dp #{value}px"
+      else
+        value
+    end
+  end
+
   def parse_color(color_value)
     if color_value.kind_of? String
       Java::android.graphics.Color.parseColor(color_value);

data/lib/droiuby/wrappers/{web_view.rb → web_view_wrapper.rb}

@@ -1,5 +1,3 @@
-require 'droiuby/wrappers/view_wrapper'
-
 class WebViewWrapper < ViewGroupWrapper
   def src
     @native.getUrl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droiuby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,6 +120,7 @@ files:
 - lib/droiuby/support/asset.rb
 - lib/droiuby/support/autoload.rb
 - lib/droiuby/support/fixnum.rb
+- lib/droiuby/support/java.rb
 - lib/droiuby/support/object.rb
 - lib/droiuby/support/string.rb
 - lib/droiuby/support/system.rb
@@ -128,33 +129,33 @@ files:
 - lib/droiuby/support/utils.rb
 - lib/droiuby/wrappers/accelerometer.rb
 - lib/droiuby/wrappers/activity.rb
-- lib/droiuby/wrappers/animation.rb
-- lib/droiuby/wrappers/async.rb
-- lib/droiuby/wrappers/button.rb
+- lib/droiuby/wrappers/animation_listener_wrapper.rb
+- lib/droiuby/wrappers/async_wrapper.rb
+- lib/droiuby/wrappers/button_wrapper.rb
 - lib/droiuby/wrappers/canvas.rb
 - lib/droiuby/wrappers/collection/view_array.rb
 - lib/droiuby/wrappers/compound_button_wrapper.rb
-- lib/droiuby/wrappers/edit_text.rb
-- lib/droiuby/wrappers/image_button.rb
-- lib/droiuby/wrappers/intent.rb
+- lib/droiuby/wrappers/edit_text_wrapper.rb
+- lib/droiuby/wrappers/image_button_wrapper.rb
+- lib/droiuby/wrappers/intent_wrapper.rb
 - lib/droiuby/wrappers/java_helpers/java_method_helper.rb
 - lib/droiuby/wrappers/java_helpers/view_helper.rb
-- lib/droiuby/wrappers/linear_layout.rb
+- lib/droiuby/wrappers/linear_layout_wrapper.rb
 - lib/droiuby/wrappers/list_adapter_wrapper.rb
-- lib/droiuby/wrappers/list_view.rb
+- lib/droiuby/wrappers/list_view_wrapper.rb
 - lib/droiuby/wrappers/listeners/auto_wrap.rb
 - lib/droiuby/wrappers/listeners/on_click_listener.rb
 - lib/droiuby/wrappers/listeners/on_web_console_ready_listener.rb
-- lib/droiuby/wrappers/motion_events.rb
+- lib/droiuby/wrappers/motion_events_wrapper.rb
 - lib/droiuby/wrappers/preferences.rb
 - lib/droiuby/wrappers/proxy_builder/interface_builder.rb
 - lib/droiuby/wrappers/runnable_wrapper.rb
 - lib/droiuby/wrappers/surface_view_wrapper.rb
-- lib/droiuby/wrappers/text_view.rb
-- lib/droiuby/wrappers/thread_pool.rb
+- lib/droiuby/wrappers/text_view_wrapper.rb
+- lib/droiuby/wrappers/thread_pool_wrapper.rb
 - lib/droiuby/wrappers/view_group_wrapper.rb
 - lib/droiuby/wrappers/view_wrapper.rb
-- lib/droiuby/wrappers/web_view.rb
+- lib/droiuby/wrappers/web_view_wrapper.rb
 - lib/droiuby/wrappers/wrappers.rb
 homepage: https://github.com/jedld/droiuby-doo
 licenses: