mathematical 1.2.0 → 1.2.1

data/ext/mathematical/mtex2MML/tests/numbered_equations.c

@@ -0,0 +1,47 @@
+#include "clar.h"
+#include "clar_test.h"
+#include <stdio.h>
+#include <string.h>
+
+static char *fixture_tex;
+static char *fixture_mml;
+static char *result;
+
+void test_numbered_equations__initialize(void)
+{
+  global_test_counter++;
+}
+
+void test_numbered_equations__cleanup(void)
+{
+  if (fixture_tex != NULL) {
+    free(fixture_tex);
+  }
+
+  if (fixture_mml != NULL) {
+    free(fixture_mml);
+  }
+
+  if (result != NULL) {
+    free(result);
+  }
+}
+
+void test_numbered_equations__single_equation(void)
+{
+  fixture_tex = read_fixture_tex("numbered_equations/single_equation.txt");
+  fixture_mml = read_fixture_mml("numbered_equations/single_equation.html");
+  result = mtex2MML_global_parse(fixture_tex, strlen(fixture_tex), 1);
+
+  cl_assert_equal_s(fixture_mml, result);
+}
+
+void test_numbered_equations__multiple_equations(void)
+{
+  fixture_tex = read_fixture_tex("numbered_equations/multiple_equations.txt");
+  fixture_mml = read_fixture_mml("numbered_equations/multiple_equations.html");
+  mtex2MML_filter(fixture_tex, strlen(fixture_tex));
+  result = mtex2MML_output();
+
+  cl_assert_equal_s(fixture_mml, result);
+}

data/lib/mathematical.rb

@@ -1,14 +1,14 @@
 require 'mathematical/mathematical'
 
 require 'mathematical/corrections'
+require 'mathematical/validator'
 require 'mathematical/version'
 
 require 'base64'
 
 class Mathematical
   include Corrections
