jimmy 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b1cb2f2d598473a594b870040ab3b022caf9ca4
-  data.tar.gz: f283a986673ede842adf3f2e944410005fb87695
+  metadata.gz: fa577a95bf9548660e2354097ef6777df04ed9b0
+  data.tar.gz: 6f229b95ec4d14465d439a9e2fea644a0088d1a4
 SHA512:
-  metadata.gz: 49ecc7449f9195e2839429944dcf9aa7e42db540e3cac4cd201f350c72798d27601ba75beee800abb1c7c5c8790e11578703496715322ce3d99eb0d179a75d4f
-  data.tar.gz: 12f4c5e48b02c700cb815bed05cf89a5e299cec8ce22907e1345eb51159fbd1e6c5daede18b9d6484b7fcbb5df69bae29dfdf5105ee403a2616f95b85ad3d7c5
+  metadata.gz: 35a2afb25ad10e4bc5bdf15b509d3a48973c948fc42faf4e20a9035f7d2fa899080edb24ae9146fe779ed6f5419314206902648aa6c2c1b2aaafbde509214840
+  data.tar.gz: 06cfcc5aacaf030fac97db89d5ae976bf74828b195825e35b442663659cc379de74bfadf31c64c23ca7b7c13674e4b76b8abf0dedf15443846093febe96d2e18

data/lib/jimmy/combination.rb

@@ -2,6 +2,7 @@ require_relative 'schema_types'
 
 module Jimmy
   class Combination < Array
+    include SchemaCreation::Referencing
 
     attr_reader :condition, :schema
 

data/lib/jimmy/definitions.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 
 module Jimmy
   class Definitions
+    include SchemaCreation::Referencing
     extend Forwardable
     delegate %i[empty? key? map] => :@values
     

data/lib/jimmy/domain.rb

@@ -16,6 +16,7 @@ module Jimmy
       @types    = {}
       @partials = {}
       @import_paths = []
+      @uri_formatter = -> _, name { @root + "#{name}.json#" }
     end
 
     def domain
@@ -65,6 +66,14 @@ module Jimmy
       @types.each   { |name, schema| export_schema schema, path + 'types' + "#{name.to_s}.json" }
     end
 
+    def uri_for(name)
+      @uri_formatter.call root, name
+    end
+
+    def uri_format(&block)
+      @uri_formatter = block
+    end
+
     private
 
     def glob(base_path, only: '.', ignore: nil, &block)
@@ -80,6 +89,7 @@ module Jimmy
     end
 
     def load_schema_from_path(path, name)
+      @schema_name = name
       instance_eval(path.read, path.to_s).schema.tap do |schema|
         schema.name = name.to_s
         JSON::Validator.add_schema JSON::Schema.new(schema.to_h, nil)

data/lib/jimmy/link.rb

@@ -48,7 +48,7 @@ module Jimmy
       end
 
       def schema(type = nil, &block)
-        link.schemas[type] = Schema.new(:object, domain, {}, &block)
+        link.schemas[type] = Schema.new(:object, link.schema).tap { |s| s.setup &block }
       end
 
       def set(**values)

data/lib/jimmy/schema.rb

@@ -4,7 +4,8 @@ module Jimmy
     JSON_HYPER_SCHEMA_URI = 'http://json-schema.org/draft-04/hyper-schema#'
 
     attr_reader :dsl, :attrs, :domain, :type, :parent
-    attr_accessor :name
+    attr_writer :name
+    attr_accessor :nullable
 
     @argument_handlers = Hash.new { |hash, key| hash[key] = {} }
     
@@ -29,16 +30,21 @@ module Jimmy
         compiler ||= SchemaTypes.compilers[schema_class]
         schema_class = schema_class.superclass
       end
-      {'type' => type.to_s}.tap do |hash|
-        hash['definitions'] = definitions.compile unless definitions.empty?
-        hash['links']       = links.map &:compile unless links.empty?
-        hash.merge! data
-        dsl.evaluate compiler, hash if compiler
-      end
+      hash                = {}
+      hash['type']        = nullable ? ['null', type.to_s] : type.to_s
+      hash['definitions'] = definitions.compile unless definitions.empty?
+      hash['links']       = links.map &:compile unless links.empty?
+      hash.merge! data
+      dsl.evaluate compiler, hash if compiler
+      hash
+    end
+
+    def name
+      @name || (parent && parent.name)
     end
 
