json_schema_tools 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJhOGY1MWU1MjhmMjAwMjg2YmNlMzM4MWY0ZjI0YzE1ZDkxYjAxZQ==
+    MGQwMzVlNmIwYjkxYjhkY2UxNGVjMTdhMGNmMDRhMjJkNmU3MmUwZQ==
   data.tar.gz: !binary |-
-    NTY2N2ZmNDg4MDc0NzUzYmFmNzYyODg1MjAwMjA1MzcyNjBjMDZmNg==
+    Yjc3N2MyM2NjMDYzOGU2YTRlM2ZlNTkyMmNmOTU4ZGI3MmYyOTU4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MWI1OGE0MTdlNjM3NDYwMGZjMjc5MThhNjRmMjAwNTJjNWViMGJiNThhMGFh
-    M2ZjM2YxMWYxOTk0Y2ViMTU4YjJkMjE4Y2JmY2M3NjQzMzZjOGRiMTNjODg0
-    MmE3MDM1NzZmNmU0NzEwMjE3Y2MyYjcwZDQ0NDljN2ZiYzE5NDI=
+    Zjk2ZDQwNDNiYzM5NTRkYWY2NzcyYTMwNWQzZGI3YTc4ZjkzNTQxNTJhMjAw
+    MDA2YWQxN2QwNmU0NzZmZDJhMzI2ZDBlNzQ2ZDE4OWI1YTE4YjA2YjFlNzll
+    OTcxNWE3NjkwYWU4ZWRjY2ZkYzQwODIxMjcxOWEzOWQwMTUyNGI=
   data.tar.gz: !binary |-
-    YWZlMDgzMDFjZDI1M2IzNDQwNDI5ZTM5MTkzYjg3NzNkMGQwYTExNmZmYzQz
-    ZTdhMDQ4ZmUwMTU2Njg3YTQ4MzI5ZGMwY2VjM2ZhNGVjYzFlNDYyYTA2ZDZk
-    MmE4ZjE3ZDA3ZWM1MThhZDFmOTFmZWI0NmQ2NWI3OTVlNDUzMDc=
+    Y2Y3NmZjZmY0Y2Q4NGVmNTRmYWMyMGQ4NzMyN2E4OTBmZDUyNmE3MTllM2Q3
+    MzUyYmIzMWQwNjI5ODk2ZjFjOWY3OWZkYjdiNmQyNWY1ZjRjMmEwNjI0Njc0
+    N2ViNWUyMGY0YWM5YzY3YzUzYmZhZmI3NDlmYTc3YThhYjEyZTg=

data/lib/schema_tools/modules/hash.rb

@@ -28,7 +28,8 @@ module SchemaTools
       # @param [Hash{Symbol=>Mixed}] opts additional options
       # @options opts [String|Symbol] :class_name used as hash key. Should be
       # a lowercase underscored name and it MUST have an existing schema file.
-      # Use it to override the default, which is obj.class.name
+      # Use it to override the default, which is obj.class.name. Only used for
+      # top-level object NOT nested objects
       # @options opts [Array<String>] :fields to return. If not set all schema
       # properties are used.
       # @options opts [String] :path of the schema files overriding global one
@@ -71,8 +72,10 @@ module SchemaTools
         schema['properties'].each do |field, prop|
           next if fields && !fields.include?(field)
           if prop['type'] == 'array'
+            opts.delete(:class_name)
             data[field] = parse_list(obj, field, prop, opts)
           elsif prop['type'] == 'object' # a singular related object
+            opts.delete(:class_name)
             data[field] = parse_object(obj, field, prop, opts)
           else # a simple field is only added if the object knows it
             data[field] = obj.send(field) if obj.respond_to?(field)
@@ -142,6 +145,11 @@ module SchemaTools
         if obj.respond_to?( field ) && rel_obj = obj.send( field )
           if prop['properties'] && prop['properties']['$ref']
             res = from_schema(rel_obj, opts)
+          elsif prop['oneOf']
+            # auto-detects which schema to use depending on the rel_object type
+            # Simpler than detecting the object type or $ref to use inside the
+            # oneOf array
+            res = from_schema(rel_obj, opts)
           else
             # NO recursion directly get values from related object. Does
             # NOT allow deeper nesting so you MUST define an own schema to be save

data/lib/schema_tools/modules/read.rb

@@ -42,6 +42,12 @@ module SchemaTools
         elsif path_or_schema.is_a?(::String) || path_or_schema.nil?
           path       = path_or_schema
           file_path  = File.join(path || SchemaTools.schema_path, "#{schema_name}.json")
+          unless File.exist?(file_path)
+            # check if file exists else try to find first real path in sub-dirs
+            recursive_search = Dir.glob( File.join(SchemaTools.schema_path, '**/*', "#{schema_name}.json"))[0]
+            # use only if we found something, else keep path which will throw error on file.open later
+            file_path = recursive_search || file_path
+          end
         else
           raise ArgumentError, 'Second parameter must be a path or a schema!'
         end

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json