rhodes 2.0.0.beta11 → 2.0.0.rc1

data/Rakefile

@@ -299,7 +299,7 @@ def common_bundle_start(startdir, dest)
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps')
-  cp_r app + '/public', File.join($srcdir,'apps')
+  cp_r app + '/public', File.join($srcdir,'apps') if File.exists? app + '/public'
   cp   app + '/rhoconfig.txt', File.join($srcdir,'apps')
 
 

data/bin/rhodes-setup

@@ -57,7 +57,7 @@ end
 
 while true
   android = prompt_for("Android SDK path", android, false)
-  android = "" if android.nil?
+  break if android.nil?
 
   android = android.gsub(/\\/,"/")
   apilevel = -1
@@ -89,9 +89,11 @@ while true
 end
 
 # try to detect android ndk
-ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort
 ndk = ""
-ndk = ndks.last if ndks.size > 0
+unless android.nil?
+  ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort
+  ndk = ndks.last if ndks.size > 0
+end
 androidndk = prompt_for("Android NDK path", ndk, false)
 
 #now cabwiz

data/lib/extensions/json/json/common.rb

@@ -104,7 +104,7 @@ module JSON
   # system. Usually this means, that the iconv library is not installed.
   class MissingUnicodeSupport < JSONError; end
 
-  module_function
+  #module_function
 
   # Parse the JSON string _source_ into a Ruby data structure and return it.
   #
@@ -176,7 +176,7 @@ module JSON
   # See also the fast_generate for the fastest creation method with the least
   # amount of sanity checks, and the pretty_generate method for some
   # defaults for a pretty output.
-  module_function
+  #module_function
   def generate(obj, state = nil)
     if state
       state = State.from_state(state)
@@ -190,8 +190,8 @@ module JSON
   # :stopdoc:
   # I want to deprecate these later, so I'll first be silent about them, and
   # later delete them.
-  alias unparse generate
-  module_function :unparse
+  #alias unparse generate
+  #module_function :unparse
   # :startdoc:
 
   # Unparse the Ruby data structure _obj_ into a single line JSON string and
@@ -221,7 +221,7 @@ module JSON
       :space      => ' ',
       :object_nl  => "\n",
       :array_nl   => "\n",
-      :check_circular => true
+      :check_circular => false #true
     )
     if opts
       if opts.respond_to? :to_hash

data/lib/extensions/json/json/pure/generator.rb

@@ -1,6 +1,4 @@
-
 module JSON
