json_world 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5ebf1266b4198d59b126441e76219cd92d43ea
-  data.tar.gz: dc88a29966be7f7bd88a1160edc7a2f76f7c22a3
+  metadata.gz: a5aef48228e4c1d49717c2f834412ea45ddc98ae
+  data.tar.gz: c1ce06838c98f6a6b18c4dbf834619879b44eb7f
 SHA512:
-  metadata.gz: f81ada767ec7fbb16a19ba47243ed0c4bc9873d228af25469bbca0681a7f1002e5c396e70dca21db6ae0ccf8eeb89e4739791a51ca3bfd94585b53b0b79d68d3
-  data.tar.gz: 271631c6fce118d0cfec526c0247d23667430a8dd110ed591181629fe10dbb8e872a1d24001d7390d462720c09bfdbf15b6ddd15ad71ef24fe72d5103de9fc92
+  metadata.gz: 3db2e0a659ba8b9c559e8862eab6a88f76de7a87f49961743b9b19d54b7eef854d15a52acaae6c5da9220345f1a2d0cc7855fcf8c34744d948ab7c76d3a3bdea
+  data.tar.gz: 70522ff96af036d7ab5b20c6e830173e3e4ca68613ce70bce2d5ef7532148738401a184a72f2fce98daecb18d6595c2f425fb344115dd85c5f589b7515505ed2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
+- Support :links option on embedding other resource as property
+
 ## 0.1.4
 - Rename as_json_schema_without_link with as_json_schema_without_links
 

data/lib/json_world/property_definition.rb

@@ -14,18 +14,26 @@ module JsonWorld
 
     # @return [Hash{Symbol => Object}]
     def as_json_schema
-      @options[:type].try(:as_json_schema_without_links) || {
-        description: description,
-        example: example,
-        format: format_type,
-        items: items_as_json_schema,
-        pattern: pattern_in_string,
-        properties: properties_as_json_schema,
-        required: required_property_names,
-        type: type,
-        uniqueItems: unique_flag,
-      }.reject do |_key, value|
-        value.nil? || value.respond_to?(:empty?) && value.empty?
+      if has_json_schema_compatible_type?
+        if @options[:links]
+          @options[:type].as_json_schema
+        else
+          @options[:type].as_json_schema_without_links
+        end
+      else
+        {
+          description: description,
+          example: example,
+          format: format_type,
+          items: items_as_json_schema,
+          pattern: pattern_in_string,
+          properties: properties_as_json_schema,
+          required: required_property_names,
+          type: type,
+          uniqueItems: unique_flag,
+        }.reject do |_key, value|
+          value.nil? || value.respond_to?(:empty?) && value.empty?
+        end
       end
     end
 
@@ -59,6 +67,11 @@ module JsonWorld
       end
     end
 
+    # @return [false, true]
+    def has_json_schema_compatible_type?
+      @options[:type].respond_to?(:as_json_schema)
+    end
+
     # @note Tuple validation is not supported yet
     # @return [Array<Hash>, nil]
     def items_as_json_schema

data/lib/json_world/version.rb

@@ -1,3 +1,3 @@
 module JsonWorld
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_world
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides DSL to define JSON Schema representation of your class.