redsnow 0.2.1 → 0.3.0

data/ext/snowcrash/src/SerializeJSON.h

@@ -21,4 +21,4 @@ namespace snowcrash {
     void SerializeSourceMapJSON(const snowcrash::SourceMap<snowcrash::Blueprint>& blueprint, std::ostream &os);
 }
 
-#endif 
+#endif

data/ext/snowcrash/src/SerializeYAML.cc

@@ -17,13 +17,13 @@ static std::string ReservedCharacters = "#-[]:|>!*&%@`,{}?\'";
 static std::string NormalizeStringValue(const std::string& value, bool& needsQuotation)
 {
     std::string normalizedValue = value;
-    
+
     if (normalizedValue.find("\"") != std::string::npos)
         normalizedValue = EscapeDoubleQuotes(normalizedValue);
-    
+
     if (value.find("\n") != std::string::npos)
         normalizedValue = EscapeNewlines(normalizedValue);
-    
+
     needsQuotation = (normalizedValue != value);
 
     if (!needsQuotation) {
@@ -33,7 +33,7 @@ static std::string NormalizeStringValue(const std::string& value, bool& needsQuo
                 break;
         }
     }
-    
+
     return normalizedValue;
 }
 
@@ -43,7 +43,7 @@ static void ArrayItemLeadIn(size_t level, std::ostream &os, bool withTrailingSpa
 {
     if (level < 1)
         return;
-    
+
     for (size_t i = 0; i < level - 1; ++i)
         os << "  ";
 
@@ -59,17 +59,17 @@ static void serialize(const std::string& key, const std::string& value, size_t l
 {
     if (key.empty())
         return;
-    
+
     for (size_t i = 0; i < level; ++i)
         os << "  ";
-    
+
     if (!value.empty()) {
-        
+
         os << key << ": ";
 
         bool needsQuotation = false;
         std::string normalizedValue = NormalizeStringValue(value, needsQuotation);
-        
+
         if (implicitQuotation) {
             // Always use quotation
             os << "\"" << normalizedValue << "\"";
@@ -80,7 +80,7 @@ static void serialize(const std::string& key, const std::string& value, size_t l
             else
                 os << value;
         }
-        
+
         os << std::endl;
     }
     else
@@ -160,7 +160,7 @@ static void serializeKeyValueCollection(const Collection<KeyValuePair>::type& co
 static void serialize(const Collection<Metadata>::type& metadata, std::ostream &os)
 {
     serialize(SerializeKey::Metadata, std::string(), 0, os);
-    
+
     if (metadata.empty())
         return;
 
@@ -204,28 +204,28 @@ static void serialize(const Parameters& parameters, size_t level, std::ostream &
 
         // Description
         serialize(SerializeKey::Description, it->description, level + 1, os);
-        
+
         // Type
         serialize(SerializeKey::Type, it->type, level + 1, os);
-        
+
         // Required
         serialize(SerializeKey::Required, (it->use == OptionalParameterUse) ? "false" : "true", level + 1, os, false);
-        
+
         // Default
         serialize(SerializeKey::Default, it->defaultValue, level + 1, os);
-        
+
         // Example
         serialize(SerializeKey::Example, it->exampleValue, level + 1, os);
-        
+
         // Values
         serialize(SerializeKey::Values, std::string(), level + 1, os);
-        
+
         for (Collection<Value>::const_iterator val_it = it->values.begin();
              val_it != it->values.end();
              ++val_it) {
 
             ArrayItemLeadIn(level + 2, os);
-                
+
             serialize(SerializeKey::Value, *val_it, 0, os);
         }
     }
@@ -275,13 +275,36 @@ static void serialize(const Collection<SourceMap<Parameter> >::type& parameters,
     }
 }
 
+/** Serialize Reference */
+static void serialize(const Reference& reference, size_t level, std::ostream &os)
+{
+    if (reference.id.empty()) {
+        return;
+    }
+
+    serialize(SerializeKey::Reference, "", level - 1, os);
+
+    // ID
+    serialize(SerializeKey::Id, reference.id, level, os);
+}
+
+/** Serialize Reference source map */
+static void serialize(const SourceMap<Reference>& reference, size_t level, std::ostream &os)
+{
+    if (reference.sourceMap.empty()) {
+        return;
+    }
+
+    serialize(SerializeKey::Reference, reference, level - 1, os);
+}
+
 /** Serialize Payload */
 static void serialize(const Payload& payload, size_t level, bool array, std::ostream &os)
 {
     for (size_t i = 0; i < level - 1; i++) {
         os << "  ";
     }
-    
+
     if (array)
         os << "- ";
     else
@@ -290,25 +313,22 @@ static void serialize(const Payload& payload, size_t level, bool array, std::ost
     // Name
     serialize(SerializeKey::Name, payload.name, 0, os);
 
-    // Symbol Reference
-    if (!payload.symbol.empty()) {
-        serialize(SerializeKey::Reference, "", level, os);
-        serialize(SerializeKey::Id, payload.symbol, level + 1, os);
-    }
+    // Reference
+    serialize(payload.reference, level + 1, os);
 
     // Description
     serialize(SerializeKey::Description, payload.description, level, os);
-    
+
     // Headers
     serialize(SerializeKey::Headers, std::string(), level, os);
 
     if (!payload.headers.empty()) {
         serialize(payload.headers, level, os);
     }
-    
+
     // Body
     serialize(SerializeKey::Body, payload.body, level, os);
-    
+
     // Schema
     serialize(SerializeKey::Schema, payload.schema, level, os);
 }
@@ -328,10 +348,8 @@ static void serialize(const SourceMap<Payload>& payload, size_t level, bool arra
     // Name
     serialize(SerializeKey::Name, payload.name, level, os, true);
 
-    // Symbol Reference
-    if (!payload.symbol.sourceMap.empty()) {
-        serialize(SerializeKey::Reference, payload.symbol, level, os);
-    }
+    // Reference
+    serialize(payload.reference, level + 1, os);
 
     // Description
     serialize(SerializeKey::Description, payload.description, level, os);
@@ -357,10 +375,10 @@ static void serialize(const TransactionExample& example, std::ostream &os)
 
     // Name
     serialize(SerializeKey::Name, example.name, 0, os);
-    
+
     // Description
     serialize(SerializeKey::Description, example.description, 4, os);
-    
+
     // Requests
     serialize(SerializeKey::Requests, std::string(), 4, os);
 
@@ -372,7 +390,7 @@ static void serialize(const TransactionExample& example, std::ostream &os)
             serialize(*it, 5, true, os);
         }
     }
-    
+
     // Responses
     serialize(SerializeKey::Responses, std::string(), 4, os);
 
@@ -426,22 +444,22 @@ static void serialize(const SourceMap<TransactionExample>& example, std::ostream
 static void serialize(const Action& action, std::ostream &os)
 {
     os << "    - ";   // indent 3
-    
+
     // Name
     serialize(SerializeKey::Name, action.name, 0, os);
-    
+
     // Description
     serialize(SerializeKey::Description, action.description, 3, os);
 
     // HTTP method
     serialize(SerializeKey::Method, action.method, 3, os);
-    
+
     // Parameters
     serialize(SerializeKey::Parameters, std::string(), 3, os);
 
     if (!action.parameters.empty())
         serialize(action.parameters, 3, os);
-    
+
     // Examples
     serialize(SerializeKey::Examples, std::string(), 3, os);
 
@@ -492,34 +510,34 @@ static void serialize(const SourceMap<Action>& action, std::ostream &os)
 static void serialize(const Resource& resource, std::ostream &os)
 {
     os << "  - ";   // indent 2
-    
+
     // Name
     serialize(SerializeKey::Name, resource.name, 0, os);
-    
+
     // Description
     serialize(SerializeKey::Description, resource.description, 2, os);
-    
+
     // URI Template
     serialize(SerializeKey::URITemplate, resource.uriTemplate, 2, os);
-    
+
     // Model
     serialize(SerializeKey::Model, std::string(), 2, os);
 
     if (!resource.model.name.empty())
         serialize(resource.model, 3, false, os);
-    
+
     // Parameters
     serialize(SerializeKey::Parameters, std::string(), 2, os);
 
     if (!resource.parameters.empty())
         serialize(resource.parameters, 2, os);
-    
+
     // Actions
     serialize(SerializeKey::Actions, std::string(), 2, os);
-    
+
     if (resource.actions.empty())
         return;
-    
+
     for (Collection<Action>::const_iterator it = resource.actions.begin();
          it != resource.actions.end();
          ++it) {
@@ -575,13 +593,13 @@ static void serialize(const ResourceGroup& group, std::ostream &os)
 
     // Name
     serialize(SerializeKey::Name, group.name, 0, os);
-    
+
     // Description
     serialize(SerializeKey::Description, group.description, 1, os);
 
     // Resources
     serialize(SerializeKey::Resources, std::string(), 1, os);
-    
+
     if (group.resources.empty())
         return;
 
@@ -623,16 +641,16 @@ static void serialize(const Blueprint& blueprint, std::ostream &os)
 {
     // AST Version
     serialize(SerializeKey::ASTVersion, AST_SERIALIZATION_VERSION, 0, os, false);
-    
+
     // Metadata
     serialize(blueprint.metadata, os);
-    
+
     // API Name
     serialize(SerializeKey::Name, blueprint.name, 0, os);
-    
+
     // API Description
     serialize(SerializeKey::Description, blueprint.description, 0, os);
-    
+
     // Resource Groups
     serialize(SerializeKey::ResourceGroups, std::string(), 0, os);
 
@@ -642,7 +660,7 @@ static void serialize(const Blueprint& blueprint, std::ostream &os)
     for (Collection<ResourceGroup>::type::const_iterator it = blueprint.resourceGroups.begin();
          it != blueprint.resourceGroups.end();
          ++it) {
-        
+
         serialize(*it, os);
     }
 }

data/ext/snowcrash/src/SerializeYAML.h

@@ -13,7 +13,7 @@
 #include "BlueprintSourcemap.h"
 
 namespace snowcrash {
-    
+
     // Naive YAML serialization to ostream
     void SerializeYAML(const snowcrash::Blueprint& blueprint, std::ostream &os);
 

data/ext/snowcrash/src/Signature.cc

@@ -38,7 +38,7 @@ SectionType snowcrash::SectionKeywordSignature(const mdp::MarkdownNodeIterator&
     if ((type = SectionProcessor<Parameters>::sectionType(node)) != UndefinedSectionType)
         return type;
 
-    /* 
+    /*
      *  NOTE: Order is important. Resource MUST preceed the Action.
      *
      *  This is because an HTTP Request Method + URI is recognized as both %ActionSectionType and %ResourceSectionType.
@@ -46,7 +46,7 @@ SectionType snowcrash::SectionKeywordSignature(const mdp::MarkdownNodeIterator&
      */
     if ((type = SectionProcessor<Resource>::sectionType(node)) != UndefinedSectionType)
         return type;
-    
+
     if ((type = SectionProcessor<Action>::sectionType(node)) != UndefinedSectionType)
         return type;
 

data/ext/snowcrash/src/Signature.h

@@ -14,7 +14,7 @@
 
 namespace snowcrash {
 
-    /** 
+    /**
      *  \brief Query whether a node has keyword-defined signature.
      *  \param node     A Markdown AST node to check.
      *  \return Type of the node if it has a recognized keyword signature, UndefinedType otherwise

data/ext/snowcrash/src/SourceAnnotation.h

@@ -14,8 +14,8 @@
 #include "ByteBuffer.h"
 
 namespace snowcrash {
-    
-    
+
+
     /**
      *  \brief  A source data annotation.
      *
@@ -23,30 +23,30 @@ namespace snowcrash {
      *  annotation code and an optional message.
      */
     struct SourceAnnotation {
-        
+
         /**
          *  \brief Default annotation code representing success.
          */
         static const int OK;
-        
+
         /**
          *  \brief  %SourceAnnotation default constructor.
          *
          *  Creates an empty annotation with the default annotation code.
          */
         SourceAnnotation() : code(OK) {}
-        
+
         /**
          *  \brief  %SourceAnnotation copy constructor.
          *  \param  rhs  An annotation to be copied.
          */
         SourceAnnotation(const SourceAnnotation& rhs) {
-            
+
             this->message = rhs.message;
             this->code = rhs.code;
             this->location = rhs.location;
         }
-        
+
         /**
          *  \brief  %SourceAnnotation constructor.
          *  \param  message     An annotation message.
@@ -56,18 +56,18 @@ namespace snowcrash {
         SourceAnnotation(const std::string& message,
                          int code = OK,
                          const mdp::CharactersRangeSet& location = mdp::CharactersRangeSet()) {
-            
+
             this->message = message;
             this->code = code;
-            
+
             this->location.clear();
             if (!location.empty())
                 this->location.assign(location.begin(), location.end());
         }
-        
+
         /** \brief  %SourceAnnotation destructor. */
         ~SourceAnnotation() {}
-        
+
         /**
          *  \brief  %SourceAnnotation assignment operator
          *  \param  rhs  An annotation to be assigned to this annotation.
@@ -78,22 +78,22 @@ namespace snowcrash {
             this->location = rhs.location;
             return *this;
         }
-        
+
         /** The location of this annotation within the source data buffer. */
         mdp::CharactersRangeSet location;
-        
+
         /** An annotation code. */
         int code;
-        
+
         /** A annotation message. */
         std::string message;
     };
-    
+
     /**
      *  Error source annotation.
      */
     typedef SourceAnnotation Error;
-    
+
     /**
      *  Error codes
      */
@@ -103,12 +103,12 @@ namespace snowcrash {
         BusinessError = 2,
         SymbolError = 3
     };
-    
+
     /**
      *  Warning source annotation.
      */
     typedef SourceAnnotation Warning;
-    
+
     /**
      *  Warning codes
      */
@@ -127,12 +127,12 @@ namespace snowcrash {
         AmbiguityWarning = 11,
         URIWarning = 12
     };
-    
+
     /**
      *  A set of warning source annotations.
      */
     typedef std::vector<Warning> Warnings;
-    
+
     /**
      *  \brief A parsing report Report.
      *
@@ -141,7 +141,7 @@ namespace snowcrash {
      *  and a set of warning source annotations.
      */
     struct Report {
-        
+
         /**
          *  \brief Append a report to this one, replacing the error source annotation.
          *
@@ -152,10 +152,10 @@ namespace snowcrash {
             warnings.insert(warnings.end(), rhs.warnings.begin(), rhs.warnings.end());
             return *this;
         }
-        
+
         /** Result error source annotation */
         Error error;
-        
+
         /** Result warning source annotations */
         Warnings warnings;
     };