markdown 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 572ba8737dad43b4418095cd939e563c1ff45df5
+  data.tar.gz: 336ed3026c0ccf05aa2fd95f3cb8d13919b435f9
+SHA512:
+  metadata.gz: 9612e63c040eee19e2368d5f0dd1409279a21110673ee4832a43b1cf9d3b3eba8d27f488ebae83aebd05c38d223f83bc8f3f4b8d114cce37be0baa00a86fbb3e
+  data.tar.gz: ab3eaef0889868e66ff6817b29556c0edf3fb4cab2723cbe07a25b5caef5c694a5a460b41326e3db36edda3c20a758a166638a4752bcb8d27152522a7a095eaf

data/Manifest.txt

@@ -1,12 +1,8 @@
-History.markdown
+HISTORY.md
 Manifest.txt
-README.markdown
+README.md
 Rakefile
-bin/markdown
 lib/markdown.rb
-lib/markdown/cli/gen.rb
-lib/markdown/cli/opts.rb
-lib/markdown/cli/runner.rb
 lib/markdown/config.rb
 lib/markdown/engines/bluecloth.rb
 lib/markdown/engines/kramdown.rb
@@ -15,20 +11,6 @@ lib/markdown/engines/pandoc_ruby.rb
 lib/markdown/engines/rdiscount.rb
 lib/markdown/engines/redcarpet.rb
 lib/markdown/engines/rpeg_markdown.rb
-lib/markdown/server.rb
-lib/markdown/server/public/style.css
-lib/markdown/server/views/_about.erb
-lib/markdown/server/views/_debug.erb
-lib/markdown/server/views/_libs.erb
-lib/markdown/server/views/_libs_service.erb
-lib/markdown/server/views/_notepad.erb
-lib/markdown/server/views/_service.erb
-lib/markdown/server/views/_version.erb
-lib/markdown/server/views/debug.erb
-lib/markdown/server/views/index.erb
-lib/markdown/server/views/layout.erb
-lib/markdown/server/views/notepad.erb
-lib/markdown/server/views/service.erb
 lib/markdown/version.rb
 lib/markdown/wrapper.rb
 test/helper.rb

data/{README.markdown → README.md}

@@ -1,7 +1,7 @@
 # Markdown Engine Wrapper - Use Your Markdown Library of Choice in Ruby
 
-* home  :: [github.com/geraldb/markdown](https://github.com/geraldb/markdown)
-* bugs  :: [github.com/geraldb/markdown/issues](https://github.com/geraldb/markdown/issues)
+* home  :: [github.com/rubylibs/markdown](https://github.com/rubylibs/markdown)
+* bugs  :: [github.com/rubylibs/markdown/issues](https://github.com/rubylibs/markdown/issues)
 * gem   :: [rubygems.org/gems/markdown](https://rubygems.org/gems/markdown)
 * rdoc  :: [rubydoc.info/gems/markdown](http://rubydoc.info/gems/markdown)
 
@@ -27,45 +27,6 @@ your markdown library of choice. Preconfigured markdown libraries include
     # => "<p>Hello World</p>\n"
 
 
-## Usage - Web Service / HTTP (JSON) API - `GET /markdown`
-
-Try the `markdown` HTTP (JSON) API running
-on Heroku [`hypertext.herokuapp.com`](http://hypertext.herokuapp.com).
-
-Example:
-
-    GET /markdown?text=Hello+World!
-    
-    <p>Hello World!</p>
-
-
-To start your own server/service use `markdown serve`. See command line below.
-
-
-## Usage - Command Line
-
-The `markdown` gem includes a little command line tool. Try `markdown -h` for details:
-
-
-    markdown - Lets you convert plain text documents to hypertext with your Markdown engine of choice
-      and preprocessing text filters.
-    
-    Usage: markdown [options] files_or_dirs
-        -o, --output PATH                Output Path
-        -v, --verbose                    Show debug trace
-    
-    
-    Examples:
-      markdown                   # Process all documents in working folder (that is, .)
-      markdown quickref          # Process document or folder using Markdown
-      markdown quickref.text     # Process document using Markdown
-      markdown -o site quickref  # Output documents to site folder
-    
-    Note:
-      markdown server            # Starts builtin markdown server
-                                 #   (aliases for server include serve, service, s)
-
-
 ## Configuration - Markdown Engine Loading Order
 
 The default (fallback) Markdown library is `kramdown`. To use your markdown engine of choice
@@ -155,7 +116,7 @@ or
 Note: As a shortcut using a single `%end` directive (that is, without a leading `%begin`)
 will skip everything until the end of the document.
 
-For more about filters see the [`textutils`](http://geraldb.github.com/textutils) gem.
+For more about filters see the [`textutils`](https://github.com/rubylibs/textutils) gem.
 
 
 ## Configuration - Converters
@@ -178,6 +139,7 @@ Just install the gem:
     $ gem install markdown
 
 
+
 ## Real World Usage
 
 The [`slideshow`](http://slideshow-s9.github.io) (also known as Slide Show (S9)) gem
@@ -190,14 +152,15 @@ and author slides in plain text using a wiki-style markup language that's easy-t
 * [`multi_markdown`](https://github.com/postmodern/multi_markdown) gem by Hal Brodigan (aka postmodern)
 * [`markdown_meta`](https://github.com/headius/markdown_meta) gem by Charles Oliver Nutter (aka headius)
 
+
+## License
+
+The `markdown` scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
+
+
 ## Questions? Comments?
 
 Send them along to the
 [Free Web Slide Show Alternatives (S5, S6, S9, Slidy And Friends) Forum/Mailing List](http://groups.google.com/group/webslideshow).
 Thanks!
-
-
-## License
-
-The `markdown` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.

data/Rakefile

@@ -2,33 +2,31 @@ require 'hoe'
 require './lib/markdown/version.rb'
 
 Hoe.spec 'markdown' do
-  
+
   self.version = Markdown::VERSION
   
   self.summary = 'Markdown Engine Wrapper - Use Your Markdown Library of Choice'
   self.description = summary
 
-  self.urls    = ['http://geraldb.github.com/markdown']
-  
+  self.urls    = ['https://github.com/rubylibs/markdown']
+
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
-  
+
   self.extra_deps = [
-    ['props','>= 1.0.0'],
-    ['textutils','>=0.6.4'],
-    ['kramdown','>= 1.0.2']
-    
-    ## todo: add sinatra ?? - keep it optional for now
+    ['props','>= 1.1.2'],
+    ['textutils','>=0.10.0'],
+    ['kramdown','>= 1.5.0']
   ]
-  
+
   # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.markdown'
-  self.history_file = 'History.markdown'
+  self.readme_file  = 'README.md'
+  self.history_file = 'HISTORY.md'
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 1.9.2'
   }
 
-end
+end

data/lib/markdown.rb

@@ -1,8 +1,4 @@
-###
-# NB: for local testing run like:
-#
-# 1.8.x: ruby -Ilib -rrubygems lib/markdown.rb
-# 1.9.x: ruby -Ilib lib/markdown.rb
+# encoding: utf-8
 
 # core and stlibs
 
@@ -14,7 +10,7 @@ require 'optparse'
 require 'fileutils'
 
 
-# rubygems
+# gems
 
 require 'props'   # manage properties/settings/env
 
@@ -27,9 +23,10 @@ end # class Env
 
 require 'textutils'  # text filters and helpers
 
+
 # our own code
 
-require 'markdown/version'
+require 'markdown/version'      # Note: let version always go first
 require 'markdown/config'
 require 'markdown/engines/bluecloth'
 require 'markdown/engines/kramdown'
@@ -40,36 +37,7 @@ require 'markdown/engines/redcarpet'
 require 'markdown/engines/rpeg_markdown'
 require 'markdown/wrapper'
 
-require 'markdown/cli/gen'
-require 'markdown/cli/opts'
-require 'markdown/cli/runner'
-
-
-module Markdown
-
-  # version string for generator meta tag (includes ruby version)
-  def self.banner
-    "markdown #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
-
-  def self.main
-    
-    # allow env variable to set RUBYOPT-style default command line options
-    #   e.g. -o site 
-    markdownopt = ENV[ 'MARKDOWNOPT' ]
-    
-    args = []
-    args += markdownopt.split if markdownopt
-    args += ARGV.dup
-    
-    Runner.new.run(args)
-  end
-
-end  # module Markdown
 
 
-Markdown.main if __FILE__ == $0
+# say hello
+puts Markdown.banner  if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/markdown/config.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
 
   class Config
@@ -197,4 +199,4 @@ DEFAULTS_SERVICE = { 'libs' => [
     end
 
   end # class Config
-end # module Markdown
+end # module Markdown

data/lib/markdown/engines/bluecloth.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 

data/lib/markdown/engines/kramdown.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 
@@ -18,8 +20,8 @@ module Markdown
       
       show_banner =  options.fetch( 'banner', true)
 
-      puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library kramdown (#{Kramdown::VERSION})"
-      puts "  using options: #{h.to_json}"
+      # puts "  Converting Markdown-text (#{content.length} bytes) to HTML using library kramdown (#{Kramdown::VERSION})"
+      # puts "  using options: #{h.to_json}"
 
       ## allow fenced blocks a la github flavored markup
       # -- thanks zenweb for inspiration:

data/lib/markdown/engines/maruku.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 

data/lib/markdown/engines/pandoc_ruby.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
    

data/lib/markdown/engines/rdiscount.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 

data/lib/markdown/engines/redcarpet.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 

data/lib/markdown/engines/rpeg_markdown.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
   module Engine
 

data/lib/markdown/version.rb

@@ -1,3 +1,25 @@
+# encoding: utf-8
+
 module Markdown
-  VERSION = '1.1.1'
-end
+
+  MAJOR = 1
+  MINOR = 2
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+
+  # version string for generator meta tag (includes ruby version)
+  def self.banner
+    "markdown/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+  end
+
+end # module Markdown
+

data/lib/markdown/wrapper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Markdown
 
   ## todo: use Converter  inside Wrapper to avoid duplication
@@ -130,4 +132,4 @@ module Markdown
     Wrapper.new( lib, mn, content, props )
   end
 
-end # module Markdown
+end # module Markdown

data/test/helper.rb

@@ -3,18 +3,10 @@
 
 ## minitest setup
 
-# require 'minitest/unit'
 require 'minitest/autorun'
 
-# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
-
-require 'logger'
-require 'pp'
-
-
 
 ## our own code
 
 require 'markdown'
 
-

data/test/test_kramdown.rb

@@ -8,9 +8,8 @@
 require 'helper'
 
 
+class TestKramdown < MiniTest::Test
 
-class TestKramdown < MiniTest::Unit::TestCase
-  
   def setup
     puts 'enter setup'
     lib = Markdown.lib

data/test/test_redcarpet.rb

@@ -8,7 +8,7 @@
 require 'helper'
 
 
-class TestRedcarpet < MiniTest::Unit::TestCase
+class TestRedcarpet < MiniTest::Test
 
   def setup
     puts 'enter setup'

metadata

@@ -1,88 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &77334260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *77334260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &77334040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *77334040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &77333820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *77333820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77333600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *77333600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77333380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *77333380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: Markdown Engine Wrapper - Use Your Markdown Library of Choice
 email: webslideshow@googlegroups.com
-executables:
-- markdown
+executables: []
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
+- README.md
 files:
-- History.markdown
+- ".gemtest"
+- HISTORY.md
 - Manifest.txt
-- README.markdown
+- README.md
 - Rakefile
-- bin/markdown
 - lib/markdown.rb
-- lib/markdown/cli/gen.rb
-- lib/markdown/cli/opts.rb
-- lib/markdown/cli/runner.rb
 - lib/markdown/config.rb
 - lib/markdown/engines/bluecloth.rb
 - lib/markdown/engines/kramdown.rb
@@ -91,52 +103,36 @@ files:
 - lib/markdown/engines/rdiscount.rb
 - lib/markdown/engines/redcarpet.rb
 - lib/markdown/engines/rpeg_markdown.rb
-- lib/markdown/server.rb
-- lib/markdown/server/public/style.css
-- lib/markdown/server/views/_about.erb
-- lib/markdown/server/views/_debug.erb
-- lib/markdown/server/views/_libs.erb
-- lib/markdown/server/views/_libs_service.erb
-- lib/markdown/server/views/_notepad.erb
-- lib/markdown/server/views/_service.erb
-- lib/markdown/server/views/_version.erb
-- lib/markdown/server/views/debug.erb
-- lib/markdown/server/views/index.erb
-- lib/markdown/server/views/layout.erb
-- lib/markdown/server/views/notepad.erb
-- lib/markdown/server/views/service.erb
 - lib/markdown/version.rb
 - lib/markdown/wrapper.rb
 - test/helper.rb
 - test/test_kramdown.rb
 - test/test_redcarpet.rb
-- .gemtest
-homepage: http://geraldb.github.com/markdown
+homepage: https://github.com/rubylibs/markdown
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README.markdown
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: markdown
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Markdown Engine Wrapper - Use Your Markdown Library of Choice
 test_files:
 - test/test_kramdown.rb