mars-nesta 0.9.4 → 0.9.5

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.4)
+    mars-nesta (0.9.5)
       RedCloth (~> 4.2)
+      coderay (>= 0.9.7)
       haml (~> 3.0)
       redcarpet (>= 1.11.0)
       shotgun (>= 0.8)
@@ -12,7 +13,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    haml (3.1.0)
+    coderay (0.9.7)
+    haml (3.1.1)
     hoe (2.9.4)
       rake (>= 0.8.7)
     hpricot (0.8.3)
@@ -20,7 +22,7 @@ GEM
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
-    redcarpet (1.11.0)
+    redcarpet (1.11.3)
     rspec (1.3.0)
     rspec_hpricot_matchers (1.0)
     shotgun (0.9)
@@ -30,14 +32,14 @@ GEM
       tilt (~> 1.2)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    tilt (1.2.2)
+    tilt (1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   hpricot (= 0.8.3)
-  nesta!
+  mars-nesta!
   rack-test (= 0.5.7)
   rspec (= 1.3.0)
   rspec_hpricot_matchers (= 1.0)

data/lib/nesta/models.rb

@@ -2,6 +2,7 @@ require "time"
 
 require "rubygems"
 require "redcloth"
+require "coderay"
 begin
   require "redcarpet"
   Maruku = Redcarpet
@@ -93,7 +94,7 @@ module Nesta
     def to_html(scope = nil)
       case @format
       when :mdown
-        Maruku.new(markup).to_html
+        Maruku.new(coderay(markup)).to_html
       when :haml
         Haml::Engine.new(markup).to_html(scope || Object.new)
       when :textile
@@ -101,6 +102,12 @@ module Nesta
       end
     end
 
+    def coderay(text)
+      text.gsub(/^```\s(\w+?)\s+?(^.*?)^```/m) do
+        CodeRay.scan($2, $1).div(:css => :class)
+      end
+    end
+
     def last_modified
       @last_modified ||= File.stat(@filename).mtime
     end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/nesta.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "mars-nesta"
   s.version     = Nesta::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Graham Ashton"]
-  s.email       = ["graham@effectif.com"]
+  s.authors     = ["Graham Ashton", "Mars Cheng"]
+  s.email       = ["graham@effectif.com", "kidrane@gmail.com"]
   s.homepage    = "http://nestacms.com"
   s.summary     = %q{Ruby CMS, written in Sinatra}
   s.description = <<-EOF
@@ -35,6 +35,7 @@ EOF
   s.add_dependency('redcarpet', '>= 1.11.0')
   s.add_dependency('RedCloth', '~> 4.2')
   s.add_dependency('sinatra', '1.1.2')
+  s.add_dependency('coderay', '>= 0.9.7')
   
   # Useful in development
   s.add_dependency('shotgun', '>= 0.8')

data/spec/commands_spec.rb

@@ -58,7 +58,7 @@ describe "nesta" do
 
       it "should add a Gemfile" do
         should_exist('Gemfile')
-        gemfile_source.should match(/gem 'nesta', '#{Nesta::VERSION}'/)
+        gemfile_source.should match(/gem 'mars-nesta', '#{Nesta::VERSION}'/)
       end
     end
 

metadata

@@ -2,15 +2,17 @@
 name: mars-nesta
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Graham Ashton
+- Mars Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 Z
+date: 2011-04-29 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -57,71 +59,82 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shotgun
+  name: coderay
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: 0.9.7
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: shotgun
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.8"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.8.3
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: "1.0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: test-unit
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.2.3
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -137,6 +150,7 @@ description: |
 
 email: 
 - graham@effectif.com
+- kidrane@gmail.com
 executables: 
 - nesta
 extensions: []
@@ -204,6 +218,7 @@ files:
 - views/sidebar.haml
 - views/sitemap.haml
 - views/summaries.haml
+has_rdoc: true
 homepage: http://nestacms.com
 licenses: []
 
@@ -227,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby CMS, written in Sinatra