moran 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd22b6c7bccaf84ff993dff93e21a1b35a20df32
-  data.tar.gz: a958ab3d4f5a2ba69b70ab9a334d83d2fdf5c5b6
+  metadata.gz: 70ddd5afef0ee4b3beef8724628259b09ba16051
+  data.tar.gz: d22f30c8b0fe1ef20e5844b707ce57f9899eff07
 SHA512:
-  metadata.gz: e52219e5738a76446903561926a3933b6f20b848e21f9bc1f043d8e513fec17a56f9cb7c521a69a502181db8d312a603d2a8ceff5b4e6a486b69d5fa30b3730f
-  data.tar.gz: c1936ff87402385cd8089aa7bbde49e71030ab76f06cf897b513511c708c22f6a8b981c7fdc3c8b83c726b11d7b7cb05aa1853f0edcd9006fa1362e76de333dc
+  metadata.gz: fdf5541c3bfb2795037b6ce93e68ef1b64b679ee002670df53acc9eae66e638d2252f0d53227b59ab93ffdf4025081f20726176eef7981ade0c830410e699f33
+  data.tar.gz: 1fe77e79f5e070badd17cbe2e1b04f0aaf1a45c9ecca9244770ddc417b010fe7c93fd75d6e92742ee6b74fca136de0849a19d2b9d1d44945952a35a553baa06a

data/README.md

@@ -1,6 +1,6 @@
 # moran
 
-moran is a simple JSON parser and generator for [RubyMotion Android](http://rubymotion.com). It provides a Ruby wrapper around the [Jackson JSON parser for Java.](https://github.com/FasterXML/jackson)
+moran (mo-RAN) is a simple JSON parser and generator for [RubyMotion Android](http://rubymotion.com). It provides a Ruby wrapper around the [Jackson JSON parser for Java.](https://github.com/FasterXML/jackson)
 
 moran emulates the standard Ruby JSON API, providing `parse` and `generate` methods:
 
@@ -87,4 +87,9 @@ or
 rake spec:device
 ```
 
+## What's in a name?
+
+Moran was named after jazz pianist and composer [Jason Moran](http://www.jasonmoran.com/)
+
+![](https://raw.githubusercontent.com/darinwilson/moran/master/img/jason_moran.jpg)
 

data/motion/moran/java_to_ruby.rb

@@ -6,11 +6,11 @@
 #   JavaToRuby.convert_hashmap(hashmap)
 #
 # This supports nested hashes and should assure that all Java-based values are properly converted
-# to their Ruby counterparts (i.e. java.lang.String => String). 
+# to their Ruby counterparts (i.e. java.lang.String => String).
 #
 # This has not been extensively tested, or optimized for performance. It should work well enough
-# for simple cases, but may well fall over with a large HashMap. 
-# 
+# for simple cases, but may well fall over with a large HashMap.
+#
 class JavaToRuby
 
   class << self
@@ -34,9 +34,9 @@ class JavaToRuby
       end
     end
   end
-  
+
   def json_object_to_hash(json_obj)
-    return nil if json_obj.nil?
+    return nil if (json_obj.nil? || json_obj.toString == "null")
     Hash.new.tap do |h|
       it = json_obj.keys()
       while it.hasNext() do
@@ -46,14 +46,30 @@ class JavaToRuby
       end
     end
   end
+
+  def json_array_to_array(json_array)
+    return nil if json_array.nil?
+    Array.new.tap do |a|
+      inx = 0
+      while inx < json_array.length() do
+        a << convert_value(json_array.get(inx))
+        inx += 1
+      end
+    end
+  end
   private
 
   def convert_value(value)
     new_value ||= hashmap_to_hash(value) if hashmap?(value)
     new_value ||= to_array(value)        if array?(value)
     new_value ||= to_boolean(value)      if boolean?(value)
-    new_value ||= nil                    if null?(value)
-    new_value ||= value
+    new_value ||= to_float(value)       if double?(value)
+    new_value ||= json_object_to_hash(value) if json_object?(value)
+    new_value ||= json_array_to_array(value) if json_array?(value)
+
+    # Using ternary here so the null-turned-JSONObjects return nil
+    # instead of the original value
+    new_value ||= null?(value) ? nil : value
   end
 
   def hashmap?(value)
@@ -68,8 +84,23 @@ class JavaToRuby
     ["true","false"].include?(value.to_s.downcase)
   end
 
+  def json_object?(value)
+    # If value is a null-turned-JSONObject, the class is java.lang.JSONObject$1
+    # so we use include here
+    value.class.to_s.include?("JSONObject")
+  end
+
+  def json_array?(value)
+    value.class.to_s.end_with?("JSONArray")
+  end
+
+  def double?(value)
+    value.class.to_s.end_with?("Double")
+  end
+
   def null?(value)
-    value.nil? || value.to_s.downcase == "null"
+    # If value is a null-turned-JSONObject, value.toString returns "null"
+    value.nil? || value.to_s.downcase == "null" || (value.respond_to?("toString") && value.toString == "null")
   end
 
   def to_array(array)
@@ -78,6 +109,10 @@ class JavaToRuby
     array.map { |value| convert_value(value) }
   end
 
+  def to_float(value)
+    value.to_s.to_f
+  end
+
   def to_boolean(value)
     value.to_s.downcase == "true"
   end

data/motion/moran/version.rb

@@ -1,4 +1,4 @@
 module Moran
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moran
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Darin Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-gradle