json_schema-artesano 0.0.1.beta.1 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f64ae69feb786b7aebba6d914cfabe466ab8951d
-  data.tar.gz: 6664232be5861daf3e8884420c3b3afdcf1631a8
+  metadata.gz: 0858d7cc3b24a1c137601e0af91aad4d2dd97b7e
+  data.tar.gz: 6d841275638d3736a2835756677d2576ed262218
 SHA512:
-  metadata.gz: 5edbf1326b78a52761bbdac3e61500c6f37faa605f08b21188fa93dd4f850b9aa4d6653c04cb3d2d58066dbe037879214b2659639dfa51fc08e768b0c0988e7c
-  data.tar.gz: fd2b26a4e91e2ef3f3f5b11139d9d6dc25438ca7e00509eaa441d2ae1e785d635efb12790e46f552bc1dab61142eecb8b330f55e99c0b8354e7aa44accd1e197
+  metadata.gz: a6fd9081a6fb74c631a2ecfa267e26cbf134cdc86f71be4e2c67ab17d9487fb4bcf4e822a28582f2fc416aee1c8d1fde86e7aba3e2513d897aad30d4624e0867
+  data.tar.gz: 7b88e96b61f2107f4100c5f51b83f9537fb06c0234cdb377d0da054452697a15e2a6ba9c06b3966f80f7121ad139e21edf2bb86ac94c7c9211008d6fe61692df

data/CHANGELOG.md

@@ -1,13 +1,6 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
-## [0.0.1.beta.1] - 2017-10-09 (Alfonso Mancilla)
-### Changed
-- Process oneOf, anyOf and allOf first, then primivites, object and array.
-### Fixed
-- Minor speel / grammar improvements to README.
-
 ## [0.0.1] - 2017-09-17 (Alfonso Mancilla)
 ### Added
  - Proof of concept strategies: Null, DataType and Static.

data/README.md

@@ -1,6 +1,6 @@
 # JsonSchema::Artesano
 
-If you give a **sketch, materials and tools** to an artesano (artisan), they will use the tools to transform the materials into a product that (hopefully) matches the sketch.
+If you give a **sketch, materials and tools** to an Artesano (Artesan), he will use the tools to transform the materials into a product that (hopefully) matches the sketch.
 
 Similary, if you give a **JSON Schema (sketch) and a strategy (tool)** to `JsonSchema::Artesano`, it will give you data (or objects, or whatever else you ask for) conformed to the schema.
 

data/lib/json_schema/artesano/hand.rb

@@ -35,32 +35,33 @@ module JsonSchema
           return tool.shape_enum(material)
         end
 
-        # OneOf
-        if material.one_of.any?
-          item = tool.select_oneof( material.one_of )
-          return transform(item)
-        end
-
-        # AnyOf
-        if material.any_of.any?
-          items = tool.select_anyof( material.any_of )
-          items = [items] unless items.is_a?(Array)
-
-          return tool.shape_array( transform_array(items) )
-        end
-
-        # AllOf
-        if material.all_of.any?
-          array = material.all_of
-          return tool.shape_array( transform_array(array) )
-        end
-
         case material.type[0]
         when *PRIMITIVE_MATERIALS
           tool.shape_primitive(material)
         when 'object'
+          # OneOf
+          if material.one_of.any?
+            item = tool.select_oneof( material.one_of )
+            return tool.shape_object( transform_object(item) )
+          end
+
+          # Plain
           tool.shape_object( transform_object(material) )
         when 'array'
+          # AnyOf
+          if material.any_of.any?
+            items = tool.select_anyof( material.any_of )
+            items = [items] unless items.is_a?(Array)
+
+            return tool.shape_array( transform_array(items) )
+          end
+
+          # AllOf
+          if material.all_of.any?
+            array = material.all_of
+            return tool.shape_array( transform_array(array) )
+          end
+
           tool.shape_array( transform_array(material) )
         else
           # Null

data/lib/json_schema/artesano/version.rb

@@ -1,5 +1,5 @@
 module JsonSchema
   module Artesano
-    VERSION = '0.0.1.beta.1'.freeze
+    VERSION = '0.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema-artesano
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1
 platform: ruby
 authors:
 - Alfonso Mancilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -106,9 +106,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13