meta-tags-helpers 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da68ee4c3c07370f7b41fbca573c38cfecf5398c
+  data.tar.gz: 3483ced9ffb0496a8855e78a4158df86eb081449
+SHA512:
+  metadata.gz: 5e4fc8b3a89d66a3fc9ae5d5ef48d6c80917e642c9e261f433e7aa20afe58f4fa1a172a09391a9ab0eed63bc3724eaaf12dd3bc5999d19e462b8ebd8989523ec
+  data.tar.gz: e0709490ffe13ab1d4e6c9862bb36890d9ab09e1ac22d24ce8b11e2a4cb3004575058ddf190f6176f5be223a70ebeb46de3dc307ad1c621c2cb198e7eb0fa441

data/.gitignore

@@ -0,0 +1,117 @@
+# Created by http://gitignore.io
+
+Gemfile.lock
+
+### Ruby ###
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+### Rails ###
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.rspec
+.rvmrc
+/.bundle
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html
+.project
+!.keep
+
+
+### SublimeText ###
+# SublimeText project files
+*.sublime-workspace
+
+### TextMate ###
+*.tmproj
+*.tmproject
+tmtags
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+### Windows ###
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+### Linux ###
+.*
+!.gitignore
+!.git*
+*~
+
+
+### RubyMine ###
+.idea/workspace.xml
+
+### Eclipse ###
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath

data/Gemfile

@@ -1,8 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'rails'
-
-group :development do  
-  gem "bundler"
-  gem "jeweler", "~> 1.8.4"
-end
+# Specify your gem's dependencies in meta-tags-helpers.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 mcasimir
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,10 +4,12 @@
 
 The `meta-tags-helpers` gem consists of a set of helpers to setup and render html meta tags in a simple way. It has good customizable defaults that also come with built-in support for open-graph and csrf: all your meta tags in a single call.
 
+Supports both Rails 3 and 4.
+
 ### Install
 
 ``` rb
-gem 'meta-tags-helpers'
+gem 'meta-tags-helpers', '~> 0.2.0'
 ```
 
 ### Examples
@@ -24,7 +26,7 @@ if you don't like the defaults you can override them passing other values as a p
 ``` erb
 <%= meta_tags(
     :title => "MyBlog - This is a Blog",
-    :description => "The blog of mine & a reserved character",
+    :description => "My blog description & a reserved character that will be escaped",
     :og => {:type => "website"}
     :ns => {
       :my_custom_meta => "a value"
@@ -35,9 +37,7 @@ if you don't like the defaults you can override them passing other values as a p
 
 You can further override these values in your controller, views and partials using the `set_meta` method (see below).
 
-**NOTE:** You can set namespaced keys (eg. `og:type`) either as key-value pairs (eg. `:"og:type" => "..."`) or as nested hashes (eg. `:og => {:type => "..."}`), both of the syntaxes would address the same meta tag.
-
-### What it generates? 
+### Generated HTML
 
 The first example above will produce the following html:
 
@@ -57,7 +57,27 @@ The first example above will produce the following html:
 
 ```
 
-**NOTE:** namespaced meta (eg. `og:title`) are supposed to be RDF properties and so they are marked using a `property` attribute.
+### Namespaced Keys
+
+Metas with namespaced keys (eg. `og:title`) are supposed to be RDF properties and so they are rendered using a `property` attribute.
+
+You can equally set namespaced keys through simple key-value pairs (eg. `:"og:type" => "..."`) or with nested hashes (eg. `:og => {:type => "..."}`).
+
+Note that you can also easily render arrays of metas having the same key passing an array as value.
+
+``` rhtml
+<%= meta_tags(
+    :title => "Escape from New York",
+    :description => "Sci-fi film by John Carpenter"
+    :og => {
+      :type => "video.movie"
+    },
+    :video => {
+      :year => 1981, 
+      :actor => ["Kurt Russell", "Lee Van Cleef"]
+    }) 
+%>
+```
 
 ### Setting and overriding meta tags from controller/partials/other views
 

data/Rakefile

@@ -1,53 +1,6 @@
-# encoding: utf-8
+require "bundler/gem_tasks"
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "meta-tags-helpers"
-  gem.homepage = "http://github.com/mcasimir/kaminari-bootstrap"
-  gem.license = "MIT"
-  gem.summary = %Q{Rails meta tags helpers}
-  gem.description = %Q{Rails meta tags helpers}
-  gem.email = "maurizio.cas@gmail.com"
-  gem.authors = ["mcasimir"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-
-task :push do
-  message = ENV["message"] || "commit #{Time.now}"
-  `git add . && git commit -a -m '#{message}' && git push`
-end
-
-task "release:patch" do
-  Rake::Task["gemspec"].invoke
-  Rake::Task["version:bump:patch"]
-  Rake::Task["push"].invoke
-  Rake::Task["release"].invoke  
-end
-
-task "release:minor" do
-  Rake::Task["gemspec"].invoke
-  Rake::Task["version:bump:minor"]
-  Rake::Task["push"].invoke
-  Rake::Task["release"].invoke  
-end
-
-task "release:major" do
-  Rake::Task["gemspec"].invoke
-  Rake::Task["version:bump:major"]
-  Rake::Task["push"].invoke
-  Rake::Task["release"].invoke  
+desc "Run tests on test app"
+task :test do
+  exec "cd test_app && rake test"
 end

data/lib/meta_tags_helpers.rb

@@ -20,8 +20,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 module MetaTagsHelpers
+
   module ActionViewExtension
     
     def meta_tags(opts = {})
@@ -40,17 +40,21 @@ module MetaTagsHelpers
         :"csrf-param"      => request_forgery_protection_token,
         :"csrf-token"      => form_authenticity_token
       }
