lacerda 0.14.8 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7047209f61c041df067f297d1c5f26305df88289
-  data.tar.gz: b06b9e0b859cc608c01eb724d57a5be12b8e6a55
+  metadata.gz: ba190f9b01d30f9afeb11e942c37982a3dd08ab4
+  data.tar.gz: 58a84ea79e3ee495ca67066f7ca7ffa7a5b5f68d
 SHA512:
-  metadata.gz: bd1cbd9fc11d8a31817a1c1ce8f97a4a039551e76fb92d70cad5470890e488c34c0c2a0244980ba54a5779365128e2f72f302ac27d7caac4bf8058dc066afcdc
-  data.tar.gz: 9da8bba5057e0232bc93d10df02479dc993d98719c6589bea0656c49c855ff1b2d5d79adeb9799cdde25c8b5d89210a87325997d234a6a67aea331920044e238
+  metadata.gz: d4f7239617c9d9b789b3af53ba83d378e3bbd7de016944816f4910726f80c60e58b595a7888bd67effa8cf9f252d1d6772dc43094ef1162f7621db930812de19
+  data.tar.gz: 75401fc75ec919d81a8d998d7ecc876720f7d81d3ec332ad7649123b5d5f6615c97127effd9f0e3eb54ce618359cd5753ca2df922a94c765281c26ae75c85f2a

data/CHANGELOG.markdown

@@ -1,6 +1,3 @@
-# 0.14.8
-- Update redsnow 0.4.3 -> 0.4.4
-
 # 0.14.6
 - relax rake dependency
 - relax tins dependency

data/lacerda.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "json-schema",   ["~> 2.6.2"]
 
-  spec.add_runtime_dependency "redsnow",       ["~> 0.4.4"]
+  spec.add_runtime_dependency "redsnow",       ["~> 0.4.3"]
   spec.add_runtime_dependency "colorize"
   spec.add_runtime_dependency "blumquist",     ["~> 0.5"]
 

data/lib/lacerda/conversion.rb

@@ -29,7 +29,7 @@ module Lacerda
       service_scope = File.dirname(filename).split(File::SEPARATOR).last.underscore
 
       # Parse MSON to an apiary blueprint AST
-      # (see https://github.com/apiaryio/api-blueprint/wiki/API-Blueprint-Map)
+      # (see https://github.com/apiaryio/api-blueprint)
       ast_file = mson_to_ast_json(filename)
 
       # Pluck out Data structures from it

data/lib/lacerda/conversion/data_structure.rb

@@ -38,6 +38,7 @@ module Lacerda
         @schema['title'] = @id
         add_description_to_json_schema
         add_properties_to_json_schema
+        @schema['additionalProperties'] = false
       end
 
       def to_json
@@ -72,8 +73,8 @@ module Lacerda
           spec = {}
           name = Lacerda.underscore(content['name']['literal'])
 
-          # This is either type: primimtive or $ref: reference_name
-          spec.merge!(primitive_or_reference(type, is_required))
+          # This is either type: primimtive or a oneOf { $ref: reference_name }
+          spec.merge!(primitive_or_oneOf(type, is_required))
 
           # We might have a description
           spec['description'] = content['description']
@@ -81,8 +82,7 @@ module Lacerda
           # If it's an array, we need to pluck out the item types
           if type == 'array'
             nestedTypes = type_definition['typeSpecification']['nestedTypes']
-            # Passing false here, because an empty array is still an array
-            spec['items'] = nestedTypes.map{|t| primitive_or_reference(t, false) }
+            spec['items'] = array_items(nestedTypes)
 
           # If it's an object, we need recursion
           elsif type == 'object'
@@ -101,22 +101,62 @@ module Lacerda
         end
       end
 
-      def primitive_or_reference(type, is_required)
+      # returns the type of an array, given its specified type(s). This will be
+      # either exactly one basic type, or a oneOf in case there are 1+ types 
+      # or exactly 1 non-basic type. 
+      # As there are specied types in the array, `nil` should not be a valid value
+      # and therefore required should be true.
+      def array_items(types)
+        if types.size == 1 && PRIMITIVES.include?(types.first)
+          primitive(types.first, true) 
+        else
+          oneOf(types, true)
+        end
+      end
+
+      def primitive_or_oneOf(type, is_required)
       	return { 'type' => 'object' } if type.blank?
+        if PRIMITIVES.include?(type)
+          primitive(type, is_required)
+        else
+          oneOf([type], is_required)
+        end
+      end
 
+      # A basic type is either a primitive type with exactly 1 primitive type
+      #   {'type' => [boolean] }
+      # a reference
+      #   { '$ref' => "#/definitions/name" }
+      # or an object if the type in not there
+      #   { 'type' => object }
+      # Basic types don't care about being required or not.
+      def basic_type(type)
+        return { 'type' => 'object' } if type.blank?
         if PRIMITIVES.include?(type)
-          types = [type]
-          types << 'null' unless is_required
-          { 'type' => types }
+          primitive(type, true)
         else
-          types = [{'$ref' => "#/definitions/#{self.class.scope(@scope, type['literal'])}" }]
-          types << { 'type' => 'null' } unless is_required
-          {
-            'oneOf' => types
-          }
+          reference(type)
         end
       end
 
+      def oneOf(types, is_required)
+        types = types.map { |type| basic_type(type) }
+        types << { 'type' => 'null' } unless is_required
+        {
+          'oneOf' => types.uniq
+        }
+      end
+
+      def primitive(type, is_required) 
+        types = [type]
+        types << 'null' unless is_required
+        { 'type' => types }
+      end
+
+      def reference(type)
+        {'$ref' => "#/definitions/#{self.class.scope(@scope, type['literal'])}" }
+      end
+
       def json_schema_blueprint
         {
           "type" => "object",

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.14.8'
+  VERSION = '1.0.0.beta1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -276,9 +276,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1