-=begin
   MAP = {
     "\x0" => '\u0000',
     "\x1" => '\u0001',
@@ -36,55 +34,31 @@ module JSON
     "\x1f" => '\u001f',
     '"'   =>  '\"',
     '\\'  =>  '\\\\',
+    '/'   =>  '\/',
   } # :nodoc:
 
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
-  if String.method_defined?(:force_encoding)
-    def utf8_to_json(string) # :nodoc:
-      string = string.dup
-      string << '' # XXX workaround: avoid buffer sharing
-      string.force_encoding(Encoding::ASCII_8BIT)
-      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
-      string.gsub!(/(
-                      (?:
-                        [\xc2-\xdf][\x80-\xbf]    |
-                        [\xe0-\xef][\x80-\xbf]{2} |
-                        [\xf0-\xf4][\x80-\xbf]{3}
-                      )+ |
-                      [\x80-\xc1\xf5-\xff]       # invalid
-                    )/nx) { |c|
-                      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-                      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
-                      s.gsub!(/.{4}/n, '\\\\u\&')
-                    }
-      string.force_encoding(Encoding::UTF_8)
-      string
-    rescue Iconv::Failure => e
-      raise GeneratorError, "Caught #{e.class}: #{e}"
-    end
-  else
-    def utf8_to_json(string) # :nodoc:
-      string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
-      string.gsub!(/(
-                      (?:
-                        [\xc2-\xdf][\x80-\xbf]    |
-                        [\xe0-\xef][\x80-\xbf]{2} |
-                        [\xf0-\xf4][\x80-\xbf]{3}
-                      )+ |
-                      [\x80-\xc1\xf5-\xff]       # invalid
-                    )/nx) { |c|
-        c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-        s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
-        s.gsub!(/.{4}/n, '\\\\u\&')
-      }
-      string
-    rescue Iconv::Failure => e
-      raise GeneratorError, "Caught #{e.class}: #{e}"
-    end
+  def utf8_to_json(string) # :nodoc:
+    string = string.dup.force_encoding("ASCII-8BIT")
+    string.gsub!(/["\\\/\x0-\x1f]/) { MAP[$&] }
+    string.gsub!(/(
+                    (?:
+                      [\xc2-\xdf][\x80-\xbf]    |
+                      [\xe0-\xef][\x80-\xbf]{2} |
+                      [\xf0-\xf4][\x80-\xbf]{3}
+                    )+ |
+                    [\x80-\xc1\xf5-\xff]       # invalid
+                  )/nx) { |c|
+      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+      c.unpack("U*").map{|c|
+        c>0xFFFF ? ('\ud%03x\ud%03x'%[0x7C0+c/1024,0xC00+c%1024]) : ('\u%04x'%c)
+      }.join("")
+    }
+    string
   end
   module_function :utf8_to_json
-=end
+
   module Pure
     module Generator
       # This class is used to create State instances, that are use to hold data
@@ -128,7 +102,7 @@ module JSON
           @space_before   = ''
           @object_nl      = ''
           @array_nl       = ''
-          @check_circular = true
+          @check_circular = false #true
           @allow_nan      = false
           configure opts
         end
@@ -226,7 +200,7 @@ module JSON
           # Converts this object to a string (calling #to_s), converts
           # it to a JSON string, and returns the result. This is a fallback, if no
           # special method #to_json was defined for some object.
-          def to_json(*) to_s.to_json end
+          def to_json(*args) to_s.to_json end
         end
 
         module Hash
@@ -235,7 +209,7 @@ module JSON
           # _state_ is a JSON::State object, that can also be used to configure the
           # produced JSON string output further.
           # _depth_ is used to find out nesting depth, to indent accordingly.
-          def to_json(state = nil, depth = 0, *)
+          def to_json(state = nil, depth = 0, *args)
             if state
               state = JSON.state.from_state(state)
               state.check_max_nesting(depth)
@@ -265,28 +239,20 @@ module JSON
 
           def json_transform(state, depth)
             delim = ','
-            if state
-              delim << state.object_nl
-              result = '{'
-              result << state.object_nl
-              result << map { |key,value|
-                s = json_shift(state, depth + 1)
-                s << key.to_s.to_json(state, depth + 1)
-                s << state.space_before
-                s << ':'
-                s << state.space
-                s << value.to_json(state, depth + 1)
-              }.join(delim)
-              result << state.object_nl
-              result << json_shift(state, depth)
-              result << '}'
-            else
-              result = '{'
-              result << map { |key,value|
-                key.to_s.to_json << ':' << value.to_json
-              }.join(delim)
-              result << '}'
-            end
+            delim << state.object_nl if state
+            result = '{'
+            result << state.object_nl if state
+            result << map { |key,value|
+              s = json_shift(state, depth + 1)
+              s << key.to_s.to_json(state, depth + 1)
+              s << state.space_before if state
+              s << ':'
+              s << state.space if state
+              s << value.to_json(state, depth + 1)
+            }.join(delim)
+            result << state.object_nl if state
+            result << json_shift(state, depth)
+            result << '}'
             result
           end
         end
@@ -297,7 +263,7 @@ module JSON
           # _state_ is a JSON::State object, that can also be used to configure the
           # produced JSON string output further.
           # _depth_ is used to find out nesting depth, to indent accordingly.
-          def to_json(state = nil, depth = 0, *)
+          def to_json(state = nil, depth = 0, *args)
             if state
               state = JSON.state.from_state(state)
               state.check_max_nesting(depth)
@@ -327,30 +293,27 @@ module JSON
 
           def json_transform(state, depth)
             delim = ','
-            if state
-              delim << state.array_nl
-              result = '['
-              result << state.array_nl
-              result << map { |value|
-                json_shift(state, depth + 1) << value.to_json(state, depth + 1)
-              }.join(delim)
-              result << state.array_nl
-              result << json_shift(state, depth) 
-              result << ']'
-            else
-              '[' << map { |value| value.to_json }.join(delim) << ']'
-            end
+            delim << state.array_nl if state
+            result = '['
+            result << state.array_nl if state
+            result << map { |value|
+              json_shift(state, depth + 1) << value.to_json(state, depth + 1)
+            }.join(delim)
+            result << state.array_nl if state
+            result << json_shift(state, depth) 
+            result << ']'
+            result
           end
         end
 
         module Integer
           # Returns a JSON string representation for this Integer number.
-          def to_json(*) to_s end
+          def to_json(*args) to_s end
         end
 
         module Float
           # Returns a JSON string representation for this Float number.
-          def to_json(state = nil, *)
+          def to_json(state = nil, *args)
             case
             when infinite?
               if !state || state.allow_nan?
@@ -374,8 +337,8 @@ module JSON
           # This string should be encoded with UTF-8 A call to this method
           # returns a JSON string encoded with UTF16 big endian characters as
           # \u????.
-          def to_json(*)
-            '"' << self << '"' #JSON.utf8_to_json(self) << '"'
+          def to_json(*args)
+            '"' << JSON.utf8_to_json(self) << '"'
           end
 
           # Module that holds the extinding methods if, the String module is
@@ -413,17 +376,17 @@ module JSON
 
         module TrueClass
           # Returns a JSON string for true: 'true'.
-          def to_json(*) 'true' end
+          def to_json(*args) 'true' end
         end
 
         module FalseClass
           # Returns a JSON string for false: 'false'.
-          def to_json(*) 'false' end
+          def to_json(*args) 'false' end
         end
 
         module NilClass
           # Returns a JSON string for nil: 'null'.
-          def to_json(*) 'null' end
+          def to_json(*args) 'null' end
         end
       end
     end

data/lib/extensions/rhoxml/rexml/document.rb

@@ -13,8 +13,18 @@ require "rexml/output"
 =end
 if !defined? RHO_ME
 require "rexml/parsers/baseparser"
+else
+module REXML
+  module Parsers
+    class BaseParser
+      def unnormalize( string, entities=nil, filter=nil )
+        string
+      end      
+    end
+  end
+end  
 end
-#require "rexml/parsers/streamparser"
+require "rexml/parsers/streamparser"
 
 require "rexml/parsers/treeparser"
 

data/lib/extensions/rhoxml/rexml/parsers/streamparser.rb

@@ -0,0 +1,46 @@
+module REXML
+  module Parsers
+    class StreamParser
+      def initialize source, listener
+        @listener = listener
+        @parser = BaseParser.new( source )
+      end
+      
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+      
+      def parse
+        # entity string
+        while true
+          event = @parser.pull
+          case event[0]
+          when :end_document
+            return
+          when :start_element
+            attrs = event[2].each do |n, v|
+              event[2][n] = @parser.unnormalize( v )
+            end
+            @listener.tag_start( event[1], attrs )
+          when :end_element
+            @listener.tag_end( event[1] )
+          when :text
+            normalized = @parser.unnormalize( event[1] )
+            @listener.text( normalized )
+          when :processing_instruction
+            @listener.instruction( *event[1,2] )
+          when :start_doctype
+            @listener.doctype( *event[1..-1] )
+          when :end_doctype
+            # FIXME: remove this condition for milestone:3.2
+            @listener.doctype_end if @listener.respond_to? :doctype_end
+          when :comment, :attlistdecl, :cdata, :xmldecl, :elementdecl
+            @listener.send( event[0].to_s, *event[1..-1] )
+          when :entitydecl, :notationdecl
+            @listener.send( event[0].to_s, event[1..-1] )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/framework/rho/mapview.rb

@@ -0,0 +1,12 @@
+module MapView
+  def self.state
+    state = nil
+    if MapView.state_started
+      state = {}
+      state[:center] = {}
+      state[:center][:latitude] = MapView.state_center_lat
+      state[:center][:longitude] = MapView.state_center_lon
+    end
+    state
+  end
+end

data/platform/android/Rhodes/jni/src/mapview.cpp

@@ -29,3 +29,62 @@ RHO_GLOBAL void mapview_create(rho_param *p)
 #endif
 }
 
+RHO_GLOBAL void mapview_close()
+{
+#ifdef RHO_GOOGLE_API_KEY
+    JNIEnv *env = jnienv();
+    jclass clsMapView = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
+    if (!clsMapView) return;
+    jmethodID midClose = getJNIClassStaticMethod(env, clsMapView, "close", "()V");
+    if (!midClose) return;
+
+    env->CallStaticVoidMethod(clsMapView, midClose);
+#endif
+}
+
+RHO_GLOBAL VALUE mapview_state_started()
+{
+#ifdef RHO_GOOGLE_API_KEY
+    VALUE nil = rho_ruby_get_NIL();
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
+    if (!cls) return nil;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "isStarted", "()Z");
+    if (!mid) return nil;
+
+    return rho_ruby_create_boolean(env->CallStaticBooleanMethod(cls, mid));
+#else
+    return rho_ruby_create_boolean(0);
+#endif
+}
+
+RHO_GLOBAL double mapview_state_center_lat()
+{
+#ifdef RHO_GOOGLE_API_KEY
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
+    if (!cls) return 0;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "getCenterLatitude", "()D");
+    if (!mid) return 0;
+
+    return env->CallStaticDoubleMethod(cls, mid);
+#else
+    return 0;
+#endif
+}
+
+RHO_GLOBAL double mapview_state_center_lon()
+{
+#ifdef RHO_GOOGLE_API_KEY
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_MAPVIEW);
+    if (!cls) return 0;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "getCenterLongitude", "()D");
+    if (!mid) return 0;
+
+    return env->CallStaticDoubleMethod(cls, mid);
+#else
+    return 0;
+#endif
+}
+