qwiki 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/qwiki/app.rb +1 -8
  2. data/qwiki.gemspec +2 -3
  3. metadata +10 -21
@@ -1,6 +1,5 @@
1
1
  require 'github/markup'
2
2
  require 'haml'
3
- require 'rdoc/markup/to_html'
4
3
  require 'sinatra'
5
4
 
6
5
  module Qwiki
@@ -13,13 +12,7 @@ module Qwiki
13
12
  if File.directory?(request_path)
14
13
  index(request_path)
15
14
  elsif File.file?(request_path)
16
- if request_path =~ /\.rdoc$/i
17
- # Workaround: GitHub::Markup doesn't render RDOC in Ruby 1.9
18
- # see https://github.com/github/markup/issues#issue/30
19
- RDoc::Markup::ToHtml.new.convert(File.read(request_path))
20
- else
21
- GitHub::Markup.render(request_path)
22
- end
15
+ GitHub::Markup.render(request_path)
23
16
  else
24
17
  raise Sinatra::NotFound
25
18
  end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = %q{qwiki}
3
- s.version = "1.1.0"
3
+ s.version = "1.2.0"
4
4
 
5
5
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
6
6
  s.authors = ["Brian Alexander"]
@@ -34,9 +34,8 @@ Gem::Specification.new do |s|
34
34
  s.test_files = [
35
35
  ]
36
36
 
37
- s.add_dependency("github-markup")
37
+ s.add_dependency("github-markup", ">= 0.7.0") # https://github.com/github/markup/issues/30
38
38
  s.add_dependency("haml")
39
- s.add_dependency("rdoc")
40
39
  s.add_dependency("sinatra")
41
40
  s.add_development_dependency("bundler", "~> 1.0.0")
42
41
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: qwiki
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,29 +13,18 @@ date: 2010-12-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: github-markup
16
- requirement: &70195549981300 !ruby/object:Gem::Requirement
16
+ requirement: &70227627538540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
20
20
  - !ruby/object:Gem::Version
21
- version: '0'
21
+ version: 0.7.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70195549981300
24
+ version_requirements: *70227627538540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: haml
27
- requirement: &70195549980780 !ruby/object:Gem::Requirement
28
- none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: '0'
33
- type: :runtime
34
- prerelease: false
35
- version_requirements: *70195549980780
36
- - !ruby/object:Gem::Dependency
37
- name: rdoc
38
- requirement: &70195549980200 !ruby/object:Gem::Requirement
27
+ requirement: &70227627537920 !ruby/object:Gem::Requirement
39
28
  none: false
40
29
  requirements:
41
30
  - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
43
32
  version: '0'
44
33
  type: :runtime
45
34
  prerelease: false
46
- version_requirements: *70195549980200
35
+ version_requirements: *70227627537920
47
36
  - !ruby/object:Gem::Dependency
48
37
  name: sinatra
49
- requirement: &70195549979720 !ruby/object:Gem::Requirement
38
+ requirement: &70227627537120 !ruby/object:Gem::Requirement
50
39
  none: false
51
40
  requirements:
52
41
  - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
54
43
  version: '0'
55
44
  type: :runtime
56
45
  prerelease: false
57
- version_requirements: *70195549979720
46
+ version_requirements: *70227627537120
58
47
  - !ruby/object:Gem::Dependency
59
48
  name: bundler
60
- requirement: &70195549979220 !ruby/object:Gem::Requirement
49
+ requirement: &70227627536380 !ruby/object:Gem::Requirement
61
50
  none: false
62
51
  requirements:
63
52
  - - ~>
@@ -65,7 +54,7 @@ dependencies:
65
54
  version: 1.0.0
66
55
  type: :development
67
56
  prerelease: false
68
- version_requirements: *70195549979220
57
+ version_requirements: *70227627536380
69
58
  description: A command-line web server that renders wiki markup files. It's handy
70
59
  when you want a quick preview of your markup.
71
60
  email: balexand@gmail.com