redsnow 0.2.1 → 0.3.0

data/ext/snowcrash/src/snowcrash/snowcrash.cc

@@ -37,15 +37,15 @@ enum SerializationFormat {
 void PrintAnnotation(const std::string& prefix, const snowcrash::SourceAnnotation& annotation)
 {
     std::cerr << prefix;
-    
+
     if (annotation.code != SourceAnnotation::OK) {
         std::cerr << " (" << annotation.code << ") ";
     }
-    
+
     if (!annotation.message.empty()) {
         std::cerr << " " << annotation.message;
     }
-    
+
     if (!annotation.location.empty()) {
         for (mdp::CharactersRangeSet::const_iterator it = annotation.location.begin();
              it != annotation.location.end();
@@ -54,7 +54,7 @@ void PrintAnnotation(const std::string& prefix, const snowcrash::SourceAnnotatio
             std::cerr << it->location << ":" << it->length;
         }
     }
-    
+
     std::cerr << std::endl;
 }
 
@@ -96,15 +96,15 @@ int main(int argc, const char *argv[])
     argumentParser.add("help", 'h', "display this help message");
     argumentParser.add(VersionArgument, 'v', "print Snow Crash version");
     argumentParser.add(ValidateArgument, 'l', "validate input only, do not print AST");
-    
+
     argumentParser.parse_check(argc, argv);
-    
+
     // Check arguments
     if (argumentParser.rest().size() > 1) {
         std::cerr << "one input file expected, got " << argumentParser.rest().size() << std::endl;
         exit(EXIT_FAILURE);
     }
-    
+
     // Version query
     if (argumentParser.exist(VersionArgument)) {
         std::cout << SNOWCRASH_VERSION_STRING << std::endl;
@@ -127,7 +127,7 @@ int main(int argc, const char *argv[])
             std::cerr << "fatal: unable to open input file '" << inputFileName << "'\n";
             exit(EXIT_FAILURE);
         }
-        
+
         inputStream << inputFileStream.rdbuf();
         inputFileStream.close();
     }
@@ -145,7 +145,7 @@ int main(int argc, const char *argv[])
 
     // Output
     if (!argumentParser.exist(ValidateArgument)) {
-        
+
         std::stringstream outputStream;
         std::stringstream sourcemapOutputStream;
 
@@ -157,7 +157,7 @@ int main(int argc, const char *argv[])
             SerializeYAML(blueprint.node, outputStream);
             SerializeSourceMapYAML(blueprint.sourceMap, sourcemapOutputStream);
         }
-        
+
         std::string outputFileName = argumentParser.get<std::string>(OutputArgument);
         std::string sourcemapOutputFileName = argumentParser.get<std::string>(SourcemapArgument);
 
@@ -170,7 +170,7 @@ int main(int argc, const char *argv[])
                 std::cerr << "fatal: unable to write to file '" <<  outputFileName << "'\n";
                 exit(EXIT_FAILURE);
             }
-            
+
             outputFileStream << outputStream.rdbuf();
             outputFileStream.close();
         }
@@ -178,17 +178,17 @@ int main(int argc, const char *argv[])
             // Serialize to stdout
             std::cout << outputStream.rdbuf();
         }
-        
+
         if (!sourcemapOutputFileName.empty()) {
             // Serialize to file
             std::ofstream sourcemapOutputFileStream;
             sourcemapOutputFileStream.open(sourcemapOutputFileName.c_str());
-            
+
             if (!sourcemapOutputFileStream.is_open()) {
                 std::cerr << "fatal: unable to write to file '" << sourcemapOutputFileName << "'\n";
                 exit(EXIT_FAILURE);
             }
-            
+
             sourcemapOutputFileStream << sourcemapOutputStream.rdbuf();
             sourcemapOutputFileStream.close();
         }

data/ext/snowcrash/src/win/RegexMatch.cc

@@ -23,7 +23,7 @@ bool snowcrash::RegexMatch(const string& target, const string& expression)
 {
     if (target.empty() || expression.empty())
         return false;
-    
+
     try {
         regex pattern(expression, regex_constants::extended);
         return regex_search(target, pattern);
@@ -32,7 +32,7 @@ bool snowcrash::RegexMatch(const string& target, const string& expression)
     }
     catch (...) {
     }
-    
+
     return false;
 }
 
@@ -42,7 +42,7 @@ string snowcrash::RegexCaptureFirst(const string& target, const string& expressi
     if (!RegexCapture(target, expression, groups) ||
         groups.size() < 2)
         return string();
-    
+
     return groups[1];
 }
 
@@ -50,16 +50,16 @@ bool snowcrash::RegexCapture(const string& target, const string& expression, Cap
 {
     if (target.empty() || expression.empty())
         return false;
-    
+
     captureGroups.clear();
 
     try {
-        
+
         regex pattern(expression, regex_constants::extended);
         match_results<string::const_iterator> result;
         if (!regex_search(target, result, pattern))
             return false;
-    
+
         for (match_results<string::const_iterator>::const_iterator it = result.begin();
              it != result.end();
              ++it) {
@@ -73,6 +73,6 @@ bool snowcrash::RegexCapture(const string& target, const string& expression, Cap
     }
     catch (...) {
     }
-    
+
     return false;
 }

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.15.0'
+  head 'https://github.com/apiaryio/snowcrash.git', :tag => 'v0.16.0'
 
   def install
     system "./configure"

data/lib/redsnow/binding.rb

@@ -55,11 +55,14 @@ module RedSnow
     attach_function("sc_payload_handle", "sc_payload_handle", [ :pointer, :int ], :pointer)
     attach_function("sc_payload_handle_resource", "sc_payload_handle_resource", [ :pointer ], :pointer)
     attach_function("sc_payload_name", "sc_payload_name", [ :pointer ], :string)
-    attach_function("sc_payload_symbol", "sc_payload_symbol", [ :pointer ], :string)
     attach_function("sc_payload_description", "sc_payload_description", [ :pointer ], :string)
     attach_function("sc_payload_body", "sc_payload_body", [ :pointer ], :string)
     attach_function("sc_payload_schema", "sc_payload_schema", [ :pointer ], :string)
 
+    # Payload Reference
+    attach_function("sc_reference_handle_payload", "sc_reference_handle_payload", [ :pointer ], :pointer)
+    attach_function("sc_reference_id", "sc_reference_id", [ :pointer ], :string)
+
     attach_function("sc_parameter_collection_handle_payload", "sc_parameter_collection_handle_payload", [ :pointer ], :pointer)
     attach_function("sc_parameter_collection_handle_resource", "sc_parameter_collection_handle_resource", [ :pointer ], :pointer)
     attach_function("sc_parameter_collection_handle_action", "sc_parameter_collection_handle_action", [ :pointer ], :pointer)
@@ -165,11 +168,14 @@ module RedSnow
     attach_function("sc_sm_payload_handle", "sc_sm_payload_handle", [ :pointer, :int ], :pointer)
     attach_function("sc_sm_payload_handle_resource", "sc_sm_payload_handle_resource", [ :pointer ], :pointer)
     attach_function("sc_sm_payload_name", "sc_sm_payload_name", [ :pointer ], :pointer)
-    attach_function("sc_sm_payload_symbol", "sc_sm_payload_symbol", [ :pointer ], :pointer)
     attach_function("sc_sm_payload_description", "sc_sm_payload_description", [ :pointer ], :pointer)
     attach_function("sc_sm_payload_body", "sc_sm_payload_body", [ :pointer ], :pointer)
     attach_function("sc_sm_payload_schema", "sc_sm_payload_schema", [ :pointer ], :pointer)
 
+    # Payload Reference Soure Map
+    attach_function("sc_sm_reference_handle", "sc_sm_reference_handle", [ :pointer ], :pointer)
+    attach_function("sc_sm_reference", "sc_sm_reference", [ :pointer ], :pointer)    
+
     attach_function("sc_sm_parameter_collection_handle_payload", "sc_sm_parameter_collection_handle_payload", [ :pointer ], :pointer)
     attach_function("sc_sm_parameter_collection_handle_resource", "sc_sm_parameter_collection_handle_resource", [ :pointer ], :pointer)
     attach_function("sc_sm_parameter_collection_handle_action", "sc_sm_parameter_collection_handle_action", [ :pointer ], :pointer)

data/lib/redsnow/blueprint.rb

@@ -226,10 +226,11 @@ module RedSnow
       @body = RedSnow::Binding.sc_payload_body(sc_payload_handle_resource)
       @schema = RedSnow::Binding.sc_payload_schema(sc_payload_handle_resource)
 
-      symbol = RedSnow::Binding.sc_payload_symbol(sc_payload_handle_resource)
+      sc_reference_handle_payload = RedSnow::Binding.sc_reference_handle_payload(sc_payload_handle_resource)
+      sc_reference_id = RedSnow::Binding.sc_reference_id(sc_reference_handle_payload)
 
-      if not symbol.empty?
-        @reference = ReferenceNode.new(symbol)
+      if not sc_reference_id.empty?
+        @reference = ReferenceNode.new(sc_reference_id)
       end
 
       sc_header_collection_handle_payload = RedSnow::Binding.sc_header_collection_handle_payload(sc_payload_handle_resource)

data/lib/redsnow/sourcemap.rb

@@ -168,11 +168,13 @@ module RedSnow
         @body = SourceMap.new(RedSnow::Binding.sc_sm_payload_body(sc_sm_payload_handle_resource))
         @schema = SourceMap.new(RedSnow::Binding.sc_sm_payload_schema(sc_sm_payload_handle_resource))
 
-        symbol_source_map_handle = RedSnow::Binding.sc_sm_payload_symbol(sc_sm_payload_handle_resource)
-        symbol_source_map_size = RedSnow::Binding.sc_source_map_size(symbol_source_map_handle)
+        # Handle to reference source map
+        sc_sm_reference_handle = RedSnow::Binding.sc_sm_reference_handle(sc_sm_payload_handle_resource)
+        sc_sm_reference = RedSnow::Binding.sc_sm_reference(sc_sm_reference_handle)
+        reference_source_map_size = RedSnow::Binding.sc_source_map_size(sc_sm_reference)
 
-        if symbol_source_map_size != 0
-          @reference = SourceMap.new(symbol_source_map_handle)
+        if reference_source_map_size != 0
+          @reference = SourceMap.new(sc_sm_reference)
         end
 
         sc_sm_header_collection_handle_payload = RedSnow::Binding.sc_sm_header_collection_handle_payload(sc_sm_payload_handle_resource)

data/lib/redsnow/version.rb

@@ -1,4 +1,4 @@
 module RedSnow
   # Gem version
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redsnow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ladislav Prskavec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -158,10 +158,6 @@ files:
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/CBlueprintSourcemap.o
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/CSourceAnnotation.o
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/HTTP.o
-- ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/MarkdownBlock.o
-- ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/MarkdownParser.o
-- ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/Parser.o
-- ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/ParserCore.o
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/Section.o
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/Serialize.o
 - ext/snowcrash/build/out/Release/obj.target/libsnowcrash/src/SerializeJSON.o
@@ -181,20 +177,10 @@ files:
 - ext/snowcrash/build/out/Release/obj.target/libsundown/ext/markdown-parser/ext/sundown/src/src_map.o
 - ext/snowcrash/build/out/Release/obj.target/libsundown/ext/markdown-parser/ext/sundown/src/stack.o
 - ext/snowcrash/build/out/Release/obj.target/snowcrash/src/snowcrash/snowcrash.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/html/houdini_href_e.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/html/houdini_html_e.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/html/html.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/html/html_smartypants.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/src/autolink.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/src/buffer.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/src/markdown.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/src/src_map.o
-- ext/snowcrash/build/out/Release/obj.target/sundown/sundown/src/stack.o
 - ext/snowcrash/build/out/Release/snowcrash
 - ext/snowcrash/build/perf-libsnowcrash.target.mk
 - ext/snowcrash/build/snowcrash.Makefile
 - ext/snowcrash/build/snowcrash.target.mk
-- ext/snowcrash/build/sundown.target.mk
 - ext/snowcrash/common.gypi
 - ext/snowcrash/config.gypi
 - ext/snowcrash/config.mk
@@ -235,6 +221,7 @@ files:
 - ext/snowcrash/ext/markdown-parser/src/MarkdownParser.h
 - ext/snowcrash/provisioning.sh
 - ext/snowcrash/snowcrash.gyp
+- ext/snowcrash/snowcrash.xcworkspace/contents.xcworkspacedata
 - ext/snowcrash/src/ActionParser.h
 - ext/snowcrash/src/AssetParser.h
 - ext/snowcrash/src/Blueprint.h
@@ -385,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Snow Crash