seo_sensei 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f665c41ec11676e7fd1f59a67d2995e33cc1c4255cfe6702707b92bd3aed33a3
-  data.tar.gz: 4c50946086ef17a9f17d78f7e5703a21f377e0ae6a6f976014529920915a55e7
+  metadata.gz: 039b4d7451379832e9b2dde51b174b8161cea974f920b0dd04052721c84c6431
+  data.tar.gz: 40e9ed89593176b74804b78efc7faef877b5939f178d94dd4af8a7759c081f21
 SHA512:
-  metadata.gz: 0b8f67b65c201ab05b35a482a475b00edeff8e57139b24cb5ac43c7094c34eb4efcef740fd86e1843a0c0c9b51f6a6874e6fd9dfdcb3ff1c177fec2953914cc4
-  data.tar.gz: b0a1f0602b49cd35ec24e2ee011fd7ef78bcef11d341bbb4f4f829726308d5ae7e19bdc6fe9e4316ee83b81eeae31d4614697da178fe0e7fbe5c8bd8318d3ab3
+  metadata.gz: adeb0f223ca94b05663a02883c9f7b29086de23acfcb817f53adb2e994d3a20ff24cf7bb5a1d22164f32bdef5990354f3a416d5c9ef8b42747cca1f146654f4d
+  data.tar.gz: b37e1f5be403af45fa7d72cc364774f56712a40a8aed9357e5009efc098171d7730a9d50717cca482146154d012b864879e0c0aa0c2804dbcdbbeb0ea59cdced

data/lib/seo_sensei/attributes/image.rb

@@ -4,12 +4,12 @@ module SeoSensei
   module Attributes
     module Image
       def self.call(resource)
-        return {} unless resource.respond_to?(:use_seo_image?) && resource.use_seo_image?
+        return {} unless resource.use_image?
 
         {
           image: resource.seo_image_url,
-          "image:width" => resource.seo_image_dimensions[:width].to_s,
-          "image:height" => resource.seo_image_dimensions[:height].to_s
+          "image:width" => resource.seo_image_width,
+          "image:height" => resource.seo_image_height
         }
       end
     end

data/lib/seo_sensei/attributes/twitter.rb

@@ -3,18 +3,16 @@
 module SeoSensei
   module Attributes
     module Twitter
-      def self.call(seo_translation, resource, url)
-        image_attributes = SeoSensei::Attributes::Image.call(resource)
-
+      def self.call(resource)
         base_attributes = {
-          title: seo_translation['title'],
-          description: seo_translation['description'],
-          url: url
+          title: resource.title,
+          description: resource.description,
+          url: resource.url
         }
 
-        unless image_attributes[:image].nil?
+        if resource.use_image?
           base_attributes.merge!(
-            image: image_attributes[:image],
+            image: resource.seo_image_url,
             card: 'summary_large_image'
           )
         end

data/lib/seo_sensei/controllers/helpers.rb

@@ -10,7 +10,11 @@ module SeoSensei
           before_action(options) do
             resource_name = options.delete(:for) || controller_name
             if (translated_seo = ::SeoSensei::Lookup.call(controller_name: resource_name, action_name: action_name))
-              set_meta_tags(translated_seo)
+              attributes_service = ::SeoSensei::SeoAttributes.new(
+                translated_seo, nil, url_for(only_path: false)
+              )
+
+              set_meta_tags(attributes_service.call)
             end
           end
         end
@@ -24,15 +28,11 @@ module SeoSensei
 
       def seo_tags_with(resource)
         if (translated_seo = ::SeoSensei::Lookup.call(controller_name: controller_name, action_name: action_name, resource: resource))
