glorify 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4bf0a54bba1e47a0081dd95144f656d566221c9e
+  data.tar.gz: 9e0dbbc0c880d892984c0e06f16a4801fef815fd
+SHA512:
+  metadata.gz: 834a04db94613c71fc15cf7867983c98ca06cdca451b7fc6e2431303ea7bd44baefc14b27cb904840c285c120d45c643933a310cac50a313c432804ec34bca5c
+  data.tar.gz: 36b0e8d07c4d7dac87dae67e6e49e3930ea7aacc92a1b02bedab4191c128ccb6da14b2995440672f531c1da496878265d3a133753a9c93c2accd803e5bc74179

data/lib/glorify/helpers.rb

@@ -61,8 +61,8 @@ module Sinatra
       #
       # For modular applications you must add <code>register
       # Sinatra::Helpers</code> to your application.
-      def glorify text
-        Glorify::Renderer.render(text.force_encoding('UTF-8'))
+      def glorify text, options = {}
+        Glorify::Renderer.new(options).parse(text.force_encoding('UTF-8'))
       end
     end
   end

data/lib/glorify/template.rb

@@ -20,12 +20,12 @@ module Sinatra
     #     end
     class Template < Tilt::Template
       def prepare # :nodoc:
-        @engine = Glorify::Renderer
+        @engine = Glorify::Renderer.new(options)
         @output = nil
       end
 
       def evaluate(scope, locals, &block) # :nodoc:
-        @output ||= @engine.render(data.force_encoding('UTF-8'))
+        @output ||= @engine.parse(data.force_encoding('UTF-8'))
       end
     end
   end

data/lib/glorify/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Glorify
     # Current version of Sinatra::Glorify
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/spec/glorify/helper_with_pipe.erb

@@ -0,0 +1 @@
+<%= glorify(@some_code, :pipe => true) %>

data/spec/glorify/helper_with_toc.erb

@@ -0,0 +1 @@
+<%= glorify(@some_code, :toc => true) %>

data/spec/glorify/with_helper.erb

@@ -1 +1 @@
-<%= glorify(@some_code) %>
+<%= glorify(@some_code, :pipe => true) %>

data/spec/glorify_spec.rb

@@ -4,10 +4,9 @@ describe Sinatra::Glorify do
 
   it "should parse a header" do
     mock_app do
-      Tilt.prefer Sinatra::Glorify::Template
       get('/') { markdown :header }
     end
-    expected = "<h1 id=\"label-a+sip+of+glory\">a sip of glory<span><a href=\"#label-a+sip+of+glory\">&para;</a> <a href=\"#documentation\">&uarr;</a></span></h1>"
+    expected = '<h1 id="label-a+sip+of+glory">a sip of glory<span><a href="#label-a+sip+of+glory">&para;</a> <a href="#documentation">&uarr;</a></span></h1>'
     get('/')
     assert ok?
     assert_equal expected, body
@@ -15,10 +14,9 @@ describe Sinatra::Glorify do
 
   it "should parse code blocks" do
     mock_app do
-      Tilt.prefer Sinatra::Glorify::Template
       get('/') { markdown :blocks }
     end
-    expected = "<pre class=\"highlight text\">&quot;Hello, world!&quot;</pre>"
+    expected = '<pre class="highlight text">&quot;Hello, world!&quot;</pre>'
     get('/')
     assert ok?
     assert_equal expected, body
@@ -27,7 +25,6 @@ describe Sinatra::Glorify do
   it "should parse ruby blocks" do
     mock_app do
       get('/') do
-        Tilt.prefer Sinatra::Glorify::Template
         markdown :ruby_blocks
       end
     end
@@ -51,6 +48,36 @@ describe Sinatra::Glorify do
     refute_empty Nokogiri::HTML(body).search("pre.highlight")
   end
 
+  it "should use helper with pipe" do
+    mock_app do
+      get('/') do
+        @some_code = File.open(
+          File.expand_path('../glorify/header.md', __FILE__),
+          "rb"
+        ).read
+        erb :helper_with_pipe
+      end
+    end
+    get('/')
+    assert ok?
+    assert_equal '<h1 id="label-a+sip+of+glory">a sip of glory</h1>', body
+  end
+
+  it "should use helper with toc" do
+    mock_app do
+      get('/') do
+        @some_code = File.open(
+          File.expand_path('../glorify/header.md', __FILE__),
+          "rb"
+        ).read
+        erb :helper_with_toc
+      end
+    end
+    get('/')
+    assert ok?
+    assert_equal "<li><a href='#label-a+sip+of+glory'>a sip of glory</a></li>", body
+  end
+
   it "should include a valid css helper for pygments" do
     mock_app
     get('/pygments.css')
@@ -59,4 +86,22 @@ describe Sinatra::Glorify do
     assert_match /text\/css/, content_type
     assert_empty validate_css(body).errors
   end
+
+  it "should render template with pipe" do
+    mock_app do
+      get('/') { markdown :header, :pipe => true }
+    end
+    get('/')
+    assert ok?
+    assert_equal '<h1 id="label-a+sip+of+glory">a sip of glory</h1>', body
+  end
+
+  it "should render template with toc" do
+    mock_app do
+      get('/') { markdown :header, :toc => true }
+    end
+    get('/')
+    assert ok?
+    assert_equal "<li><a href='#label-a+sip+of+glory'>a sip of glory</a></li>", body
+  end
 end

data/spec/spec_helper.rb

@@ -19,7 +19,10 @@ class MiniTest::Spec
   include W3CValidators
 
   def mock_app(base=Sinatra::Base, &block)
-    @app = Sinatra.new(base, &block)
+    @app = Sinatra.new(base) do
+      Tilt.prefer Sinatra::Glorify::Template
+      class_eval &block if block_given?
+    end
   end
 
   def app

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glorify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Zachary Scott
@@ -11,124 +10,109 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc-rouge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: w3c_validators
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -164,6 +147,8 @@ files:
 - lib/glorify/version.rb
 - spec/glorify/blocks.md
 - spec/glorify/header.md
+- spec/glorify/helper_with_pipe.erb
+- spec/glorify/helper_with_toc.erb
 - spec/glorify/ruby_blocks.md
 - spec/glorify/some_code.md
 - spec/glorify/with_helper.erb
@@ -171,32 +156,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://zacharyscott.net/glorify/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1006836911274585602
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1006836911274585602
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sinatra helper to parse markdown with syntax highlighting like the pros
 test_files: []