jsonx 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8164d5e06dffd753cb2022ec4c03b66c612755e4
-  data.tar.gz: d8828773b49e32d62e54aa21399fe821c9c3c324
+  metadata.gz: 14b705397a992fbb32300cf56082f307159bc798
+  data.tar.gz: a7fbec75a3f41d5ffc50b70e814b391fa9a9b28b
 SHA512:
-  metadata.gz: 2f4a06a5ffbf83a415aa2a558c2fc8acbfc7c460668829846cb0a4f2f1f67cf6abbd3ec7fee728018a830b20323482dc65abfe7039501b7de43fd5ff668632a6
-  data.tar.gz: d9e9fc53560648903e04a32a0f881768caf0919f5f1ccf7eb8771286202c6cd746400e857c1842e0654cf50b4e656c76a2284b0206531865ccae1a7957344242
+  metadata.gz: fffc92a6508940d67bc81880e8672cb66714e623c84e1f8db2ce01fc11cb6a7769fa9cb575edd2d79720a11315bce89f45cb3d111e518a24539b409abf476c9a
+  data.tar.gz: 1e067e33e87eedb108db51a80a0b4a0b3842c536ebb5dad86c59772e8bcf0479c5fcf512b2003126cb3666c16e866b181c23821312067b87a7373577ca399bd2

data/lib/jsonx.rb

@@ -24,7 +24,6 @@ class JSONx
       json_to_jsonx obj # transform the hash
     end
 
-
   end
   
   alias to_jsonx to_s
@@ -35,31 +34,34 @@ class JSONx
   def json_to_jsonx(h)
     
     types = {
-           Hash:  ->(k, h){
+      
+            Hash:  ->(k, h) {
         type = 'json:object'
-        [type, '', (k.empty? ? {} : {name: k}), 
+        [type, (k.empty? ? {} : {name: k}), '',
           *h.map {|k2,v| types[v.class.to_s.to_sym].call(k2, v)}
         ]
       },
       FalseClass: ->(k, b){ ['json:boolean', 
-                                b.to_s, k.empty? ? {} : {name: k}]},
+                                k.empty? ? {} : {name: k}, b.to_s ]},
        TrueClass: ->(k, b){ ['json:boolean', 
-                                b.to_s, k.empty? ? {} : {name: k}]},
-          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}]},
+                                k.empty? ? {} : {name: k}, b.to_s]},
+          Fixnum: ->(k, n){ ['json:number', k.empty? ? {} : {name: k}, n]},
+           Float: ->(k, n){ ['json:number', k.empty? ? {} : {name: k}, n]},
+        NilClass: ->(k, n){ ['json:null',  k.empty? ? {} : {name: k}, '']},
+          String: ->(k, s){ ['json:string', k.empty? ? {} : {name: k}, s]},
            Array: ->(k, a){ 
-        ['json:array', '', {name: k}, 
+        ['json:array', {name: k}, '', 
           *a.map{|y| types[y.class.to_s.to_sym].call('', y)}
         ]
       }
+    
     }
 
     a =  types[:Hash].call '', h
     a[2] = {'xsi:schemaLocation' => "http://www.datapower.com/schemas/json jsonx.xsd",
     'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
     'xmlns:json' => "http://www.ibm.com/xmlns/prod/2009/jsonx"}
+    
     @to_s = Rexle.new(a).xml pretty: true    
   end
   
@@ -68,6 +70,7 @@ class JSONx
     doc = Rexle.new xml
 
     types = {
+      
       boolean: ->(e){ e.text.downcase == 'true' },
        string: ->(e){ e.text },
          null: ->(e){ nil },
@@ -81,6 +84,7 @@ class JSONx
         end
       }
     }
+    
     @to_json = types[:object].call(doc.root).to_json
     
   end
@@ -92,4 +96,4 @@ if __FILE__ == $0 then
 
   JSONx.new(ARGV[0]).to_s
 
-end
+end

metadata

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