h2ocube_rails_helper 0.0.8 → 0.0.9

data/h2ocube_rails_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_helper'
-  gem.version       = '0.0.8'
+  gem.version       = '0.0.9'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = %q{Just an helper collection}

data/lib/h2ocube_rails_helper.rb

@@ -62,36 +62,36 @@ def render_title opts = {}
   "<title>#{_title(opts).join(' - ')}</title>".html_safe
 end
 
-def _keywords
+def _keywords opts = {}
   if defined? @keywords
-    keywords = (@keywords.class.to_s == 'Array' ? @keywords : @keywords.to_s.strip.split(/(,|，)/))
+    keywords = @keywords
   elsif defined?(@item) && @item.respond_to?(:keywords) && !@item.keywords.blank?
     keywords = @item.keywords.strip.split(/(,|，)/)
   else
-    keywords = HelperSettings.keywords.strip.split(/(,|，)/)
+    keywords = opts.has_key?(:keywords) ? opts[:keywords] : HelperSettings.keywords.strip.split(/(,|，)/)
   end
-  keywords.compact.map{ |k| k = k.gsub(/(,|，)/, '').strip; k.blank? ? nil : k }.compact.uniq
+  [keywords].flatten.compact.map{ |k| k = k.gsub(/(,|，)/, '').strip; k.blank? ? nil : k }.compact.uniq
 end
 
 def render_keywords opts = {}
   return '' if _keywords.length == 0
-  "<meta name=\"keywords\" content=\"#{_keywords.join(',')}\" />".html_safe
+  "<meta name=\"keywords\" content=\"#{_keywords(opts).join(',')}\" />".html_safe
 end
 
-def _description
+def _description opts = {}
   if defined? @description
     description = @description
   elsif defined?(@item) && @item.respond_to?(:description) && !@item.description.blank?
     description = @item.description
   else
-    description = HelperSettings.description
+    description = opts.has_key?(:description) ? opts[:description] : HelperSettings.description
   end
   description.to_s.strip
 end
 
 def render_description opts = {}
   return '' if _description == ''
-  "<meta name=\"description\" content=\"#{_description}\" />".html_safe
+  "<meta name=\"description\" content=\"#{_description(opts)}\" />".html_safe
 end
 
 def render_canonical opts = {}

data/test/render_description_test.rb

@@ -18,6 +18,10 @@ class RenderDescriptionClass < ActionView::TestCase
     @item = Item.new
     assert_equal render_description, '<meta name="description" content="item_description" />'
   end
+
+  test 'opts' do
+    assert_equal render_description(description: 'opts'), '<meta name="description" content="opts" />'
+  end
 end
 
 class HelperSettings

data/test/render_keywords_test.rb

@@ -20,6 +20,10 @@ class RenderKeywordsClass < ActionView::TestCase
     @item = Item.new
     assert_equal render_keywords, '<meta name="keywords" content="item_keywords" />'
   end
+
+  test 'opts' do
+    assert_equal render_keywords(keywords: 'opts'), '<meta name="keywords" content="opts" />'
+  end
 end
 
 class HelperSettings

metadata

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