rmultimarkdown 6.7.0.1 → 6.7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd8bfbc3316f0cf803a3cbd85c39b398ec0d83587e4d61898306ed0af65dc99
-  data.tar.gz: be476ee43b2fee74e71ae988126a0fbe7c255aa02f8017bb9304a2440d734924
+  metadata.gz: 2f0716fc464af2d155a21038fa169fa91b3be0fd0e128fb70e191710f898e215
+  data.tar.gz: a9dc54567a87cf6b44123b5dc33e5a4ce4e2997a040d35ee9340b7a02868d5e5
 SHA512:
-  metadata.gz: 257a1c54b684ce8072d90f392f39dae0f6a249f417b463d54fb7c5f0e9dff50890448e3f35c8f113c65f2a379f276fbbb853f2a832a20a67e33a64ce5e4b77c8
-  data.tar.gz: b2a99801765040749082e8e6d1a2ce55f832d2fe15ca85d987cec8ccf169b74b1b1ebbe033caaac9e147fab63228992b83ec8788fa325d99c23a765bad712aec
+  metadata.gz: a742b7c66fda2db7e4dfae8eb1b0b6cb1e716e84588a2268cd1ee584dd3455b68209c121de381827d1bf7ecb1c8cb9b03a3ac37ef0afb694247d63a1e676e33c
+  data.tar.gz: 6c11fa1de094e944daac1082867a5aa1f9fed39e410672b19e12fa92304b1178f14ed69fe71d66a206f1611cebf9ccfc13f43e652f16de6167dd6feaf4d66795

data/ext/ruby_multi_markdown.c

@@ -44,38 +44,54 @@ typedef struct engine_manager {
   mmd_engine *mmd_engine;
 } engine_manager;
 
-mmd_engine *get_mmd_engine(VALUE self) {
-  engine_manager *manager;
-  Data_Get_Struct(self, engine_manager, manager);
-
-  return manager->mmd_engine;
-}
-
-static void free_engine_manager(engine_manager* manager) {
+static void engine_manager_free(void *ptr) {
+  engine_manager *manager = (engine_manager *)ptr;
   if (manager->mmd_engine) {
     mmd_engine_free(manager->mmd_engine, true);
+    manager->mmd_engine = NULL;
   }
-  free(manager);
+  xfree(manager);
 }
 
+static size_t engine_manager_memsize(const void *ptr) {
+  return sizeof(engine_manager);
+}
+
+static const rb_data_type_t engine_manager_type = {
+  "MultiMarkdown/engine_manager",
+  { 0, engine_manager_free, engine_manager_memsize, },
+  0, 0,
+  RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE rb_multimarkdown_allocate(VALUE klass) {
-  engine_manager *manager = malloc(sizeof(engine_manager));
+  engine_manager *manager;
+  VALUE obj = TypedData_Make_Struct(klass, engine_manager, &engine_manager_type, manager);
   manager->mmd_engine = NULL;
+  return obj;
+}
 
-  return Data_Wrap_Struct(klass, NULL, free_engine_manager, manager);
+static engine_manager *get_manager(VALUE self) {
+  engine_manager *manager;
+  TypedData_Get_Struct(self, engine_manager, &engine_manager_type, manager);
+  return manager;
+}
+
+static mmd_engine *get_mmd_engine(VALUE self) {
+  return get_manager(self)->mmd_engine;
 }
 
 static VALUE rb_multimarkdown_start_engine(VALUE self, VALUE text) {
   Check_Type(text, T_STRING);
 
-  engine_manager *manager;
-  Data_Get_Struct(self, engine_manager, manager);
+  engine_manager *manager = get_manager(self);
 
   if (manager->mmd_engine) {
     mmd_engine_free(manager->mmd_engine, true);
+    manager->mmd_engine = NULL;
   }
 
-  manager->mmd_engine = mmd_engine_create_with_string(StringValuePtr(text), get_exts(self));
+  manager->mmd_engine = mmd_engine_create_with_string(StringValueCStr(text), get_exts(self));
 
   return self;
 }
@@ -84,29 +100,25 @@ static VALUE rb_multimarkdown_start_engine(VALUE self, VALUE text) {
 
 static VALUE rb_multimarkdown_set_language(VALUE self, VALUE language) {
   short lang = ENGLISH;
-  VALUE language_s = rb_funcall(language, rb_intern("to_s"), 0);
 
-  if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("de")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("german")) == Qtrue) {
+  VALUE language_s = rb_obj_as_string(language);
+  const char *s = StringValueCStr(language_s);
+
+  if (strcmp(s, "de") == 0 || strcmp(s, "german") == 0) {
     lang = GERMANGUILL;
-  }
-  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("ch")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("de-ch")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("swiss")) == Qtrue) {
+  } else if (strcmp(s, "ch") == 0 || strcmp(s, "de-ch") == 0 || strcmp(s, "swiss") == 0) {
     lang = GERMAN;
-  }
-  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("nl")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("dutch")) == Qtrue) {
+  } else if (strcmp(s, "nl") == 0 || strcmp(s, "dutch") == 0) {
     lang = DUTCH;
-  }
-  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("fr")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("french")) == Qtrue) {
+  } else if (strcmp(s, "fr") == 0 || strcmp(s, "french") == 0) {
     lang = FRENCH;
-  }
-  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("sp")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("spanish")) == Qtrue) {
+  } else if (strcmp(s, "sp") == 0 || strcmp(s, "spanish") == 0) {
     lang = SPANISH;
-  }
-  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("sv")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("swedish")) == Qtrue) {
+  } else if (strcmp(s, "sv") == 0 || strcmp(s, "swedish") == 0) {
     lang = SWEDISH;
   }
 
   mmd_engine_set_language(get_mmd_engine(self), lang);
