metamagic 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6eed70ef80714dd6ce2abf2734aeabe71337b6
-  data.tar.gz: 017a7abdbc84eabd2ebab6a16bb52334ea072707
+  metadata.gz: 0bd1c5cb5eaeec1a81f04a1351ffa0d4ebcb6bda
+  data.tar.gz: aeb4fd251d0f1a35d2fb671f646786e1e16723cd
 SHA512:
-  metadata.gz: 86b5bea5a74acfc5c5eed5b997a86d1d31bb2404736cfdc35a889f585b4b8e9ae5eb8b08c633540361df41d520f87f051cd334a7587537486fcfdadd9c2f14cd
-  data.tar.gz: 9399b18fe4a280bf6102244ad6fe5d37b2f618de6570082ccf8749c8e62532346c4d51a135dfccd2af6f3eab9c27894444de6a70e4fc2f1bd992618ac3bdaa7d
+  metadata.gz: 5d26a67f84c95eab8de16287d5c5cb4140109b390ac238f862e8b8a709d58e6745e210c912be710634db2b1d6eb13a617bbfe0bad44aab601c95a43955d3bb64
+  data.tar.gz: e075cf385f3da913b9d7ff8e775d1c4633f02cfa7dbfbd717c50e4943632bf85bd8873fc5d7017e4ca9c1f9fb2997ff4299c71af3c5ea910807f135671de9494

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## Version 3.1.4
+
+* Fixes a bug where symbol-like strings inside meta tags would raise an exception
+
 ## Version 3.1.3
 
-# Shortcut helpers now return the value you send to them.
+* Shortcut helpers now return the value you send to them.
 
 ## Version 3.1.2
 

data/README.md

@@ -108,24 +108,25 @@ metamagic site: "My Site", title: -> { title.include?(site) ? title : "#{title}
 
 This will insert the site name only if it is not already present in the title.
 
-You could also do this with a view helper:
+You could also do this with a view helper. I use this in one of my websites:
 
 ```ruby
 module ApplicationHelper
   def meta_title_for(title, site)
+    return site if title.blank?
     title.include?(site) ? title : "#{title} — #{site}"
   end
 end
 ```
 
+The proc is still needed in the layout to ensure the right context for the template:
+
 ```erb
 <%
 metamagic site: "My Site", title: -> { meta_title_for(title, site) }
 %>
 ```
 
-The proc is still needed here to ensure the right context for the template.
-
 #### Keywords template
 
 Keyword templates can be used to add some default keywords to all pages on your site.
@@ -424,4 +425,4 @@ Contributors
 
 * [See the list of contributors](https://github.com/lassebunk/metamagic/graphs/contributors)
 
-Copyright (c) 2010-2014 [Lasse Bunk](http://lassebunk.dk), released under the MIT license
+Copyright (c) 2010-2014 [Lasse Bunk](http://lassebunk.dk), released under the MIT license

data/lib/metamagic/renderer.rb

@@ -104,7 +104,7 @@ module Metamagic
       Array(value).any? do |val|
         val.is_a?(Proc) ||
         val.is_a?(Symbol) ||
-        val =~ /:\w+/
+        val =~ /\A:\w+/
       end
     end
 

data/lib/metamagic/version.rb

@@ -1,3 +1,3 @@
 module Metamagic
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

data/test/metamagic_test.rb

@@ -20,6 +20,14 @@ class MetamagicTest < ActionView::TestCase
                  metamagic(title: "Default Title", description: "Default description", test: "Default test")
   end
 
+  test "default meta tags containing colons" do
+    meta title: "Test Title",
+         test: "Test tag"
+
+    assert_equal %{<title>Test Title</title>\n<meta content="Test tag" name="test" />\n<meta content="Default\n:something" name="description" />},
+                 metamagic(title: "Default:Title", description: "Default\n:something", test: "Default test")
+  end
+
   test "not adding existing meta tags" do
     meta title: "Test Title",
          description: "Test description."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamagic
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails