jimmy 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd8199acb7af5c492da8d005e07eac93636d5890
-  data.tar.gz: b318741c9a421485ce660f3e9c94b7682eccad89
+  metadata.gz: 3b145c1cfe4c89af444c4b4244125acf8cc7976d
+  data.tar.gz: 6cf8d0705db84c4da118d22f359b823eec1a294c
 SHA512:
-  metadata.gz: b1e02737e075e1251d217fe3c89a33242fc8fb766bd69f9d68f40b32dbdf590680a1796ca7ffa132500427b0fbba749943259bd30a4bd3c2df88a6f5e4ebcbf0
-  data.tar.gz: c3e3de0769a8931338a1d185675396e4776da762a8da6e091adf40b011219d47c71a0eeb1f4e3fc33126ca77d47ac3912ec953d7250ae2b675d92d12f2509348
+  metadata.gz: b790bbe36cf3350c930f3f958d065b614a768b7ca6eaddbacfb97a5207981b5bfc8a5de0fd8eb7f5a8516f97385d7f8ee00ebf33ac695415da40d34f091a838d
+  data.tar.gz: 0062dea3b6fdf538e052d37cd7e25292bc19ce9eac5668bcbcee68f1f8111b55d90b4942e5068cb346e63a0c319dca9741368a5ff2dbf795ddaa36839902431e

data/lib/jimmy/schema_creation.rb

@@ -28,17 +28,16 @@ module Jimmy
       end
 
       def with_locals(**locals)
-        # TODO: validate locals
+        locals.each_key do |key|
+          raise "Local '#{key}' conflicts with an existing DSL method" if reserved? key
+        end
         original = locals
         @locals = original.merge(locals)
         yield.tap { @locals = original }
       end
 
       def respond_to_missing?(method, *)
-        locals.key?(method) ||
-            SchemaTypes.key?(method) ||
-            domain.types.key?(method) ||
-            super
+        locals.key?(method) || reserved?(method, false) || super
       end
 
       def method_missing(method, *args, &block)
@@ -64,6 +63,13 @@ module Jimmy
         super method, *args, &block
       end
 
+      private
+
+      def reserved?(key, all = true)
+        domain.autoload_type key
+        (all && respond_to?(key)) || SchemaTypes.key?(key) || domain.types.key?(key)
+      end
+
     end
 
   end

data/lib/jimmy/schema_type.rb

@@ -62,11 +62,18 @@ module Jimmy
       def include(*partial_names, **locals)
         partial_names.each do |name|
           with_locals locals do
-            instance_eval *domain.partials[name.to_s]
+            evaluate_partial domain.partials[name.to_s]
           end
         end
       end
 
+      private
+
+      # Minimize collisions with local scope (hence the weird name __args)
+      def evaluate_partial(__args)
+        instance_eval *__args
+      end
+
     end
 
   end

data/lib/jimmy/version.rb

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

metadata

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