asciimath 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ac3713271b5ebfc1878d30dc820458ad9e6cc1
-  data.tar.gz: 99b1031e60e3681265cb98d8a74f7470341787cf
+  metadata.gz: aa1c3652a0a8ee204467385b78c06902d31c473d
+  data.tar.gz: 5c5f71402ee68f2b5f4fbbcca771b2f0f7b1107b
 SHA512:
-  metadata.gz: d315370a018cacd96a53a2abd8026d596b8dd4f0e7449ed9f5affa6e222b534c2ba2508e7de4df5235ab3a6291272f40c6529deac709e0a6ff6be70d68bd97e8
-  data.tar.gz: 6c652b60fe2a67c1fca6322d668488d9570c9b78114d54013f970d3d6a4d5a2ad10fa49506c1222031ab2c2c1bbd158ac481931aa5742d472d0e8ac4cc1155d1
+  metadata.gz: d0c849c8dbcafb79620ae2b1358629e4644f6372f324b0e56a74beabc4509b395512dd3a64deb9916dc864bda42a16a013253db3a75818268a3193a82da6fa82
+  data.tar.gz: fbd88a8fa50bd2042976f9fe9b2529af73f4d8dac108197d316aa1e2b9666694ec283ce218f5af1862fe619b9cd79a692f3d05a6ef381e104d60c0258aa9f22a

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+cache:
+  apt: true
+  directories:
+    - vendor/bundle
+    - $HOME/.cache/pip
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby
+install:
+  - bundle install --path vendor/bundle --jobs=3 --retry=3

data/Rakefile

@@ -1,2 +1,7 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test)
+
+task :default => :test

data/lib/asciimath/parser.rb

@@ -53,7 +53,6 @@ module AsciiMath
   #
   class Tokenizer
     WHITESPACE = /^\s+/
-    NUMBER_START = /[-0-9]/
     NUMBER = /-?[0-9]+(?:\.[0-9]+)?/
     TEXT = /"[^"]+"/
 
@@ -87,7 +86,7 @@ module AsciiMath
       case @string.peek(1)
         when '"'
           read_text
-        when NUMBER_START
+        when '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
           read_number() || read_symbol
         else
           read_symbol()
@@ -125,6 +124,17 @@ module AsciiMath
       end
     end
 
+    if String.method_defined?(:bytesize)
+      def bytesize(s)
+        s.bytesize
+      end
+    else
+      def bytesize(s)
+        s.length
+      end
+    end
+
+
     # Private: Reads a symbol token from the input string. This method first creates
     # a String from the input String starting from the current position with a length
     # that matches that of the longest key in the symbol table. It then looks up that
@@ -143,7 +153,7 @@ module AsciiMath
         until s.length == 1 || @symbols.include?(s)
           s.chop!
         end
-        @string.pos = position + s.length
+        @string.pos = position + bytesize(s)
         @symbols[s] || {:value => s, :type => :identifier}
       end
     end
@@ -162,6 +172,12 @@ module AsciiMath
         s
       end
     end
+
+    if String.respond_to?(:byte_size)
+      def byte_size(s)
+        s.byte_size
+      end
+    end
   end
 
   class Parser

data/lib/asciimath/version.rb

@@ -1,3 +1,3 @@
 module AsciiMath
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/{test → spec}/parser_spec.rb

@@ -42,8 +42,16 @@ TEST_CASES = {
         '<math><mrow><mo>(</mo><mtable><mtr><mtd><msub><mi>a</mi><mn>11</mn></msub></mtd><mtd><mo>&#x22EF;</mo></mtd><mtd><msub><mi>a</mi><mrow><mn>1</mn><mi>n</mi></mrow></msub></mtd></mtr><mtr><mtd><mo>&#x22EE;</mo></mtd><mtd><mo>&#x22F1;</mo></mtd><mtd><mo>&#x22EE;</mo></mtd></mtr><mtr><mtd><msub><mi>a</mi><mrow><mi>m</mi><mn>1</mn></mrow></msub></mtd><mtd><mo>&#x22EF;</mo></mtd><mtd><msub><mi>a</mi><mrow><mi>m</mi><mi>n</mi></mrow></msub></mtd></mtr></mtable><mo>)</mo></mrow></math>',
     'sum_(k=1)^n k = 1+2+ cdots +n=(n(n+1))/2' =>
         '<math><munderover><mo>&#x2211;</mo><mrow><mi>k</mi><mo>=</mo><mn>1</mn></mrow><mi>n</mi></munderover><mi>k</mi><mo>=</mo><mn>1</mn><mo>+</mo><mn>2</mn><mo>+</mo><mo>&#x22EF;</mo><mo>+</mo><mi>n</mi><mo>=</mo><mfrac><mrow><mi>n</mi><mrow><mo>(</mo><mi>n</mi><mo>+</mo><mn>1</mn><mo>)</mo></mrow></mrow><mn>2</mn></mfrac></math>',
+    '"Скорость"=("Расстояние")/("Время")' =>
+        '<math><mtext>Скорость</mtext><mo>=</mo><mfrac><mtext>Расстояние</mtext><mtext>Время</mtext></mfrac></math>'
 }
 
+version = RUBY_VERSION.split('.').map { |s| s.to_i }
+
+if version[0] > 1 || version[1] > 8
+  TEST_CASES['Скорость=(Расстояние)/(Время)'] = '<math><mi>С</mi><mi>к</mi><mi>о</mi><mi>р</mi><mi>о</mi><mi>с</mi><mi>т</mi><mi>ь</mi><mo>=</mo><mfrac><mrow><mi>Р</mi><mi>а</mi><mi>с</mi><mi>с</mi><mi>т</mi><mi>о</mi><mi>я</mi><mi>н</mi><mi>и</mi><mi>е</mi></mrow><mrow><mi>В</mi><mi>р</mi><mi>е</mi><mi>м</mi><mi>я</mi></mrow></mfrac></math>'
+end
+
 module AsciiMathHelper
   def expect_mathml(asciimath, mathml)
     expect(AsciiMath.parse(asciimath).to_mathml).to eq(mathml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciimath
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,7 +73,7 @@ files:
 - lib/asciimath/mathml.rb
 - lib/asciimath/parser.rb
 - lib/asciimath/version.rb
-- test/parser_spec.rb
+- spec/parser_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -98,5 +99,5 @@ signing_key:
 specification_version: 4
 summary: AsciiMath parser and converter
 test_files:
-- test/parser_spec.rb
+- spec/parser_spec.rb
 has_rdoc: