redsnow 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27dcef9308792bec5bcc00cd275633bad9012160
-  data.tar.gz: 78544e79fddb7c1d3ba08e4c17c6f95b7e74d7e5
+  metadata.gz: 5a8a38283797a2cafbccf55b139a0b19e1c4eb8a
+  data.tar.gz: 276d98c64b94e5e1ae32b5843732a2940e60fde0
 SHA512:
-  metadata.gz: b43a113c6ffd35e6eca1371838c3cb62ca3a8f851f6159bbe34f73cb49178443a57781eed1fa41e6d17f9665650526cbf82eb047efc48702934ba9fe624b93a1
-  data.tar.gz: e29214475daf2192389a9869610ab5c851c2146cecc09356d2e0e6999e8c641ceca3e8dbf7ea79eb404391e79e5012cb1557fca0fd9824c029f549737266756a
+  metadata.gz: ab1ebb2eb3f8453d1d3813b737faeea77189e6e945c4f47fe5a035e8c7194e931c7b23587333b2fad55215d76d14517572d62bdf492eb70b5d44c3244f3c0cca
+  data.tar.gz: 36cbd238f7710f0cab49ba18791b369ce842d011831a1e3cb88300902ee37e5426e963b642987f16504ec8354520ea988e105d65e4ee7ede30a845bc8383079b

data/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+- 0.1.0 - Snow Crash updated to [0.12.1](https://github.com/apiaryio/snowcrash/releases/tag/v0.12.1)
 - 0.0.8 - Add support for [Parse Result](https://github.com/apiaryio/api-blueprint-ast/blob/master/Parse%20Result.md)
 - 0.0.7 - Fixed dependency, first public version
 - 0.0.1 - 0.0.6 Developement versions

data/ext/snowcrash/src/ParameterDefinitonParser.h

@@ -22,17 +22,13 @@
 #define PARAMETER_VALUE "`([^`]+)`"
 
 /** Parameter Identifier */
-#define PARAMETER_IDENTIFIER "([[:alnum:]_.-]+)"
+#define PARAMETER_IDENTIFIER "(([[:alnum:]_.-])*|(%[A-Fa-f0-9]{2})*)+"
 
 /** Lead in and out for comma separated values regex */
 #define CSV_LEADINOUT "[[:blank:]]*,?[[:blank:]]*"
 
 namespace snowcrashconst {
 
-    /** Parameter Abbreviated definition matching regex */
-    const char* const ParameterAbbrevDefinitionRegex = "^" PARAMETER_IDENTIFIER \
-                                                        "([[:blank:]]*=[[:blank:]]*`([^`]*)`[[:blank:]]*)?([[:blank:]]*\\(([^)]*)\\)[[:blank:]]*)?([[:blank:]]*\\.\\.\\.[[:blank:]]*(.*))?$";
-
     /** Parameter Required matching regex */
     const char* const ParameterRequiredRegex = "^[[:blank:]]*[Rr]equired[[:blank:]]*$";
 
@@ -53,6 +49,8 @@ namespace snowcrashconst {
 
     /** Values expected content */
     const char* const ExpectedValuesContent = "nested list of possible parameter values, one element per list item e.g. '`value`'";
+
+    const std::string DescriptionIdentifier = "...";
 }
 
 namespace snowcrash {
@@ -91,7 +89,65 @@ namespace snowcrash {
                 
         return UndefinedSectionType;
     }
-    
+   
+    /** Determine if a signature is a valid parameter*/
+    FORCEINLINE bool IsValidParameterSignature(const SourceData& signature) {
+
+        SourceData innerSignature = signature;
+        innerSignature = TrimString(innerSignature);
+
+        if (innerSignature.length() == 0) {
+            return false; // Empty string, invalid
+        }
+
+        size_t firstSpace = innerSignature.find(" ");
+        if (firstSpace == std::string::npos) {
+            return RegexMatch(innerSignature, "^" PARAMETER_IDENTIFIER "$");
+        }
+        
+        std::string paramName = innerSignature.substr(0, firstSpace);
+        if (!RegexMatch(paramName, "^" PARAMETER_IDENTIFIER "$")) {
+            return false; // Invalid param name
+        }
+        // Remove param name
+        innerSignature = innerSignature.substr(firstSpace + 1);
+
+        size_t descriptionPos = innerSignature.find(snowcrashconst::DescriptionIdentifier);
+        // Remove description
+        if (descriptionPos != std::string::npos) {
+            innerSignature = innerSignature.substr(0, descriptionPos);
+            innerSignature = TrimString(innerSignature);
+        }
+
+        size_t attributesPos = innerSignature.find("(");
+        if (attributesPos != std::string::npos) {
+            size_t endOfAttributesPos = innerSignature.find_last_of(")");
+            if (endOfAttributesPos == std::string::npos) {
+                return false; // Expecting close of attributes
+            }
+            // Remove attributes
+            innerSignature = innerSignature.substr(0, attributesPos);
+            innerSignature = TrimString(innerSignature);
+        }
+
+        if (innerSignature.length() == 0) {
+            return true;
+        }
+
+        if (innerSignature.substr(0,1) == "=") {
+            innerSignature = innerSignature.substr(1);
+            innerSignature = TrimString(innerSignature);
+            if (innerSignature.length() == 0) {
+                return false; // No default value
+            }
+            if (innerSignature.substr(0,1) == "`" && innerSignature.substr(innerSignature.length()-1,1) == "`") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      *  Returns true if given block has a parameter definition signature, false otherwise.
      */
@@ -114,9 +170,9 @@ namespace snowcrash {
         SourceData remainingContent;
         SourceData content = GetListItemSignature(begin, end, remainingContent);
         content = TrimString(content);
-        return RegexMatch(content, snowcrashconst::ParameterAbbrevDefinitionRegex);
+        return IsValidParameterSignature(content);
     }
-    
+
     /**
      *  Block Classifier, Parameter context.
      */
@@ -230,6 +286,8 @@ namespace snowcrash {
             return result;
             
         }
+
+      
         
         /**
          *  Retrieve and process parameter definition signature.
@@ -240,41 +298,57 @@ namespace snowcrash {
                                      Result& result,
                                      Parameter& parameter) {
             
-            
             // Set default values
             parameter.use = UndefinedParameterUse;
             
             // Process signature
             SourceData remainingContent;
             SourceData signature = GetListItemSignature(cur, section.bounds.second, remainingContent);
-
+            
             TrimString(signature);
-            CaptureGroups captureGroups;
-            if (RegexCapture(signature, snowcrashconst::ParameterAbbrevDefinitionRegex, captureGroups) &&
-                captureGroups.size() == 8) {
-                
-                // Name
-                parameter.name = captureGroups[1];
-                TrimString(parameter.name);
-                
-                // Default value
-                if (!captureGroups[3].empty())
-                    parameter.defaultValue = captureGroups[3];
-                
-                // Additional Attributes
-                if (!captureGroups[5].empty())
-                    ProcessSignatureAdditionalTraits(section, cur, captureGroups[5], sourceData, result, parameter);
-                
-                // Description
-                if (!captureGroups[7].empty())
-                    parameter.description = captureGroups[7];
+
+            if (IsValidParameterSignature(signature)) {
                 
-                if (!remainingContent.empty()) {
-                    parameter.description += "\n";
-                    parameter.description += remainingContent;
-                    parameter.description += "\n";
+                SourceData innerSignature = signature;
+                innerSignature = TrimString(innerSignature);
+
+                size_t firstSpace = innerSignature.find(" ");
+                if (firstSpace == std::string::npos) {
+                    // Name
+                    parameter.name = signature;
+                }
+                else {
+                    parameter.name = innerSignature.substr(0, firstSpace);
+                    innerSignature = innerSignature.substr(firstSpace + 1);
+                    size_t descriptionPos = innerSignature.find(snowcrashconst::DescriptionIdentifier);
+                    if (descriptionPos != std::string::npos) {
+                        // Description
+                        parameter.description = innerSignature.substr(descriptionPos);
+                        parameter.description = TrimString(parameter.description.replace(0, snowcrashconst::DescriptionIdentifier.length(), ""));
+                        innerSignature = innerSignature.substr(0, descriptionPos);
+                        innerSignature = TrimString(innerSignature);
+                    }
+
+                    size_t attributesPos = innerSignature.find("(");
+                    if (attributesPos != std::string::npos) {
+                        size_t endOfAttributesPos = innerSignature.find_last_of(")");
+                        if (endOfAttributesPos - attributesPos > 1) {
+                            std::string attributes = innerSignature.substr(attributesPos, endOfAttributesPos - attributesPos);
+                            attributes = attributes.substr(1);
+                            ProcessSignatureAdditionalTraits(section, cur, attributes, sourceData, result, parameter);
+                            innerSignature = innerSignature.substr(0, attributesPos);
+                            innerSignature = TrimString(innerSignature);
+                        }
+                    }
+
+                    if (innerSignature.length() > 0) {
+                        // Remove =
+                        parameter.defaultValue = innerSignature;
+                        parameter.defaultValue.erase(std::remove(parameter.defaultValue.begin(), parameter.defaultValue.end(), '='), parameter.defaultValue.end());
+                        parameter.defaultValue.erase(std::remove(parameter.defaultValue.begin(), parameter.defaultValue.end(), '`'), parameter.defaultValue.end());
+                        parameter.defaultValue = TrimString(parameter.defaultValue);
+                    }
                 }
-                
                 // Check possible required vs default clash
                 if (parameter.use != OptionalParameterUse &&
                     !parameter.defaultValue.empty()) {
@@ -290,7 +364,6 @@ namespace snowcrash {
                                                       LogicalErrorWarning,
                                                       sourceBlock));
                 }
-
             }
             else {
                 // ERR: unable to parse 
@@ -301,6 +374,7 @@ namespace snowcrash {
                                       sourceBlock));
             }
         }
+
         
         /** Parse additional parameter attributes from abbrev definition bracket */
         static void ProcessSignatureAdditionalTraits(const BlueprintSection& section,
@@ -562,6 +636,7 @@ namespace snowcrash {
             return;
         }
 
+
     };
     
     typedef BlockParser<Parameter, SectionParser<Parameter> > ParameterDefinitionParser;

data/ext/snowcrash/src/Version.h

@@ -16,7 +16,7 @@
 
 #define SNOWCRASH_MAJOR_VERSION 0
 #define SNOWCRASH_MINOR_VERSION 12
-#define SNOWCRASH_PATCH_VERSION 0
+#define SNOWCRASH_PATCH_VERSION 1
 
 #define SNOWCRASH_VERSION_IS_RELEASE 1
 

data/ext/snowcrash/tools/homebrew/snowcrash.rb

@@ -2,7 +2,7 @@ require 'formula'
 
 class Snowcrash < Formula
   homepage 'http://apiblueprint.org'
-  head 'https://github.com/apiaryio/snowcrash.git', :tag => 'v0.12.0'
+  head 'https://github.com/apiaryio/snowcrash.git', :tag => 'v0.12.1'
 
   def install
     system "./configure"

data/lib/redsnow/version.rb

@@ -1,4 +1,4 @@
 module RedSnow
   # Gem version
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redsnow
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Ladislav Prskavec