-
-  FORMAT_TYPES = [:svg, :png, :mathml]
+  include Validator
 
   DEFAULT_OPTS = {
     :ppi => 72.0,
@@ -23,7 +23,7 @@ class Mathematical
   def initialize(opts = {})
     @config = DEFAULT_OPTS.merge(opts)
 
-    validate_config
+    validate_config(@config)
 
     @config[:formatInt] = FORMAT_TYPES.index(@config[:format])
 
@@ -43,53 +43,8 @@ class Mathematical
     end
   end
 
-  def validate_content(maths)
-    if !maths.is_a?(String) && !maths.is_a?(Array)
-      fail(TypeError, 'input must be a string or an array!')
-    end
-
-    if maths.is_a? String
-      validate_string(maths)
-    else
-      validate_array(maths)
-    end
-  end
-
   private
 
-  def validate_config
-    fail(TypeError, 'maxsize must be an integer!') unless @config[:maxsize].is_a? Fixnum
-    fail(TypeError, 'maxsize cannot be less than 0!') if @config[:maxsize] < 0
-    fail(TypeError, 'format must be a symbol!') unless @config[:format].is_a? Symbol
-    fail(TypeError, "format type must be one of the following formats: #{FORMAT_TYPES.join(', ')}") unless FORMAT_TYPES.include?(@config[:format])
-  end
-
-  def validate_string(maths)
-    maths = maths.strip
-    unless valid_math_string(maths)
-      fail(ArgumentError, 'input must be in tex format (`$...$` or `$$...$$`)!')
-    end
-
-    maths
-  end
-
-  def validate_array(maths)
-    unless maths.all? { |m| m.is_a?(String) }
-      fail(ArgumentError, 'every element in array must be a string in tex format (`$...$` or `$$...$$`)!')
-    end
-
-    maths = maths.map(&:strip)
-    unless maths.all? { |m| valid_math_string(m) }
-      fail(ArgumentError, 'every element in array must be a string in tex format (`$...$` or `$$...$$`)!')
-    end
-
-    maths
-  end
-
-  def valid_math_string(maths)
-    maths =~ /\A\${1,2}/
-  end
-
   def format_data(result_hash)
     # we passed in an array of math, and found an unprocessable element
     return result_hash if result_hash[:exception]

data/lib/mathematical/validator.rb

@@ -0,0 +1,52 @@
+class Mathematical
+  module Validator
+    # explanation can be found at http://git.io/vJRBj
+    DOLLAR_MATCHER = /\A(?<!\\)(?:((?<!\$)\${1,2}(?!\$))(.*?(\g<1>)?.*?)(?<!\\)(?(1)(?<!\$)\1(?!\$)))\z/xm
+
+    FORMAT_TYPES = [:svg, :png, :mathml].freeze
+
+    def validate_config(config)
+      fail(TypeError, 'maxsize must be an integer!') unless config[:maxsize].is_a? Fixnum
+      fail(TypeError, 'maxsize cannot be less than 0!') if config[:maxsize] < 0
+      fail(TypeError, 'format must be a symbol!') unless config[:format].is_a? Symbol
+      fail(TypeError, "format type must be one of the following formats: #{FORMAT_TYPES.join(', ')}") unless FORMAT_TYPES.include?(config[:format])
+    end
+
+    def validate_content(maths)
+      if !maths.is_a?(String) && !maths.is_a?(Array)
+        fail(TypeError, 'input must be a string or an array!')
+      end
+
+      if maths.is_a? String
+        validate_string(maths)
+      else
+        validate_array(maths)
+      end
+    end
+
+    def validate_string(maths)
+      maths = maths.strip
+      unless valid_math_string(maths)
+        fail(ArgumentError, 'input must be in tex format (`$...$` or `$$...$$`)!')
+      end
+
+      maths
+    end
+
+    def validate_array(maths)
+      maths.map do |m|
+        unless m.is_a?(String)
+          fail(ArgumentError, 'every element in array must be a string in tex format (`$...$` or `$$...$$`)!')
+        end
+        validate_string(m)
+      end
+
+      maths
+    end
+
+    def valid_math_string(maths)
+      maths =~ DOLLAR_MATCHER
+    end
+
+  end
+end

data/lib/mathematical/version.rb

@@ -1,3 +1,3 @@
 class Mathematical
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/mathematical/basic_test.rb

@@ -13,4 +13,11 @@ class Mathematical::BasicTest < MiniTest::Test
     assert_equal 1, output.scan(/<svg/).size, 'should only contain one svg'
   end
 
+  def test_handles_line_breaks
+    s = "$$x\ny$$"
+    render = Mathematical.new
+    output = render.render(s)[:data]
+    assert_equal 1, output.scan(/<svg/).size, 'should only contain one svg'
+  end
+
 end

data/test/mathematical/maliciousness_test.rb

@@ -73,6 +73,26 @@ class Mathematical::MaliciousnessTest < MiniTest::Test
       Mathematical.new.render('No dollars')
     end
 
+    assert_raises ArgumentError do
+      Mathematical.new.render('$$x')
+    end
+
+    assert_raises ArgumentError do
+      Mathematical.new.render('x$$')
+    end
+
+    assert_raises ArgumentError do
+      Mathematical.new.render('$$x$')
+    end
+
+    assert_raises ArgumentError do
+      Mathematical.new.render('$x$$')
+    end
+
+    assert_raises ArgumentError do
+      Mathematical.new.render('blah blah $x$ blah')
+    end
+
     assert_raises ArgumentError do
       array = %w(foof poof)
       Mathematical.new.render(array)
@@ -82,13 +102,18 @@ class Mathematical::MaliciousnessTest < MiniTest::Test
       array = ['$foof$', nil, '$poof$']
       Mathematical.new.render(array)
     end
+
+    assert_raises ArgumentError do
+      array = ['$x$', 4]
+      Mathematical.new.render(array)
+    end
   end
 
   def test_it_returns_unmodified_string_for_max_parsing
     render = Mathematical.new
     output = nil
     # Much like above, this fails in mtx2MML, but should do nothing here
-    text = '$\Huge \sqrt\sqrt\sqrt\sqrt\sqrt\sqrt\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+    text = '$\Huge \sqrt\sqrt\sqrt\sqrt\sqrt\sqrt\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}$'
     output = render.render(text)
     assert_equal output[:data], text
     assert_equal output[:exception].class, Mathematical::ParseError

data/test/mathematical/mathjax_test.rb

@@ -5,11 +5,11 @@ class Mathematical::MathJaxTest < MiniTest::Test
 
   render_svg = Mathematical.new
 
