moran 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3454fe7b252f3096bc9815fbabaaf2be572a068f
-  data.tar.gz: 45d56ceaf867411772302298515c26966f8fb0cb
+  metadata.gz: 764ea7daa392c9c631d505683fd31abbc736b7cc
+  data.tar.gz: 87759f4175c0c2a11e6b1ed810b0e6e70db2c350
 SHA512:
-  metadata.gz: a6e5e82b1cbeec09290228a01fbd36c387584922d2f7d189354d810115e19c609286dc1243aae4def5448cc0dc7701e11fd7f76c53793a8bed70ffe52a8e1105
-  data.tar.gz: 6f08376262d0d96f5425a8b30a2790d505f97c57515cb98a6009aaf52f250662b54a05d9da0914bf208c62322b4ccb317c7e0efcbadfdc21226225fcbeb26909
+  metadata.gz: 211ad06528572d877283ab1858b03098b0d699567d67839905b861d4afa2ffc0bd9163b6c6f94641bc98c82ef438ef14794ecb4675925923ee08f9e2a1a05539
+  data.tar.gz: f6a027bba5e29eeba076240419bffc86ad0e3cd63860570ea874294e840cbabda8213b686aefebda594e75387c1070b1e4c41345d1499d89382689fd5d5b5f40

data/motion/moran/moran.rb

@@ -6,12 +6,19 @@ class Moran
     mapper = Com::Fasterxml::Jackson::Databind::ObjectMapper.new
     mapper.configure(Com::Fasterxml::Jackson::Core::JsonParser::Feature::ALLOW_UNQUOTED_FIELD_NAMES,
                      true)
-    mapper.readValue(json, Hash)
+    is_array = json.lstrip[0] == "["
+    mapper.readValue(json, is_array ? Array : Hash)
   end
 
-  def generate(hash)
+  def generate(obj)
     mapper = Com::Fasterxml::Jackson::Databind::ObjectMapper.new
-    mapper.writeValueAsString(RubyToJava.convert_hash(hash));
+    converted =
+      if obj.is_a?(Array)
+        RubyToJava.convert_array(obj)
+      else
+        RubyToJava.convert_hash(obj)
+      end
+    mapper.writeValueAsString(converted)
   end
 
 end

data/motion/moran/ruby_to_java.rb

@@ -3,7 +3,11 @@
 class RubyToJava
 
   def self.convert_hash(hash)
-    RubyToJava.new.to_hashmap(hash)    
+    RubyToJava.new.to_hashmap(hash)
+  end
+
+  def self.convert_array(array)
+    RubyToJava.new.to_array(array)
   end
 
   def to_hashmap(old_hash)
@@ -14,17 +18,17 @@ class RubyToJava
     end
   end
 
+  def to_array(array)
+    array.map { |v| v.is_a?(String) ? v.toString : v }
+  end
+
   private
 
   def convert_value(value)
-    new_value ||= to_hashmap(value)     if value.is_a?(Hash)
-    new_value ||= convert_array(value)  if value.is_a?(Array)
-    new_value ||= value.toString        if value.is_a?(String)
+    new_value ||= to_hashmap(value) if value.is_a?(Hash)
+    new_value ||= to_array(value)   if value.is_a?(Array)
+    new_value ||= value.toString    if value.is_a?(String)
     new_value ||= value
   end
 
-  def convert_array(array)
-    array.map { |v| v.is_a?(String) ? v.toString : v }
-  end
-
 end

data/motion/moran/version.rb

@@ -1,4 +1,4 @@
 module Moran
-  VERSION = "0.5"
+  VERSION = "0.6"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moran
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Darin Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-gradle