emoticon_fontify 1.0.1 → 1.0.2

data/README.md

@@ -16,32 +16,32 @@ gem 'emoticon_fontify'
 Then include the stylesheet in your `application.css` manifest.
 
 ```
-//= 'emoticon_fontify/emoticons.css'
+*= 'emoticon_fontify/emoticons'
 ```
 
 Finally use the helper to fontify emoticons in a string. This would allow fontifying content such as: `Why hello there good sir :O could I interest you in a cup of coffee? :)~D`
 
 ```ruby
-require EmoticonFontify::EmoticonHelper
+require 'emoticon_fontify'
 
-emoticon_fontify(content)
+EmoticonFontify.emoticon_fontify(h(content))
 ```
 
 
 ## List Of Emoticons
 
-[':)', ':-)'] => 'icon-emo-happy',
-[';)', ';-)'] => 'icon-emo-wink',
-[':(', ':-('] => 'icon-emo-unhappy',
-[':|', ':-|'] => 'icon-emo-sleep',
-['>:)', '>:-)', '}:)', '}:-)'] => 'icon-emo-devil',
-[':O', ':-O', ':0', ':-0'] => 'icon-emo-surprised',
-[':P', ':-P'] => 'icon-emo-tongue',
-[':)~D', ':-)~D'] => 'icon-emo-coffee',
-['B)', 'B-)'] => 'icon-emo-sunglasses',
-[':/', ':-/', ':\\', ':-\\'] => 'icon-emo-displeased',
-[':D', ':-D'] => 'icon-emo-grin',
-['>(', '>-('] => 'icon-emo-angry',
-['O:)', 'O:-)', '0:)', '0:-)'] => 'icon-emo-saint',
-[';(', ';-(', ":'(", ":'-("] => 'icon-emo-cry',
-['8)', '8-)'] => 'icon-emo-laugh'
+:) :-)
+;) ;-)
+:( :-(
+:| :-|
+}:) }:-) 3:) 3:-)
+:O :-O :0 :-0
+:P :-P
+:)~D :-)~D
+B) B-)
+:/ :-/ :\ :-\
+:D :-D
+:@ :-@ X( X-(
+O:) O:-) 0:) 0:-)
+;( ;-(
+8) 8-)

data/app/assets/stylesheets/emoticon_fontify/{emoticons.css → emoticons.css.scss}

@@ -1,17 +1,32 @@
 @font-face {
   font-family: 'emoticons';
-  src: url(asset_path('emoticon_fontify/emoticons.eot'));
-  src: url(asset_path('emoticon_fontify/emoticons.eot?#iefix')) format('embedded-opentype'), url(asset_path('emoticon_fontify/emoticons.woff')) format('woff'), url(asset_path('emoticon_fontify/emoticons.ttf')) format('truetype'), url(asset_path('emoticon_fontify/emoticons.svg#emoticons')) format('svg');
+  src: url(asset_path('emoticon_fontify/emoticons.eot', font));
+  src: url(asset_path('emoticon_fontify/emoticons.eot?#iefix', font)) format('embedded-opentype'), url(asset_path('emoticon_fontify/emoticons.woff', font)) format('woff'), url(asset_path('emoticon_fontify/emoticons.ttf', font)) format('truetype'), url(asset_path('emoticon_fontify/emoticons.svg#emoticons', font)) format('svg');
   font-weight: normal;
   font-style: normal;
 }
+
+[class^="icon-"] {
+  display: inline-block;
+  width: 1em;
+  margin: 0 0.2em;
+  font-size: 1em;
+  visibility: hidden;
+  position: relative;
+}
+
 [class^="icon-"]:before,
 [class*=" icon-"]:before {
   font-family: 'emoticons';
   font-style: normal;
   font-weight: normal;
+  font-size: 1em;
+  visibility: visible;
   speak: none;
   display: inline-block;
+  position: absolute;
+  left: 0;
+  bottom: 0;
   text-decoration: inherit;
   width: 1em;
   margin-right: 0.2em;
@@ -19,13 +34,10 @@
   opacity: 0.8;
 /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
-/* Animation center compensation - magrins should be symmetric */
-/* remove if not needed */
-  margin-left: 0.2em;
 /* you can be more comfortable with increased icons size */
 /* font-size: 120%; */
 /* Uncomment for 3D effect */
-/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+   text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3);
 }
 
 .icon-emo-happy:before { content: '\e800'; } /* '' */

data/lib/emoticon_fontify.rb

@@ -3,20 +3,20 @@ require "emoticon_fontify/engine"
 module EmoticonFontify
   def self.emoticons_to_classes
     @emoticons_to_classes ||= {
+      [':)~D', ':-)~D'] => 'icon-emo-coffee',
       [':)', ':-)'] => 'icon-emo-happy',
       [';)', ';-)'] => 'icon-emo-wink',
       [':(', ':-('] => 'icon-emo-unhappy',
       [':|', ':-|'] => 'icon-emo-sleep',
-      ['>:)', '>:-)', '}:)', '}:-)'] => 'icon-emo-devil',
+      ['}:)', '}:-)', '3:)', '3:-)'] => 'icon-emo-devil',
       [':O', ':-O', ':0', ':-0'] => 'icon-emo-surprised',
       [':P', ':-P'] => 'icon-emo-tongue',
-      [':)~D', ':-)~D'] => 'icon-emo-coffee',
       ['B)', 'B-)'] => 'icon-emo-sunglasses',
       [':/', ':-/', ':\\', ':-\\'] => 'icon-emo-displeased',
       [':D', ':-D'] => 'icon-emo-grin',
-      ['>(', '>-('] => 'icon-emo-angry',
+      [':@', ':-@', 'X-(', 'X('] => 'icon-emo-angry',
       ['O:)', 'O:-)', '0:)', '0:-)'] => 'icon-emo-saint',
-      [';(', ';-(', ":'(", ":'-("] => 'icon-emo-cry',
+      [';(', ';-('] => 'icon-emo-cry',
       ['8)', '8-)'] => 'icon-emo-laugh'
     }
   end
@@ -34,7 +34,8 @@ module EmoticonFontify
   end
 
   def self.emoticon_fontify(content)
-    h(content).to_str.gsub(/(#{emoticons.join('|')})/) do |match|
+    escaped_emoticons = emoticons.map{ |e| Regexp.escape(e) }
+    content.to_str.gsub(/(#{escaped_emoticons.join('|')})/) do |match|
       '<span class="' + emoticon_to_class(match) + '">' + match + '</span>'
     end.html_safe if content.present?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emoticon_fontify
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies: []
 description: Add emoticon font to assets and convert text to unicode symbols.
 email: simon@sfcgeorge.co.uk
@@ -18,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- app/helpers/emoticon_fontify/emoticon_helper.rb
 - lib/emoticon_fontify/engine.rb
 - lib/emoticon_fontify.rb
 - app/assets/fonts/emoticon_fontify/emoticons.eot
@@ -29,7 +28,7 @@ files:
 - app/assets/stylesheets/emoticon_fontify/emoticons-codes.css
 - app/assets/stylesheets/emoticon_fontify/emoticons-ie7-codes.css
 - app/assets/stylesheets/emoticon_fontify/emoticons-ie7.css
-- app/assets/stylesheets/emoticon_fontify/emoticons.css
+- app/assets/stylesheets/emoticon_fontify/emoticons.css.scss
 homepage: https://github.com/sfcgeorge/emoticon_fontify
 licenses: []
 post_install_message: 

data/app/helpers/emoticon_fontify/emoticon_helper.rb

@@ -1,5 +0,0 @@
-module EmoticonFontify
-  module EmoticonHelper
-
-  end
-end