vigia 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7222d06de2ca3a765f9e0e7a95d55dba86fcf2c
-  data.tar.gz: 9682733199c872a48488ebff5bab234af8bc9602
+  metadata.gz: 839517ce635ec40f0392b395b499995141ce6f1e
+  data.tar.gz: ead01a03d5b47e234b89a3b05c0ab08d015a1258
 SHA512:
-  metadata.gz: 2d7a990aa5867d01f729792a334cdcee1534340d7346fa26efc56b870477cdf98e749fb0e1d0b1da096aa81c241b3b3fcc52dabbde2855c68ee00cbe62ac34ac
-  data.tar.gz: 91206c7fce603e5674dab0a8b5d6fa3f105a608876aaacc3c278bf8fb083037754fbe3a877be61050f6d467d2981d2c59fc641847aa6fa2b1210ea91d8facc77
+  metadata.gz: 480f72fca1b7d0fe762def39949a025fd0f6e85502b1d49981359556f6a94724bb1683d70be14b57a3feceff594bfaf612a0bb813913dbec153d85b8f016c4f2
+  data.tar.gz: 086906a7d54e9aab0cc1fd1b669ca822d00308bf7bb9daf143da07cd9bde54c929f2fd672e6db27021ecac84f69fd35a00e1390cc3cec3641395dd210622526e

data/lib/vigia/adapters/raml.rb

@@ -85,7 +85,11 @@ module Vigia
 
       def format_parameters(raml_hash)
         raml_hash.values.each_with_object([]) do |parameter, array|
-          array << { name: parameter.name, value: parameter.example, required: !parameter.optional }
+          array << {
+            name:     name_to_rfc_3986(parameter.name),
+            value:    parameter.example,
+            required: !parameter.optional
+          }
         end
       end
 
@@ -104,7 +108,31 @@ module Vigia
       def query_parameters(method)
         method.apply_traits if method.traits.any? # Does this belong here RAML?
         return '' if method.query_parameters.empty?
-        "{?#{ method.query_parameters.keys.join(',') }}"
+
+        "{?#{ query_string(method) }}"
+      end
+
+      # RAML specification for query parameter name must comply with RFC 3986,
+      # However, Vigia uses `addressable` for query parameters expansion, which
+      # enforces RFC 6570. These two specification understand in different ways
+      # what it is consider to be an unreserved character. While RFC 3986 allows
+      # this set: `ALPHA / DIGIT / "-" / "." / "_" / "~"`, RFC 6570 only accepts
+      # `ALPHA / DIGIT / "_", and encoded characters in pct-encoded format `%*`
+      # Thus, the transformation:
+      def name_to_rfc_3986(string)
+        return if string.nil?
+
+        string.gsub(/[-.~]/,
+          '-' => '%2D',
+          '~' => '%7E',
+          '.' => '%2E'
+        )
+      end
+
+      def query_string(method)
+        method.query_parameters.keys.map do |key|
+          name_to_rfc_3986(key.to_s)
+        end.join(',')
       end
     end
   end

data/lib/vigia/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Vigia
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vigia
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Test your Apiary Blueprint specification on ruby