-      
-      meta_hash = default.deep_merge(opts).deep_merge(@_meta_tags_hash || {})
+
+      override_hash = controller.instance_variable_get("@_meta_tags_hash") || {}      
+      meta_hash = default.deep_merge(opts).deep_merge(override_hash)
         
       html = ""
       html << "<title>#{h(meta_hash.delete(:title)) }</title>\n"
-      meta_hash.each {|k,v|
-        if k.to_s =~ /[a-zA-Z_][-a-zA-Z0-9_.]\:/
-          html << "<meta property=\"#{h(k)}\" content=\"#{h(v)}\" />\n"  
-        else
-          html << "<meta name=\"#{h(k)}\" content=\"#{h(v)}\" />\n"  
-        end
+      meta_hash.each {|k,value_or_array|
+        values = value_or_array.is_a?(Array) ? value_or_array : [value_or_array]
+        values.each { |v|
+          if k.to_s =~ /[a-zA-Z_][-a-zA-Z0-9_.]\:/
+            html << "<meta property=\"#{h(k)}\" content=\"#{h(v)}\" />\n"  
+          else
+            html << "<meta name=\"#{h(k)}\" content=\"#{h(v)}\" />\n"  
+          end
+        }
       }
       html.html_safe
     end
@@ -58,7 +62,7 @@ module MetaTagsHelpers
   end #~ ActionViewExtension
   
   module ActionControllerExtension
-    extend ActiveSupport::Concern
+    extend ::ActiveSupport::Concern
     included do
       helper_method :set_meta, :meta_title, :meta_description, :meta_image, :meta_type, :normalize_meta_hash
     end
@@ -68,7 +72,7 @@ module MetaTagsHelpers
     end
   
     def set_meta(options)
-      _meta_tags_hash.deep_merge(normalize_meta_hash(options))
+      _meta_tags_hash.deep_merge!(normalize_meta_hash(options))
     end
   
     def meta_title(val = nil)
@@ -107,29 +111,28 @@ module MetaTagsHelpers
     protected
     
     def normalize_meta_hash(hash)
-      
-      meta_hash = hash.dup
-      
-      # separates namespaced keys
-      namespaces = meta_hash.select { |k,v| v.is_a?(Hash) }
-        
-      # delete nil/false/namespaced keys
-      meta_hash.delete_if { |k,v| v.blank? || v == false || v.is_a?(Hash)}
-        
-      namespaces.each { |ns, namespaced|
-        namespaced.delete_if { |k,v|
-          v.blank? || v == false || v.is_a?(Hash)
-        }
-        namespaced.each {|k,v|
-          meta_hash[:"#{ns}:#{k}"] = v 
-        }
-      }
-      
-      meta_hash
-      
+      normalized = {}
+      normalize_meta_hash_walker(hash, normalized)
+      normalized
     end
+
+    private
     
+    def normalize_meta_hash_walker(hash, normalized, current = nil)
+      hash.each do |k, v|
+        thisPath = current ? current.dup : []
+        thisPath << k.to_s
+
+        if v.is_a?(Hash)
+          normalize_meta_hash_walker(v, normalized, thisPath) 
+        elsif v
+          key = thisPath.join ":"
+          normalized[:"#{key}"] = v
+        end
+      end
+    end
+
   end
 end
 ActionController::Base.send :include, MetaTagsHelpers::ActionControllerExtension
-ActionView::Base.send :include, MetaTagsHelpers::ActionViewExtension
+ActionView::Base.send :include, MetaTagsHelpers::ActionViewExtension

data/meta-tags-helpers.gemspec

@@ -1,52 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = "meta-tags-helpers"
-  s.version = "0.1.7"
+Gem::Specification.new do |spec|
+  spec.name          = "meta-tags-helpers"
+  spec.version       = "0.2.0"
+  spec.authors       = ["mcasimir"]
+  spec.email         = ["maurizio.cas@gmail.com"]
+  spec.description   = "Rails meta tags helpers"
+  spec.summary       = "Seo and future-proof meta tags for Rails"
+  spec.homepage      = "https://github.com/mcasimir/meta-tags-helpers"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["mcasimir"]
-  s.date = "2013-06-01"
-  s.description = "Rails meta tags helpers"
-  s.email = "maurizio.cas@gmail.com"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/meta-tags-helpers.rb",
-    "lib/meta_tags_helpers.rb",
-    "meta-tags-helpers.gemspec"
-  ]
-  s.homepage = "http://github.com/mcasimir/kaminari-bootstrap"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Rails meta tags helpers"
+  spec.files         = `git ls-files`.split($/)
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_dependency "rails", "> 3"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "combustion", "~> 0.5.1"
+  spec.add_development_dependency "actionpack"
+  spec.add_development_dependency "activesupport"
 end
-