seorel 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5415fb78ce39e34eb897b5d3497242b10cf50aaf
-  data.tar.gz: ccf9f1f1b2cad13a818550f33be53d9a4c541a75
+  metadata.gz: 04ded42a7de4c35cf8b3ca1ae7766053a264092f
+  data.tar.gz: 088956d78184b2bc7e7af053dd14d61ef970e9b5
 SHA512:
-  metadata.gz: 772d420512c836c0650335fcf2a3bad82a379d59340949ed7a1fd8f690ee58bb667f02d562150dc49997160749aaaaca5715f8d77874030b5af760c38888d2ed
-  data.tar.gz: 6b6577210a6a1049a49ac57e65e0b19edd56c82c1aa0268097369c888cf1651564dd261945b11754e27c0b0f6fa6b76157ef32163efe535c0e72b65fd458c07c
+  metadata.gz: 5cfb0fa0dd75c4ba7035151b6489158ff271ebae44b6ed3dda4d09c2996c90c98934fb5f14a0700a7bca3b91912b1e443cd238f1550393c907aadbd5897fac9a
+  data.tar.gz: a914c39f7c167f76cc61e3a396af43247ada409869b46bd9bfe004791dccf547daad9d7576f7f4bf9168b51dc71a2827271f27b2bc738935dfb609bf73b7ec7a

data/README.md

@@ -11,7 +11,7 @@ Ruby on Rails SEO Metatags plugins for ActiveRecord models
 `Gemfile.rb`:
 
 ```ruby
-gem 'seorel', '~> 0.0.5'
+gem 'seorel', '~> 0.1.0'
 
 # the edge version can be had using:
 # gem 'seorel', github: 'dalpo/seorel'
@@ -34,11 +34,16 @@ Will generate the `seorel_config.rb` initializer to customize the default values
 
 ```ruby
 Seorel.configure do |config|
+  # config.default_prepend_title = nil
   # config.default_title = nil
+  # config.default_append_title  = nil
+  #
+  # config.default_prepend_description = nil
   # config.default_description = nil
+  # config.default_append_description  = nil
+  #
   # config.default_image = nil
