opengraphplus 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48292c717ae45fcea5cd4273eba0baf9b1d9ebeb646ddc2d9c2cf666894c1f74
-  data.tar.gz: 293b987be6c9eee0193d12e601df3e542713e53f631720ddab150b1374a4055b
+  metadata.gz: 7d947ee47bc0e434395f69cceb99321f78ab4f8ac437f5b537b97ffa9a199d51
+  data.tar.gz: 308d3466e160b11f935afd3b9f0c891ba3b268f95f3de12400af9e815020a82f
 SHA512:
-  metadata.gz: 8e4a720f1974d2177dc7221cbe073dd3d68d57393c6b85d387d602d40bb2cf479c4118f4383ef40973d29c1eeb3fc60323500d29846d296acf64e15c35ff5c58
-  data.tar.gz: 8655b837fa39a53ba16b9fd2ca1112f99c04fa4b5472b54f8bc35f74915e23b4dd5b4e4fba0b26dba08b2a8d9fbed7f573ad63927d3e5a12c1c3ff475f19dcd2
+  metadata.gz: ac3f345867d3cc9e5ad6fa1745f5f6ea45cf505fdd057191c0af0d48ca62d8af6e64aa7dfa26b2097f8d97af95fab8dec9888a37b00a573bc94c5ad68660c6c3
+  data.tar.gz: 9a20a378f2e36d594667c2abdba8e194bdcae2bc55a2daf33bf1195162b9c9498ca257e426e645ae85a3087cc0f80b83ff9f7065f730cc240564daf7617e58e7

data/lib/opengraphplus/configuration.rb

@@ -2,12 +2,14 @@
 
 module OpenGraphPlus
   class Configuration
-    attr_reader :api_key
-
     def initialize
       @api_key = nil
     end
 
+    def api_key
+      @api_key or warn "[OpenGraphPlus] API key not configured. Set OpenGraphPlus.configuration.api_key to enable automatic Open Graph image generation."
+    end
+
     def api_key=(value)
       @api_key = value.is_a?(APIKey) ? value : APIKey.parse(value)
     end

data/lib/opengraphplus/image_generator.rb

@@ -6,11 +6,20 @@ module OpenGraphPlus
 
     def initialize(request)
       @request = request
-      @signature_url = Signature::URL.new
     end
 
     def url
-      @signature_url.build("/opengraph", url: request.original_url)
+      return nil unless api_key
+
+      Signature::URL.new
+        .signed_path("/api/websites/v1", api_key)
+        .build("image", url: request.original_url)
+    end
+
+    private
+
+    def api_key
+      @api_key ||= OpenGraphPlus.configuration.api_key
     end
   end
 end

data/lib/opengraphplus/namespace.rb

@@ -7,21 +7,14 @@ module OpenGraphPlus
     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 each(&block) = tags.each(&block)
 
-      def tags = []
+      def tag(property, value)
+        Tag.new(property, value) if value
+      end
 
-      def render_in(rails_view_context)
-        rails_view_context.safe_join(map { |tag| tag.render_in(rails_view_context) }, "\n")
+      def render_in(_view_context = nil)
+        map { |tag| tag.render_in }.join("\n").html_safe
       end
 
       def update(**kwargs)
@@ -31,23 +24,32 @@ module OpenGraphPlus
     end
 
     class Image < Base
-      attr_accessor :url, :width, :height, :type, :alt, :secure_url
+      attr_accessor :url, :secure_url, :type, :width, :height, :alt
+
+      def tags
+        [
+          tag("og:image", url),
+          tag("og:image:secure_url", secure_url),
+          tag("og:image:type", type),
+          tag("og:image:width", width),
+          tag("og:image:height", height),
+          tag("og:image:alt", alt)
+        ].compact
+      end
+    end
+
+    class Viewport < Base
+      attr_accessor :width
 
       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),
-        ]
+          tag("og:plus:viewport:width", width)
+        ].compact
       end
     end
 
     class Plus < Base
-      attr_accessor :selector
-      attr_reader :style
+      attr_accessor :selector, :style
 
       def style=(value)
         @style = case value
@@ -58,11 +60,16 @@ module OpenGraphPlus
         end
       end
 
+      def viewport
+        @viewport ||= Viewport.new
+      end
+
       def tags
         [
-          Tag.new("og:plus:selector", selector),
-          Tag.new("og:plus:style", style),
-        ]
+          tag("og:plus:selector", selector),
+          tag("og:plus:style", style),
+          *viewport.tags
+        ].compact
       end
 
       private
@@ -75,13 +82,18 @@ module OpenGraphPlus
     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
+        @image ||= Image.new
+      end
+
+      def plus
+        @plus ||= Plus.new
+      end
+
       def image_url=(url)
         image.url = url
         image.secure_url = url
@@ -89,46 +101,73 @@ module OpenGraphPlus
 
       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,
-        ]
+          tag("og:title", title),
+          tag("og:description", description),
+          tag("og:url", url),
+          tag("og:type", type),
+          tag("og:site_name", site_name),
+          tag("og:locale", locale),
+          tag("og:determiner", determiner),
+          tag("og:audio", audio),
+          tag("og:video", video),
+          *image.tags,
+          *plus.tags
+        ].compact
       end
     end
 
     class Twitter < Base
-      attr_accessor :card, :site, :creator, :title, :description, :image, :image_alt
+      class Image < Base
+        attr_accessor :url, :alt
+
+        def tags
+          [
+            tag("twitter:image", url),
+            tag("twitter:image:alt", alt)
+          ].compact
+        end
+      end
+
+      attr_accessor :card, :site, :creator, :title, :description
 
       def initialize
         @card = "summary_large_image"
       end
 
+      def image
+        @image ||= Image.new
+      end
+
+      def image_url=(url)
+        image.url = url
+      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),
-        ]
+          tag("twitter:card", card),
+          tag("twitter:site", site),
+          tag("twitter:creator", creator),
+          tag("twitter:title", title),
+          tag("twitter:description", description),
+          *image.tags
+        ].compact
       end
     end
 
     class Root < Base
       extend Forwardable
 
-      def og = @og ||= OG.new
-      def twitter = @twitter ||= Twitter.new
+      def og
+        @og ||= OG.new
+      end
+
+      def twitter
+        @twitter ||= Twitter.new
+      end
+
+      def tags
+        [*og.tags, *twitter.tags]
+      end
 
       def_delegators :og,
         :title, :title=,
@@ -142,10 +181,6 @@ module OpenGraphPlus
         :video, :video=,
         :image, :image_url=,
         :plus
-
-      def tags
-        [og, twitter]
-      end
     end
   end
 

data/lib/opengraphplus/rails/controller.rb

@@ -4,9 +4,11 @@ module OpenGraphPlus
   module Rails
     module Controller
       extend ActiveSupport::Concern
+      include OpenGraphPlus::Rails::Helper
 
       included do
         helper_method :open_graph, :open_graph_tags, :open_graph_meta_tags
+        before_action :set_default_open_graph
         append_before_action :set_default_open_graph_image
       end
 
@@ -22,14 +24,17 @@ module OpenGraphPlus
 
       private
 
+      def set_default_open_graph
+        open_graph.type = "website"
+        open_graph.url = request.original_url
+      end
+
       def set_default_open_graph_image
         return if open_graph.image.url
 
         generated_url = open_graph_image_generator.url
         open_graph.image.url = generated_url if generated_url
       end
-
-      include Helper
     end
   end
 end

data/lib/opengraphplus/signature/generator.rb

@@ -6,10 +6,21 @@ require "base64"
 module OpenGraphPlus
   module Signature
     class Generator
+      class InvalidAPIKeyError < StandardError; end
+
       attr_reader :api_key
 
       def initialize(api_key)
-        @api_key = api_key
+        @api_key = case api_key
+        when APIKey
+          api_key
+        when String
+          APIKey.parse(api_key)
+        end
+
+        raise InvalidAPIKeyError, "API key is missing or invalid" unless @api_key
+        raise InvalidAPIKeyError, "API key is missing public_key" unless @api_key.public_key
+        raise InvalidAPIKeyError, "API key is missing secret_key" unless @api_key.secret_key
       end
 
       def generate(path_and_query)

data/lib/opengraphplus/signature/url.rb

@@ -6,57 +6,40 @@ module OpenGraphPlus
   module Signature
     class URL
       DEFAULT_BASE_URL = "https://opengraphplus.com"
-      DEFAULT_PATH_PREFIX = "/v2/:signature"
 
-      attr_reader :base_uri, :path_prefix
+      attr_reader :base_uri
 
-      def initialize(api_key: nil, generator: nil, base_url: nil, path_prefix: DEFAULT_PATH_PREFIX)
-        @api_key = api_key
-        @generator = generator
+      def initialize(base_url: nil)
         @base_uri = URI.parse(base_url || ENV.fetch("OPENGRAPHPLUS_URL", DEFAULT_BASE_URL))
-        @path_prefix = path_prefix
       end
 
-      def build(path, **params)
-        return nil unless generator
-
-        path_and_query = build_path_and_query(path, params)
-        signature = generator.generate(path_and_query)
-
-        base_uri.dup.tap do |uri|
-          uri.path = signed_path(signature, path)
-          uri.query = URI.encode_www_form(params) unless params.empty?
-        end.to_s
-      end
-
-      def generator
-        @generator ||= begin
-          api_key = @api_key || OpenGraphPlus.configuration.api_key
-          if api_key
-            Generator.new(api_key)
-          else
-            warn_missing_api_key
-            nil
-          end
-        end
+      def signed_path(prefix, api_key)
+        SignedPath.new(prefix:, api_key:, base_uri:)
       end
+    end
 
-      private
+    class SignedPath
+      attr_reader :prefix, :api_key, :base_uri
 
-      def build_path_and_query(path, params)
-        normalized_path = File.join("/", path)
-        params.empty? ? normalized_path : "#{normalized_path}?#{URI.encode_www_form(params)}"
+      def initialize(prefix:, api_key:, base_uri:)
+        @prefix = prefix
+        @api_key = api_key
+        @base_uri = base_uri
       end
 
-      def signed_path(signature, path)
-        File.join(path_prefix.gsub(":signature", signature), path)
+      def generator
+        @generator ||= Generator.new(api_key)
       end
 
-      def warn_missing_api_key
-        return if @warned
+      def build(*segments, **params)
+        signed_path = File.join("/", *segments.map(&:to_s))
+        path_and_query = params.empty? ? signed_path : "#{signed_path}?#{URI.encode_www_form(params)}"
+        signature = generator.generate(path_and_query)
 
-        warn "[OpenGraphPlus] API key not configured. Set OpenGraphPlus.configuration.api_key to enable automatic Open Graph image generation."
-        @warned = true
+        base_uri.dup.tap do |uri|
+          uri.path = File.join(prefix, signature, *segments.map(&:to_s))
+          uri.query = URI.encode_www_form(params) unless params.empty?
+        end.to_s
       end
     end
   end

data/lib/opengraphplus/tag.rb

@@ -15,8 +15,8 @@ module OpenGraphPlus
       %(<meta property="#{escape property}" content="#{escape content}">)
     end
 
-    def render_in(rails_view_context)
-      rails_view_context.raw(meta)
+    def render_in(_view_context = nil)
+      meta.html_safe
     end
 
     def to_s

data/lib/opengraphplus/tags.rb

@@ -7,11 +7,11 @@ module OpenGraphPlus
     class Base
       include Enumerable
 
-      def each(&)
+      def each(&block)
         tags.each do |t|
           case t
           when Base
-            t.each(&)
+            t.each(&block)
           when Tag
             yield t if t.content
           end

data/lib/opengraphplus/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: opengraphplus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Brad Gessler
 bindir: exe
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2026-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport