seorel 0.0.1 → 0.0.2

data/README.md

@@ -2,13 +2,18 @@
 
 Ruby on Rails SEO Metatags plugins for ActiveRecord models
 
+[![Gem Version](https://badge.fury.io/rb/seorel.png)](http://badge.fury.io/rb/seorel)
+
 ## Rails Setup
 
 
 `Gemfile.rb`:
 
 ```ruby
-gem 'seorel', github: 'dalpo/seorel'
+gem 'seorel', '~> 0.0.2'
+
+# the edge version can be had using:
+# gem 'seorel', github: 'dalpo/seorel'
 ```
 
 `Console`:
@@ -33,6 +38,7 @@ Seorel.configure do |config|
   # config.default_image = nil
   # config.prepend_title = nil
   # config.append_title  = nil
+  # config.store_seorel_if = :empty # Available values :empty | :changed
 end
 ```
 

data/app/models/seorel/seorel.rb

@@ -2,14 +2,7 @@
 module Seorel
   class Seorel < ActiveRecord::Base
 
-    belongs_to :seorelable, polymorphic: true
-
-    mount_uploader :image, Seorel::ImageUploader
-
-    before_save do
-      self.title = ::ActionController::Base.helpers.strip_tags(self.title).first(255) if self.title?
-      self.description = ::ActionController::Base.helpers.strip_tags(self.description).first(255) if self.description?
-    end
+    belongs_to :seorelable, polymorphic: true, touch: true
 
     def title?
       self.title.present?
@@ -23,5 +16,9 @@ module Seorel
       I18n.t("seorel.admin.label")
     end
 
+    def image?
+      false
+    end
+
   end
 end

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

@@ -5,4 +5,5 @@ Seorel.configure do |config|
   # 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

@@ -24,6 +24,7 @@ module Seorel
     config_accessor :default_image
     config_accessor :prepend_title
     config_accessor :append_title
+    config_accessor :store_seorel_if
 
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
@@ -42,5 +43,6 @@ module Seorel
     config.default_image = nil
     config.prepend_title = nil
     config.append_title  = nil
+    config.store_seorel_if = :empty
   end
 end

data/lib/seorel/controller/instance_methods.rb

@@ -16,14 +16,14 @@ module Seorel
       def add_seorel_hash(values = {})
         seorel_params.title = values[:title] if values[:title].present?
         seorel_params.description = values[:description] if values[:description].present?
-        seorel_params.image = values[:image] if values[:image].present?
+        # seorel_params.image = values[:image] if values[:image].present?
         seorel_params
       end
 
       def add_seorel_model(model)
         seorel_params.title = model.seo_title
         seorel_params.description = model.seo_description
-        seorel_params.image = model.seo_image.default.url if model.seo_image?
+        # seorel_params.image = model.seo_image.default.url if model.seo_image?
         seorel_params
       end
 

data/lib/seorel/controller/params.rb

@@ -4,7 +4,6 @@ require 'active_support/configurable'
 module Seorel
   module Controller
     class Params
-
       include ActiveSupport::Configurable
 
       config_accessor :title
@@ -30,7 +29,6 @@ module Seorel
       def default_options
         ::Seorel.config
       end
-
     end
   end
 end

data/lib/seorel/engine.rb

@@ -8,9 +8,7 @@ module Seorel
       app.config.to_prepare do
         ActionController::Base.send :extend,  ::Seorel::Controller::ClassMethods
         ActionController::Base.send :include, ::Seorel::Controller::InstanceMethods
-
         ActionController::Base.send :helper_method, :seorel_params
-
         ActionView::Base.send :include, ::Seorel::Helper
       end
     end

data/lib/seorel/helper.rb

@@ -3,12 +3,7 @@ module Seorel
   module Helper
 
     def render_meta_tags
-      metas = ''
-      metas+= render_title
-      metas+= render_description
-      metas+= render_open_graph
-      metas+= render_twitter_cards
-      metas.html_safe
+      [render_title, render_description, render_open_graph, render_twitter_cards].join("\n").html_safe
     end
 
     def render_title
@@ -20,23 +15,23 @@ module Seorel
     end
 
     def render_open_graph
-      metas = ''
-      metas+= content_tag :meta, nil, name: 'og:type', content: 'website'
-      metas+= content_tag :meta, nil, name: 'og:title', content: seorel_params.full_title
-      metas+= content_tag :meta, nil, name: 'og:description', content: seorel_params.description
-      metas+= content_tag :meta, nil, name: 'og:image', content: seorel_params.image
-      metas+= content_tag :meta, nil, name: 'og:locale', content: I18n.locale.to_s
-      metas.html_safe
+      [
+        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: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)
+      ].join("\n").html_safe
     end
 
     def render_twitter_cards
-      metas = ''
-      metas+= content_tag :meta, nil, name: 'twitter:card', content: 'summary'
-      metas+= content_tag :meta, nil, name: 'twitter:url', content: url_for
-      metas+= content_tag :meta, nil, name: 'twitter:title', content: seorel_params.full_title
-      metas+= content_tag :meta, nil, name: 'twitter:description', content: seorel_params.description
-      metas+= content_tag :meta, nil, name: 'twitter:image', content: seorel_params.image
-      metas.html_safe
+      [
+        content_tag(:meta, nil, name: 'twitter:card', content: 'summary'),
+        content_tag(:meta, nil, name: 'twitter:url', content: url_for),
+        content_tag(:meta, nil, name: 'twitter:title', content: seorel_params.full_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
     end
 
   end

data/lib/seorel/model/base.rb

@@ -22,7 +22,7 @@ module Seorel
         has_one :seorel, as: :seorelable, dependent: :destroy, class_name: 'Seorel::Seorel'
         accepts_nested_attributes_for :seorel, allow_destroy: false
 
-        before_save :set_seorel_default_values
+        before_save :set_seorel
 
         delegate :title, :title?, :description, :description?, :image, :image?, to: :seorel, prefix: :seo, allow_nil: true
       end

data/lib/seorel/model/instance_methods.rb

@@ -7,19 +7,29 @@ module Seorel
         self.try(:seorel).present?
       end
 
-      def set_seorel_default_values
+      def should_update_seo_title?
+        ::Seorel.config.store_seorel_if.eql?(:changed) || !self.seo_title?
+      end
+
+      def should_update_seo_description?
+        ::Seorel.config.store_seorel_if.eql?(:changed) || !self.seo_description?
+      end
+
+      def set_seorel
         self.build_seorel unless self.seorel?
 
-        self.seorel.title       = self.seorel_title_value       if self.seorel_title_value.present?
-        self.seorel.description = self.seorel_description_value if self.seorel_description_value.present?
+        self.seorel.title       = self.seorel_title_value       if self.should_update_seo_title?
+        self.seorel.description = self.seorel_description_value if self.should_update_seo_description?
       end
 
       def seorel_title_value
-        self.class.seorel_title_field && self.send(self.class.seorel_title_field)
+        raw_title = self.class.seorel_title_field && self.send(self.class.seorel_title_field)
+        ::ActionController::Base.helpers.strip_tags(raw_title.to_s).first(255)
       end
 
       def seorel_description_value
-        self.class.seorel_description_field && self.send(self.class.seorel_description_field)
+        raw_description = self.class.seorel_description_field && self.send(self.class.seorel_description_field)
+        ::ActionController::Base.helpers.strip_tags(raw_description.to_s).first(255)
       end
 
       def seorel_default_value?

data/lib/seorel/version.rb

@@ -1,3 +1,3 @@
 module Seorel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seorel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,54 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Easy management of SEO Metatags for your ActiveRecord models
 email:
 - info@andreadalponte.com
@@ -83,7 +35,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/models/seorel/seorel.rb
-- app/uploaders/seorel/image_uploader.rb
 - config/locales/en.seorel.yml
 - config/locales/it.seorel.yml
 - config/routes.rb

data/app/uploaders/seorel/image_uploader.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-module Seorel
-  class ImageUploader < CarrierWave::Uploader::Base
-
-    # Include RMagick or MiniMagick support:
-    # include CarrierWave::RMagick
-    # include CarrierWave::Processing::RMagick
-    include CarrierWave::MiniMagick
-
-    # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
-    include Sprockets::Helpers::RailsHelper
-    include Sprockets::Helpers::IsolatedHelper
-
-    # Choose what kind of storage to use for this uploader:
-    storage :file
-    # storage :fog
-
-    # Override the directory where uploaded files will be stored.
-    # This is a sensible default for uploaders that are meant to be mounted:
-    def store_dir
-      File.join('system', model.class.to_s.underscore.to_s, mounted_as.to_s, model.id.to_s)
-    end
-
-    # Provide a default URL as a default if there hasn't been a file uploaded:
-    def default_url
-      # For Rails 3.1+ asset pipeline compatibility:
-      asset_path('seorel/default.jpg')
-    end
-
-    process convert: 'jpeg'
-
-    version :thumbnail do
-      process resize_to_fill: [150, 150]
-    end
-
-    version :default do
-      process resize_and_pad: [300, 300, '#ffffff']
-    end
-
-    # Add a white list of extensions which are allowed to be uploaded.
-    # For images you might use something like this:
-    def extension_white_list
-      %w(jpg jpeg gif png bmp tif tiff)
-    end
-
-    # Override the filename of the uploaded files:
-    # Avoid using model.id or version_name here, see uploader/store.rb for details.
-    # def filename
-    #   "something.jpg" if original_filename
-    # end
-
-  end
-end