octopress-pygments 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzYxMGQ3ZWMxMzg3OGQxY2MyMWMzMDQ1YmQ0OTk1ZTU0MmFlNDkxMA==
+    OWY3YTkyYWNlMjgzMDE0YzFkZjBjY2U0ZGUyMjAwMGUxMDVhYWQ4Zg==
   data.tar.gz: !binary |-
-    MzQxMjhkMTE4NWVlNzYyMWYyMzgzOWViNDFjNzYxYjVhODAyZmQwYg==
+    NzIyOGNkMjUxYzQzN2EyNDgzYjhjZDExNTdlODM1OTVhMDg4ZmY0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDUwMTY2ZWZjMzA0NDZlMDNjNDEzZDRlNTZhZDgwZTdiNDUzZmU2OWUxNzY1
-    M2QyM2E2MjIyMGViODFjODI5N2E0YjUwYWRlOWI0YzllMGRmYWI5NzdjNWNk
-    ZmI1Njc5ZDU2NDVkZTIzZDkzZTc0NGY2YWEwZjI3M2Y2MWI4NDg=
+    YWE0Yzc2YjQ2ZTVkYzYyMzE0NjE2OWI5NjYwNWZhYmU1MDQ2YTFhOGM2ZjVk
+    OTZiNmNjODAyZTdkNjNmOTQ1M2JmOTJlMDcwZjM1YmQ4MWNmM2Q1NjZhYjIz
+    MGFmZmJlZTU1NzRkZWQyNTQ1NGQwMGM1YjAxOTgyNWI4MjJjMDA=
   data.tar.gz: !binary |-
-    YWMwYzRhZDIyZWIyMWE1MGRmY2ExOWM2NzBjNGM0NmE4NWFjMzFhZDA3M2I5
-    NDllNTNiNGE3NWI5OTQ1NjA0MmEzM2Q3MjJjZWQ3ODQ0NWE0YWQwMzI5Njcw
-    MmZkYjAwODgxMTAzMTIzYTVhN2NlOWM4ZTA0NjliZTk0MTM0MGI=
+    NGY4OWQxOTUzOTI1ZWQ5MDBjNzcyYTdmYTY1M2M0ODgzMzVhNDUxODNiMGQ0
+    MjFkNjRiZDA5OThmN2VhNDY2MjcxMzIyNTRkMjZjNmI4MTk2ZjFkOTI4NzYy
+    OWQwZjA2ZjMwYzY1Y2Q4NjdmMjUwM2JmZWQ2MzQwNWFhNmZmMjc=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.2.1
+  - Fix: No longer overwriting options with `nil` in parse_markup
+
 ## 1.2.0
   - Added method for users to specify lexer aliases
   - Removed default aliases:

data/lib/octopress-pygments/options_parser.rb

@@ -20,7 +20,7 @@ module Octopress
       end
 
       def parse_markup(defaults = {})
-        defaults.merge({
+        options = {
           lang:      lang,
           url:       url,
           title:     title,
@@ -29,7 +29,9 @@ module Octopress
           link_text: link_text,
           start:     start,
           end:       endline
-        })
+        }
+        options = options.delete_if { |k,v| v.nil? }
+        defaults.merge(options)
       end
 
       def lang

data/lib/octopress-pygments/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Pygments
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/spec/pygments_spec.rb

@@ -58,7 +58,7 @@ EOF
 
   let(:markup) do
     [
-      "lang:ruby",
+      "lang:abc",
       'title:"Hello"',
       "url:http://something.com/hi/fuaiofnioaf.html",
       "link_text:'get it here'",
@@ -86,7 +86,7 @@ EOF
 
   let(:options) do
     {
-      lang: "ruby",
+      lang: "abc",
       url:  "http://something.com/hi/fuaiofnioaf.html",
       title: "Hello",
       linenos: "yes",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-pygments
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brandon Mathis