-          og_attributes = ::SeoSensei::Attributes::Og.call(
-            translated_seo, resource, url_for(:only_path => false)
-          )
-
-          twitter_attributes = ::SeoSensei::Attributes::Twitter.call(
-            translated_seo, resource, url_for(:only_path => false)
+          attributes_service = ::SeoSensei::SeoAttributes.new(
+            translated_seo, resource, url_for(only_path: false)
           )
 
-          set_meta_tags(translated_seo.merge(og_attributes).merge(twitter_attributes))
+          set_meta_tags(attributes_service.call)
         end
       end
     end

data/lib/seo_sensei/resource.rb

@@ -0,0 +1,67 @@
+module SeoSensei
+  class Resource
+    def initialize(translation, obj, url)
+      @translation = translation
+      @obj = obj
+      @url = url
+    end
+
+    def url
+      @url
+    end
+
+    def title
+      @translation['title']
+    end
+
+    def description
+      @translation['description']
+    end
+
+    def keywords
+      @translation['keywords']
+    end
+
+    def use_image?
+      use_obj_image? || use_translation_image?
+    end
+
+    def seo_image_url
+      if use_obj_image?
+        @obj.seo_image_url
+      elsif use_translation_image?
+        @translation['seo_image_url']
+      end
+    end
+
+    def seo_image_width
+      if use_obj_image?
+        @obj.seo_image_dimensions[:width].to_s
+      elsif use_translation_image?
+        @translation['seo_image_width']
+      end
+    end
+
+    def seo_image_height
+      if use_obj_image?
+        @obj.seo_image_dimensions[:height].to_s
+      elsif use_translation_image?
+        @translation['seo_image_height']
+      end
+    end
+
+    private
+
+    def use_obj_image?
+      !@obj.nil? &&
+        @obj.respond_to?(:use_seo_image?) &&
+        @obj.use_seo_image?
+    end
+
+    def use_translation_image?
+      !@translation['seo_image_url'].nil? &&
+        !@translation['seo_image_width'].nil? &&
+        !@translation['seo_image_height'].nil?
+    end
+  end
+end

data/lib/seo_sensei/seo_attributes.rb

@@ -0,0 +1,30 @@
+module SeoSensei
+  class SeoAttributes
+    def initialize(translation, obj, url)
+      @translation = translation
+      @obj = obj
+      @url = url
+    end
+
+    def call
+      attributes = {}
+
+      image_attributes = SeoSensei::Attributes::Image.call(resource)
+      twitter_attributes = SeoSensei::Attributes::Twitter.call(resource)
+
+      {
+        og: {
+          title: resource.title,
+          description: resource.description,
+          url: resource.url
+        }.merge(image_attributes)
+      }.merge(twitter_attributes)
+    end
+
+    private
+
+    def resource
+      @resource ||= SeoSensei::Resource.new(@translation, @obj, @url)
+    end
+  end
+end

data/lib/seo_sensei/version.rb

@@ -6,7 +6,7 @@ module SeoSensei
     #
     # @return [String]
     def to_s
-      "0.0.5"
+      "0.0.6"
     end
   end
 end

data/lib/seo_sensei.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require 'meta-tags'
+require 'seo_sensei/seo_attributes'
+require 'seo_sensei/resource'
 require 'seo_sensei/attributes/twitter'
-require 'seo_sensei/attributes/og'
 require 'seo_sensei/attributes/image'
 require 'seo_sensei/lookup'
 require 'seo_sensei/controllers/helpers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seo_sensei
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paweł Dąbrowski
@@ -84,7 +84,6 @@ files:
 - lib/generators/templates/seo_sensei.rb
 - lib/seo_sensei.rb
 - lib/seo_sensei/attributes/image.rb
-- lib/seo_sensei/attributes/og.rb
 - lib/seo_sensei/attributes/twitter.rb
 - lib/seo_sensei/controllers/helpers.rb
 - lib/seo_sensei/lookup.rb
@@ -94,6 +93,8 @@ files:
 - lib/seo_sensei/lookups/translation_attributes.rb
 - lib/seo_sensei/models/helpers.rb
 - lib/seo_sensei/models/seo_tag.rb
+- lib/seo_sensei/resource.rb
+- lib/seo_sensei/seo_attributes.rb
 - lib/seo_sensei/version.rb
 homepage: http://github.com/rubyhero/seo_sensei
 licenses:

data/lib/seo_sensei/attributes/og.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module SeoSensei
-  module Attributes
-    module Og
-      def self.call(seo_translation, resource, url)
-        image_attributes = SeoSensei::Attributes::Image.call(resource)
-
-        base_attributes = {
-          title: seo_translation['title'],
-          description: seo_translation['description'],
-          url: url
-        }
-
-        { og: base_attributes.merge(image_attributes) }
-      end
-    end
-  end
-end