wikicloth 0.8.1 → 0.8.2

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
-  - 1.8.7 # (current default)
   - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/Rakefile

@@ -11,20 +11,11 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-if RUBY_VERSION =~ /^1\.9/
-  require 'simplecov'
-  desc "Code coverage detail"
-  task :simplecov do
-    ENV['COVERAGE'] = "true"
-    Rake::Task['spec'].execute
-  end
-else
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
+require 'simplecov'
+desc "Code coverage detail"
+task :simplecov do
+  ENV['COVERAGE'] = "true"
+  Rake::Task['spec'].execute
 end
 
 task :default => :test

data/lib/wikicloth.rb

@@ -1,5 +1,3 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'jcode' if RUBY_VERSION < '1.9'
 require 'builder'
 # if i18n gem loaded use it instead
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "i18n") unless defined?(I18n)

data/lib/wikicloth/core_ext.rb

@@ -1,31 +1,11 @@
-require 'rinku'
-
-if RUBY_VERSION < '1.9'
-  READ_MODE = "r"
-  class Object
-    module InstanceExecHelper; end
-    include InstanceExecHelper
-    def instance_exec(*args, &block)
-      begin
-        old_critical, Thread.critical = Thread.critical, true
-        n = 0
-        n += 1 while respond_to?(mname="__instance_exec#{n}")
-        InstanceExecHelper.module_eval{ define_method(mname, &block) }
-      ensure
-        Thread.critical = old_critical
-      end
-      begin
-        ret = send(mname, *args)
-      ensure
-        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-      end
-      ret
-    end
-  end
-else
-  READ_MODE = "r:UTF-8"
+begin
+  require 'rinku'
+rescue LoadError
+  require 'twitter-text'
 end
 
+READ_MODE = "r:UTF-8"
+
 module Math
   def self.eval(expression)
     allowed_characters = Regexp.escape('+-*/.() ')
@@ -48,8 +28,14 @@ module ExtendedString
     self.gsub(/\W+/, '-').gsub(/^-+/,'').gsub(/-+$/,'').downcase
   end
 
-  def auto_link
-    Rinku.auto_link(to_s)
+  if defined? Rinku
+    def auto_link
+      Rinku.auto_link(to_s)
+    end
+  else
+    def auto_link
+      Twitter::Autolink.auto_link(to_s)
+    end
   end
 
   def last(n)

data/lib/wikicloth/version.rb

@@ -1,3 +1,3 @@
 module WikiCloth
-  VERSION = "0.8.1" unless defined?(::WikiCloth::VERSION)
+  VERSION = "0.8.2" unless defined?(::WikiCloth::VERSION)
 end

data/lib/wikicloth/wiki_buffer/var.rb

@@ -175,7 +175,7 @@ class WikiBuffer::Var < WikiBuffer
     when "ucfirst"
       params.first.capitalize
     when "lcfirst"
-      params.first[0,1].downcase + params.first[1..-1]
+      params.first[0,1].downcase + params.first[1..-1].to_s
     when "anchorencode"
       params.first.gsub(/\s+/,'_')
     when "plural"

data/wikicloth.gemspec

@@ -22,11 +22,11 @@ spec = Gem::Specification.new do |s|
   s.license = "MIT"
   s.add_dependency 'builder'
   s.add_dependency 'expression_parser'
-  s.add_dependency 'rinku'
+  s.add_dependency 'twitter-text'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'activesupport'
   s.add_development_dependency 'i18n'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency(RUBY_VERSION =~ /^1\.9/ ? "simplecov" : "rcov")
+  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikicloth
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17717700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17717700
 - !ruby/object:Gem::Dependency
   name: expression_parser
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17717280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17717280
 - !ruby/object:Gem::Dependency
-  name: rinku
-  requirement: !ruby/object:Gem::Requirement
+  name: twitter-text
+  requirement: &17716860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17716860
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17768360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17768360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17767940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17767940
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17767520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17767520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17767100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17767100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17766680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17766680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &17766260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *17766260
 description: mediawiki parser
 email: nricciar@gmail.com
 executables: []
@@ -230,21 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2603482441025638053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2603482441025638053
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An implementation of the mediawiki markup in ruby