polytexnic 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e7de21594c8b7389b2644e15ea5cf098edff39
-  data.tar.gz: 49867ac88a23d41ddf48903ada6f0269dd84d940
+  metadata.gz: b446df53404a9a04b877d6cca7d2e597c8aeb248
+  data.tar.gz: 306bbb15becc07f985e2d670aa783e9715e07164
 SHA512:
-  metadata.gz: 0c58db6f0f1661a51c11c216c624960f4d9f405eaf2b201f88e810c9276c94e30539b322100c71cd9c36163480f43229d271fcb2520ffdd715889451db977ef7
-  data.tar.gz: 015ba8b5a3034d4b2765b509d2fa9a58f1fc8f5f4a897c0a2724b7048e4f912deec4cd18c0d4635a5c5b98ab95c356be1c79ded81802f839fb804ad7650b7d47
+  metadata.gz: e9edb1dfa39ccd01042ee5990813dc2ee45e81c0eae11233a967e7285dfc81a05e089a69cfabe2708bc6061b3bd4769606ef52f1c87d2404e5b3f51efee94c5d
+  data.tar.gz: f829982d042ec3c585364dae133701ae3634957f1195a5d40678d6fe884920febc65a3d05c12425fd03a6e1f5ccfc879df612acd757a9bee49b54835876f7798

data/lib/polytexnic/literal.rb

@@ -9,7 +9,7 @@ module Polytexnic
     # Matches the line for code inclusion.
     # %= <</path/to/code.ext
     CODE_INCLUSION_REGEX = /^\s*%=\s+<<\s*\(          # opening
-                             \s*([\w\/]+\.?(\w*))     # path
+                             \s*([\w\/-]+\.?(\w*))     # path
                              (?:,\s*lang:\s*(\w+))?   # optional lang
                              \s*\)                    # closing paren
                              /x

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/markdown_to_polytex_spec.rb

@@ -157,6 +157,18 @@ def foo; "bar"; end
         it { should resemble '\label{code:lorem}' }
         it { should resemble '\end{codelisting}' }
       end
+
+      context "code inclusion inside codelisting" do
+        let(:source) do <<-'EOS'
+\begin{codelisting}
+\codecaption{Lorem ipsum.}
+\label{code:lorem}
+<<(/path/to/code)
+\end{codelisting}
+          EOS
+        end
+        it { should resemble '%= <<(/path/to/code)' }
+      end
     end
 
     describe "source code" do

data/spec/to_html/codelistings_spec.rb

@@ -67,4 +67,25 @@ $ subl .gemrc
       expect { processed_text }.not_to raise_error
     end
   end
+
+  describe "containing code inclusion with a hyphen" do
+    before do
+      File.write(File.join('spec', 'fixtures', 'name-with-hyphens.txt'), '')
+    end
+    after do
+      FileUtils.rm(File.join('spec', 'fixtures', 'name-with-hyphens.txt'))
+    end
+    let(:polytex) do <<-'EOS'
+\begin{codelisting}
+\codecaption{Foo}
+\label{code:foo}
+%= <<(spec/fixtures/name-with-hyphens.txt, lang: text)
+\end{codelisting}
+      EOS
+    end
+
+    it "should not raise an error" do
+      expect { processed_text }.not_to raise_error
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -164,6 +164,7 @@ files:
 - .pull_requests/1383263695
 - .pull_requests/1383274008
 - .pull_requests/1383327328
+- .pull_requests/1384446851
 - .rspec
 - .ruby-gemset
 - .ruby-version