matter_compiler 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19e325ef7a0cbf7f7694b87d6b4a2947658e2e1
-  data.tar.gz: 7f46dbae5982e326b5bb2111bbf405fa8a9c1d17
+  metadata.gz: 2438e7716b2607e8788be4e332aff2eedb0d460c
+  data.tar.gz: db36d457d1d9ab69d0553e6f447d30adf486dd8f
 SHA512:
-  metadata.gz: daabff21fb92ea1d400c256fc2745cfe54c0dca159690ee826af45afc219bcef81d9c1534aca7c0498d6fe7ec7e77f4d96609bc234e7351535381eed5640c0cf
-  data.tar.gz: 1167484610a8a5a500dff8249a4c5222c9c9559536da38acfd0c71da23d8eb3e0538aad2b3c72b45ab4614c85e4df66c44ade92ecb11bba33859c16c8816d522
+  metadata.gz: 3005e01e75d7ac2ed028f5c4caccc3aae4557b9a26d3b51cf4d3fde2ac19f6a62861e57e5a22f54722bd443046d5c161fae76e36943a18c83a5d95a0b8b6c50c
+  data.tar.gz: 2515278165482136a04b5d6e827d3222a0ab859e91d44b04360f5cfc54504464e5e26c6adfb42c7b02e7f2f2c731e4c75aa488c8bfc099e3b548442c186b973f

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/cucumber/aruba.git
-  revision: 7afbc5c0cbae9c9a946d70c4c2735ccb86e00f08
+  revision: 99d8e6a5992af17b014783e775409bc3fd422273
   specs:
-    aruba (0.5.3)
+    aruba (0.5.4)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
@@ -10,13 +10,13 @@ GIT
 PATH
   remote: .
   specs:
-    matter_compiler (0.1.1)
+    matter_compiler (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    childprocess (0.3.9)
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.10)
       builder (>= 2.1.2)
@@ -28,8 +28,8 @@ GEM
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    minitest (4.7.5)
-    multi_json (1.8.2)
+    minitest (5.2.1)
+    multi_json (1.8.4)
     multi_test (0.0.3)
     rake (10.1.1)
     rspec-expectations (2.14.4)

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2013 Apiary Inc. <support@apiary.io>.
+Copyright (c) 2014 Apiary Inc. <support@apiary.io>.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,9 +1,7 @@
 # Matter Compiler [![Build Status](https://travis-ci.org/apiaryio/matter_compiler.png?branch=master)](https://travis-ci.org/apiaryio/matter_compiler)
