obf 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa4899ce714401f07c3efb5de7b5f852ed973e8
-  data.tar.gz: 5531558fe14f1d255b15188e47cf47147e934278
+  metadata.gz: 44736a323f88c6996ad1b669f4b6f9df4ee8a51a
+  data.tar.gz: 4432293b3a3197d5f0542e576a673f09168f88b2
 SHA512:
-  metadata.gz: 1a757ced5cd7b21d16acca423951a43e16f879a02219e791689e68c58aeb470d5c18af3e6bdebe19f7c5bcbed33e9674dd2b710d9b3cffb621ce3485ab9242db
-  data.tar.gz: 63fa5a8561e226e320fb6566867d2e1643cc53cb2de793cefe444223af1605e7141393f8f72d81297f0c2dc14bc985dc68012675c0d85333a124afb1665f807a
+  metadata.gz: 3669f2ae9bc8864dd926c614a6d5d090b4056a3e013b08013a3ffdbc845e1c127fe92e6b11c4d675a12d1cc8c12d52c4fa570a6fdb8215080202d7d2146ade5f
+  data.tar.gz: 6376f5ef17a123d6186608310eec61144fcd92e62570b74815b7468b2aabf0afbcdc63dbcf447626438be7f31016400836509b156c2756e6d5ee57044238ace2

data/lib/obf/utils.rb

@@ -39,10 +39,14 @@ module OBF::Utils
     else
       json = JSON.parse(File.read(path)) rescue nil
       if json
-        if json['format'] && json['format'].match(/^open-board-/)
-          return :obf
+        if json.is_a?(Hash)
+          if json['format'] && json['format'].match(/^open-board-/)
+            return :obf
+          end
+          return :json_not_obf
+        else
+          return :json_not_object
         end
-        return :unknown
       end
       
       begin

data/lib/obf/validator.rb

@@ -44,7 +44,8 @@ module OBF
       elsif type == :obz
         validate_obz(path)
       else
-        {
+        hint = 
+        res = {
           :filename => fn,
           :filesize => filesize,
           :valid => false,
@@ -53,9 +54,25 @@ module OBF
             'type' => 'valid_file',
             'description' => 'valid .obf or .obz file',
             'valid' => false,
-            'error' => 'file must be an .obf JSON file or a .obz zip package'
+            'error' => 'file must be a single .obf JSON file or a .obz zip package'
           }]
         }
+        if type == :json_not_obf
+          res[:results] << {
+            'type' => 'json_parse',
+            'description' => 'valid JSON object',
+            'valid' => false,
+            'error' => 'file contains a JSON object but it does not appear to be an OBF-formatted object'
+          }
+        elsif type == :json_not_object
+          res[:results] << {
+            'type' => 'json_parse',
+            'description' => 'valid JSON object',
+            'valid' => false,
+            'error' => 'file contains valid JSON, but a type other than Object. OBF files do not support arrays, strings, etc. as the root object'
+          }
+        end
+        res
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json