-    def url
-      "#{domain.root}/#{name}.json#"
+    def uri
+      domain.uri_for name
     end
 
     def definitions
@@ -63,22 +69,25 @@ module Jimmy
 
     def to_h
       {'$schema' => schema_uri}.tap do |h|
-        h['id'] = url if name
+        h['id'] = uri.to_s if name
         h.merge! compile
       end
     end
 
     def validate(data)
-      errors = JSON::Validator.fully_validate(JSON::Validator.schema_for_uri(url).schema, data, errors_as_objects: true)
+      errors = JSON::Validator.fully_validate(JSON::Validator.schema_for_uri(uri).schema, data, errors_as_objects: true)
       raise ValidationError.new(self, data, errors) unless errors.empty?
     end
 
-    def initialize(type, parent, locals, *args, &block)
+    def initialize(type, parent)
       @attrs  = {}
       @type   = type
       @domain = parent.domain
       @dsl    = SchemaTypes.dsls[type].new(self)
       @parent = parent if parent.is_a? self.class
+    end
+
+    def setup(*args, **locals, &block)
       args.each do |arg|
         case arg
           when Symbol

data/lib/jimmy/schema_creation.rb

@@ -29,6 +29,29 @@ module Jimmy
       %i[title description default].each { |k| define_method(k) { |v| set k => v } }
     end
 
+    module Referencing
+      def method_missing(name, *args, &block)
+        if schema.definitions[name]
+          ref *args, definition(name)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(name, *)
+        schema.definitions.key?(name) || super
+      end
+
+      def definition(id)
+        "/#{schema.name}#/definitions/#{id}"
+      end
+
+      def ref(*args, uri)
+        handler = SchemaCreation.handlers[self.class]
+        instance_exec(Reference.new(uri), *args, &handler) if handler
+      end
+    end
+
     module DefiningMethods
       include MetadataMethods
 
@@ -58,11 +81,10 @@ module Jimmy
             handler_args = handler && inner_args.shift(handler.arity - 1)
             child_schema = Schema.new(
                 method,
-                respond_to?(:schema) ? schema : domain,
-                locals,
-                *inner_args,
-                &inner_block
+                respond_to?(:schema) ? schema : domain
             )
+            child_schema.name = @schema_name if is_a? Domain
+            child_schema.setup *inner_args, **locals, &inner_block
             instance_exec child_schema, *handler_args, &handler if handler
             child_schema.dsl
           end

data/lib/jimmy/schema_type.rb

@@ -37,6 +37,7 @@ module Jimmy
 
     class DSL
       extend Forwardable
+      include SchemaCreation::Referencing
       include SchemaCreation::MetadataMethods
 
       attr_reader :schema
@@ -76,27 +77,14 @@ module Jimmy
         schema.data
       end
 
-      def ref(*args, uri)
-        handler = SchemaCreation.handlers[self.class]
-        instance_exec(Reference.new(uri), *args, &handler) if handler
-      end
-
       def link(rel_and_href, &block)
-        link = Link.new(self, *rel_and_href.first)
+        link = Link.new(schema, *rel_and_href.first)
         schema.links << link
         link.dsl.evaluate &block if block
       end
 
-      def method_missing(name, *args, &block)
-        if schema.definitions[name]
-          ref *args, "#/definitions/#{name}"
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(name, *)
-        schema.definitions.key?(name) || super
+      def nullable
+        schema.nullable = true
       end
 
       private

data/lib/jimmy/schema_types/object.rb

@@ -34,7 +34,8 @@ module Jimmy
         hash[collection] ||= {}
         hash[collection][key] = value.compile
       end
-      hash['required'] = (attrs[:required] || []).to_a
+      required = attrs[:required]
+      hash['required'] = required.to_a if required && !required.empty?
       hash['additionalProperties'] = !!attrs[:additional_properties]
     end
 

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema