jimmy 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f652069943cf8ded7610304ef3053d0260c3fdf8
-  data.tar.gz: fa7c2a51e59cf67867ece774924d5bb0b7a81553
+  metadata.gz: 390e7947ce86632067be15b72c4b5ba5f2c4173e
+  data.tar.gz: 6a0ab25b1dcb989e0134aa3c1c65cca1c20de984
 SHA512:
-  metadata.gz: a8565852915935b93e0b184457e54b4f50257fb9dab2e615ad0a8ec582497bf3332a9df977b46dedca74c050c84bb4d2950a3d10b8314428d59eccbf7f7a9c7a
-  data.tar.gz: 7b95a43c73126cb6cf7a749b566f56108b7487931b74e7674e3629ac2ceef954c050ec3126262b843cc579b67a66909fb07706d5c6bd3aa55053bd55a865ca0e
+  metadata.gz: 76b2bc0690eb1ea1efacec551d84a9ac5f36f4649f9492036f82a1d3b07b4dcb4cdb4fe667d61253f37c9ec5f616bff96ecda9dc9c87617b7ce72407586facb7
+  data.tar.gz: c88a9274de459bafca324b0ddb451d10dac429e3613f7745466d291ec83de34c54f781ca62945fd42c44b3bb0aa3e34dac560a8e18c8fc56b33958fd06474f32

data/jimmy.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'diff_matcher', '~> 2.7'
 end

data/lib/jimmy/reference.rb

@@ -2,11 +2,31 @@ module Jimmy
   class Reference
     attr_reader :uri
 
-    def initialize(uri)
-      @uri = uri
+    def initialize(uri, nullable = false)
+      @uri      = uri
+      @nullable = nullable
     end
 
     def compile
+      if nullable?
+        {
+            'anyOf' => [
+                {'type' => 'null'},
+                ref_hash
+            ]
+        }
+      else
+        ref_hash
+      end
+    end
+
+    def nullable?
+      @nullable
+    end
+
+    private
+
+    def ref_hash
       {'$ref' => uri}
     end
   end

data/lib/jimmy/schema_creation.rb

@@ -94,7 +94,7 @@ module Jimmy
         domain.autoload_type method
 
         if domain.types.key? method
-          return instance_exec TypeReference.new(method), *args, &SchemaCreation.handlers[self.class]
+          return instance_exec TypeReference.new(method, args.include?(:nullable)), *args, &SchemaCreation.handlers[self.class]
         end
 
         if kind_of_array?(method)

data/lib/jimmy/type_reference.rb

@@ -2,12 +2,9 @@ module Jimmy
   class TypeReference < Reference
     attr_reader :type
 
-    def initialize(type)
+    def initialize(type, *args)
       @type = type
-    end
-
-    def uri
-      "/types/#{type}.json#"
+      super "/types/#{type}.json#", *args
     end
   end
 end

data/lib/jimmy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: diff_matcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 description: Jimmy makes it a snap to compose detailed JSON schema documents.
 email:
 - neil.pearson@orionvm.com
@@ -121,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Jimmy the JSON Schema DSL