parametric 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9d011c06f718caa4de95a60589cd858f693a98085a1962c8882e9213effd26
-  data.tar.gz: f759c6f6d051935a36d6a080b15602b628e4967b9b052d9ec3c5f912bf5a9b2e
+  metadata.gz: 3e5e99f35e7a900299c8ca79bf1edecc57a73209c8fab7c292ef5fff11f1e467
+  data.tar.gz: a28ad622475c98957079ee5a000c02f91b1df05c6f3fd9492bcdfd10a6751edc
 SHA512:
-  metadata.gz: 8f4867518fb179f164983751d2d6143a324eff9a961b91618e02677c74fe8e596f9f8d48a25582e2955c339f8128565b9cfaee95ca73f3a128a6b5861c5638aa
-  data.tar.gz: 87c47b5d47339b543027cff38b2f3a8a343ff27342ddfd1611fe0953c5b3169dee3064ac014a865382eebea0a87caab554312539f279648be43c66651c3a18b0
+  metadata.gz: 86bcd5fcd359872f8eab2b23206bd359b13ab1363d5b7d29eb8ef9899ed421605d3be10cbf4841d2791eeecf46de8292e63d97180c799ae2febb0c955b054c92
+  data.tar.gz: b767db9489841a70489812bd51be1bb167de8a87b9c91a4f21cb82201d7023ed5e0a05747d853332f936bb0d05f2e3be44d6ed64c6bd24820fb19da1902c708f

data/README.md

@@ -98,7 +98,7 @@ results.errors # => {"$.friends[0].name" => "is required"}
 You can optionally use an existing schema instance as a nested schema:
 
 ```ruby
-friends_schema = Parametric::Schema.new do
+FRIENDS_SCHEMA = Parametric::Schema.new do
   field(:friends).type(:array).schema do
     field(:name).type(:string).required
     field(:email).policy(:email)
@@ -109,10 +109,24 @@ person_schema = Parametric::Schema.new do
   field(:name).type(:string).required
   field(:age).type(:integer)
   # Nest friends_schema
-  field(:friends).type(:array).schema(friends_schema)
+  field(:friends).type(:array).schema(FRIENDS_SCHEMA)
 end
 ```
 
+Note that _person_schema_'s definition has access to `FRIENDS_SCHEMA` because it's a constant.
+Definition blocks are run in the context of the defining schema instance by default.
+
+To preserve the original block's context, declare two arguments in your block, the defining schema `sc` and options has.
+
+```ruby
+person_schema = Parametric::Schema.new do |sc, options|
+  # this block now preserves its context. Call `sc.field` to add fields to the current schema.
+  sc.field(:name).type(:string).required
+  sc.field(:age).type(:integer)
+  # We now have access to local variables
+  sc.field(:friends).type(:array).schema(friends_schema)
+end
+```
 ## Built-in policies
 
 Type coercions (the `type` method) and validations (the `validate` method) are all _policies_.

data/lib/parametric/schema.rb

@@ -182,7 +182,11 @@ module Parametric
     def apply!
       return if @applied
       definitions.each do |d|
-        self.instance_exec(options, &d)
+        if d.arity == 2 # pass schema instance and options, preserve block context
+          d.call(self, options)
+        else # run block in context of current instance
+          self.instance_exec(options, &d)
+        end
       end
       @applied = true
     end

data/lib/parametric/version.rb

@@ -1,3 +1,3 @@
 module Parametric
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/schema_spec.rb

@@ -237,6 +237,20 @@ describe Parametric::Schema do
     end
   end
 
+  context 'yielding schema to definition, to preserve outer context' do
+    it 'yields schema instance and options to definition block, can access outer context' do
+      schema1 = described_class.new do
+        field(:name).type(:string)
+      end
+      schema2 = described_class.new do |sc, _opts|
+        sc.field(:user).schema schema1
+      end
+
+      out = schema2.resolve(user: { name: 'Joe' }).output
+      expect(out[:user][:name]).to eq 'Joe'
+    end
+  end
+
   describe "#ignore" do
     it "ignores fields" do
       s1 = described_class.new.ignore(:title, :status) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parametric
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler