Merge pull request #86 from jgarber/cleanup

A round of cleanups

.ruby-gemset

@@ -0,0 +1 @@
+redcloth

.ruby-version

@@ -0,0 +1 @@
+3.2.3

CHANGELOG

@@ -1,5 +1,6 @@
 == 4.3.4
 
+* A round of cleanups [Helio Cola]
 * Stop checking for main function in libc [Jean byroot Boussier]
 * Update maintainer, scrub redcloth.org [Jason Garber]
 * Add GitHub action [Anton Maminov]

redcloth.gemspec

@@ -9,12 +9,20 @@ Gem::Specification.new do |s|
   s.authors     = ["Jason Garber", "Joshua Siler", "Ola Bini"]
   s.description = "Textile parser for Ruby."
   s.summary     = RedCloth::SUMMARY
-  s.email       = "[email protected]"
   s.homepage    = "https://github.com/jgarber/redcloth"
-  s.rubyforge_project = "redcloth"
+  s.license = "MIT"
 
+  s.platform = 'ruby'
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4")
   s.rubygems_version   = "1.3.7"
-  s.default_executable = "redcloth"
+
+  if s.respond_to?(:metadata=)
+    s.metadata = {
+      "bug_tracker_uri" => "https://github.com/jgarber/redcloth/issues",
+      "changelog_uri" => "https://github.com/jgarber/redcloth/blob/master/CHANGELOG",
+      "source_code_uri" => "https://github.com/jgarber/redcloth"
+    }
+  end
 
   s.files            = Dir['.gemtest', '.rspec', 'CHANGELOG', 'COPYING', 'Gemfile', 'README.rdoc', 'Rakefile', 'doc/**/*', 'bin/**/*', 'lib/**/*', 'redcloth.gemspec', 'spec/**/*', 'tasks/**/*']
   s.test_files       = Dir['spec/**/*']
@@ -26,8 +34,6 @@ Gem::Specification.new do |s|
   s.files -= Dir['lib/**/*.bundle']
   s.files -= Dir['lib/**/*.so']
 
-  s.platform = 'ruby'
-
   s.files += %w[attributes inline scan].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
   s.files += ["ext/redcloth_scan/redcloth.h"]
   s.extensions = Dir['ext/**/extconf.rb']
@@ -37,5 +43,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 3.12')
   s.add_development_dependency('diff-lcs', '~> 1.5')
 
-  s.license = "MIT"
-end
+end

spec/custom_tags_spec.rb

@@ -30,13 +30,13 @@ def fig( opts )
     html << %Q{<div>\n}
     html << %Q{<p>The last line of text.</p>}
 
-    r.to_html.should == html
+    expect(r.to_html).to eq(html)
   end
 
   it "should fall back if custom tag isn't defined" do
     r = RedCloth.new %Q/fig()>[no]{color:red}. 1.1 | img.jpg/
 
-    r.to_html.should == "<p>fig()>[no]{color:red}. 1.1 | img.jpg</p>"
+    expect(r.to_html).to eq("<p>fig()>[no]{color:red}. 1.1 | img.jpg</p>")
   end
 
   it "should not call just regular string methods" do
@@ -45,6 +45,6 @@ def fig( opts )
 
     html  = "<p>next. </p>"
 
-    r.to_html.should == html
+    expect(r.to_html).to eq(html)
   end
 end

spec/erb_spec.rb

@@ -5,6 +5,6 @@
     template = %{<%=t "This new ERB tag makes is so _easy_ to use *RedCloth*" %>}
     expected = %{<p>This new <span class="caps">ERB</span> tag makes is so <em>easy</em> to use <strong>RedCloth</strong></p>}
 
-    ERB.new(template).result.should == expected
+    expect(ERB.new(template).result).to eq(expected)
   end
 end

spec/extension_spec.rb

@@ -20,7 +20,7 @@ def refs_smiley(text)
 
     html  = %Q{<p>You&#8217;re so silly! <img src='/images/emoticons/58_80.png' title=':P' class='smiley' /></p>}
 
-    RedCloth.new(input).to_html(:textile, :refs_smiley).should == html
+    expect(RedCloth.new(input).to_html(:textile, :refs_smiley)).to eq(html)
   end
 
 end

spec/formatters/html_spec.rb

@@ -6,8 +6,8 @@
   end
 
   it "should not raise an error when orphaned parentheses in a link are followed by punctuation and words in HTML" do
-    lambda {
+    expect {
       RedCloth.new(%Q{Test "(read this":http://test.host), ok}).to_html
-    }.should_not raise_error
+    }.not_to raise_error
   end
 end

spec/formatters/latex_spec.rb

@@ -6,8 +6,8 @@
   end
 
   it "should not raise an error when orphaned parentheses in a link are followed by punctuation and words in LaTeX" do
-    lambda { 
+    expect { 
       RedCloth.new(%Q{Test "(read this":http://test.host), ok}).to_latex
-    }.should_not raise_error
+    }.not_to raise_error
   end
 end

spec/parser_spec.rb

@@ -4,15 +4,15 @@
 
   describe "#new" do
     it "should accept options" do
-      lambda {
+      expect {
         RedCloth.new("test", [:hard_breaks])
-      }.should_not raise_error
+      }.not_to raise_error
     end
   end
 
   it "should have a VERSION" do
-    RedCloth.const_defined?("VERSION").should be_truthy
-    RedCloth::VERSION.const_defined?("STRING").should be_truthy
+    expect(RedCloth.const_defined?("VERSION")).to be_truthy
+    expect(RedCloth::VERSION.const_defined?("STRING")).to be_truthy
   end
 
   it "should show the version as a string" do

spec/spec_helper.rb

@@ -10,11 +10,11 @@ def examples_from_yaml(&block)
     if doc[formatter]
       example("should output #{formatter} for #{name}") do
         output = method("format_as_#{formatter}").call(doc)
-        output.should == doc[formatter]
+        expect(output).to eq(doc[formatter])
       end
     else
       example("should not raise errors when rendering #{formatter} for #{name}") do
-        lambda { method("format_as_#{formatter}").call(doc) }.should_not raise_error
+        expect { method("format_as_#{formatter}").call(doc) }.not_to raise_error
       end
     end
   end