koara 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3740a66092afcdca69ca8e1ab7fbeec672f173
-  data.tar.gz: f31b7b0609a6f3c61624f6867d841f78d5e8f5b6
+  metadata.gz: 1eda3e058819a93a8e25eec083a6317dc98a9f2f
+  data.tar.gz: 5ceb0cc340e176c7490185d589b47d6327aa8cfb
 SHA512:
-  metadata.gz: 1308736ba99a01114f387abe022e75a025cbd81982406034c8fac28d76e02bf7ad7fa82271ecf949e95f93dc13e97e42c42daf68c1185e1f1074174b5bcfbd7f
-  data.tar.gz: 5982de70647333d8fe63a4d052bcb88366e57f9a6cf32032d77e71b535101aa87b713d3175dd21616a98d2872111e2f4f70da3f317143d07a9ab78a2aab70ec7
+  metadata.gz: ef3933b6b1a76fa854a3bc23abeb797fd1a8cf5666c619b684141350b119918f347b280eda85dca0722b147c7759e2efefcaf55708b8be2de81b38abb293af8e
+  data.tar.gz: 8e9863716d11d758c68922eb479de647531bc8161704c49be10f50aceb36dbc4ecc759c7fe91fe9e5a93238d967fb502e69ea1b4a49c64def24941c3f81c0844

data/README.md

@@ -1,4 +1,4 @@
-[![Koara](http://www.koara.io/logo.png)](http://www.koara.io)
+[![Koara](http://www.codeaddslife.com/koara.png)](http://www.codeaddslife.com/koara)
 
 [![Build Status](https://img.shields.io/travis/koara/koara-rb.svg)](https://travis-ci.org/koara/koara-rb)
 [![Coverage Status](https://img.shields.io/coveralls/koara/koara-rb.svg)](https://coveralls.io/github/koara/koara-rb?branch=master)
@@ -6,7 +6,7 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/koara/koara-rb/blob/master/LICENSE)
 
 # Koara-rb
-[Koara](http://www.koara.io) is a modular lightweight markup language. This project is the core koara parser written in Ruby.
+[Koara](http://www.codeaddslife.com/koara) is a modular lightweight markup language. This project is the core koara parser written in Ruby.
 If you are interested in converting koara to a specific outputFormat, please look the [Related Projects](#related-projects) section.
 
 ## Getting started

data/lib/koara/io/filereader.rb

@@ -15,7 +15,7 @@ module Koara
             buffer[offset + i] = c
             characters_read += 1
             @index += c.bytesize
-            return characters_read if characters_read >= length
+              return characters_read if characters_read >= length
           }
           return characters_read
 

data/lib/koara/parser.rb

@@ -37,6 +37,8 @@ module Koara
     end
 
     def parse_file(file)
+
+
       if File.basename(file).downcase.reverse[0, 3].reverse.to_s != '.kd'
         raise(ArgumentError, "Can only parse files with extension .kd")
       end

data/lib/koara/version.rb

@@ -1,4 +1,4 @@
 module Koara
   # Koara version number.
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/test/charstream_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class CharStreamTest < MiniTest::Unit::TestCase
+class CharStreamTest < Minitest::Test
   def test_begin_token
     cs = Koara::CharStream.new(Koara::Io::StringReader.new('abcd'))
     assert_equal('a', cs.begin_token)

data/test/compliance_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 require 'html5renderer'
 require 'pathname'
 
-class ComplianceTest < MiniTest::Unit::TestCase
+class ComplianceTest < Minitest::Test
 
   TEST_DIR = 'testsuite'
 

data/test/end_to_end_test.rb

@@ -2,12 +2,13 @@
 require 'test_helper'
 require_relative 'html5renderer'
 
-class EndToEndTest < MiniTest::Unit::TestCase
+class EndToEndTest < Minitest::Test
 
   TEST_DIR = 'testsuite'
 
   def setup
     @parser = Koara::Parser.new
+    @kd = File.read("#{TEST_DIR}/input/end2end.kd")
   end
 
   def test_000001
@@ -1031,14 +1032,12 @@ class EndToEndTest < MiniTest::Unit::TestCase
   end
 
   def assert_output(file, modules)
-    kd = File.read("#{TEST_DIR}/input/end2end.kd")
     html = File.read("#{TEST_DIR}/output/html5/end2end/#{file}.htm")
 
     parser = Koara::Parser.new
 
     parser.modules = modules
-
-    document = parser.parse_file(File.new("#{TEST_DIR}/input/end2end.kd"))
+    document = parser.parse(@kd)
     renderer = Html5Renderer.new
     document.accept(renderer)
 

data/test/filereader_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class FileReaderTest < MiniTest::Unit::TestCase
+class FileReaderTest < Minitest::Test
   def setup
     @buffer = Array.new
   end
@@ -28,8 +28,8 @@ class FileReaderTest < MiniTest::Unit::TestCase
   def test_read_with_offset_part_of_string
     @reader = Koara::Io::FileReader.new('test/filereader.kd')
     assert_equal(4, @reader.read(@buffer, 2, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
     assert_equal('a', @buffer[2])
     assert_equal('b', @buffer[3])
   end
@@ -37,10 +37,10 @@ class FileReaderTest < MiniTest::Unit::TestCase
   def test_read_with_offset_too_large_part_of_string
     @reader = Koara::Io::FileReader.new('test/filereader.kd')
     assert_equal(4, @reader.read(@buffer, 6, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
-    assert_equal(nil, @buffer[2])
-    assert_equal(nil, @buffer[3])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
+    assert_nil(@buffer[2])
+    assert_nil(@buffer[3])
   end
 
   def test_read_until_eof
@@ -75,8 +75,8 @@ class FileReaderTest < MiniTest::Unit::TestCase
   def test_read_with_unicode_and_offset_part_of_string
     @reader = Koara::Io::FileReader.new('test/filereader-unicode.kd')
     assert_equal(4, @reader.read(@buffer, 2, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
     assert_equal('ð', @buffer[2])
     assert_equal('i', @buffer[3])
   end
@@ -84,10 +84,10 @@ class FileReaderTest < MiniTest::Unit::TestCase
   def test_read_with_unicode_and_offset_too_large_part_of_string
     @reader = Koara::Io::FileReader.new('test/filereader-unicode.kd')
     assert_equal(4, @reader.read(@buffer, 6, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
-    assert_equal(nil, @buffer[2])
-    assert_equal(nil, @buffer[3])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
+    assert_nil(@buffer[2])
+    assert_nil(@buffer[3])
   end
 
   def test_read_with_unicode_until_eof

data/test/stringreader_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class StringReaderTest < MiniTest::Unit::TestCase
+class StringReaderTest < Minitest::Test
   def setup
     @buffer = Array.new
   end
@@ -28,8 +28,8 @@ class StringReaderTest < MiniTest::Unit::TestCase
   def test_read_with_offset_part_of_string
     @reader = Koara::Io::StringReader.new('abcd')
     assert_equal(4, @reader.read(@buffer, 2, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
     assert_equal('a', @buffer[2])
     assert_equal('b', @buffer[3])
   end
@@ -37,10 +37,10 @@ class StringReaderTest < MiniTest::Unit::TestCase
   def test_read_with_offset_too_large_part_of_string
     @reader = Koara::Io::StringReader.new('abcd')
     assert_equal(4, @reader.read(@buffer, 6, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
-    assert_equal(nil, @buffer[2])
-    assert_equal(nil, @buffer[3])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
+    assert_nil(@buffer[2])
+    assert_nil(@buffer[3])
   end
 
   def test_read_until_eof
@@ -75,8 +75,8 @@ class StringReaderTest < MiniTest::Unit::TestCase
   def test_Read_with_unicode_and_offset_part_of_string
     @reader = Koara::Io::StringReader.new('ðinæ')
     assert_equal(4, @reader.read(@buffer, 2, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
     assert_equal('ð', @buffer[2])
     assert_equal('i', @buffer[3])
   end
@@ -84,10 +84,10 @@ class StringReaderTest < MiniTest::Unit::TestCase
   def test_read_with_unicode_and_offset_too_large_part_of_string
     @reader = Koara::Io::StringReader.new('ðinæ')
     assert_equal(4, @reader.read(@buffer, 6, 4))
-    assert_equal(nil, @buffer[0])
-    assert_equal(nil, @buffer[1])
-    assert_equal(nil, @buffer[2])
-    assert_equal(nil, @buffer[3])
+    assert_nil(@buffer[0])
+    assert_nil(@buffer[1])
+    assert_nil(@buffer[2])
+    assert_nil(@buffer[3])
   end
 
   def test_read_with_unicode_until_eof

data/test/token_manager_test.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class TokenManagerTest < MiniTest::Unit::TestCase
-
+class TokenManagerTest < Minitest::Test
 
   def test_eof
    token = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new('')))::get_next_token
@@ -68,6 +67,12 @@ class TokenManagerTest < MiniTest::Unit::TestCase
     assert_equal(Koara::TokenManager::EOL, token.kind)
     assert_equal("\n", token.image)
   end
+  
+  def test_eol_with_spaces
+    token = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new("  \n"))).get_next_token
+    assert_equal(Koara::TokenManager::EOL, token.kind)
+    assert_equal("  \n", token.image)
+  end
 
   def test_eq
     token = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new('='))).get_next_token
@@ -141,17 +146,18 @@ class TokenManagerTest < MiniTest::Unit::TestCase
     assert_equal('_', token.image)
   end
 
-  def test_space_after_char_sequence
-    tm = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new('a ')))
-    assert_equal('a', tm.get_next_token.image)
-    assert_equal(' ', tm.get_next_token.image)
-  end
-
-  def test_two_distinct_char_sequences
-    tm = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new('ði ı')))
-    assert_equal('ði', tm.get_next_token.image)
-    assert_equal(' ', tm.get_next_token.image)
-    assert_equal('ı', tm.get_next_token.image)
+  def test_linebreak
+  	tm = Koara::TokenManager.new(Koara::CharStream.new(Koara::Io::StringReader.new("a\nb")))
+    token = tm.get_next_token
+    assert_equal(Koara::TokenManager::CHAR_SEQUENCE, token.kind)
+    assert_equal('a', token.image)
+    token = tm.get_next_token
+    assert_equal(Koara::TokenManager::EOL, token.kind)
+    assert_equal("\n", token.image)
+    token = tm.get_next_token
+    assert_equal(Koara::TokenManager::CHAR_SEQUENCE, token.kind)    
   end
+  
+  
 
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: koara
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Andy Van Den Heuvel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Koara parser written in Ruby
@@ -79,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Koara parser written in Ruby