jimmy 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9a33ee9ed0b7f72d8f48754308e5d9bd61f33a4
-  data.tar.gz: f3c83b5489a5b51131f416ded556ccf89c88cded
+  metadata.gz: 0b29b82478061d92d1ea69b8f5034e6f7ff4e90f
+  data.tar.gz: 2dc4b0bfd4c6f612d08b79ba8f80f298bb0e1b71
 SHA512:
-  metadata.gz: 3158fb0245caadaa29bc765927db8ee8f6c4a1bf4663637777657b099a3b924be08ea925c02cda4ecc8ee28ab9bd0771cecf6d68f3d6689741afba0a81450c8a
-  data.tar.gz: f5466c57c1e8482a4760931586b1ded7efc499ade5499b3ba0e9c5c73304cfdac45f875f13a34598c47d9e2abf4bbbc6e65b86a5594259f6a90b182a38e5f351
+  metadata.gz: 9f99382d8d00e349241ef5f0aa136b5d485b8a275ec19266faf820fbd0d53850fddc0ec590b4319f05df9eb651db0d6e853bffb95ec8ab84d1aa12f87d44b6a9
+  data.tar.gz: 58ea95faddb76c8adbc35825236014646bd3085f2ce769ce056890716ae7d3c041d212561f7d58b012203ac51e843937f3c79573ddb9a68b8d7180e9a883b442

data/lib/jimmy/link.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Jimmy
   class Link < Hash
     attr_reader :schema
@@ -24,6 +26,26 @@ module Jimmy
       merge schemas.map { |k, v| [(k ? "#{k}Schema" : 'schema'), v.compile] }.to_h
     end
 
+    def schema_creator
+      @schema_creator ||= SchemaCreator.new(self)
+    end
+
+    class SchemaCreator < Hash
+      include SchemaCreation::Referencing
+      extend Forwardable
+      delegate [:schema, :domain] => :@link
+
+      def initialize(link)
+        @link = link
+      end
+
+      def parent
+        schema
+      end
+
+      SchemaCreation.apply_to(self) { |schema, prefix| @link.schemas[prefix] = schema }
+    end
+
     class DSL
       attr_reader :link
 
@@ -47,12 +69,20 @@ module Jimmy
         instance_exec &block
       end
 
-      def schema(type = :object, prefix = nil, &block)
-        link.schemas[prefix] = Schema.new(type, link.schema).tap { |s| s.setup &block }
+      def schema(*args, prefix: nil, **opts, &block)
+        if args.empty? && opts.any?
+          args = opts.shift
+          type = args.shift
+        else
+          type = args.shift || :object
+        end
+        args.unshift type, prefix
+        args << opts if opts.any?
+        link.schema_creator.__send__ *args, &block
       end
 
-      def target_schema(type = :object, &block)
-        schema type, :target, &block
+      def target_schema(*args, **opts, &block)
+        schema *args, **opts.merge(prefix: :target), &block
       end
 
       def set(**values)

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

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