maruku 0.6.0 → 0.6.1

data/Rakefile

@@ -1,73 +1,48 @@
 require 'rubygems'
-Gem::manage_gems
-require 'rake/gempackagetask'
-
-require 'maruku_gem'
-
-task :default => [:package]
-
-Rake::GemPackageTask.new($spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
 
-PKG_NAME = 'maruku'
-PKG_FILE_NAME = "#{PKG_NAME}-#{MaRuKu::Version}"
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER = 'andrea'
-
-RELEASE_NAME  = MaRuKu::Version
-RUBY_FORGE_GROUPID = '2795'
-RUBY_FORGE_PACKAGEID = '3292'
+require 'rake/clean'
+require 'rake/rdoctask'
 
-desc "Publish the release files to RubyForge."
-task :release => [:gem, :package] do
-	system("rubyforge login --username #{RUBY_FORGE_USER}")
+task :default => :spec
+CLEAN.replace %w(pkg doc)
 
-	gem = "pkg/#{PKG_FILE_NAME}.gem"
-	# -n notes/#{Maruku::Version}.txt
-	cmd = "rubyforge  add_release %s %s \"%s\" %s" %
-		[RUBY_FORGE_GROUPID, RUBY_FORGE_PACKAGEID, RELEASE_NAME, gem]
-	
-	puts cmd
-	system(cmd)
-	
-	files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-	files.each do |file|
-#		system("rubyforge add_file %s %s %s %s" %
-#		[RUBY_FORGE_GROUPID, RUBY_FORGE_PACKAGEID, RELEASE_NAME, file])
-  end
-end
+Bundler::GemHelper.install_tasks
 
+desc "Run all tests"
 task :test => [:markdown_span_tests, :markdown_block_tests]
 
+desc "Run block-level tests"
 task :markdown_block_tests do
-	tests = Dir['tests/unittest/**/*.md'].join(' ')
-	puts "Executing tests #{tests}"
-#	ok = marutest(tests)
-	ok = system "ruby -Ilib bin/marutest #{tests}"
-	raise "Failed block unittest" if not ok
+  tests = Dir['tests/unittest/**/*.md'].join(' ')
+  puts "Executing tests #{tests}"
+  ok = system "ruby -Ilib bin/marutest #{tests}"
+  raise "Failed block unittest" if not ok
 end
 
+desc "Run span-level tests"
 task :markdown_span_tests do
-	ok = system( "ruby -Ilib lib/maruku/tests/new_parser.rb v b")
-	raise "Failed span unittest" if not ok
+  ok = system( "ruby -Ilib lib/maruku/tests/new_parser.rb v b")
+  raise "Failed span unittest" if not ok
 end
 
-require 'rake/rdoctask'
-
 Rake::RDocTask.new do |rdoc|
-	files = [#'README', 'LICENSE', 'COPYING', 
-		'lib/**/*.rb', 
-		'rdoc/*.rdoc'#, 'test/*.rb'
-	]
-	rdoc.rdoc_files.add(files)
-	rdoc.main = "rdoc/main.rdoc" # page to start on
-	rdoc.title = "Maruku Documentation"
-	rdoc.template = "jamis.rb"
-	rdoc.rdoc_dir = 'doc' # rdoc output folder
-	rdoc.options << '--line-numbers' << '--inline-source'
+       files = [#'README', 'LICENSE', 'COPYING', 
+               'lib/**/*.rb', 
+               'rdoc/*.rdoc'#, 'test/*.rb'
+       ]
+       rdoc.rdoc_files.add(files)
+       rdoc.main = "rdoc/main.rdoc" # page to start on
+       rdoc.title = "Maruku Documentation"
+       rdoc.template = "jamis.rb"
+       rdoc.rdoc_dir = 'doc' # rdoc output folder
+       rdoc.options << '--line-numbers' << '--inline-source'
 end
-
-
-

data/lib/maruku/input/parse_doc.rb

@@ -18,10 +18,6 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #++
 
-
-require 'iconv'
-
-
 module MaRuKu; module In; module Markdown; module BlockLevelParser
 		
 	def parse_doc(s)
@@ -39,21 +35,23 @@ Summary:   Encoding for the document.
 
 If the `encoding` attribute is specified, then the content
 will be converted from the specified encoding to UTF-8.
-
-Conversion happens using the `iconv` library.
 =end
 
 		enc = self.attributes[:encoding]
 		self.attributes.delete :encoding
 		if enc && enc.downcase != 'utf-8'
-			converted = Iconv.new('utf-8', enc).iconv(data)
-			
-#			puts "Data: #{data.inspect}: #{data}"
-#			puts "Conv: #{converted.inspect}: #{converted}"
-			
-			data = converted
+
+			# Switch to ruby 1.9 String#encode
+			# with backward 1.8 compatibility
+			if data.respond_to?(:encode!)
+				data.encode!('UTF-8', enc)
+			else
+				require 'iconv'
+				data = Iconv.new('utf-8', enc).iconv(data)
+			end
+
 		end
-		
+
 		@children = parse_text_as_markdown(data)
 		
 		if true #markdown_extra? 

data/lib/maruku/version.rb

@@ -19,9 +19,9 @@
 #++
 
 module MaRuKu
-	Version = '0.6.0'
+	Version = '0.6.1'
 	
-	MarukuURL = 'http://maruku.rubyforge.org/'
+	MarukuURL = 'http://github.com/bhollis/maruku/'
 	
 	# If true, use also PHP Markdown extra syntax
 	#

metadata

@@ -1,28 +1,76 @@
 --- !ruby/object:Gem::Specification 
 name: maruku
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  hash: 5
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Andrea Censi
+- Nathan Weizenbaum
 autorequire: maruku
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
-default_executable: 
+date: 2012-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: syntax
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  prerelease: false
+  requirement: *id001
+  name: syntax
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
-description: Maruku is a Markdown interpreter in Ruby. It features native export to HTML and PDF (via Latex). The output is really beautiful!
-email: andrea@rubyforge.org
+  prerelease: false
+  requirement: *id002
+  name: syntax
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  prerelease: false
+  requirement: *id003
+  name: rake
+  type: :development
+description: "Maruku is a Markdown interpreter in Ruby.\n\
+  \tIt features native export to HTML and PDF (via Latex). The\n\
+  \toutput is really beautiful!\n\
+  \t"
+email: ben@benhollis.net
 executables: 
 - maruku
 - marutex
@@ -146,7 +194,6 @@ files:
 - tests/unittest/extra_header_id.md
 - tests/unittest/extra_table1.md
 - tests/unittest/footnotes.md
-- tests/unittest/hang.md
 - tests/unittest/headers.md
 - tests/unittest/hex_entities.md
 - tests/unittest/hrule.md
@@ -220,32 +267,38 @@ files:
 - unit_test_block.sh
 - unit_test_span.sh
 - Rakefile
-- maruku_gem.rb
-has_rdoc: false
-homepage: http://maruku.rubyforge.org
+homepage: http://github.com/bhollis/maruku
+licenses: 
+- GPL-2
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Maruku is a Markdown-superset interpreter written in Ruby.
 test_files: []
 

data/maruku_gem.rb

@@ -1,33 +0,0 @@
-
-require 'lib/maruku/version'
-
-$spec = Gem::Specification.new do |s|
-  s.name = 'maruku'
-  s.version = MaRuKu::Version
-  s.summary = "Maruku is a Markdown-superset interpreter written in Ruby."
-  s.description = %{Maruku is a Markdown interpreter in Ruby.
-	It features native export to HTML and PDF (via Latex). The
-	output is really beautiful!
-	}
-  s.files = Dir['lib/**/*.rb'] + Dir['lib/*.rb'] + 
-	Dir['docs/*.md'] +	Dir['docs/*.html'] +
-	Dir['tests/**/*.md'] +
-          Dir['bin/*'] + Dir['*.sh'] + ['Rakefile', 'maruku_gem.rb']
-
-  s.bindir = 'bin'
-  s.executables = ['maruku','marutex']
-
-  s.require_path = 'lib'
-  s.autorequire = 'maruku'
-
-  s.add_dependency('syntax', '>= 1.0.0')
-
-  s.author = "Andrea Censi"
-  s.email = "andrea@rubyforge.org"
-  s.homepage = "http://maruku.rubyforge.org"
-end
-
-#  s.has_rdoc = true
-#  s.extra_rdoc_files = Dir['[A-Z]*']
-#  s.rdoc_options << '--title' <<  'Builder -- Easy XML Building'
-

data/tests/unittest/hang.md

@@ -1,29 +0,0 @@
-Write a comment here
-*** Parameters: ***
-{} # params 
-*** Markdown input: ***
-deded  {.num_defn #IsbellDuality
-	
-
-*** Output of inspect ***
-md_el(:document,[md_par(["deded"])],{},[])
-*** Output of to_html ***
-<p>deded</p>
-*** Output of to_latex ***
-deded
-*** Output of to_md ***
-deded
-*** Output of to_s ***
-deded
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)