jimmy 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b145c1cfe4c89af444c4b4244125acf8cc7976d
-  data.tar.gz: 6cf8d0705db84c4da118d22f359b823eec1a294c
+  metadata.gz: f47c1f31b48652bdbb4943497e356fe9bc0dbf57
+  data.tar.gz: 0d3d60874cdd2a4cd28068ed570c424140add30d
 SHA512:
-  metadata.gz: b790bbe36cf3350c930f3f958d065b614a768b7ca6eaddbacfb97a5207981b5bfc8a5de0fd8eb7f5a8516f97385d7f8ee00ebf33ac695415da40d34f091a838d
-  data.tar.gz: 0062dea3b6fdf538e052d37cd7e25292bc19ce9eac5668bcbcee68f1f8111b55d90b4942e5068cb346e63a0c319dca9741368a5ff2dbf795ddaa36839902431e
+  metadata.gz: c02c4739d222fa9690046d3a6516a9cda574411de138e29f96a3a267fb627e8cfd34842f5a4a21727efdc5abcf719ece6438fbecc38307841767d2a8633fd952
+  data.tar.gz: cfd705bf01d1195764285f3c94ab3d334eec1e23853a5fc6eb3d5bd68bf73038592048debbea6ceee5af59436c5864b417f88dabee5a28cccb1881f33ce06798

data/lib/jimmy.rb

@@ -9,8 +9,12 @@ require_relative 'jimmy/symbol_array'
 
 require_relative 'jimmy/domain'
 require_relative 'jimmy/schema'
+require_relative 'jimmy/reference'
+require_relative 'jimmy/type_reference'
 require_relative 'jimmy/schema_creation'
 require_relative 'jimmy/schema_types'
 require_relative 'jimmy/schema_type'
 require_relative 'jimmy/combination'
+require_relative 'jimmy/link'
 require_relative 'jimmy/validation_error'
+require_relative 'jimmy/definitions'

data/lib/jimmy/definitions.rb

@@ -0,0 +1,23 @@
+module Jimmy
+  class Definitions < Hash
+    attr_reader :schema
+
+    def initialize(schema)
+      @schema = schema
+    end
+
+    def evaluate(&block)
+      instance_exec &block
+    end
+
+    def domain
+      schema.domain
+    end
+
+    def compile
+      map { |k, v| [k.to_s, v.compile] }.to_h
+    end
+
+    SchemaCreation.apply_to(self) { |schema, name| self[name] = schema }
+  end
+end

data/lib/jimmy/link.rb

@@ -0,0 +1,56 @@
+module Jimmy
+  class Link < Hash
+    attr_reader :schema
+
+    def initialize(schema, rel, href)
+      @schema = schema
+      merge! 'rel'  => rel.to_s,
+             'href' => href.to_s
+    end
+
+    def dsl
+      @dsl ||= DSL.new(self)
+    end
+
+    def schemas
+      @schemas ||= {}
+    end
+
+    def domain
+      schema.domain
+    end
+
+    def compile
+      merge schemas.map { |k, v| [(k ? "#{k}Schema" : 'schema'), v.compile] }.to_h
+    end
+
+    class DSL
+      attr_reader :link
+
+      def initialize(link)
+        @link = link
+      end
+
+      def domain
+        link.domain
+      end
+
+      def title(value)
+        link['title'] = value
+      end
+
+      def method(value)
+        link['method'] = value.to_s.upcase
+      end
+
+      def evaluate(&block)
+        instance_exec &block
+      end
+
+      def schema(type = nil, &block)
+        link.schemas[type] = Schema.new(:object, domain, {}, &block)
+      end
+
+    end
+  end
+end

data/lib/jimmy/reference.rb

@@ -0,0 +1,13 @@
+module Jimmy
+  class Reference
+    attr_reader :uri
+
+    def initialize(uri)
+      @uri = uri
+    end
+
+    def compile
+      {'$ref' => uri}
+    end
+  end
+end

data/lib/jimmy/schema.rb

@@ -28,6 +28,8 @@ module Jimmy
         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?
         dsl.evaluate compiler, hash if compiler
       end
     end
@@ -36,11 +38,21 @@ module Jimmy
       "#{domain.root}/#{name}.json#"
     end
 
+    def definitions
+      @definitions ||= Definitions.new(self)
+    end
+
+    def links
+      @links ||= []
+    end
+
+    def hash
+      @hash ||= {'$schema' => 'http://json-schema.org/draft-04/schema#'}
+    end
+
     def to_h
-      {'$schema' => 'http://json-schema.org/draft-04/schema#'}.tap do |hash|
-        hash['id'] = url if name
-        hash.merge! compile
-      end
+      hash['id'] = url if name
+      hash.merge! compile
     end
 
     def validate(data)
@@ -48,8 +60,6 @@ module Jimmy
       raise ValidationError.new(self, data, errors) unless errors.empty?
     end
 
-    private
-
     def initialize(type, domain, locals, *args, &block)
       @attrs  = {}
       @type   = type

data/lib/jimmy/schema_creation.rb

@@ -57,7 +57,7 @@ module Jimmy
         domain.autoload_type method
 
         if domain.types.key? method
-          return instance_exec method, *args, &SchemaCreation.handlers[self.class]
+          return instance_exec TypeReference.new(method), *args, &SchemaCreation.handlers[self.class]
         end
 
         super method, *args, &block

data/lib/jimmy/schema_type.rb

@@ -55,10 +55,6 @@ module Jimmy
         included_args.map { |arg| [arg.to_s.gsub(/_([a-z])/) { $1.upcase }, attrs[arg]] }.to_h
       end
 
-      def compile_schema(schema)
-        schema.is_a?(Symbol) ? {'$ref' => "/types/#{schema}.json#"} : schema.compile
-      end
-
       def include(*partial_names, **locals)
         partial_names.each do |name|
           with_locals locals do
@@ -67,6 +63,43 @@ module Jimmy
         end
       end
 
+      def set(**values)
+        values.each { |k, v| schema.hash[k.to_s] = v }
+      end
+
+      def definitions(&block)
+        schema.definitions.evaluate &block
+      end
+
+      def define(type, *args, &block)
+        definitions { __send__ type, *args, &block }
+      end
+
+      %i[title description default].each { |k| define_method(k) { |v| set k => v } }
+
+      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)
+        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
+      end
+
       private
 
       # Minimize collisions with local scope (hence the weird name __args)

data/lib/jimmy/schema_types/array.rb

@@ -19,9 +19,9 @@ module Jimmy
       hash.merge! camelize_attrs(%i[min_items max_items])
       items = attrs[:items] || []
       if items.length > 1
-        hash['items'] = {'anyOf' => items.map { |i| compile_schema i }}
+        hash['items'] = {'anyOf' => items.map(&:compile)}
       elsif items.length == 1
-        hash['items'] = compile_schema(items.first)
+        hash['items'] = items.first.compile
       end
     end
 

data/lib/jimmy/schema_types/object.rb

@@ -32,7 +32,7 @@ module Jimmy
               ['properties', key.to_s]
             end
         hash[collection] ||= {}
-        hash[collection][key] = compile_schema(value)
+        hash[collection][key] = value.compile
       end
       hash['required'] = (attrs[:required] || []).to_a
       hash['additionalProperties'] = !!attrs[:additional_properties]

data/lib/jimmy/type_reference.rb

@@ -0,0 +1,13 @@
+module Jimmy
+  class TypeReference < Reference
+    attr_reader :type
+
+    def initialize(type)
+      @type = type
+    end
+
+    def uri
+      "/types/#{type}.json#"
+    end
+  end
+end

data/lib/jimmy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -82,7 +82,10 @@ files:
 - jimmy.gemspec
 - lib/jimmy.rb
 - lib/jimmy/combination.rb
+- lib/jimmy/definitions.rb
 - lib/jimmy/domain.rb
+- lib/jimmy/link.rb
+- lib/jimmy/reference.rb
 - lib/jimmy/schema.rb
 - lib/jimmy/schema_creation.rb
 - lib/jimmy/schema_type.rb
@@ -95,6 +98,7 @@ files:
 - lib/jimmy/schema_types/object.rb
 - lib/jimmy/schema_types/string.rb
 - lib/jimmy/symbol_array.rb
+- lib/jimmy/type_reference.rb
 - lib/jimmy/validation_error.rb
 - lib/jimmy/version.rb
 homepage: https://github.com/orionvm/jimmy