octopress-pygments 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YzYxMGQ3ZWMxMzg3OGQxY2MyMWMzMDQ1YmQ0OTk1ZTU0MmFlNDkxMA==
4
+ OWY3YTkyYWNlMjgzMDE0YzFkZjBjY2U0ZGUyMjAwMGUxMDVhYWQ4Zg==
5
5
  data.tar.gz: !binary |-
6
- MzQxMjhkMTE4NWVlNzYyMWYyMzgzOWViNDFjNzYxYjVhODAyZmQwYg==
6
+ NzIyOGNkMjUxYzQzN2EyNDgzYjhjZDExNTdlODM1OTVhMDg4ZmY0Nw==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NDUwMTY2ZWZjMzA0NDZlMDNjNDEzZDRlNTZhZDgwZTdiNDUzZmU2OWUxNzY1
10
- M2QyM2E2MjIyMGViODFjODI5N2E0YjUwYWRlOWI0YzllMGRmYWI5NzdjNWNk
11
- ZmI1Njc5ZDU2NDVkZTIzZDkzZTc0NGY2YWEwZjI3M2Y2MWI4NDg=
9
+ YWE0Yzc2YjQ2ZTVkYzYyMzE0NjE2OWI5NjYwNWZhYmU1MDQ2YTFhOGM2ZjVk
10
+ OTZiNmNjODAyZTdkNjNmOTQ1M2JmOTJlMDcwZjM1YmQ4MWNmM2Q1NjZhYjIz
11
+ MGFmZmJlZTU1NzRkZWQyNTQ1NGQwMGM1YjAxOTgyNWI4MjJjMDA=
12
12
  data.tar.gz: !binary |-
13
- YWMwYzRhZDIyZWIyMWE1MGRmY2ExOWM2NzBjNGM0NmE4NWFjMzFhZDA3M2I5
14
- NDllNTNiNGE3NWI5OTQ1NjA0MmEzM2Q3MjJjZWQ3ODQ0NWE0YWQwMzI5Njcw
15
- MmZkYjAwODgxMTAzMTIzYTVhN2NlOWM4ZTA0NjliZTk0MTM0MGI=
13
+ NGY4OWQxOTUzOTI1ZWQ5MDBjNzcyYTdmYTY1M2M0ODgzMzVhNDUxODNiMGQ0
14
+ MjFkNjRiZDA5OThmN2VhNDY2MjcxMzIyNTRkMjZjNmI4MTk2ZjFkOTI4NzYy
15
+ OWQwZjA2ZjMwYzY1Y2Q4NjdmMjUwM2JmZWQ2MzQwNWFhNmZmMjc=
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ## 1.2.1
4
+ - Fix: No longer overwriting options with `nil` in parse_markup
5
+
3
6
  ## 1.2.0
4
7
  - Added method for users to specify lexer aliases
5
8
  - Removed default aliases:
@@ -20,7 +20,7 @@ module Octopress
20
20
  end
21
21
 
22
22
  def parse_markup(defaults = {})
23
- defaults.merge({
23
+ options = {
24
24
  lang: lang,
25
25
  url: url,
26
26
  title: title,
@@ -29,7 +29,9 @@ module Octopress
29
29
  link_text: link_text,
30
30
  start: start,
31
31
  end: endline
32
- })
32
+ }
33
+ options = options.delete_if { |k,v| v.nil? }
34
+ defaults.merge(options)
33
35
  end
34
36
 
35
37
  def lang
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Pygments
3
- VERSION = "1.2.0"
3
+ VERSION = "1.2.1"
4
4
  end
5
5
  end
@@ -58,7 +58,7 @@ EOF
58
58
 
59
59
  let(:markup) do
60
60
  [
61
- "lang:ruby",
61
+ "lang:abc",
62
62
  'title:"Hello"',
63
63
  "url:http://something.com/hi/fuaiofnioaf.html",
64
64
  "link_text:'get it here'",
@@ -86,7 +86,7 @@ EOF
86
86
 
87
87
  let(:options) do
88
88
  {
89
- lang: "ruby",
89
+ lang: "abc",
90
90
  url: "http://something.com/hi/fuaiofnioaf.html",
91
91
  title: "Hello",
92
92
  linenos: "yes",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-pygments
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis