jimmy 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a528bcad0fb42079b9497df793dd18e00303651
-  data.tar.gz: e33cea2e53c93a02f99e875b23ff7dda1c54bce3
+  metadata.gz: 5b1cb2f2d598473a594b870040ab3b022caf9ca4
+  data.tar.gz: f283a986673ede842adf3f2e944410005fb87695
 SHA512:
-  metadata.gz: 8789d546ee5e8353f21393331ba1c00bb96d737e2dff463e93d874a895904993870a36d273709215fce5922ec79b53ad3b83e2f3c55f5269a37861be85664eae
-  data.tar.gz: 3d6505a992d4b0239fb737f540a1a30563a00ac62f88ac27a9ef5fcaa87f6bfdb68bd57382980907014516df65d77fefa88205bfcfd2bef63d5376a24682bb2a
+  metadata.gz: 49ecc7449f9195e2839429944dcf9aa7e42db540e3cac4cd201f350c72798d27601ba75beee800abb1c7c5c8790e11578703496715322ce3d99eb0d179a75d4f
+  data.tar.gz: 12f4c5e48b02c700cb815bed05cf89a5e299cec8ce22907e1345eb51159fbd1e6c5daede18b9d6484b7fcbb5df69bae29dfdf5105ee403a2616f95b85ad3d7c5

data/lib/jimmy/definitions.rb

@@ -1,9 +1,15 @@
+require 'forwardable'
+
 module Jimmy
-  class Definitions < Hash
+  class Definitions
+    extend Forwardable
+    delegate %i[empty? key? map] => :@values
+    
     attr_reader :schema
 
     def initialize(schema)
       @schema = schema
+      @values = {}
     end
 
     def evaluate(&block)
@@ -23,9 +29,9 @@ module Jimmy
     end
 
     def [](key)
-      super || (schema.parent && schema.parent.definitions[key])
+      @values[key] || (schema.parent && schema.parent.definitions[key])
     end
 
-    SchemaCreation.apply_to(self) { |schema, name| self[name] = schema }
+    SchemaCreation.apply_to(self) { |schema, name| @values[name] = schema }
   end
 end

data/lib/jimmy/schema.rb

@@ -32,6 +32,7 @@ module Jimmy
       {'type' => type.to_s}.tap do |hash|
         hash['definitions'] = definitions.compile unless definitions.empty?
         hash['links']       = links.map &:compile unless links.empty?
+        hash.merge! data
         dsl.evaluate compiler, hash if compiler
       end
     end
@@ -62,7 +63,6 @@ module Jimmy
 
     def to_h
       {'$schema' => schema_uri}.tap do |h|
-        h.merge! data
         h['id'] = url if name
         h.merge! compile
       end

data/lib/jimmy/schema_creation.rb

@@ -21,7 +21,16 @@ module Jimmy
       end
     end
 
+    module MetadataMethods
+      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 } }
+    end
+
     module DefiningMethods
+      include MetadataMethods
 
       def locals
         @locals ||= {}
@@ -40,12 +49,6 @@ 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

@@ -37,6 +37,7 @@ module Jimmy
 
     class DSL
       extend Forwardable
+      include SchemaCreation::MetadataMethods
 
       attr_reader :schema
 

data/lib/jimmy/version.rb

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

metadata

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