jsonx 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e5932be89001039dde6f7b48d456955d493fee9
-  data.tar.gz: 275af6220d10ebdf6048a7897099dba01a91e8f4
+  metadata.gz: 8164d5e06dffd753cb2022ec4c03b66c612755e4
+  data.tar.gz: d8828773b49e32d62e54aa21399fe821c9c3c324
 SHA512:
-  metadata.gz: 24c0e5a163ec7b9ff3ddd4f2c03d9c0fa0dc6f1dc976b631692b0a467f6920fccd106e285c9ee709b4c936bcc67d36759d123705dff80c49714651e470220eda
-  data.tar.gz: 1ad1ac681b7c057ec895000cb89a63de0ea7baaeb2ec2d82924ddb603a2198b609db29faefef27f5a754beef5fe14ce093517325fb1d4db5456a8360cd0f6bd1
+  metadata.gz: 2f4a06a5ffbf83a415aa2a558c2fc8acbfc7c460668829846cb0a4f2f1f67cf6abbd3ec7fee728018a830b20323482dc65abfe7039501b7de43fd5ff668632a6
+  data.tar.gz: d9e9fc53560648903e04a32a0f881768caf0919f5f1ccf7eb8771286202c6cd746400e857c1842e0654cf50b4e656c76a2284b0206531865ccae1a7957344242

data/lib/jsonx.rb

@@ -26,12 +26,16 @@ class JSONx
 
 
   end
+  
+  alias to_jsonx to_s
+  alias to_xml to_s
 
   private
   
   def json_to_jsonx(h)
+    
     types = {
-      Hash:     ->(k, h){
+           Hash:  ->(k, h){
         type = 'json:object'
         [type, '', (k.empty? ? {} : {name: k}), 
           *h.map {|k2,v| types[v.class.to_s.to_sym].call(k2, v)}
@@ -39,14 +43,15 @@ class JSONx
       },
       FalseClass: ->(k, b){ ['json:boolean', 
                                 b.to_s, k.empty? ? {} : {name: k}]},
-      TrueClass:  ->(k, b){ ['json:boolean', 
+       TrueClass: ->(k, b){ ['json:boolean', 
                                 b.to_s, k.empty? ? {} : {name: k}]},
-      Fixnum:     ->(k, n){ ['json:number', n, k.empty? ? {} : {name: k}]},
-      NilClass:   ->(k, n){ ['json:null',  '', k.empty? ? {} : {name: k}]},
-      String:     ->(k, s){ ['json:string', s, k.empty? ? {} : {name: k}]},
-      Array:      ->(k, a){ 
+          Fixnum: ->(k, n){ ['json:number', n, k.empty? ? {} : {name: k}]},
+           Float: ->(k, n){ ['json:number', n, k.empty? ? {} : {name: k}]},
+        NilClass: ->(k, n){ ['json:null',  '', k.empty? ? {} : {name: k}]},
+          String: ->(k, s){ ['json:string', s, k.empty? ? {} : {name: k}]},
+           Array: ->(k, a){ 
         ['json:array', '', {name: k}, 
-          *a.map{|y| types[y.class.to_s.to_sym].call('', y.to_s)}
+          *a.map{|y| types[y.class.to_s.to_sym].call('', y)}
         ]
       }
     }
@@ -64,16 +69,15 @@ class JSONx
 
     types = {
       boolean: ->(e){ e.text.downcase == 'true' },
-      string: ->(e){e.text},
-      null: ->(e){nil},
-      number: ->(e){ s = e.text; s.to_i == s.to_f ? s.to_i : s.to_f},
-      array: ->(e){
+       string: ->(e){ e.text },
+         null: ->(e){ nil },
+       number: ->(e){ s = e.text; s.to_i == s.to_f ? s.to_i : s.to_f},
+        array: ->(e){
         e.elements.map {|x| types[x.name[/\w+$/].to_sym].call x }
       },
-      object: ->(e){
+       object: ->(e){
         e.elements.inject({}) do |r, x| 
-          name = x.name[/\w+$/]
-          r.merge(x.attributes[:name] => types[name.to_sym].call(x))
+          r.merge(x.attributes[:name] => types[x.name[/\w+$/].to_sym].call(x))
         end
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   oqIfSIJniA/rq0qM/Bhn+dpcKTcPQZtx+xFxMoZ25KJWupSNDOi8rtKUyPTNPrqu
   6j3yoPh2uEBjKA==
   -----END CERTIFICATE-----
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -42,7 +42,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.23
+        version: 1.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.23
+        version: 1.0.24
 description: 
 email: james@r0bertson.co.uk
 executables: []