brujula 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728af83883cc6088ff24fc157a824221a04668fe
-  data.tar.gz: bb27ac407bb64ef0840073ad168cc1abb30e0184
+  metadata.gz: 4432f8e3a02056bf3d4699197c82e6036168af26
+  data.tar.gz: 973ed2b40689295a17239237cdfc37b099919688
 SHA512:
-  metadata.gz: 146647cbd16918d460e3c036b8c886940488fddf4bc6cd9e2edddad732bc61612320fd925fe5c103eb4505b5103ebba629e753cd419d3d524d07d014a631b225
-  data.tar.gz: c531af198a63ffbeb311213b7cdb12c9e494b3332e5f8adefc1a158c91e056b6717b866c7fcf29a700f2b8cde6a359099de9e263934de249f53d48da1d3a6ac5
+  metadata.gz: d08750f73c2ac6f611b001be7b38a34b5da31ddd18d95f47bcecf05147863ca01315329929da65465fc02c4422f7f29183710a72115446999218b3b9fe843547
+  data.tar.gz: 04c58c3ef43821a9050139c0652d642e9cb11efd854a6a27248fd400931658021cceb6868428f3c2586dc036d3f88f95197a71bc41a6ca651acabc970fe43432

data/SPEC_SUPPORT.md

@@ -31,6 +31,36 @@ securedBy? | :warning: | Definition and merging support. Not fully tested though
 
 * [Raml Data Types](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#raml-data-types)
 
+Property | Status | Comments
+---|---|---
+schema? | :white_check_mark: :warning: | Show deprecation notice when using RAML 1.0
+type?	| :white_check_mark: :warning: | Some inheritance and merging strategies might not work
+example? | :white_check_mark: :warning: | Should complain if both example and examples are present
+examples? | :white_check_mark: :warning: | Should complain if both example and examples are present
+displayName?	| :white_check_mark: |
+description?	| :white_check_mark: |
+(<annotationName>)? | :x: |
+
+  * [Object Data Types](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#object-types)
+
+
+  Property | Status | Comments
+  ---|---|---
+  properties? | :white_check_mark: :warning: | Some property limitations. See properties
+  minProperties?	| :warning: | Not fully tested. Need examples
+  maxProperties? | :warning: | Not fully tested. Need examples
+  additionalProperties? | :warning: | Declaration works. Not fully tested
+  patternProperties? | :warning: | Declaration works. Not fully tested
+  discriminator?	| :x: |
+
+  Extra Feature | Status
+  ---|--
+  [Alternative Syntax](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#alternative-syntax) | :white_check_mark:
+  [Inheritance](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#inheritance) | :warning: See inheritance
+  [Map types](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#map-types) | :x:
+
+  * [Array Types](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md/#array-types)
+
 _TBC_
 
 * [Base URI and Base URI Parameters](https://github.com/raml-org/raml-spec/blob/raml-10/versions/raml-10/raml-10.md#base-uri-and-base-uri-parameters)

data/lib/brujula.rb

@@ -34,6 +34,7 @@ require_relative 'brujula/mergers/map_object_merger'
 require_relative 'brujula/type_extender/resource'
 require_relative 'brujula/type_extender/resource_type'
 require_relative 'brujula/type_extender/method'
+require_relative 'brujula/type_extender/raml_type'
 
 # Definitions
 require_relative 'brujula/raml/definition'

data/lib/brujula/data_transformers/property_declaration.rb

@@ -17,7 +17,9 @@ module Brujula
       def call
         data.each_with_object({}) do |(key, property), object|
           if property.is_a?(String) # data as type
-            object.merge!(key => { "type" => property })
+            object.merge!(key.gsub(/\?$/, "") => {
+              "type" => property, "required" => !key.to_s.end_with?("?")
+            })
           else
             object.merge!(key => property)
           end

data/lib/brujula/map_object.rb

@@ -70,6 +70,8 @@ module Brujula
         Brujula::TypeExtender::Method.new(definition: child).call
       when Brujula::Raml::V1_0::ResourceType
         Brujula::TypeExtender::ResourceType.new(definition: child).call
+      when Brujula::Raml::V1_0::RamlType
+        Brujula::TypeExtender::RamlType.new(definition: child).call
       else
         child
       end

data/lib/brujula/object_parser.rb

@@ -33,12 +33,22 @@ module Brujula
     end
 
     def normalized_data
+      @normalized_data ||= apply_default_type(node_data)
+    end
+
+    def node_data
       return data unless external_data?
 
-      # TODO
       data.load_external_data(definition.root.base_dir)
     end
 
+    def apply_default_type(data)
+      return data unless scheme.typed?
+      return data if data.key?("type")
+
+      data.merge("type" => scheme.default_type.to_s)
+    end
+
     def external_data?
       data.is_a?(Brujula::YamlInclude)
     end
@@ -47,15 +57,10 @@ module Brujula
       @scheme ||= definition.class.scheme
     end
 
-    # Typed schemas must provide a type
-    def data_type
-      normalized_data.fetch('type', scheme.default_type)
-    end
-
     def scheme_keys
       return scheme.key_collection unless scheme.typed?
 
-      scheme.typed_keys(data_type)
+      scheme.typed_keys(normalized_data.fetch('type'))
     end
 
     def object_builder(key)

data/lib/brujula/raml/exceptions.rb

@@ -2,5 +2,6 @@ module Brujula
   module Raml
     class RequiredProperty < StandardError; end
     class ObjectTypeNotFound < StandardError; end
+    class InvalidTypeReference < KeyError; end
   end
 end

data/lib/brujula/raml/v1_0/property.rb

@@ -17,15 +17,15 @@ module Brujula
           key :enum, as: :array, unless_type_is: %w( file )
 
           # When Property is integer
-          key :minimum, as: :number, for_types: %( number integer )
-          key :maximum, as: :number, for_types: %( number integer )
+          key :minimum, as: :number, for_types: %w( number integer )
+          key :maximum, as: :number, for_types: %w( number integer )
           key :format, as: :string,
-              in: %( int32 int64 int long float double int16 int8 )
+              in: %w( int32 int64 int long float double int16 int8 )
 
           # When Property is string
-          key :pattern, as: :regexp, for_types: %( string )
-          key :min_length, as: :number, for_types: %( string )
-          key :max_length, as: :number, for_types: %( string )
+          key :pattern, as: :regexp, for_types: %w( string )
+          key :min_length, as: :number, for_types: %w( string )
+          key :max_length, as: :number, for_types: %w( string )
 
         end
       end

data/lib/brujula/raml/v1_0/raml_type.rb

@@ -3,7 +3,7 @@ module Brujula
     module V1_0
       class RamlType < Brujula::Object
         scheme typed: true, default_type: :object do
-          key :type,   as: :string
+          key :type,   as: :any
           key :schema, as: :string, deprecated: true
 
           key :properties, as: :map_object, children: :property,
@@ -17,15 +17,15 @@ module Brujula
           key :examples, as: :any
 
           # When Property is integer
-          key :minimum, as: :number, for_types: %( number integer )
-          key :maximum, as: :number, for_types: %( number integer )
+          key :minimum, as: :number, for_types: %w( number integer )
+          key :maximum, as: :number, for_types: %w( number integer )
           key :format, as: :string,
-              in: %( int32 int64 int long float double int16 int8 )
+              in: %w( int32 int64 int long float double int16 int8 )
 
           # When Property is string
-          key :pattern, as: :regexp, for_types: %( string )
-          key :min_length, as: :number, for_types: %( string )
-          key :max_length, as: :number, for_types: %( string )
+          key :pattern, as: :regexp, for_types: %w( string )
+          key :min_length, as: :number, for_types: %w( string )
+          key :max_length, as: :number, for_types: %w( string )
 
 
           # include_type_keys

data/lib/brujula/scheme.rb

@@ -1,10 +1,8 @@
 module Brujula
   class Scheme
-    attr_reader :keys, :typed, :default_type, :reference,
-                :store_for_reference, :allow_any
+    attr_reader :keys, :typed, :default_type, :reference, :allow_any
 
     alias :typed? :typed
-    alias :store_object_for_reference? :store_for_reference
     alias :allow_any? :allow_any
 
     def initialize(klass, options = {}, block = nil)
@@ -13,7 +11,6 @@ module Brujula
       @keys                = {}
       @typed               = !!options[:typed]
       @default_type        = options[:default_type] || :string
-      @store_for_reference = !!options[:store_for_reference]
       @allow_any           = !!options[:allow_any]
 
       if options[:as]
@@ -33,7 +30,7 @@ module Brujula
       valid_keys?(data) || raise(Brujula::Raml::RequiredProperty) # && enough_data?(data))
     end
 
-    def typed_keys(type)
+    def typed_keys(type) # TODO
       keys.values.select do |brujula_key|
         brujula_key.valid_for_type?(type)
       end

data/lib/brujula/type_extender/raml_type.rb

@@ -0,0 +1,60 @@
+module Brujula
+  module TypeExtender
+    class RamlType
+
+      RAML_TYPES = %w( object number string integer boolean date file array )
+
+      attr_reader :definition
+
+      def initialize(definition:)
+        @definition = definition
+      end
+
+      def call
+        return definition unless custom_type?
+
+        expand_object
+      end
+
+      private
+
+      def expand_object
+        superinstances.inject(definition) do |instance, superinstance|
+          Brujula::Mergers::ObjectMerger.new(
+            superinstance: superinstance, instance: instance
+          ).call
+        end
+      end
+
+      def superinstances
+        case definition.type
+        when Array
+          definition.type.map { |type| get_reference(type) }
+        when String
+          [ get_reference(definition.type) ]
+        else
+          raise_invalid_reference(definition.type)
+        end
+      end
+
+      def raise_invalid_reference(reference)
+        raise Brujula::Raml::InvalidTypeReference,
+          "The referenced type #{ reference } cannot be processed"
+      end
+
+      def custom_type?
+        ! RAML_TYPES.include?(definition.type)
+      end
+
+      def get_reference(reference)
+        if definition.parent.name == "types" # root types, not preloaded
+          definition.parent.fetch(reference)
+        else
+          definition.root.types.fetch(reference)
+        end
+      rescue KeyError
+        raise_invalid_reference(reference)
+      end
+    end
+  end
+end

data/lib/brujula/version.rb

@@ -1,3 +1,3 @@
 module Brujula
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brujula
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Tapiador
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -197,6 +197,7 @@ files:
 - lib/brujula/scheme.rb
 - lib/brujula/transformer_functions.rb
 - lib/brujula/type_extender/method.rb
+- lib/brujula/type_extender/raml_type.rb
 - lib/brujula/type_extender/resource.rb
 - lib/brujula/type_extender/resource_type.rb
 - lib/brujula/version.rb