gust 0.1.0 → 0.1.1

data/gust.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gust"
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jeff Kreeftmeijer"]
   s.email       = ["jeff@kreeftmeijer.nl"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/jeffkreeftmeijer/gust"
   s.summary     = %q{Syntax highlighting and Markdown/Textile parsing}
   s.description = %q{Syntax highlighting and Markdown/Textile parsing}
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rspec', ['~> 2.0']
+  s.add_development_dependency 'rspec', ['~> 2.0']
   s.add_dependency 'pygments.rb', ['~> 0.1.2']
   s.add_dependency 'kramdown', ['~> 0.13.3']
   s.add_dependency 'RedCloth', ['~> 4.2.7']

data/lib/gust.rb

@@ -5,16 +5,15 @@ require 'RedCloth'
 class Gust
 
   def self.parse(code, options = {})
+    return "<div class=\"markup\">#{code}</div>\n" unless options[:filename]
 
-    if options[:filename]
-      code = case options[:filename]
-        when /.*\.markdown$/ then Kramdown::Document.new(code).to_html
-        when /.*\.textile$/ then RedCloth.new(code).to_html
-        else return Pygments.highlight(code, options) rescue code
-      end
+    case options[:filename]
+      when /.*\.png$/ then "<div class=\"image\"><img src=\"#{options[:url]}\"/></div>\n"
+      when /.*\.markdown$/, /.*\.md$/ then "<div class=\"markup\">#{Kramdown::Document.new(code).to_html}</div>\n"
+      when /.*\.textile$/ then "<div class=\"markup\">#{RedCloth.new(code).to_html}</div>\n"
+      else Pygments.highlight(code, options) rescue "<div class=\"markup\">#{code}</div>\n"
     end
 
-    "<div class=\"markup\">#{code}</div>\n"
   end
 
 end

data/spec/gust_spec.rb

@@ -2,49 +2,70 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'gust'
 
 describe Gust do
-  
+
+  shared_examples_for 'a markdown file' do
+
+    it { should == "<div class=\"markup\"><p><em>foo</em></p>\n</div>\n" }
+
+  end
+
   describe '.parse' do
-    
+
     context 'when only passing "foo" as a string' do
-      
+
       subject { Gust.parse('foo') }
-      
+
       it { should == "<div class=\"markup\">foo</div>\n" }
-      
+
     end
-    
+
     context 'with an unknown filename' do
-      
+
       subject { Gust.parse('foo', :filename => 'foo.bar') }
-      
+
       it { should == "<div class=\"markup\">foo</div>\n" }
-      
+
     end
-    
+
     context 'with a ruby file' do
-      
+
       subject { Gust.parse('foo', :filename => 'foo.rb') }
-      
+
       it { should == "<div class=\"highlight\"><pre><span class=\"n\">foo</span>\n</pre>\n</div>\n" }
-      
+
     end
-    
+
     context 'with a markdown file' do
-      
+
       subject { Gust.parse('*foo*', :filename => 'foo.markdown') }
-      
-      it { should == "<div class=\"markup\"><p><em>foo</em></p>\n</div>\n" }
-      
+
+      it_should_behave_like 'a markdown file'
+
     end
-    
+
+    context 'with a markdown file that uses the (wrong) .md extension' do
+
+      subject { Gust.parse('*foo*', :filename => 'foo.md') }
+
+      it_should_behave_like 'a markdown file'
+
+    end
+
     context 'with a textile file' do
-      
+
       subject { Gust.parse('*foo*', :filename => 'foo.textile') }
-      
+
       it { should == "<div class=\"markup\"><p><strong>foo</strong></p></div>\n" }
-      
+
     end
-    
+
+    context 'with a .png file' do
+      subject { Gust.parse('', :filename => 'foo.png', :url => 'http://jeffkreeftmeijer.com/images/carnivore_capybara.png') }
+
+      it { should == "<div class=\"image\"><img src=\"http://jeffkreeftmeijer.com/images/carnivore_capybara.png\"/></div>\n" }
+
+    end
+
   end
-  
+
 end

metadata

@@ -1,68 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gust
-version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Jeff Kreeftmeijer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-26 00:00:00.000000000 +02:00
+
+date: 2011-06-27 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2154021680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2154021680
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: pygments.rb
-  requirement: &2154021180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2154021180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: kramdown
-  requirement: &2154020700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 13
+        - 3
         version: 0.13.3
   type: :runtime
-  prerelease: false
-  version_requirements: *2154020700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: RedCloth
-  requirement: &2154020220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 7
         version: 4.2.7
   type: :runtime
-  prerelease: false
-  version_requirements: *2154020220
+  version_requirements: *id004
 description: Syntax highlighting and Markdown/Textile parsing
-email:
+email: 
 - jeff@kreeftmeijer.nl
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -71,29 +90,34 @@ files:
 - lib/gust.rb
 - spec/gust_spec.rb
 has_rdoc: true
-homepage: ''
+homepage: https://github.com/jeffkreeftmeijer/gust
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: gust
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Syntax highlighting and Markdown/Textile parsing
-test_files:
+test_files: 
 - spec/gust_spec.rb