polytexnic 1.0.beta4 → 1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cd3da83721b462b620c6264b757009d7764242
-  data.tar.gz: 66afdad9074a52e82885ab4c59de356b41aefc27
+  metadata.gz: 5a8660e3ba5020ca916133a4dd388a904a44515a
+  data.tar.gz: 5677ef66765af80c5620c19ee5fe2f8f8c2f4218
 SHA512:
-  metadata.gz: 6fc1fd9be6e8abca50d1974632eb8240a4cc1d2e0d9eb97f0c82fd38796a969f44477c426d54926f654b84325936e6ddd4825ea7ffd5b9d2ab924fb341a59a2d
-  data.tar.gz: 333b985f56228ca304ace76eb0ee5b578fc01068c0c955e8d8cfb9f84f81b9983115ae9a0ca36022491561827ab28d6481ac9f88166df102b39f291472627c94
+  metadata.gz: f0bbb2b8122364b561ff3918907eea18d8159a18b2cda446d511730cc663ffdbd3bdc09267136cf2e4fff09740921c6be217e9c572abb25557b3e520cab66eea
+  data.tar.gz: 17299412d2276f2bc78b79938c3031d7cbe1cfec9715cfc12ae990b50d2e1bc47e413cf7a4f870c1497b94b05eb845e7f190d8fc7b15ad792a846508ad9e6d12

data/lib/polytexnic/literal.rb

@@ -4,7 +4,7 @@ module Polytexnic
 
     # Matches the line for syntax highlighting.
     # %= lang: <language>[, options: ...]
-    LANG_REGEX = /^\s*%=\s+lang:\s*(\w+)(?:,\s*options:(.*))?/
+    LANG_REGEX = /^\s*%=\s+lang:\s*([\w+]+)(?:,\s*options:(.*))?/
 
 
     # Makes the caches for literal environments.

data/lib/polytexnic/preprocessors/html.rb

@@ -46,9 +46,9 @@ module Polytexnic
         # global substitutions.
         def clean_document(polytex)
           doc = cache_literal(add_commands(polytex))
-          inline_verbatim(doc)
-          cache_hrefs(doc)
           expand_input!(doc, Proc.new { |source| cache_literal(source) }, 'tex')
+          inline_verbatim(doc)
+          cache_urls(doc)
           remove_comments(doc)
           double_backslashes(cache_display_inline_math(doc))
         end

data/lib/polytexnic/utils.rb

@@ -90,13 +90,14 @@ module Polytexnic
       string.gsub(/\\(\s+|$)/) { '\\\\' + $1.to_s }
     end
 
-    # Caches URLs for \href commands.
-    def cache_hrefs(doc, latex=false)
+    # Caches URLs for \href and \url commands.
+    def cache_urls(doc, latex=false)
       doc.tap do |text|
-        text.gsub!(/\\href{(.*?)}/) do
-          key = digest($1)
-          literal_cache[key] = $1
-          "\\href{#{key}}"
+        text.gsub!(/\\(href|url){(.*?)}/) do
+          command, url = $1, $2
+          key = digest(url)
+          literal_cache[key] = url
+          command == 'url' ? "\\href{#{key}}{#{url}}" : "\\href{#{key}}"
         end
       end
     end

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.0.beta4"
+  VERSION = "1.0.beta5"
 end

data/spec/to_html/core_spec.rb

@@ -201,7 +201,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     it { should resemble output }
   end
 
-  describe "href" do
+  describe "URLs" do
 
     context "standard URL" do
       let(:polytex) { '\href{http://example.com/}{Example Site}' }
@@ -219,6 +219,11 @@ describe 'Polytexnic::Pipeline#to_html' do
       let(:polytex) { '\href{http://example.com/escaped\_text}{Example Site}' }
       it { should include '<a href="http://example.com/escaped_text">Example Site</a>' }
     end
+
+    context "self-linking URL" do
+      let(:polytex) { '\url{http://example.com/}' }
+      it { should include '<a href="http://example.com/">http://example.com/</a>' }
+    end
   end
 
   describe "centering" do

data/spec/to_html/input_spec.rb

@@ -10,7 +10,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     let(:external_file) { 'foo.tex' }
     let(:nested_external_file) { 'bar.tex' }
     let(:input) do <<-'EOS'
-Lorem ipsum
+Lorem ipsum \href{http://example.com/}{example}
 %= lang:ruby
 \begin{code}
 def foo; 'foo'; end
@@ -44,8 +44,10 @@ def bar(): return "bar"
     let(:bar_html) do
       '<div class="code"><div class="highlight"><pre><span class="k">def</span> <span class="nf">bar</span><span class="p">():'
     end
+    let(:href_html) { '<a href="http://example.com/">example</a>' }
 
     it { should include foo_html }
     it { should include bar_html }
+    it { should include href_html }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.0.beta4
+  version: 1.0.beta5
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri