opengraphplus 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84dcc38250134ee587a8c981aab111e6cc13114455f69f6aff9eb3c90a2333bf
-  data.tar.gz: 14ff03291f508e0a7d91d1e104b9f8f647e6430885eb3e644b8cc96942aa1f8e
+  metadata.gz: 48292c717ae45fcea5cd4273eba0baf9b1d9ebeb646ddc2d9c2cf666894c1f74
+  data.tar.gz: 293b987be6c9eee0193d12e601df3e542713e53f631720ddab150b1374a4055b
 SHA512:
-  metadata.gz: b3d569b9fc677192c068379c45cb3b7206f3f39c88d024404beb0d91fab470e4c2862b099936ceb2b5c3d8edc857694f85305121a9d438422a39bb8f3a77b106
-  data.tar.gz: 1627854d4aa87fe61df5c98b803b4788adbe2118732334753b5d117b76bd1abe493ef9848974a48941a716431dcd6c5a2f1a9f1909b45a8a4f95a297307ddcd0
+  metadata.gz: 8e4a720f1974d2177dc7221cbe073dd3d68d57393c6b85d387d602d40bb2cf479c4118f4383ef40973d29c1eeb3fc60323500d29846d296acf64e15c35ff5c58
+  data.tar.gz: 8655b837fa39a53ba16b9fd2ca1112f99c04fa4b5472b54f8bc35f74915e23b4dd5b4e4fba0b26dba08b2a8d9fbed7f573ad63927d3e5a12c1c3ff475f19dcd2

data/lib/opengraphplus/namespace.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module OpenGraphPlus
+  module Namespace
+    class Base
+      include Enumerable
+
+      def each(&)
+        tags.each do |t|
+          case t
+          when Base
+            t.each(&)
+          when Tag
+            yield t if t.content
+          end
+        end
+      end
+
+      def tags = []
+
+      def render_in(rails_view_context)
+        rails_view_context.safe_join(map { |tag| tag.render_in(rails_view_context) }, "\n")
+      end
+
+      def update(**kwargs)
+        kwargs.each { |key, value| public_send(:"#{key}=", value) }
+        self
+      end
+    end
+
+    class Image < Base
+      attr_accessor :url, :width, :height, :type, :alt, :secure_url
+
+      def tags
+        [
+          Tag.new("og:image", url),
+          Tag.new("og:image:secure_url", secure_url),
+          Tag.new("og:image:type", type),
+          Tag.new("og:image:width", width),
+          Tag.new("og:image:height", height),
+          Tag.new("og:image:alt", alt),
+        ]
+      end
+    end
+
+    class Plus < Base
+      attr_accessor :selector
+      attr_reader :style
+
+      def style=(value)
+        @style = case value
+        when Hash
+          hash_to_css(value)
+        else
+          value
+        end
+      end
+
+      def tags
+        [
+          Tag.new("og:plus:selector", selector),
+          Tag.new("og:plus:style", style),
+        ]
+      end
+
+      private
+
+      def hash_to_css(hash)
+        hash.map { |k, v| "#{k.to_s.tr("_", "-")}: #{v}" }.join("; ")
+      end
+    end
+
+    class OG < Base
+      attr_accessor :title, :description, :url, :type, :site_name, :locale, :determiner, :audio, :video
+
+      def image = @image ||= Image.new
+      def plus = @plus ||= Plus.new
+
+      def initialize
+        @type = "website"
+      end
+
+      def image_url=(url)
+        image.url = url
+        image.secure_url = url
+      end
+
+      def tags
+        [
+          Tag.new("og:title", title),
+          Tag.new("og:description", description),
+          Tag.new("og:url", url),
+          Tag.new("og:type", type),
+          Tag.new("og:site_name", site_name),
+          Tag.new("og:locale", locale),
+          Tag.new("og:determiner", determiner),
+          Tag.new("og:audio", audio),
+          Tag.new("og:video", video),
+          image,
+          plus,
+        ]
+      end
+    end
+
+    class Twitter < Base
+      attr_accessor :card, :site, :creator, :title, :description, :image, :image_alt
+
+      def initialize
+        @card = "summary_large_image"
+      end
+
+      def tags
+        [
+          Tag.new("twitter:card", card),
+          Tag.new("twitter:site", site),
+          Tag.new("twitter:creator", creator),
+          Tag.new("twitter:title", title),
+          Tag.new("twitter:description", description),
+          Tag.new("twitter:image", image),
+          Tag.new("twitter:image:alt", image_alt),
+        ]
+      end
+    end
+
+    class Root < Base
+      extend Forwardable
+
+      def og = @og ||= OG.new
+      def twitter = @twitter ||= Twitter.new
+
+      def_delegators :og,
+        :title, :title=,
+        :description, :description=,
+        :url, :url=,
+        :type, :type=,
+        :site_name, :site_name=,
+        :locale, :locale=,
+        :determiner, :determiner=,
+        :audio, :audio=,
+        :video, :video=,
+        :image, :image_url=,
+        :plus
+
+      def tags
+        [og, twitter]
+      end
+    end
+  end
+
+  # Backwards compatibility
+  Tags = Namespace
+end

data/lib/opengraphplus/rails/helper.rb

@@ -3,21 +3,19 @@
 module OpenGraphPlus
   module Rails
     module Helper
-      def open_graph(**kwargs)
-        @open_graph_root ||= Tags::Root.new
-        @open_graph_root.update(**kwargs) if kwargs.any?
-        yield(@open_graph_root) if block_given?
+      def open_graph(**)
+        @open_graph_root ||= Namespace::Root.new
+        @open_graph_root.update(**)
+        yield @open_graph_root if block_given?
         @open_graph_root
       end
 
       def open_graph_tags
-        root = @open_graph_root || Tags::Root.new
-        Tags::Renderer.new(root).tags
+        open_graph.to_a
       end
 
       def open_graph_meta_tags
-        result = open_graph_tags.map(&:to_s).join("\n")
-        result.respond_to?(:html_safe) ? result.html_safe : result
+        open_graph.render_in(self)
       end
     end
   end

data/lib/opengraphplus/tag.rb

@@ -15,15 +15,8 @@ module OpenGraphPlus
       %(<meta property="#{escape property}" content="#{escape content}">)
     end
 
-    def render_in(view_context = nil)
-      result = meta
-      if view_context.respond_to?(:raw)
-        view_context.raw(result)
-      elsif result.respond_to?(:html_safe)
-        result.html_safe
-      else
-        result
-      end
+    def render_in(rails_view_context)
+      rails_view_context.raw(meta)
     end
 
     def to_s

data/lib/opengraphplus/tags.rb

@@ -5,6 +5,25 @@ require "forwardable"
 module OpenGraphPlus
   module Tags
     class Base
+      include Enumerable
+
+      def each(&)
+        tags.each do |t|
+          case t
+          when Base
+            t.each(&)
+          when Tag
+            yield t if t.content
+          end
+        end
+      end
+
+      def tags = []
+
+      def render_in(view_context)
+        map { |tag| tag.render_in(view_context) }.join("\n")
+      end
+
       def update(**kwargs)
         kwargs.each { |key, value| public_send(:"#{key}=", value) }
         self
@@ -13,29 +32,16 @@ module OpenGraphPlus
 
     class Image < Base
       attr_accessor :url, :width, :height, :type, :alt, :secure_url
-    end
 
-    class Twitter < Base
-      attr_accessor :card, :site, :creator, :title, :description, :image, :image_alt
-
-      def initialize
-        @card = "summary_large_image"
-      end
-    end
-
-    class OpenGraph < Base
-      attr_accessor :title, :description, :url, :type, :site_name, :locale, :determiner, :audio, :video
-      attr_reader :image, :plus
-
-      def initialize
-        @type = "website"
-        @image = Image.new
-        @plus = Plus.new
-      end
-
-      def image_url=(url)
-        @image.url = url
-        @image.secure_url = url
+      def tags
+        [
+          Tag.new("og:image", url),
+          Tag.new("og:image:secure_url", secure_url),
+          Tag.new("og:image:type", type),
+          Tag.new("og:image:width", width),
+          Tag.new("og:image:height", height),
+          Tag.new("og:image:alt", alt),
+        ]
       end
     end
 
@@ -52,6 +58,13 @@ module OpenGraphPlus
         end
       end
 
+      def tags
+        [
+          Tag.new("og:plus:selector", selector),
+          Tag.new("og:plus:style", style),
+        ]
+      end
+
       private
 
       def hash_to_css(hash)
@@ -59,12 +72,65 @@ module OpenGraphPlus
       end
     end
 
+    class OpenGraph < Base
+      attr_accessor :title, :description, :url, :type, :site_name, :locale, :determiner, :audio, :video
+
+      def image = @image ||= Image.new
+      def plus = @plus ||= Plus.new
+
+      def initialize
+        @type = "website"
+      end
+
+      def image_url=(url)
+        image.url = url
+        image.secure_url = url
+      end
+
+      def tags
+        [
+          Tag.new("og:title", title),
+          Tag.new("og:description", description),
+          Tag.new("og:url", url),
+          Tag.new("og:type", type),
+          Tag.new("og:site_name", site_name),
+          Tag.new("og:locale", locale),
+          Tag.new("og:determiner", determiner),
+          Tag.new("og:audio", audio),
+          Tag.new("og:video", video),
+          image,
+          plus,
+        ]
+      end
+    end
+
+    class Twitter < Base
+      attr_accessor :card, :site, :creator, :title, :description, :image, :image_alt
+
+      def initialize
+        @card = "summary_large_image"
+      end
+
+      def tags
+        [
+          Tag.new("twitter:card", card),
+          Tag.new("twitter:site", site),
+          Tag.new("twitter:creator", creator),
+          Tag.new("twitter:title", title),
+          Tag.new("twitter:description", description),
+          Tag.new("twitter:image", image),
+          Tag.new("twitter:image:alt", image_alt),
+        ]
+      end
+    end
+
     class Root < Base
       extend Forwardable
 
-      attr_reader :og, :twitter
+      def og = @og ||= OpenGraph.new
+      def twitter = @twitter ||= Twitter.new
 
-      def_delegators :@og,
+      def_delegators :og,
         :title, :title=,
         :description, :description=,
         :url, :url=,
@@ -77,9 +143,8 @@ module OpenGraphPlus
         :image, :image_url=,
         :plus
 
-      def initialize
-        @og = OpenGraph.new
-        @twitter = Twitter.new
+      def tags
+        [og, twitter]
       end
     end
   end

data/lib/opengraphplus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenGraphPlus
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/opengraphplus.rb

@@ -5,8 +5,7 @@ require_relative "opengraphplus/api_key"
 require_relative "opengraphplus/configuration"
 require_relative "opengraphplus/signature"
 require_relative "opengraphplus/tag"
-require_relative "opengraphplus/tags"
-require_relative "opengraphplus/tags/renderer"
+require_relative "opengraphplus/namespace"
 require_relative "opengraphplus/image_generator"
 
 module OpenGraphPlus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opengraphplus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Brad Gessler
@@ -42,6 +42,7 @@ files:
 - lib/opengraphplus/api_key.rb
 - lib/opengraphplus/configuration.rb
 - lib/opengraphplus/image_generator.rb
+- lib/opengraphplus/namespace.rb
 - lib/opengraphplus/rails.rb
 - lib/opengraphplus/rails/controller.rb
 - lib/opengraphplus/rails/helper.rb
@@ -55,7 +56,6 @@ files:
 - lib/opengraphplus/signature/verifier.rb
 - lib/opengraphplus/tag.rb
 - lib/opengraphplus/tags.rb
-- lib/opengraphplus/tags/renderer.rb
 - lib/opengraphplus/version.rb
 - sig/open_graph_plus.rbs
 homepage: https://opengraphplus.com/ruby

data/lib/opengraphplus/tags/renderer.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-module OpenGraphPlus
-  module Tags
-    class Renderer
-      attr_reader :root
-
-      def initialize(root)
-        @root = root
-      end
-
-      def tags
-        [*og_tags, *twitter_tags].compact
-      end
-
-      private
-
-      def og
-        root.og
-      end
-
-      def twitter
-        root.twitter
-      end
-
-      def tag(property, content)
-        return nil if content.nil?
-
-        Tag.new(property, content)
-      end
-
-      def og_tags
-        [
-          tag("og:title", og.title),
-          tag("og:description", og.description),
-          tag("og:url", og.url),
-          tag("og:type", og.type),
-          tag("og:site_name", og.site_name),
-          tag("og:locale", og.locale),
-          tag("og:determiner", og.determiner),
-          tag("og:audio", og.audio),
-          tag("og:video", og.video),
-          *og_image_tags
-        ]
-      end
-
-      def og_image_tags
-        return [] unless og.image
-
-        image = og.image
-        [
-          tag("og:image", image.url),
-          tag("og:image:secure_url", image.secure_url),
-          tag("og:image:type", image.type),
-          tag("og:image:width", image.width),
-          tag("og:image:height", image.height),
-          tag("og:image:alt", image.alt)
-        ]
-      end
-
-      def twitter_tags
-        [
-          tag("twitter:card", twitter.card),
-          tag("twitter:site", twitter.site),
-          tag("twitter:creator", twitter.creator),
-          tag("twitter:title", twitter.title || og.title),
-          tag("twitter:description", twitter.description || og.description),
-          tag("twitter:image", twitter_image_url),
-          tag("twitter:image:alt", twitter.image_alt || og.image&.alt)
-        ]
-      end
-
-      def twitter_image_url
-        twitter.image || og.image&.url
-      end
-    end
-  end
-end