-
 Matter Compiler is a [API Blueprint AST Media Types](https://github.com/apiaryio/snowcrash/wiki/API-Blueprint-AST-Media-Types) to [API Blueprint](https://apiblueprint.org) conversion tool. It composes an API blueprint from its serialzed AST media-type.
 
 ## Installation
-
 Add this line to your application's Gemfile:
 
     gem 'matter_compiler'
@@ -26,7 +24,6 @@ $ matter_compiler path/to/ast.yaml
 See the [compose feature](features/compose.feature) for details or run `matter_compiler --help`.
 
 ## Contributing
-
 1. Fork it (https://github.com/apiaryio/matter_compiler/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/features/compose.feature

@@ -331,20 +331,20 @@
   Scenario: Compose blueprint from an YAML stdin input
     When I run `matter_compiler --format yaml` interactively
     When I pipe in the file "ast.yaml"
-    Then the output should contain the content file "blueprint.md"
+    Then the output should contain the content of file "blueprint.md"
 
   Scenario: Compose blueprint from an YAML file
     When I run `matter_compiler ast.yaml`
-    Then the output should contain the content file "blueprint.md"    
+    Then the output should contain the content of file "blueprint.md"    
 
   Scenario: Compose blueprint from a JSON stdin input
     When I run `matter_compiler --format json` interactively
     When I pipe in the file "ast.json"
-    Then the output should contain the content file "blueprint.md"
+    Then the output should contain the content of file "blueprint.md"
 
   Scenario: Compose blueprint from a JSON file
     When I run `matter_compiler ast.json`
-    Then the output should contain the content file "blueprint.md"
+    Then the output should contain the content of file "blueprint.md"
 
 
   Scenario: Copose unsupported version of blueprint AST

data/features/step_definitions/file_content_step.rb

@@ -1,4 +1,4 @@
-Then /^the output should contain the content file "(.*)"$/ do |filename|
+Then /^the output should contain the content of file "(.*)"$/ do |filename|
   expected = nil
   in_current_dir do
     expected = File.read(filename)

data/lib/matter_compiler/blueprint.rb

@@ -32,6 +32,18 @@ module MatterCompiler
       @name = hash[:name]
       @description = hash[:description]
     end
+
+    # Ensure a description serialization
+    # ends with two newlines.
+    def ensure_description_newlines(buffer)
+      return if description.blank?
+
+      if description[-1, 1] != "\n"
+        buffer << "\n\n"
+      elsif description.length > 1 && description[-2, 1] != "\n"
+        buffer << "\n"
+      end    
+    end        
   end
 
   #
@@ -269,19 +281,28 @@ module MatterCompiler
         end
         buffer << "\n"
 
+        got_new_line = false
         @body.each_line do |line| 
           asset_indent_level.times { buffer << ONE_INDENTATION_LEVEL }
           buffer << "#{line}"
+          got_new_line = line[-1, 1] == "\n"
         end
+      
+        buffer << "\n" unless got_new_line
         buffer << "\n"
       end
 
       unless @schema.blank?
         buffer << "#{ONE_INDENTATION_LEVEL}+ Schema\n\n"
+
+        got_new_line = false
         @schema.each_line do |line| 
           3.times { buffer << ONE_INDENTATION_LEVEL }
           buffer << "#{line}"
-        end        
+          got_new_line = line[-1, 1] == "\n"
+        end 
+
+        buffer << "\n" unless got_new_line
         buffer << "\n"
       end
 
@@ -400,6 +421,7 @@ module MatterCompiler
       end
 
       buffer << "#{@description}" unless @description.blank?
+      ensure_description_newlines(buffer)
 
       buffer << @parameters.serialize unless @parameters.nil?
       buffer << @headers.serialize unless @headers.nil?
@@ -444,6 +466,7 @@ module MatterCompiler
       end
 
       buffer << "#{@description}" unless @description.blank?
+      ensure_description_newlines(buffer)
 
       buffer << @model.serialize unless @model.nil?
       buffer << @parameters.serialize unless @parameters.nil?
@@ -475,6 +498,7 @@ module MatterCompiler
       buffer = ""
       buffer << "# Group #{@name}\n" unless @name.blank?
       buffer << "#{@description}" unless @description.blank?
+      ensure_description_newlines(buffer)
 
       @resources.each { |resource| buffer << resource.serialize } unless @resources.nil?
       buffer
@@ -513,6 +537,7 @@ module MatterCompiler
       buffer << "#{@metadata.serialize}" unless @metadata.nil?      
       buffer << "# #{@name}\n" unless @name.blank?
       buffer << "#{@description}" unless @description.blank?
+      ensure_description_newlines(buffer)
 
       @resource_groups.each { |group| buffer << group.serialize } unless @resource_groups.nil?
       buffer

data/lib/matter_compiler/version.rb

@@ -1,3 +1,3 @@
 module MatterCompiler
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/action_test.rb

@@ -4,7 +4,7 @@ require_relative 'parameters_test'
 require_relative 'headers_test'
 require_relative 'transaction_example_test'
 
-class ActionTest < Minitest::Unit::TestCase
+class ActionTest < Minitest::Test
   AST_HASH = {
     :name => "Into Action",
     :description => "Dolor sit amet\n\n",

data/test/blueprint_test.rb

@@ -3,7 +3,7 @@ require 'matter_compiler/blueprint'
 require_relative 'resource_group_test'
 require_relative 'metadata_test'
 
-class BlueprintTest < Minitest::Unit::TestCase
+class BlueprintTest < Minitest::Test
   AST_HASH = {
     :_version => 1.0,
     :metadata => MetadataTest::AST_HASH,

data/test/composer_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'matter_compiler/composer'
 
-class ComposerTest < Minitest::Unit::TestCase
+class ComposerTest < Minitest::Test
   def test_guess_format
     assert_equal :yaml_ast, MatterCompiler::Composer.guess_format('test.yaml')
     assert_equal :json_ast, MatterCompiler::Composer.guess_format('test.json')

data/test/headers_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'matter_compiler/blueprint'
 
-class HeadersTest < Minitest::Unit::TestCase
+class HeadersTest < Minitest::Test
   AST_HASH = {
     :'X-Header' => {
       :value => "1"      

data/test/metadata_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'matter_compiler/blueprint'
 
-class MetadataTest < Minitest::Unit::TestCase
+class MetadataTest < Minitest::Test
   AST_HASH = {
     :FORMAT => {
       :value => "1A"      

data/test/parameters_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'matter_compiler/blueprint'
 
-class ParametersTest < Minitest::Unit::TestCase
+class ParametersTest < Minitest::Test
   AST_HASH = {
     :id => {
       :description => "Lorem\nIpsum\n",

data/test/payload_test.rb

@@ -7,7 +7,7 @@ require_relative 'headers_test'
 # with model test used as an archetype for payload.
 #
 
-class ModelTest < Minitest::Unit::TestCase
+class ModelTest < Minitest::Test
   AST_HASH = {
     :name => "My Resource",
     :description => "Lorem ipsum dolor sit amet.\n",
@@ -48,7 +48,7 @@ class ModelTest < Minitest::Unit::TestCase
   end
 end
 
-class RequestTest < Minitest::Unit::TestCase
+class RequestTest < Minitest::Test
   AST_HASH = {
     :name => "Name",
     :description => "Lorem\nIpsum\n",
@@ -86,7 +86,7 @@ class RequestTest < Minitest::Unit::TestCase
   end
 end
 
-class ResponseTest < Minitest::Unit::TestCase
+class ResponseTest < Minitest::Test
   AST_HASH = {
     :name => "200",
     :description => nil,

data/test/resource_group_test.rb

@@ -2,7 +2,7 @@ require 'minitest/autorun'
 require 'matter_compiler/blueprint'
 require_relative 'resource_test'
 
-class ResourceGroupTest < Minitest::Unit::TestCase
+class ResourceGroupTest < Minitest::Test
   AST_HASH = {
     :name => "My Resource Group",
     :description => "Lorem Ipsum at [Apiary](http://apiary.io)\n\n",

data/test/resource_test.rb

@@ -5,7 +5,7 @@ require_relative 'payload_test'
 require_relative 'parameters_test'
 require_relative 'headers_test'
 
-class ResourceTest < Minitest::Unit::TestCase
+class ResourceTest < Minitest::Test
   AST_HASH = {
     :name => "My Resource",
     :description => "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\n",

data/test/transaction_example_test.rb

@@ -2,7 +2,7 @@ require 'minitest/autorun'
 require 'matter_compiler/blueprint'
 require_relative 'payload_test'
 
-class TransactionExampleTest < Minitest::Unit::TestCase
+class TransactionExampleTest < Minitest::Test
   AST_HASH = {
     :name => "",
     :description => "",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matter_compiler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Zdenek Nemec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler