metamagic 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fe3e857376924eb66e388066c0c0b6a26e0ec8
-  data.tar.gz: 76f4eefc651bcf2efa087e9a283db8e747856447
+  metadata.gz: fba62bacfa3f4e346ae0524f52b8514f6d9b20b5
+  data.tar.gz: 58f310e55106f357ae972bdf1d5386b1ab5261d5
 SHA512:
-  metadata.gz: 4ad6a68d73ce4b98057ff488618ccec093e2b6cd1a75b4611fc4f80795916b336073f4f206a243e71d64ed843e96b73eb020d3003ea26c354a4a45f8a18671bd
-  data.tar.gz: 87383b4816f9403bdc96daa0e381cb6a6b3616409c0c977c51ed427c0509670918d9453cad3458873c97cfbc7a0ff16c7c071ea2faa841a5ce90aad36fd3b523
+  metadata.gz: 2e9bad37c4556b757d3b774cbb0d80ea5fb83658d60e01a3baa3fd2dac4c2af7d3701322cb905529738c72da8cfa313544e80f3d218cc753fb119c950d4d5dee
+  data.tar.gz: 0b6de62e85b5dddf63a10179169cd1e675f5630f3d14d1dafce7c2cee1534aec478214bb9767ee8482ecdda732d214524e6130a89822c7eb95eec05d1a6b569e

data/lib/metamagic/renderer.rb

@@ -53,7 +53,7 @@ module Metamagic
     end
 
     def render
-      tags.sort.map(&:to_html).join("\n").html_safe
+      tags.sort.map(&:to_html).compact.join("\n").html_safe
     end
 
     def method_missing(*args)

data/lib/metamagic/tags/meta_tag.rb

@@ -1,7 +1,8 @@
 module Metamagic
   class MetaTag < Tag
     def to_html
-      tag(:meta, name: key, content: Array(value).join(", "))
+      return unless values = Array(value).compact.presence
+      tag(:meta, name: key, content: values.join(", "))
     end
 
     def sort_order

data/lib/metamagic/tags/property_tag.rb

@@ -6,7 +6,7 @@ module Metamagic
     end
 
     def to_html
-      Array(value).map { |value| tag(:meta, property: key, content: value) }.join("\n").html_safe
+      Array(value).compact.map { |value| tag(:meta, property: key, content: value) }.join("\n").html_safe.presence
     end
 
     def sort_order

data/lib/metamagic/tags/title_tag.rb

@@ -1,7 +1,7 @@
 module Metamagic
   class TitleTag < Tag
     def to_html
-      content_tag(:title, value)
+      content_tag(:title, value) if value
     end
 
     def sort_order

data/lib/metamagic/version.rb

@@ -1,3 +1,3 @@
 module Metamagic
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/legacy_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class LegacyTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "old property definition" do
+    assert_raises ArgumentError do
+      meta [:property => "og:image", :content => "http://mydomain.com/images/my_image.jpg"]
+    end
+  end
+end

data/test/meta_tag_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class MetaTagTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "nil meta value" do
+    title "Test Title"
+    description nil
+
+    assert_equal %{<title>Test Title</title>},
+                 metamagic
+  end
+
+  test "array as meta value" do
+    keywords %w{one two three}
+
+    assert_equal %{<meta content="one, two, three" name="keywords" />},
+                 metamagic
+  end
+
+  test "empty array as meta value" do
+    title "Test Title"
+    keywords []
+
+    assert_equal %{<title>Test Title</title>},
+                 metamagic
+  end
+
+  test "nil in array as meta value" do
+    title "Test Title"
+    keywords ["one", nil, "two"]
+
+    assert_equal %{<title>Test Title</title>\n<meta content="one, two" name="keywords" />},
+                 metamagic
+  end
+
+  test "nil only array as meta value" do
+    title "Test Title"
+    keywords [nil]
+
+    assert_equal %{<title>Test Title</title>},
+                 metamagic
+  end
+end

data/test/metamagic_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class HelperMethodsTest < ActionView::TestCase
+class MetamagicTest < ActionView::TestCase
   include Metamagic::ViewHelper
 
   test "meta tags generation" do
@@ -31,30 +31,6 @@ class HelperMethodsTest < ActionView::TestCase
                  metamagic
   end
 
-  test "open graph" do
-    meta title: "Test Title",
-         og: {
-           image: {
-             url: "http://test.com/image.jpg",
-             type: "image/png"
-           }
-         }
-
-    assert_equal %{<title>Test Title</title>\n<meta content="http://test.com/image.jpg" property="og:image:url" />\n<meta content="image/png" property="og:image:type" />},
-                 metamagic
-  end
-
-  test "twitter cards" do
-    meta title: "Test Title",
-         twitter: {
-           card: :summary,
-           site: "@flickr"
-         }
-
-    assert_equal %{<title>Test Title</title>\n<meta content="summary" property="twitter:card" />\n<meta content="@flickr" property="twitter:site" />},
-                 metamagic
-  end
-
   test "custom tags" do
     Metamagic::Renderer.register_tag_type :custom, ->(key, value) { tag(:custom_tag, one: key, two: value) }
 
@@ -99,10 +75,4 @@ class HelperMethodsTest < ActionView::TestCase
     assert_equal %{<title>My Title</title>\n<meta content="one, two, three" name="keywords" />\n<meta content="My description." name="description" />\n<meta content="http://test.com/image.png" property="og:image" />\n<meta content="summary" property="twitter:card" />},
                  metamagic
   end
-
-  test "old property definition" do
-    assert_raises ArgumentError do
-      meta [:property => "og:image", :content => "http://mydomain.com/images/my_image.jpg"]
-    end
-  end
 end

data/test/open_graph_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class OpenGraphTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "open graph" do
+    meta title: "Test Title",
+         og: {
+           image: {
+             url: "http://test.com/image.jpg",
+             type: "image/png"
+           }
+         }
+
+    assert_equal %{<title>Test Title</title>\n<meta content="http://test.com/image.jpg" property="og:image:url" />\n<meta content="image/png" property="og:image:type" />},
+                 metamagic
+  end
+end

data/test/property_tag_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class PropertyTagTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "property array" do
+    og image: ["one.jpg", "two.jpg"]
+
+    assert_equal %{<meta content="one.jpg" property="og:image" />\n<meta content="two.jpg" property="og:image" />},
+                 metamagic
+  end
+
+  test "nil property" do
+    og title: "Test Title",
+       image: nil
+
+    assert_equal %{<meta content="Test Title" property="og:title" />},
+                 metamagic
+  end
+
+  test "nil only property array" do
+    og title: "Test Title",
+       image: [nil]
+
+    assert_equal %{<meta content="Test Title" property="og:title" />},
+                 metamagic
+  end
+
+  test "nil in property array" do
+    og title: "Test Title",
+       image: ["one.jpg", nil, "two.jpg"]
+
+    assert_equal %{<meta content="Test Title" property="og:title" />\n<meta content="one.jpg" property="og:image" />\n<meta content="two.jpg" property="og:image" />},
+                 metamagic
+  end
+
+  test "empty property array" do
+    og image: "http://test.com/image.png",
+       book: {
+         author: ["Leif Davidsen", "Anders Mogensen"],
+         tag: []
+       }
+
+    assert_equal %{<meta content="http://test.com/image.png" property="og:image" />\n<meta content="Leif Davidsen" property="og:book:author" />\n<meta content="Anders Mogensen" property="og:book:author" />},
+                 metamagic
+  end
+end

data/test/title_tag_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class TitleTagTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "nil title" do
+    title nil
+    description "Test description"
+
+    assert_equal %{<meta content="Test description" name="description" />},
+                 metamagic
+  end
+end

data/test/twitter_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class TwitterTest < ActionView::TestCase
+  include Metamagic::ViewHelper
+
+  test "twitter cards" do
+    meta title: "Test Title",
+         twitter: {
+           card: :summary,
+           site: "@flickr"
+         }
+
+    assert_equal %{<title>Test Title</title>\n<meta content="summary" property="twitter:card" />\n<meta content="@flickr" property="twitter:site" />},
+                 metamagic
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: metamagic
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Metamagic is a simple Ruby on Rails plugin for creating meta tags.
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -101,8 +101,14 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/legacy_test.rb
+- test/meta_tag_test.rb
 - test/metamagic_test.rb
+- test/open_graph_test.rb
+- test/property_tag_test.rb
 - test/test_helper.rb
+- test/title_tag_test.rb
+- test/twitter_test.rb
 homepage: http://github.com/lassebunk/metamagic
 licenses:
 - MIT
@@ -113,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Simple Ruby on Rails plugin for creating meta tags.
@@ -167,5 +173,11 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/legacy_test.rb
+- test/meta_tag_test.rb
 - test/metamagic_test.rb
+- test/open_graph_test.rb
+- test/property_tag_test.rb
 - test/test_helper.rb
+- test/title_tag_test.rb
+- test/twitter_test.rb