jsonj-integration 1.1 → 1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 SHA1:
   metadata.gz: !binary |-
-    NDAzZjMwMTczMTIyZDNiZjUyMjg4YWNkYzhkNGE5MjA2NDA2NDM2MA==
+    ODM5ZmI2NTU2MGQ4N2ZhMjAzNzBhYmVjMGZhYjVmMWRkNDNhODQzNQ==
   data.tar.gz: !binary |-
-    YTg0NTEyOGQ1YmE2MTY5NjU2YzNhMDMzNjNiYzgzZGY1MDMwYTg1ZA==
+    M2IxNDAzODZiMWI2MjIwMjM3NGIwYTkzNDgzYzI4MDdmZWYxMDQ0Ng==
 SHA512:
   metadata.gz: !binary |-
-    NTEwNTc5OWQ1ZmFkMGFhYjFhMzMxYWYwNTg5N2QwZDA5N2I1NGIxZmRkYTM1
-    ZjhkOWY5YmZjZWJmYzBjYjJhOWQ3ZDIxZjhmZjc0MDcxNzg3NDk1OGZmNzUz
-    YTIxMzk2Mzc4ZjU0Y2FkMzQ1Y2Y1MWJjN2E5MGMyODk2ZDFlZjU=
+    NTc1Y2FmNjNlZGZjMDI5OTQ1ZTU3YzYwZDY3M2U0NGE4MzhhYzZhNzAyMTJk
+    NjMzNmZkYmE5YzJhMDM1YzYxNThkZjVhYTQ2YTVlMzhiMzFjMWViMDU0ODhm
+    N2E1NDQ1MzU0MTU4MGJkNWM0YzcxMTFiM2RiMDM0ZjI4M2Q3N2U=
   data.tar.gz: !binary |-
-    ZWIyN2MyNzY1NjczNmEwODlkYmRmMzg4YmEwODAxOGNiOWVjYjlhYzkzYjBi
-    ODVkOTE4M2E3ODcwZDYxZmU1ODRkMTA4MTRhYTY0NGU3NzYxNTY2MGJlM2Fj
-    MTRlZjA4NDJkMjQ3ZTU1ZmIwNDQxMjk3NTU3ZGE5NDMwMTRhYmM=
+    NTMyMGE1MWYyODFhMTU4MDA1NTgxMzgwZmE4MDBkN2ViNTkzNDFmMDA3NmJi
+    MzM1Y2RlYTdjODNlNWNjNWU1ZDk4NGYxODk3ODVkMzM1YWM2YzRkMGYzODk4
+    ODZhNzhjY2I5ZjI0MTNkZTk5YzcwZmVlZDIxYWJlNmY5OTMwMWM=

data/lib/jsonj.rb

@@ -8,10 +8,12 @@
 #
 java_import com.github.jsonj.JsonObject
 java_import com.github.jsonj.JsonArray
+java_import com.github.jsonj.JsonSet
 java_import com.github.jsonj.JsonPrimitive
 java_import com.github.jsonj.JsonType
 java_import com.github.jsonj.tools.JsonBuilder
 
+
 # this function is injected into JsonElement subclasses
 def convertToRuby(value)
   if value.isObject
@@ -48,10 +50,31 @@ JsonArray.send(:define_method, 'to_s') do
   tos self
 end
 
+JsonSet.send(:define_method, 'to_s') do 
+  tos self
+end
+
 JsonPrimitive.send(:define_method, 'to_s') do 
   tos self
 end
 
+JsonObject.send(:define_method, 'to_json') do 
+  tos self
+end
+
+JsonArray.send(:define_method, 'to_json') do 
+  tos self
+end
+
+JsonSet.send(:define_method, 'to_json') do 
+  tos self
+end
+
+JsonPrimitive.send(:define_method, 'to_json') do 
+  tos self
+end
+
+
 JsonObject.send(:define_method, 'toRuby') do 
   convertToRuby self
 end
@@ -60,7 +83,6 @@ JsonObject.send(:define_method, '[]=') do |key,value|
   self.put(key.to_s,JsonBuilder::fromObject(value))
 end
 
-
 JsonObject.send(:define_method, '[]') do |key|
   val = self.get(key)
   if val && val.isPrimitive
@@ -97,18 +119,48 @@ JsonArray.send(:define_method, '[]') do |key|
   end
 end
 
+JsonSet.send(:define_method, '[]') do |key|
+  val = self.get(key)
+  if val && val.isPrimitive
+    case val.type.to_s
+    when 'string'
+      val.asString
+    when 'number'
+      val.asDouble
+    when 'bool'
+      val.asBoolean
+    when 'nullValue'
+      nil
+    end
+  else
+    val
+  end
+end
+
 JsonArray.send(:define_method, '[]=') do |index,value|
   self.set(index,JsonBuilder::fromObject(value))
 end
 
+JsonSet.send(:define_method, '[]=') do |index,value|
+  self.set(index,JsonBuilder::fromObject(value))
+end
+
 JsonArray.send(:define_method, '<<') do |value|
   self.add(JsonBuilder::fromObject(value))
 end
 
+JsonSet.send(:define_method, '<<') do |value|
+  self.add(JsonBuilder::fromObject(value))
+end
+
 JsonArray.send(:define_method, 'toRuby') do 
   convertToRuby self
 end
 
+JsonSet.send(:define_method, 'toRuby') do 
+  convertToRuby self
+end
+
 JsonPrimitive.send(:define_method, 'toRuby') do 
   if(self.type.toString == 'string')
     self.asString

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonj-integration
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Jilles van Gurp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Provides seemless integration of the jsonj library by adding conversion methods to hashes, lists and JsonElement instances and support for using [] and << on the Java objects.
 email: incoming@jillesvangurp.xom