jimmy 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f47c1f31b48652bdbb4943497e356fe9bc0dbf57
-  data.tar.gz: 0d3d60874cdd2a4cd28068ed570c424140add30d
+  metadata.gz: 8e19cc9c83e2881cb849f0e706878b4768171fcf
+  data.tar.gz: b0700ff1202645eb217e13ea2ae65bdccc043f89
 SHA512:
-  metadata.gz: c02c4739d222fa9690046d3a6516a9cda574411de138e29f96a3a267fb627e8cfd34842f5a4a21727efdc5abcf719ece6438fbecc38307841767d2a8633fd952
-  data.tar.gz: cfd705bf01d1195764285f3c94ab3d334eec1e23853a5fc6eb3d5bd68bf73038592048debbea6ceee5af59436c5864b417f88dabee5a28cccb1881f33ce06798
+  metadata.gz: 00dd76c52214222acca04a4bfe638f4a969c00484969c269d31b436c7cb77c53a2acda9cb61eefff14391d03899f0e12581beba3c3eb60775f0331ad4b13307c
+  data.tar.gz: 5ddeef3280aecdfd8598d027a0d3810dbca2440dce29fc90f599a78668e9f1a5f7310708fdc84a2246a41c09b437e8b740027a094a0b6eab4ae8b474d2570e12

data/lib/jimmy/definitions.rb

@@ -18,6 +18,10 @@ module Jimmy
       map { |k, v| [k.to_s, v.compile] }.to_h
     end
 
+    def [](key)
+      super || (schema.parent && schema.parent.definitions[key])
+    end
+
     SchemaCreation.apply_to(self) { |schema, name| self[name] = schema }
   end
 end

data/lib/jimmy/link.rb

@@ -51,6 +51,9 @@ module Jimmy
         link.schemas[type] = Schema.new(:object, domain, {}, &block)
       end
 
+      def set(**values)
+        values.each { |k, v| link[k.to_s] = v }
+      end
     end
   end
 end

data/lib/jimmy/schema.rb

@@ -1,7 +1,9 @@
 module Jimmy
   class Schema
+    JSON_SCHEMA_URI       = 'http://json-schema.org/draft-04/schema#'
+    JSON_HYPER_SCHEMA_URI = 'http://json-schema.org/draft-04/hyper-schema#'
 
-    attr_reader :dsl, :attrs, :domain, :type
+    attr_reader :dsl, :attrs, :domain, :type, :parent
     attr_accessor :name
 
     @argument_handlers = Hash.new { |hash, key| hash[key] = {} }
@@ -46,13 +48,24 @@ module Jimmy
       @links ||= []
     end
 
-    def hash
-      @hash ||= {'$schema' => 'http://json-schema.org/draft-04/schema#'}
+    def data
+      @data ||= {}
+    end
+
+    def hyper?
+      links.any?
+    end
+
+    def schema_uri
+      hyper? ? JSON_HYPER_SCHEMA_URI : JSON_SCHEMA_URI
     end
 
     def to_h
-      hash['id'] = url if name
-      hash.merge! compile
+      {'$schema' => schema_uri}.tap do |h|
+        h.merge! data
+        h['id'] = url if name
+        h.merge! compile
+      end
     end
 
     def validate(data)
@@ -60,11 +73,12 @@ module Jimmy
       raise ValidationError.new(self, data, errors) unless errors.empty?
     end
 
-    def initialize(type, domain, locals, *args, &block)
+    def initialize(type, parent, locals, *args, &block)
       @attrs  = {}
       @type   = type
-      @domain = domain
+      @domain = parent.domain
       @dsl    = SchemaTypes.dsls[type].new(self)
+      @parent = parent if parent.is_a? self.class
       args.each do |arg|
         case arg
           when Symbol

data/lib/jimmy/schema_creation.rb

@@ -47,9 +47,15 @@ module Jimmy
           handler = SchemaCreation.handlers[self.class]
           self.class.__send__ :define_method, method do |*inner_args, &inner_block|
             handler_args = handler && inner_args.shift(handler.arity - 1)
-            schema = Schema.new(method, domain, locals, *inner_args, &inner_block)
-            instance_exec schema, *handler_args, &handler if handler
-            schema.dsl
+            child_schema = Schema.new(
+                method,
+                respond_to?(:schema) ? schema : domain,
+                locals,
+                *inner_args,
+                &inner_block
+            )
+            instance_exec child_schema, *handler_args, &handler if handler
+            child_schema.dsl
           end
           return __send__ method, *args, &block
         end

data/lib/jimmy/schema_type.rb

@@ -64,7 +64,7 @@ module Jimmy
       end
 
       def set(**values)
-        values.each { |k, v| schema.hash[k.to_s] = v }
+        values.each { |k, v| schema.data[k.to_s] = v }
       end
 
       def definitions(&block)

data/lib/jimmy/schema_types/string.rb

@@ -5,6 +5,15 @@ module Jimmy
     trait :min_length
     trait :max_length
     trait(:pattern) { |regex| attrs[:pattern] = regex.is_a?(Regexp) ? regex.inspect.gsub(%r`^/|/[a-z]*$`, '') : regex }
+    trait(:format) { |value| attrs[:format] = value.to_s.gsub('_', '-') }
+    %i[
+      date_time
+      email
+      hostname
+      ipv4
+      ipv6
+      uri
+    ].each { |k| trait(k) { format k } }
     trait(Regexp) { |regex| pattern regex }
     trait Range do |value|
       variation = value.exclude_end? ? 1 : 0
@@ -20,7 +29,7 @@ module Jimmy
     trait(Array) { |value| attrs[:enum] = value.map(&:to_s) }
 
     compile do |hash|
-      hash.merge! camelize_attrs(%i[min_length max_length pattern enum])
+      hash.merge! camelize_attrs(%i[min_length max_length pattern enum format])
     end
 
   end

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Neil E. Pearson