jimmy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e19cc9c83e2881cb849f0e706878b4768171fcf
-  data.tar.gz: b0700ff1202645eb217e13ea2ae65bdccc043f89
+  metadata.gz: 9a528bcad0fb42079b9497df793dd18e00303651
+  data.tar.gz: e33cea2e53c93a02f99e875b23ff7dda1c54bce3
 SHA512:
-  metadata.gz: 00dd76c52214222acca04a4bfe638f4a969c00484969c269d31b436c7cb77c53a2acda9cb61eefff14391d03899f0e12581beba3c3eb60775f0331ad4b13307c
-  data.tar.gz: 5ddeef3280aecdfd8598d027a0d3810dbca2440dce29fc90f599a78668e9f1a5f7310708fdc84a2246a41c09b437e8b740027a094a0b6eab4ae8b474d2570e12
+  metadata.gz: 8789d546ee5e8353f21393331ba1c00bb96d737e2dff463e93d874a895904993870a36d273709215fce5922ec79b53ad3b83e2f3c55f5269a37861be85664eae
+  data.tar.gz: 3d6505a992d4b0239fb737f540a1a30563a00ac62f88ac27a9ef5fcaa87f6bfdb68bd57382980907014516df65d77fefa88205bfcfd2bef63d5376a24682bb2a

data/lib/jimmy/combination.rb

@@ -3,12 +3,16 @@ require_relative 'schema_types'
 module Jimmy
   class Combination < Array
 
-    attr_reader :condition, :domain
+    attr_reader :condition, :schema
 
     # @param [Symbol] condition One of :one, :all, or :any
-    def initialize(condition, domain)
+    def initialize(condition, schema)
       @condition = condition
-      @domain = domain
+      @schema = schema
+    end
+
+    def domain
+      schema.domain
     end
 
     def evaluate(types_proc)
@@ -16,7 +20,11 @@ module Jimmy
     end
 
     def compile
-      {"#{condition}Of" => map(&:compile)}
+      data.merge "#{condition}Of" => map(&:compile)
+    end
+
+    def data
+      @data ||= {}
     end
 
     SchemaCreation.apply_to(self) { |schema| push schema }

data/lib/jimmy/definitions.rb

@@ -18,6 +18,10 @@ module Jimmy
       map { |k, v| [k.to_s, v.compile] }.to_h
     end
 
+    def data
+      schema.data
+    end
+
     def [](key)
       super || (schema.parent && schema.parent.definitions[key])
     end

data/lib/jimmy/schema_creation.rb

@@ -11,17 +11,17 @@ module Jimmy
         @handlers[klass] = handler
         %i(one all any).each do |condition|
           klass.__send__ :define_method, :"#{condition}_of" do |*args, &inner_block|
-            Combination.new(condition, domain).tap do |combo|
+            Combination.new(condition, schema).tap do |combo|
               combo.with_locals(locals) { combo.evaluate inner_block }
               instance_exec combo, *args, &handler
             end
           end
         end
-        klass.include MissingMethods
+        klass.include DefiningMethods
       end
     end
 
-    module MissingMethods
+    module DefiningMethods
 
       def locals
         @locals ||= {}
@@ -40,6 +40,12 @@ module Jimmy
         locals.key?(method) || reserved?(method, false) || super
       end
 
+      def set(**values)
+        values.each { |k, v| data[k.to_s] = v }
+      end
+
+      %i[title description default].each { |k| define_method(k) { |v| set k => v } }
+
       def method_missing(method, *args, &block)
         return locals[method] if locals.key?(method)
 

data/lib/jimmy/schema_type.rb

@@ -63,10 +63,6 @@ module Jimmy
         end
       end
 
-      def set(**values)
-        values.each { |k, v| schema.data[k.to_s] = v }
-      end
-
       def definitions(&block)
         schema.definitions.evaluate &block
       end
@@ -75,7 +71,9 @@ module Jimmy
         definitions { __send__ type, *args, &block }
       end
 
-      %i[title description default].each { |k| define_method(k) { |v| set k => v } }
+      def data
+        schema.data
+      end
 
       def ref(*args, uri)
         handler = SchemaCreation.handlers[self.class]

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Neil E. Pearson