matter_compiler 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9153d21f8315633c3bc9d88554c1ce4e78c32787
-  data.tar.gz: ad37793f494ab8a5ed3e0a853d363fedde362f4c
+  metadata.gz: af6044418ad5bad55bb39e240c75f793c54696f5
+  data.tar.gz: 9624d5754ebccb5e50c1ff6e2b3b1f878e35520e
 SHA512:
-  metadata.gz: b031392eeeba9b4cb9bc0aca86259cf96d48aa7ad1d278c48c507bb7e96fcac9e1cc48631f9ec48c62c883886e6d0ce389fc58a36d048f9e4898ec75000501c2
-  data.tar.gz: 2ebb07a49858b3a01c7f74746c2f41498cdb4c0834a14836fac9302440b00f951d1bd0d33aa3810d264e0cd55dec9d6d904b38c93afb3918675b8baefc71e125
+  metadata.gz: e6c06b29b400c41ee52ab5b9105f4b7480950972db6c2b32a09813bc4396470b2cd09ebeb5505d9813610b9c82e4ba326e9c3b86b8a35501bab549e0ea9b14d6
+  data.tar.gz: 5ce218d30c59d46da378fbb2b6a417ebfec2c0a7d76a176a1a1b09e6311908f2acee3820678627423eb8c216c762a73228295d596f996436fe02b97b84ef2948

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/README.md

@@ -1,4 +1,4 @@
-![logo](https://raw.github.com/apiaryio/api-blueprint/gh-pages/assets/logo_apiblueprint.png) 
+![logo](https://raw.github.com/apiaryio/api-blueprint/master/assets/logo_apiblueprint.png)
 
 # 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/api-blueprint-ast) to [API Blueprint](https://apiblueprint.org) conversion tool. It composes an API blueprint from its serialzed AST media-type.

data/lib/matter_compiler/composer.rb

@@ -5,13 +5,16 @@ require 'object'
 
 module MatterCompiler
 
+  class BadInputException < Exception
+  end
+
   class Composer
-  
-    # Read AST file 
+
+    # Read AST file
     def self.read_file(file)
       unless File.readable?(file)
         abort "Unable to read input ast file: #{file.inspect}"
-      end      
+      end
       input = File.read(file)
     end
 
@@ -31,7 +34,7 @@ module MatterCompiler
         return :yaml_ast
       else
         return :unknown_ast
-      end      
+      end
     end
 
     # Guess format from filename extension.
@@ -44,6 +47,26 @@ module MatterCompiler
       self.parse_format(extension[1..-1])
     end
 
+    def self.parse_json(input)
+      begin
+        ast_hash = JSON.parse(input).deep_symbolize_keys
+      rescue JSON::ParserError
+        raise BadInputException, "Invalid JSON input"
+      end
+    end
+
+    def self.parse_yaml(input)
+      begin
+        ast_hash = YAML.load(input).deep_symbolize_keys
+      rescue Psych::SyntaxError
+        raise BadInputException, "Invalid YAML input"
+      end
+      if not ast_hash.is_a?(Hash)
+        raise BadInputException, "Invalid AST"
+      end
+      ast_hash
+    end
+
     # Compose API Blueprint from an AST file.
     # Returns a string with composed API Blueprint.
     def self.compose(file = nil, format = nil, set_blueprint_format = false)
@@ -51,25 +74,29 @@ module MatterCompiler
       input = nil
       if file.nil?
         input = self.read_stdin
-      else 
+      else
         input = self.read_file(file)
       end
+      input = input.strip
 
       if input.blank?
-        puts "Empty input"
-        exit
+        abort("Empty input")
       end
 
       # Parse input
       input_format = format ? format : self.guess_format(file)
       ast_hash = nil;
-      case input_format
-      when :json_ast
-        ast_hash = JSON.parse(input).deep_symbolize_keys
-      when :yaml_ast
-        ast_hash = YAML.load(input).deep_symbolize_keys
-      else
-        abort "Undefined input format"
+      begin
+        case input_format
+        when :json_ast
+          ast_hash = self.parse_json(input)
+        when :yaml_ast
+          ast_hash = self.parse_yaml(input)
+        else
+          raise BadInputException, "Undefined input format"
+        end
+      rescue BadInputException => e
+        abort(e.message)
       end
 
       # Check version of the AST
@@ -88,7 +115,7 @@ module MatterCompiler
       # TODO: use $stdout for now, add serialization options later
       puts blueprint.serialize(set_blueprint_format)
     end
-  
+
   end
 
 end

data/lib/matter_compiler/version.rb

@@ -1,3 +1,3 @@
 module MatterCompiler
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/composer_test.rb

@@ -1,10 +1,90 @@
+require 'tempfile'
+require 'stringio'
 require 'minitest/autorun'
 require 'matter_compiler/composer'
 
+
 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')
     assert_equal :unknown_ast, MatterCompiler::Composer.guess_format('test.txt')
   end
-end
+
+  def test_empty_file_input
+    file = Tempfile.new('test.json')
+    file.close
+
+    stderr = StringIO.new
+    $stderr = stderr
+
+    begin
+      MatterCompiler::Composer.compose(file.path, :json_ast)
+    rescue SystemExit
+    ensure
+      assert_equal "Empty input\n", stderr.string
+
+      file.unlink
+      $stderr = STDERR
+    end
+  end
+
+  def test_whitespace_only_file_input
+    file = Tempfile.new('test.json')
+    file.write("\n\n\n\n\n")
+    file.close
+
+    stderr = StringIO.new
+    $stderr = stderr
+
+    begin
+      MatterCompiler::Composer.compose(file.path, :json_ast)
+    rescue SystemExit
+    ensure
+      assert_equal "Empty input\n", stderr.string
+
+      file.unlink
+      $stderr = STDERR
+    end
+  end
+
+  def test_corrupted_json_input
+    file = Tempfile.new('test.json')
+    file.write("{\n:-(")
+    file.close
+
+    stderr = StringIO.new
+    $stderr = stderr
+
+    begin
+      MatterCompiler::Composer.compose(file.path, :json_ast)
+    rescue SystemExit
+    ensure
+      assert_equal "Invalid JSON input\n", stderr.string
+
+      file.unlink
+      $stderr = STDERR
+    end
+  end
+
+  def test_corrupted_yaml_input
+    file = Tempfile.new('test.yaml')
+    file.write("@@@@@\n:-(")
+    file.close
+
+    stderr = StringIO.new
+    $stderr = stderr
+
+    begin
+      MatterCompiler::Composer.compose(file.path, :yaml_ast)
+    rescue SystemExit
+    ensure
+      assert_equal "Invalid YAML input\n", stderr.string
+
+      file.unlink
+      $stderr = STDERR
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matter_compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Zdenek Nemec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -123,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: API Blueprint AST to API Blueprint convertor

data/Gemfile.lock

@@ -1,47 +0,0 @@
-GIT
-  remote: git://github.com/cucumber/aruba.git
-  revision: 99d8e6a5992af17b014783e775409bc3fd422273
-  specs:
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-
-PATH
-  remote: .
-  specs:
-    matter_compiler (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    childprocess (0.4.0)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.10)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.5)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    minitest (5.2.1)
-    multi_json (1.8.4)
-    multi_test (0.0.3)
-    rake (10.1.1)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba!
-  bundler (~> 1.5)
-  cucumber
-  matter_compiler!
-  minitest
-  rake