jimmy 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390e7947ce86632067be15b72c4b5ba5f2c4173e
-  data.tar.gz: 6a0ab25b1dcb989e0134aa3c1c65cca1c20de984
+  metadata.gz: 34798f1a348146e90f429b56679534c18b4abd0b
+  data.tar.gz: 573d2b3df49c893a637e59add2c6072d8594abb0
 SHA512:
-  metadata.gz: 76b2bc0690eb1ea1efacec551d84a9ac5f36f4649f9492036f82a1d3b07b4dcb4cdb4fe667d61253f37c9ec5f616bff96ecda9dc9c87617b7ce72407586facb7
-  data.tar.gz: c88a9274de459bafca324b0ddb451d10dac429e3613f7745466d291ec83de34c54f781ca62945fd42c44b3bb0aa3e34dac560a8e18c8fc56b33958fd06474f32
+  metadata.gz: e84ef0ceaa4662559bfac862e456430e3b70cc6eb3fec016d4952b8fb99177795bd0eefa9f349cba509231d828ca50ff4a73523c678fa7467792be3f9180ff90
+  data.tar.gz: 9990a5a746d8ad34114832f4d5d83aa7fb42996eb3842a26cba58f789b2e0747b77ed5c8325c659c1452742eb12796d31705b39760b16c92f591a84abbafd50e

data/lib/jimmy/reference.rb

@@ -1,23 +1,27 @@
 module Jimmy
   class Reference
-    attr_reader :uri
+    include SchemaCreation::MetadataMethods
+    attr_reader :uri, :data
 
-    def initialize(uri, nullable = false)
+    def initialize(uri, nullable = false, *args, **opts, &block)
       @uri      = uri
       @nullable = nullable
+      @data     = {}
+      args.each { |arg| __send__ arg }
+      opts.each { |arg| __send__ *arg }
+      instance_exec &block if block
     end
 
     def compile
-      if nullable?
+      data.merge(nullable? ?
         {
             'anyOf' => [
                 {'type' => 'null'},
                 ref_hash
             ]
-        }
-      else
+        } :
         ref_hash
-      end
+      )
     end
 
     def nullable?

data/lib/jimmy/schema_creation.rb

@@ -32,7 +32,7 @@ module Jimmy
     module Referencing
       def method_missing(name, *args, &block)
         if schema.definitions[name]
-          ref *args, definition(name)
+          ref *args, definition(name), &block
         else
           super
         end
@@ -46,9 +46,9 @@ module Jimmy
         "/#{schema.name}#/definitions/#{id}"
       end
 
-      def ref(*args, uri)
+      def ref(*args, uri, &block)
         handler = SchemaCreation.handlers[self.class]
-        instance_exec(Reference.new(uri), *args, &handler) if handler
+        instance_exec(Reference.new(uri, &block), *args, &handler) if handler
       end
     end
 

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema