Remove Wikitext_parser_encode_special_link_target function

"Special" link targets haven't been treated specially since prior
to version 1.4.0, so the Wikitext_parser_encode_special_link_target
function is literally identical to the Wikitext_parser_encode_link_target
function.

Seeing as it was only ever exposed for testing purposed and never
advertised or documented as public API, get rid of it.

Signed-off-by: Wincent Colaiuta <win@wincent.com>

diff --git a/ext/parser.c b/ext/parser.c
index 5722fa3c431f95aa455973521f5a0e1e9238a454..f4a41b5a69112090a1a6667ea209ed3246d3180b 100644 (file)
--- a/ext/parser.c
+++ b/ext/parser.c
@@ -894,17 +894,6 @@ VALUE Wikitext_parser_encode_link_target(VALUE self, VALUE in)
     return string_from_str(parser.link_target);
 }
 
-// this method exposed for testing only
-VALUE Wikitext_parser_encode_special_link_target(VALUE self, VALUE in)
-{
-    parser_t parser;
-    parser.space_to_underscore      = false;
-    parser.link_target              = str_new_from_string(in);
-    GC_WRAP_STR(parser.link_target, link_target_gc);
-    _Wikitext_encode_link_target(&parser);
-    return string_from_str(parser.link_target);
-}
-
 // returns 1 (true) if supplied string is blank (nil, empty, or all whitespace)
 // returns 0 (false) otherwise
 bool _Wikitext_blank(str_t *str)

diff --git a/ext/parser.h b/ext/parser.h
index 923d83a9428bd39917ddb28211c396616b1997b7..f0c334afe512b62b6bd053d4f91458ee1a820387 100644 (file)
--- a/ext/parser.h
+++ b/ext/parser.h
@@ -35,8 +35,6 @@ VALUE Wikitext_parser_sanitize_link_target(VALUE self, VALUE string);
 
 VALUE Wikitext_parser_encode_link_target(VALUE self, VALUE in);
 
-VALUE Wikitext_parser_encode_special_link_target(VALUE self, VALUE in);
-
 VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self);
 
 VALUE Wikitext_parser_profiling_parse(VALUE self, VALUE string);

diff --git a/ext/wikitext.c b/ext/wikitext.c
index 6c1943cdb681262dd5c1beee8fba86f2df6c2657..982058fdd6471a8de68a67c84cd98cb18e97970a 100644 (file)
--- a/ext/wikitext.c
+++ b/ext/wikitext.c
@@ -44,7 +44,6 @@ void Init_wikitext()
     rb_define_method(cWikitextParser, "fulltext_tokenize", Wikitext_parser_fulltext_tokenize, -1);
     rb_define_singleton_method(cWikitextParser, "sanitize_link_target", Wikitext_parser_sanitize_link_target, 1);
     rb_define_singleton_method(cWikitextParser, "encode_link_target", Wikitext_parser_encode_link_target, 1);
-    rb_define_singleton_method(cWikitextParser, "encode_special_link_target", Wikitext_parser_encode_special_link_target, 1);
     rb_define_attr(cWikitextParser, "line_ending", Qtrue, Qtrue);
     rb_define_attr(cWikitextParser, "internal_link_prefix", Qtrue, Qtrue);
     rb_define_attr(cWikitextParser, "img_prefix", Qtrue, Qtrue);

diff --git a/spec/link_encoding_spec.rb b/spec/link_encoding_spec.rb
index e1344fe7a5a44d7bf64e9700b5af0577409d9716..3396affbcd2b27e7748962df6b72def32a70e78c 100755 (executable)
--- a/spec/link_encoding_spec.rb
+++ b/spec/link_encoding_spec.rb
@@ -94,51 +94,4 @@ describe Wikitext, 'encoding a link target' do
       Wikitext::Parser.encode_link_target(string).should == URI.escape(string, reserved).downcase
     end
   end
-
-  # "special" links don't get transformed in any way
-  describe 'special links' do
-
-    # as of version 1.4.0 the encode_link_target function no longer handles special links
-    it 'should (no longer) recognize links which match /\A[a-z]+\/\d+\z/ as being special' do
-      string = 'foo/10'
-      Wikitext::Parser.encode_special_link_target(string).should == 'foo%2f10'
-      Wikitext::Parser.encode_link_target(string).should == 'foo%2f10'
-    end
-
-    it "should not recognize links which don't match at /\A/ as being special" do
-      string = '  foo/10'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-      string = '..foo/10'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-      string = '12foo/10'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-    end
-
-    it "should not recognize links which don't match at /\z/ as being special" do
-      string = 'foo/10  '
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-      string = 'foo/10__'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-      string = 'foo/10##'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-      string = 'foo/10ab'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-    end
-
-    it "should not recognize links which don't match at /[a-z]/ (case differences) as being special" do
-      string = 'FOO/10'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-    end
-
-    it "should not recognize links which don't match at /[0-9]/ (case differences) as being special" do
-      string = 'foo/xx'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-    end
-
-    it "should not recognize links which don't match at /\// as being special" do
-      string = 'foo 10'
-      Wikitext::Parser.encode_special_link_target(string).should_not == string
-    end
-  end
 end
-