mars-nesta 0.9.4 → 0.9.5

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 (6) hide show
  1. data/Gemfile.lock +7 -5
  2. data/lib/nesta/models.rb +8 -1
  3. data/lib/nesta/version.rb +1 -1
  4. data/nesta.gemspec +3 -2
  5. data/spec/commands_spec.rb +1 -1
  6. metadata +30 -15
data/Gemfile.lock CHANGED
@@ -1,8 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- nesta (0.9.4)
4
+ mars-nesta (0.9.5)
5
5
  RedCloth (~> 4.2)
6
+ coderay (>= 0.9.7)
6
7
  haml (~> 3.0)
7
8
  redcarpet (>= 1.11.0)
8
9
  shotgun (>= 0.8)
@@ -12,7 +13,8 @@ GEM
12
13
  remote: http://rubygems.org/
13
14
  specs:
14
15
  RedCloth (4.2.7)
15
- haml (3.1.0)
16
+ coderay (0.9.7)
17
+ haml (3.1.1)
16
18
  hoe (2.9.4)
17
19
  rake (>= 0.8.7)
18
20
  hpricot (0.8.3)
@@ -20,7 +22,7 @@ GEM
20
22
  rack-test (0.5.7)
21
23
  rack (>= 1.0)
22
24
  rake (0.8.7)
23
- redcarpet (1.11.0)
25
+ redcarpet (1.11.3)
24
26
  rspec (1.3.0)
25
27
  rspec_hpricot_matchers (1.0)
26
28
  shotgun (0.9)
@@ -30,14 +32,14 @@ GEM
30
32
  tilt (~> 1.2)
31
33
  test-unit (1.2.3)
32
34
  hoe (>= 1.5.1)
33
- tilt (1.2.2)
35
+ tilt (1.3)
34
36
 
35
37
  PLATFORMS
36
38
  ruby
37
39
 
38
40
  DEPENDENCIES
39
41
  hpricot (= 0.8.3)
40
- nesta!
42
+ mars-nesta!
41
43
  rack-test (= 0.5.7)
42
44
  rspec (= 1.3.0)
43
45
  rspec_hpricot_matchers (= 1.0)
data/lib/nesta/models.rb CHANGED
@@ -2,6 +2,7 @@ require "time"
2
2
 
3
3
  require "rubygems"
4
4
  require "redcloth"
5
+ require "coderay"
5
6
  begin
6
7
  require "redcarpet"
7
8
  Maruku = Redcarpet
@@ -93,7 +94,7 @@ module Nesta
93
94
  def to_html(scope = nil)
94
95
  case @format
95
96
  when :mdown
96
- Maruku.new(markup).to_html
97
+ Maruku.new(coderay(markup)).to_html
97
98
  when :haml
98
99
  Haml::Engine.new(markup).to_html(scope || Object.new)
99
100
  when :textile
@@ -101,6 +102,12 @@ module Nesta
101
102
  end
102
103
  end
103
104
 
105
+ def coderay(text)
106
+ text.gsub(/^```\s(\w+?)\s+?(^.*?)^```/m) do
107
+ CodeRay.scan($2, $1).div(:css => :class)
108
+ end
109
+ end
110
+
104
111
  def last_modified
105
112
  @last_modified ||= File.stat(@filename).mtime
106
113
  end
data/lib/nesta/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Nesta
2
- VERSION = '0.9.4'
2
+ VERSION = '0.9.5'
3
3
  end
data/nesta.gemspec CHANGED
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
6
6
  s.name = "mars-nesta"
7
7
  s.version = Nesta::VERSION
8
8
  s.platform = Gem::Platform::RUBY
9
- s.authors = ["Graham Ashton"]
10
- s.email = ["graham@effectif.com"]
9
+ s.authors = ["Graham Ashton", "Mars Cheng"]
10
+ s.email = ["graham@effectif.com", "kidrane@gmail.com"]
11
11
  s.homepage = "http://nestacms.com"
12
12
  s.summary = %q{Ruby CMS, written in Sinatra}
13
13
  s.description = <<-EOF
@@ -35,6 +35,7 @@ EOF
35
35
  s.add_dependency('redcarpet', '>= 1.11.0')
36
36
  s.add_dependency('RedCloth', '~> 4.2')
37
37
  s.add_dependency('sinatra', '1.1.2')
38
+ s.add_dependency('coderay', '>= 0.9.7')
38
39
 
39
40
  # Useful in development
40
41
  s.add_dependency('shotgun', '>= 0.8')
data/spec/commands_spec.rb CHANGED
@@ -58,7 +58,7 @@ describe "nesta" do
58
58
 
59
59
  it "should add a Gemfile" do
60
60
  should_exist('Gemfile')
61
- gemfile_source.should match(/gem 'nesta', '#{Nesta::VERSION}'/)
61
+ gemfile_source.should match(/gem 'mars-nesta', '#{Nesta::VERSION}'/)
62
62
  end
63
63
  end
64
64
 
metadata CHANGED
@@ -2,15 +2,17 @@
2
2
  name: mars-nesta
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.9.4
5
+ version: 0.9.5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Graham Ashton
9
+ - Mars Cheng
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
13
 
13
- date: 2011-04-26 00:00:00 Z
14
+ date: 2011-04-29 00:00:00 +08:00
15
+ default_executable:
14
16
  dependencies:
15
17
  - !ruby/object:Gem::Dependency
16
18
  name: haml
@@ -57,71 +59,82 @@ dependencies:
57
59
  type: :runtime
58
60
  version_requirements: *id004
59
61
  - !ruby/object:Gem::Dependency
60
- name: shotgun
62
+ name: coderay
61
63
  prerelease: false
62
64
  requirement: &id005 !ruby/object:Gem::Requirement
63
65
  none: false
64
66
  requirements:
65
67
  - - ">="
66
68
  - !ruby/object:Gem::Version
67
- version: "0.8"
69
+ version: 0.9.7
68
70
  type: :runtime
69
71
  version_requirements: *id005
70
72
  - !ruby/object:Gem::Dependency
71
- name: hpricot
73
+ name: shotgun
72
74
  prerelease: false
73
75
  requirement: &id006 !ruby/object:Gem::Requirement
76
+ none: false
77
+ requirements:
78
+ - - ">="
79
+ - !ruby/object:Gem::Version
80
+ version: "0.8"
81
+ type: :runtime
82
+ version_requirements: *id006
83
+ - !ruby/object:Gem::Dependency
84
+ name: hpricot
85
+ prerelease: false
86
+ requirement: &id007 !ruby/object:Gem::Requirement
74
87
  none: false
75
88
  requirements:
76
89
  - - "="
77
90
  - !ruby/object:Gem::Version
78
91
  version: 0.8.3
79
92
  type: :development
80
- version_requirements: *id006
93
+ version_requirements: *id007
81
94
  - !ruby/object:Gem::Dependency
82
95
  name: rack-test
83
96
  prerelease: false
84
- requirement: &id007 !ruby/object:Gem::Requirement
97
+ requirement: &id008 !ruby/object:Gem::Requirement
85
98
  none: false
86
99
  requirements:
87
100
  - - "="
88
101
  - !ruby/object:Gem::Version
89
102
  version: 0.5.7
90
103
  type: :development
91
- version_requirements: *id007
104
+ version_requirements: *id008
92
105
  - !ruby/object:Gem::Dependency
93
106
  name: rspec
94
107
  prerelease: false
95
- requirement: &id008 !ruby/object:Gem::Requirement
108
+ requirement: &id009 !ruby/object:Gem::Requirement
96
109
  none: false
97
110
  requirements:
98
111
  - - "="
99
112
  - !ruby/object:Gem::Version
100
113
  version: 1.3.0
101
114
  type: :development
102
- version_requirements: *id008
115
+ version_requirements: *id009
103
116
  - !ruby/object:Gem::Dependency
104
117
  name: rspec_hpricot_matchers
105
118
  prerelease: false
106
- requirement: &id009 !ruby/object:Gem::Requirement
119
+ requirement: &id010 !ruby/object:Gem::Requirement
107
120
  none: false
108
121
  requirements:
109
122
  - - "="
110
123
  - !ruby/object:Gem::Version
111
124
  version: "1.0"
112
125
  type: :development
113
- version_requirements: *id009
126
+ version_requirements: *id010
114
127
  - !ruby/object:Gem::Dependency
115
128
  name: test-unit
116
129
  prerelease: false
117
- requirement: &id010 !ruby/object:Gem::Requirement
130
+ requirement: &id011 !ruby/object:Gem::Requirement
118
131
  none: false
119
132
  requirements:
120
133
  - - "="
121
134
  - !ruby/object:Gem::Version
122
135
  version: 1.2.3
123
136
  type: :development
124
- version_requirements: *id010
137
+ version_requirements: *id011
125
138
  description: |
126
139
  Nesta is a lightweight Content Management System, written in Ruby using
127
140
  the Sinatra web framework. Nesta has the simplicity of a static site
@@ -137,6 +150,7 @@ description: |
137
150
 
138
151
  email:
139
152
  - graham@effectif.com
153
+ - kidrane@gmail.com
140
154
  executables:
141
155
  - nesta
142
156
  extensions: []
@@ -204,6 +218,7 @@ files:
204
218
  - views/sidebar.haml
205
219
  - views/sitemap.haml
206
220
  - views/summaries.haml
221
+ has_rdoc: true
207
222
  homepage: http://nestacms.com
208
223
  licenses: []
209
224
 
@@ -227,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
227
242
  requirements: []
228
243
 
229
244
  rubyforge_project:
230
- rubygems_version: 1.7.2
245
+ rubygems_version: 1.6.2
231
246
  signing_key:
232
247
  specification_version: 3
233
248
  summary: Ruby CMS, written in Sinatra