-  MATHJAX_TEST_TEST_DIR = File.join('ext', 'mathematical', 'mtex2MML', 'test', 'fixtures', 'MathJax')
+  MATHJAX_TEST_TEST_DIR = File.join('ext', 'mathematical', 'mtex2MML', 'tests', 'fixtures', 'MathJax')
   MATHJAX_TEST_TEX_DIR = File.join(MATHJAX_TEST_TEST_DIR, 'LaTeXToMathML-tex')
 
   SKIPPED = []
-  Dir["#{MATHJAX_TEST_TEX_DIR}/**/*.tex"].each do |tex|
+  Dir["#{MATHJAX_TEST_TEX_DIR}/**/*.txt"].each do |tex|
     define_method "test_#{tex}" do
       tex_contents = File.read(tex)
       data = render_svg.render(tex_contents)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathematical
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -338,13 +338,14 @@ files:
 - ext/mathematical/lasem_overrides.h
 - ext/mathematical/mathematical.c
 - ext/mathematical/mathematical.h
-- ext/mathematical/mtex2MML/ext/extconf.rb
+- ext/mathematical/mtex2MML/build/mtex2MML.h
+- ext/mathematical/mtex2MML/deps/uthash/utarray.h
+- ext/mathematical/mtex2MML/deps/uthash/uthash.h
+- ext/mathematical/mtex2MML/deps/uthash/utlist.h
+- ext/mathematical/mtex2MML/deps/uthash/utstring.h
 - ext/mathematical/mtex2MML/src/color_definitions.c
-- ext/mathematical/mtex2MML/src/deps/uthash/utarray.h
-- ext/mathematical/mtex2MML/src/deps/uthash/uthash.h
-- ext/mathematical/mtex2MML/src/deps/uthash/utlist.h
-- ext/mathematical/mtex2MML/src/deps/uthash/utstring.h
 - ext/mathematical/mtex2MML/src/lex.yy.c
+- ext/mathematical/mtex2MML/src/main.c
 - ext/mathematical/mtex2MML/src/mtex2MML.h
 - ext/mathematical/mtex2MML/src/parse_extras.c
 - ext/mathematical/mtex2MML/src/parse_extras.h
@@ -352,8 +353,31 @@ files:
 - ext/mathematical/mtex2MML/src/string_extras.h
 - ext/mathematical/mtex2MML/src/y.tab.c
 - ext/mathematical/mtex2MML/src/y.tab.h
+- ext/mathematical/mtex2MML/tests/array.c
+- ext/mathematical/mtex2MML/tests/basic.c
+- ext/mathematical/mtex2MML/tests/clar.c
+- ext/mathematical/mtex2MML/tests/clar.h
+- ext/mathematical/mtex2MML/tests/clar/fixtures.h
+- ext/mathematical/mtex2MML/tests/clar/fs.h
+- ext/mathematical/mtex2MML/tests/clar/print.h
+- ext/mathematical/mtex2MML/tests/clar/sandbox.h
+- ext/mathematical/mtex2MML/tests/clar_test.h
+- ext/mathematical/mtex2MML/tests/cornercases.c
+- ext/mathematical/mtex2MML/tests/deps/file2str/file2str.c
+- ext/mathematical/mtex2MML/tests/deps/file2str/file2str.h
+- ext/mathematical/mtex2MML/tests/deps/trim/trim.c
+- ext/mathematical/mtex2MML/tests/deps/trim/trim.h
+- ext/mathematical/mtex2MML/tests/env.c
+- ext/mathematical/mtex2MML/tests/functions.c
+- ext/mathematical/mtex2MML/tests/helpers.c
+- ext/mathematical/mtex2MML/tests/helpers.h
+- ext/mathematical/mtex2MML/tests/main.c
+- ext/mathematical/mtex2MML/tests/maliciousness.c
+- ext/mathematical/mtex2MML/tests/mathjax.c
+- ext/mathematical/mtex2MML/tests/numbered_equations.c
 - lib/mathematical.rb
 - lib/mathematical/corrections.rb
+- lib/mathematical/validator.rb
 - lib/mathematical/version.rb
 - mathematical.gemspec
 - test/mathematical/basic_test.rb

data/ext/mathematical/mtex2MML/ext/extconf.rb

@@ -1,4 +0,0 @@
-require 'mkmf'
-
-$CFLAGS << ' -Dmtex2MML_CAPTURE'
-create_makefile('mtex2MML')