jimmy 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc78f64835960e1b8d8724bee79adc324f710bb7
-  data.tar.gz: 647dab7d9050d3ec4642b55a2cbc2211bfac1ab9
+  metadata.gz: bd8199acb7af5c492da8d005e07eac93636d5890
+  data.tar.gz: b318741c9a421485ce660f3e9c94b7682eccad89
 SHA512:
-  metadata.gz: d8f71fc6b11b45bca65a0f599ef0cfa161d43d0c93e208fa47ec42b840c9584a76a7f358b4063e3901bcc51e65c3b8db948e86d3b336363ec87be098db6cdc26
-  data.tar.gz: c11234863a1c7f3ccc8180c3e4f55b9d88844c648f34efa06aef0d30a31869aae7c21a345a1fcd0df7a0c3463cd71880f09863ce18cc4460dc35c0e0caafa46c
+  metadata.gz: b1e02737e075e1251d217fe3c89a33242fc8fb766bd69f9d68f40b32dbdf590680a1796ca7ffa132500427b0fbba749943259bd30a4bd3c2df88a6f5e4ebcbf0
+  data.tar.gz: c3e3de0769a8931338a1d185675396e4776da762a8da6e091adf40b011219d47c71a0eeb1f4e3fc33126ca77d47ac3912ec953d7250ae2b675d92d12f2509348

data/README.md

@@ -77,7 +77,7 @@ object do
   array :points_of_interest do
     object do
       string :title, 3..150
-      integer :popularity, 1..5
+      integer :popularity, [1, 3, 5, 7]
       geopoint :location
       boolean :featured
       require :title
@@ -123,8 +123,7 @@ Here's the full result (though we expect you get the gist of it by now):
           },
           "popularity": {
             "type": "integer",
-            "minimum": 1,
-            "maximum": 5
+            "enum": [1, 3, 5, 7]
           },
           "location": {
             "$ref": "/types/geopoint#"

data/lib/jimmy/schema.rb

@@ -50,7 +50,7 @@ module Jimmy
 
     private
 
-    def initialize(type, domain, *args, &block)
+    def initialize(type, domain, locals, *args, &block)
       @attrs  = {}
       @type   = type
       @domain = domain
@@ -67,7 +67,13 @@ module Jimmy
             dsl.evaluate handler, arg
         end
       end
-      dsl.evaluate block if block
+      if block
+        if dsl.respond_to? :with_locals
+          dsl.with_locals(locals) { dsl.evaluate block }
+        else
+          dsl.evaluate block
+        end
+      end
     end
 
   end

data/lib/jimmy/schema_creation.rb

@@ -12,27 +12,43 @@ module Jimmy
         %i(one all any).each do |condition|
           klass.__send__ :define_method, :"#{condition}_of" do |*args, &inner_block|
             Combination.new(condition, domain).tap do |combo|
-              combo.evaluate inner_block
+              combo.with_locals(locals) { combo.evaluate inner_block }
               instance_exec combo, *args, &handler
             end
           end
         end
-        klass.include ResolveMissingToCustomType
+        klass.include MissingMethods
       end
     end
 
-    module ResolveMissingToCustomType
+    module MissingMethods
+
+      def locals
+        @locals ||= {}
+      end
+
+      def with_locals(**locals)
+        # TODO: validate locals
+        original = locals
+        @locals = original.merge(locals)
+        yield.tap { @locals = original }
+      end
 
       def respond_to_missing?(method, *)
-        SchemaTypes.key?(method) || domain.types.key?(method) || super
+        locals.key?(method) ||
+            SchemaTypes.key?(method) ||
+            domain.types.key?(method) ||
+            super
       end
 
       def method_missing(method, *args, &block)
+        return locals[method] if locals.key?(method)
+
         if SchemaTypes.key? method
           handler = SchemaCreation.handlers[self.class]
           self.class.__send__ :define_method, method do |*inner_args, &inner_block|
             handler_args = handler && inner_args.shift(handler.arity - 1)
-            schema = Schema.new(method, domain, *inner_args, &inner_block)
+            schema = Schema.new(method, domain, locals, *inner_args, &inner_block)
             instance_exec schema, *handler_args, &handler if handler
             schema.dsl
           end

data/lib/jimmy/schema_type.rb

@@ -11,15 +11,17 @@ module Jimmy
         SchemaTypes.register self
       end
 
-      def trait(name_or_type, &handler)
-        case name_or_type
-          when Symbol
-            handler ||= proc { |value| attrs[name_or_type] = value }
-            self::DSL.__send__ :define_method, name_or_type, handler
-          when Class
-            Schema.set_argument_handler self, name_or_type, handler
-          else
-            raise 'Trait must be a Symbol or a Class'
+      def trait(*args, &handler)
+        args.each do |name_or_type|
+          case name_or_type
+            when Symbol
+              handler ||= proc { |value| attrs[name_or_type] = value }
+              self::DSL.__send__ :define_method, name_or_type, handler
+            when Class
+              Schema.set_argument_handler self, name_or_type, handler
+            else
+              raise 'Trait must be a Symbol or a Class'
+          end
         end
       end
 
@@ -57,8 +59,12 @@ module Jimmy
         schema.is_a?(Symbol) ? {'$ref' => "/types/#{schema}.json#"} : schema.compile
       end
 
-      def include(*partial_names)
-        partial_names.each { |name| instance_eval *domain.partials[name.to_s] }
+      def include(*partial_names, **locals)
+        partial_names.each do |name|
+          with_locals locals do
+            instance_eval *domain.partials[name.to_s]
+          end
+        end
       end
 
     end

data/lib/jimmy/schema_types/number.rb

@@ -9,7 +9,11 @@ module Jimmy
     trait(:<=) { |value| maximum value; attrs[:exclusive_maximum] = nil; self }
     trait(:>) { |value| minimum value; attrs[:exclusive_minimum] = true; self }
     trait(:>=) { |value| minimum value; attrs[:exclusive_minimum] = nil; self }
-    trait(Numeric) { |value| minimum value; maximum value }
+    trait(:enum) do |*values|
+      attrs[:enum] ||= []
+      attrs[:enum] |= values.flatten
+    end
+    trait(Numeric, Array) { |value| enum value }
     trait(Range) do |range|
       if range.first <= range.last
         minimum range.first
@@ -23,7 +27,7 @@ module Jimmy
     end
 
     compile do |hash|
-      hash.merge! camelize_attrs(%i[minimum maximum exclusive_minimum exclusive_maximum multiple_of])
+      hash.merge! camelize_attrs(%i[minimum maximum exclusive_minimum exclusive_maximum multiple_of enum])
     end
 
   end

data/lib/jimmy/version.rb

@@ -1,3 +1,3 @@
 module Jimmy
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

metadata

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