-
   return language;
 }
 
@@ -127,21 +139,36 @@ static VALUE rb_multimarkdown_to_latex(VALUE self) {
 }
 
 static VALUE rb_multimarkdown_extract_metadata_keys(VALUE self) {
-  char *metadata_keys = mmd_engine_metadata_keys(get_mmd_engine(self));
+  mmd_engine *engine = get_mmd_engine(self);
+  size_t end = 0;
+
+  if (!mmd_engine_has_metadata(engine, &end)) {
+    return rb_ary_new();
+  }
+
+  char *metadata_keys = mmd_engine_metadata_keys(engine);
   VALUE str = rb_utf8_str_new_cstr(metadata_keys);
   free(metadata_keys);
 
-  return rb_funcall(str, rb_intern("split"), 1, rb_str_new2("\n"));
+  return rb_funcall(str, rb_intern("split"), 1, rb_str_new_cstr("\n"));
 }
 
 static VALUE rb_multimarkdown_extract_metadata_value(VALUE self, VALUE key) {
   Check_Type(key, T_STRING);
-  char *pkey = StringValuePtr(key);
 
-  char *metadata = mmd_engine_metavalue_for_key(get_mmd_engine(self), pkey);
-  VALUE result = rb_utf8_str_new_cstr(metadata);
+  mmd_engine *engine = get_mmd_engine(self);
+  size_t end = 0;
 
-  return result;
+  if (!mmd_engine_has_metadata(engine, &end)) {
+    return Qnil;
+  }
+
+  char *metadata = mmd_engine_metavalue_for_key(engine, StringValueCStr(key));
+  if (metadata == NULL) {
+    return Qnil;
+  }
+
+  return rb_utf8_str_new_cstr(metadata);
 }
 
 //*** Define Class
@@ -187,7 +214,7 @@ void Init_multi_markdown() {
    * The version of the MultiMarkdown-6 library
    */
   char *version = mmd_version();
-  rb_define_const(rb_cMultiMarkdown, "MMD_VERSION", rb_str_new2(version));
+  rb_define_const(rb_cMultiMarkdown, "MMD_VERSION", rb_str_new_cstr(version));
   free(version);
 
 }

data/lib/multi_markdown/version.rb

@@ -1,6 +1,6 @@
 class MultiMarkdown
 
   # The ruby 'multimarkdown' gem version
-  VERSION = "6.7.0.1"
+  VERSION = "6.7.0.2"
 
 end

data/test/multi_markdown_test.rb

@@ -87,4 +87,17 @@ eof
       assert_equal("M€tädätä", multimarkdown.metadata('umlauts'))
   end
 
+  def test_empty_metadata
+    m = MultiMarkdown.new "# Markdown without metadata"
+    assert_equal({}, m.metadata)
+
+    m2 = MultiMarkdown.new "foo: bar\n\n# Markdown with some metadata"
+    assert_equal("bar", m2.extract_metadata_value("foo"))
+    assert_equal(nil, m2.extract_metadata_value("doesnt_exist"))
+
+    m3 = MultiMarkdown.new "foo: bar\n\n# More Markdown", :no_metadata
+    assert_equal(nil, m3.extract_metadata_value("foo"))
+    assert_equal(nil, m3.extract_metadata_value("doesnt_exist"))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmultimarkdown
 version: !ruby/object:Gem::Version
-  version: 6.7.0.1
+  version: 6.7.0.2
 platform: ruby
 authors:
 - Till Schulte-Coerne