metamagic 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad1cfb51aa95e26223fc02287031c0e05541514
-  data.tar.gz: 290dc71df03bd998dad9bd0fc5c1af19e6722b9b
+  metadata.gz: 57930b74a808316cefbeec3bbc64ef77b663fabb
+  data.tar.gz: c95622c22507fac0b58ce38d7621d552aea66711
 SHA512:
-  metadata.gz: 2cac024a9c26e40f864b03b2fcfa3c5e6dea7b92e82a17321e4b2d50fb5f48cb13fe0fa4a0d755f55906fd893fb6ad1e93af1907b6a87da9ba9472c0c0c8070a
-  data.tar.gz: c8c70d7029d85fd580c0d8d0ffa4f61b287a54b2a9961ccf8c11f6c456ecf1a1a8ee2faca1c5f61e4b9f9ce76269ca0a7b81dba28134f3243a7ce941843f9f45
+  metadata.gz: 0dd898c6711a29f723fac3f9863d36d494cb0d91eb79bfc8033d5d8063dc70a62f92e86c29f2a94c4728c4a61f55e7d078bc0a6c40b160b66f64360c9e397288
+  data.tar.gz: b245b1875056f118f934d9c119a41dc9df80d03c5dbb93d04d4f422868aa9f16706c67d862d236fa9b811374d7abae7e1c8044c267ba6ab2f535dcd86642c6f5

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## Version 3.1.6
+
+* Revert changes from 3.1.5 because of regression errors.
+
 ## Version 3.1.5
 
-* Adds support for duplicating tags, e.g. setting `twitter:image` to the value of `og:image`.
+* Adds support for duplicating tags, e.g. setting `twitter:image` to the value of `og:image`. *(reverted in 3.1.6)*
 
 ## Version 3.1.4
 

data/README.md

@@ -162,34 +162,6 @@ Templates are supported on all tag types. You can access the values set in the
 view by replacing colons (`:`) in your meta keys with underscores (`_`), so for
 example `og:image` can be accessed with `og_image`.
 
-### Duplicating tags
-
-Sometimes you want tags to be the same for e.g. Twitter and Facebook (OpenGraph).
-To circumvent the need to duplicate these tags every time you write them in your code, you can let Metamagic do this for you.
-
-Given that you want to add the same tags for Twitter as you have for Facebook, you can do this, in your view:
-
-```erb
-<%
-og title: "My Title",
-   image: "http://test.com/image.jpg",
-   description: "My description."
-%>
-```
-
-And in your layout:
-
-```erb
-<%= metamagic twitter: {
-                card: "summary",
-                title: :og_title,
-                image: :og_image,
-                description: :og_description 
-              }
-```
-
-Now you only need to set OpenGraph data and these will be copied to Twitter.
-
 ### Shortcut helpers
 
 For easy setting of meta tags, you can use the shortcut helpers like this:

data/lib/metamagic/renderer.rb

@@ -69,7 +69,7 @@ module Metamagic
     end
 
     def has_tag_type?(prefix)
-      self.class.tag_types.has_key?(prefix.to_sym)
+      self.class.tag_types.has_key?(prefix)
     end
 
     def title_template
@@ -94,12 +94,8 @@ module Metamagic
       tags.sort.map(&:to_html).compact.join("\n").html_safe
     end
 
-    def method_missing(method, *args, &block)
-      if method.to_s =~ /^([^_]+)/ && has_tag_type?($1) # Adds support for calling e.g. `og_image`
-        tags.find { |t| t.key == method.to_s.gsub("_", ":") }.try(:interpolated_values)
-      else
-        context.send(method, *args, &block)
-      end
+    def method_missing(*args)
+      context.send(*args)
     end
 
     private

data/lib/metamagic/version.rb

@@ -1,3 +1,3 @@
 module Metamagic
-  VERSION = "3.1.5"
+  VERSION = "3.1.6"
 end

data/lib/metamagic/view_helper.rb

@@ -23,12 +23,8 @@ module Metamagic
 
     def method_missing(method, *args, &block)
       if metamagic_renderer.has_tag_type?(method)
-        if args.length > 0
-          value = args.first
+        args.first.tap do |value|
           meta method => value
-          value
-        else
-          metamagic_renderer.send method
         end
       else
         super

data/test/metamagic_test.rb

@@ -82,12 +82,4 @@ class MetamagicTest < 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 "duplicating tags" do
-    og image: "http://test.com/image.png",
-       description: "My description."
-
-    assert_equal %{<meta content="http://test.com/image.png" property="og:image" />\n<meta content="http://test.com/default.png" property="og:image" />\n<meta content="My description." property="og:description" />\n<meta content="http://test.com/image.png" property="twitter:image" />\n<meta content="http://test.com/default.png" property="twitter:image" />\n<meta content="summary" property="twitter:card" />\n<meta content="My description." property="twitter:description" />},
-                 metamagic(og: { image: [:value, "http://test.com/default.png"] }, twitter: { card: "summary", image: :og_image, description: :og_description, other: :og_nonexisting })
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metamagic
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Lasse Bunk