-  # config.prepend_title = nil
-  # config.append_title  = nil
+  #
   # config.store_seorel_if = :empty # Available values :empty | :changed
 end
 ```
@@ -92,7 +97,7 @@ class PostsController < ApplicationController
     @post = Post.find(params[:id])
     ###
     # Extract meta tags info from your Seorelified Model
-    add_metatags(@post)
+    add_metatags @post
 
     ...
   end
@@ -111,7 +116,20 @@ For instance `seorel.en.yml`:
 # encoding: utf-8
 en:
   seorel:
+    # controller_name:
+    #   action_name:
+    #     prepend_title: '...'
+    #     title: '...'
+    #     append_title: '...'
+    #
+    #     prepend_description: '...'
+    #     description: '...'
+    #     append_description: '...'
+
     posts:
+      show:
+        prepend_title: "Details for: "
+
       history:
         title: "Posts history metatitle"
         description: "Posts history metadescriprion"

data/lib/generators/seorel/templates/seorel_config.rb

@@ -1,9 +1,14 @@
 # encoding: utf-8
 Seorel.configure do |config|
+  # config.default_prepend_title = nil
   # config.default_title = nil
+  # config.default_append_title  = nil
+  #
+  # config.default_prepend_description = nil
   # config.default_description = nil
+  # config.default_append_description  = nil
+  #
   # config.default_image = nil
-  # config.prepend_title = nil
-  # config.append_title  = nil
+  #
   # config.store_seorel_if = :empty # Available values :empty | :changed
 end

data/lib/seorel/config.rb

@@ -19,11 +19,16 @@ module Seorel
   class Configuration #:nodoc:
     include ActiveSupport::Configurable
 
+    config_accessor :default_prepend_title
     config_accessor :default_title
+    config_accessor :default_append_title
+
+    config_accessor :default_prepend_description
     config_accessor :default_description
+    config_accessor :default_append_description
+
     config_accessor :default_image
-    config_accessor :prepend_title
-    config_accessor :append_title
+
     config_accessor :store_seorel_if
 
     def param_name
@@ -36,13 +41,17 @@ module Seorel
     class_eval writer, __FILE__, line
   end
 
-  # this is ugly. why can't we pass the default value to config_accessor...?
   configure do |config|
+    config.default_prepend_title = nil
     config.default_title = nil
+    config.default_append_title  = nil
+
+    config.default_prepend_description = nil
     config.default_description = nil
+    config.default_append_description  = nil
+
     config.default_image = nil
-    config.prepend_title = nil
-    config.append_title  = nil
+
     config.store_seorel_if = :empty
   end
 end

data/lib/seorel/controller/params.rb

@@ -14,40 +14,83 @@ module Seorel
         @controller = controller
       end
 
-      def full_title
-        [default_options.prepend_title, self.title, default_options.append_title].compact.join.html_safe
-      end
-
       def title
-        (config.title || I18n.t(i18n_path(:title), default: default_options.default_title)).html_safe
+        [
+          self.lookup_prepend_title,
+          self.base_title,
+          self.lookup_append_title
+        ].compact.join.html_safe
       end
 
       def description
-        (config.description || I18n.t(i18n_path(:description), default: default_options.default_description)).html_safe
+        [
+          self.lookup_prepend_description,
+          self.base_description,
+          self.lookup_append_description
+        ].compact.join.html_safe
       end
 
       def image
         config.image || default_options.default_image
       end
 
+      def base_title
+        (config.title || self.lookup_title).html_safe
+      end
+
+      def base_description
+        (config.description || self.lookup_description).html_safe
+      end
+
       def default_options
         ::Seorel.config
       end
 
-    protected
+      def lookup_i18n(key, default = nil)
+        I18n.t i18n_path(key), default: (default || '')
+      end
+
+      def lookup_prepend_title
+        lookup_i18n :prepend_title, default_options.default_prepend_title
+      end
 
-      def controller
-        @controller
+      def lookup_title
+        lookup_i18n :title, default_options.default_title
       end
 
-      def i18n_path(key)
-        [
-          'seorel',
-          controller.class.name.underscore,
-          controller.action_name,
-          key
-        ].join('.')
+      def lookup_append_title
+        lookup_i18n :append_title, default_options.default_append_title
       end
+
+      def lookup_prepend_description
+        lookup_i18n :prepend_description, default_options.default_prepend_description
+      end
+
+      def lookup_description
+        lookup_i18n :description, default_options.default_description
+      end
+
+      def lookup_append_description
+        lookup_i18n :append_description, default_options.default_append_description
+      end
+
+      protected
+
+        def controller
+          @controller
+        end
+
+        def controller_name
+          controller.class.name.underscore.gsub(/_controller$/, '')
+        end
+
+        def action_name
+          controller.action_name
+        end
+
+        def i18n_path(key)
+          ['seorel', self.controller_name, self.action_name, key].join('.')
+        end
     end
   end
 end

data/lib/seorel/helper.rb

@@ -7,7 +7,7 @@ module Seorel
     end
 
     def render_title
-      content_tag :title, seorel_params.full_title
+      content_tag :title, seorel_params.title
     end
 
     def render_description
@@ -17,7 +17,7 @@ module Seorel
     def render_open_graph
       [
         content_tag(:meta, nil, name: 'og:type', content: 'website'),
-        content_tag(:meta, nil, name: 'og:title', content: seorel_params.full_title),
+        content_tag(:meta, nil, name: 'og:title', content: seorel_params.title),
         content_tag(:meta, nil, name: 'og:description', content: seorel_params.description),
         content_tag(:meta, nil, name: 'og:image', content: seorel_params.image),
         content_tag(:meta, nil, name: 'og:locale', content: I18n.locale.to_s)
@@ -28,7 +28,7 @@ module Seorel
       [
         content_tag(:meta, nil, name: 'twitter:card', content: 'summary'),
         content_tag(:meta, nil, name: 'twitter:url', content: request.url),
-        content_tag(:meta, nil, name: 'twitter:title', content: seorel_params.full_title),
+        content_tag(:meta, nil, name: 'twitter:title', content: seorel_params.title),
         content_tag(:meta, nil, name: 'twitter:description', content: seorel_params.description),
         content_tag(:meta, nil, name: 'twitter:image', content: seorel_params.image)
       ].join("\n").html_safe

data/lib/seorel/model/base.rb

@@ -2,10 +2,9 @@
 module Seorel
   module Model
     module Base
-
       def seorelify(*args)
-        include InstanceMethods
         extend  ClassMethods
+        include InstanceMethods
 
         cattr_accessor :seorel_title_field, :seorel_description_field, :seorel_image_field
 
@@ -20,13 +19,13 @@ module Seorel
         end
 
         has_one :seorel, as: :seorelable, dependent: :destroy, class_name: 'Seorel::Seorel'
-        accepts_nested_attributes_for :seorel, allow_destroy: false
+        accepts_nested_attributes_for :seorel, allow_destroy: true
 
-        before_save :set_seorel
+        delegate :title, :title?, :description, :description?, :image, :image?,
+          to: :seorel, prefix: :seo, allow_nil: true
 
-        delegate :title, :title?, :description, :description?, :image, :image?, to: :seorel, prefix: :seo, allow_nil: true
+        before_save :set_seorel
       end
-
     end
   end
 end

data/lib/seorel/model/class_methods.rb

@@ -2,11 +2,9 @@
 module Seorel
   module Model
     module ClassMethods
-
       def seorel?
         true
       end
-
     end
   end
 end

data/lib/seorel/model/instance_methods.rb

@@ -2,17 +2,20 @@
 module Seorel
   module Model
     module InstanceMethods
-
       def seorel?
         self.try(:seorel).present?
       end
 
+      def seorel_changed_mode?
+        ::Seorel.config.store_seorel_if.eql?(:changed)
+      end
+
       def should_update_seo_title?
-        ::Seorel.config.store_seorel_if.eql?(:changed) || !self.seo_title?
+        self.seorel_changed_mode? || !self.seo_title?
       end
 
       def should_update_seo_description?
-        ::Seorel.config.store_seorel_if.eql?(:changed) || !self.seo_description?
+        self.seorel_changed_mode? || !self.seo_description?
       end
 
       def set_seorel
@@ -35,7 +38,6 @@ module Seorel
       def seorel_default_value?
         self.class.seorel_base_field.present?
       end
-
     end
   end
 end

data/lib/seorel/version.rb

@@ -1,3 +1,3 @@
 module Seorel
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seorel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrea Dal Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails