seo_fuel 0.0.8 → 0.0.9

data/README.md

@@ -59,7 +59,7 @@ or, if you wish to only let signed in users be able to see the form (using devse
     <%= edit_seo_dialog if admin_signed_in? %>
     
 ### Setting default values
-By default, all meta tags are blank. If a tag is blank, the one specified in `seo_fuel_settings.yml` should be used (NOT YET IMPLEMENTED). Per template, you can specify a default value by adding a few lines of code to your view template. These values take precedence over the default values.
+By default, all meta tags are blank. If a tag is blank, the one specified in `seo_fuel_settings.yml` will be used. Per template, you can specify a default value by adding a few lines of code to your view template. These values take precedence over the default values.
 The 'in browser' added SEO settings take precedence over all default values. 
 
     <% default_title("Site Name | #{@article.title}") %>

data/app/views/seo_tags/update.js.erb

@@ -1,2 +1,2 @@
 hideSeoForm();
-$('title').text('<%= @tag.show_title %>');
+document.title = "<%= @tag.show_title %>";

data/config/seo_fuel_settings.yml

@@ -1,4 +1,5 @@
 SEO_FUEL_SETTINGS: 
   seperator: |
   default_title: "Your Website Name"
-  default_description: Give a discription of your website
+  default_description: Give a discription of your website
+  default_keywords: "enter, your, keywords, here"

data/lib/seo_fuel/controller_helper.rb

@@ -1,48 +1,17 @@
 module SeoFuel
   # Contains methods to use in controllers.
-  #
-  # You can define several instance variables to set meta tags:
-  #   @page_title = 'Member Login'
-  #   @page_description = 'Member login page.'
-  #   @page_keywords = 'Site, Login, Members'
-  #
-  # Also you can use {InstanceMethods#set_meta_tags} method, that have the same parameters
-  # as {ViewHelper#set_meta_tags}.
-  #
-  module ControllerHelper
-    def self.included(base)
-      base.send :include, InstanceMethods
-      base.alias_method_chain :render, :meta_tags
-    end
-
-    module InstanceMethods
-      # Processes the <tt>@page_title</tt>, <tt>@page_keywords</tt>, and
-      # <tt>@page_description</tt> instance variables and calls +render+.
-      def render_with_meta_tags(*args, &block)
-        meta_tags = {}
-        meta_tags[:title]       = @page_title       if @page_title
-        meta_tags[:keywords]    = @page_keywords    if @page_keywords
-        meta_tags[:description] = @page_description if @page_description
-        set_meta_tags(meta_tags)
 
-        render_without_meta_tags(*args, &block)
-      end
-
-      # Set meta tags for the page.
-      #
-      # See <tt>MetaTags.set_meta_tags</tt> for details.
-      def set_meta_tags(meta_tags)
-        meta_tags ||= {}
-        meta_tags[:open_graph] = meta_tags.delete(:og) if meta_tags.key?(:og)
-        self.meta_tags.deep_merge!(meta_tags || {})
-      end
-      protected :set_meta_tags
+  module ControllerHelper
+    extend ActiveSupport::Concern
 
-      # Get meta tags for the page.
-      def meta_tags
-        @meta_tags ||= {}
-      end
-      protected :meta_tags
+    included do
+      helper_method :testing
+    end
+  
+    def testing
+      logger.info "TESTING: OK"
+      raise "ERROR!!!!!!!!!!!!!"
     end
+    
   end
 end

data/lib/seo_fuel/version.rb

@@ -1,3 +1,3 @@
 module SeoFuel
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/seo_fuel/view_helper.rb

@@ -3,6 +3,11 @@ module SeoFuel
   
   module ViewHelper
     
+    # opens and reads the users options file
+    def default_settings_from_config_file
+      YAML::load(File.open("config/seo_fuel_settings.yml"))
+    end
+    
     # used in version < 0.0.4
     def edit_seo_button(text=I18n.t('seo.button_text'), klass="")
       link_to text, "#", class: "seo_fuel #{klass}", id: "edit_seo_btn"
@@ -32,8 +37,8 @@ module SeoFuel
         current_page.description
       elsif @default_description.present?
         @default_description
-      else
-        ""
+      elsif default_settings_from_config_file
+        default_settings_from_config_file['SEO_FUEL_SETTINGS']['default_description']
       end
     end
     
@@ -49,8 +54,8 @@ module SeoFuel
         current_page.keywords
       elsif @default_keywords.present?
         @default_keywords
-      else
-        ""
+      elsif default_settings_from_config_file
+        default_settings_from_config_file['SEO_FUEL_SETTINGS']['default_keywords']
       end
     end
 
@@ -60,8 +65,8 @@ module SeoFuel
         current_page.title
       elsif @default_title.present?
         @default_title
-      else
-        ""
+      elsif default_settings_from_config_file
+        default_settings_from_config_file['SEO_FUEL_SETTINGS']['default_title']
       end
     end
     

data/vendor/assets/stylesheets/seo_fuel.css

@@ -3,12 +3,13 @@
 }
 
 #edit_seo_btn {
+  font-size: 12px;
   text-align: center;
   position: fixed;
   top: -5px;
   left: 50%;
   margin-left: -75px;
-  width: 150px;
+  min-width: 150px;
   background: #fff;
   border: 1px solid #dedede;
   padding-bottom: 4px;
@@ -28,18 +29,18 @@
   );
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
-  border-radius: 3px;
+/*  border-radius: 3px;
   -webkit-box-shadow: 0px 0px 2px 2px #dedede;
   box-shadow: 0px 0px 2px 2px #dedede;
-  
+*/  
   border: 1px solid #aaa;
   
   font-family: arial;
   text-decoration: none;
-  color: #fff;
+  color: #333;
   
-  text-shadow: 1px 1px 0px #333;
-  filter: dropshadow(color=#333, offx=1, offy=1);
+  text-shadow: 1px 1px 0px #dedede;
+  filter: dropshadow(color=#dedede, offx=1, offy=1);
 }
 
 #edit_seo_dialog {
@@ -85,7 +86,23 @@
 .seo_form input[type=submit] {
   float: right;
   width: 150px;
+  margin-right: 20px;
+  background: #eee;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  text-shadow: 1px 1px 0px #dedede;
+  filter: dropshadow(color=#dedede, offx=1, offy=1);
+}
+
+.seo_form input[type=submit]:hover {
+  background: #ccc;
 }
+
+.seo_form input[type=submit]:active {
+  background: #bbb;
+}
+
 #cancel_seo_btn {
   float: left;
   text-decoration: none;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seo_fuel
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: