Emoji 0.3.4

README.md

@@ -1,7 +1,7 @@
 Emoji
 =====
 
-Shared Emoji assets between GitHub,  Campfire, and BCX.
+Shared Emoji assets between GitHub, Campfire, and BCX.
 
 Contributing
 ------------
@@ -33,3 +33,14 @@ Deploying
 
 1. Push changes to 37signals/emoji
 2. Run `bundle update emoji` in app root
+
+Notes
+-----
+
+Use `replace` for the sprite and `emojify` for individual images.
+
+Todo
+----
+
+- Make all apps use lib/assets versions
+- Move the sprite img/css into CF/BCX and remove from the gem

emoji.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "emoji"
-  s.version = "0.3.1"
+  s.version = "0.3.4"
   s.summary = "Emoji Assets"
   s.description = "Shared Emoji assets between GitHub,  Campfire, and BCX."
 

lib/assets/javascripts/emoji.js.erb

@@ -2,7 +2,7 @@ var Emoji = {
   names: <%= Emoji.names.to_json %>,
   paths: <%= Emoji.names.inject({}) { |h, n| h[n] = asset_path("emoji/#{n}.png"); h }.to_json %>,
 
-  replace: function(string) {
+  emojify: function(string) {
     return string.replace(/:([a-z0-9\+\-_]+):/g, function(match, $1) {
       if (Emoji.names.indexOf($1) >= 0) {
         return '<img alt="' + $1 + '" height="20" src="' + Emoji.paths[$1] + '" style="vertical-align:middle" width="20" />';

lib/emoji.rb

@@ -9,7 +9,7 @@ module Emoji
   end
 
   def self.names
-    @names ||= Dir["#{PATH}/assets/images/emoji/*.png"].sort.map { |fn| File.basename(fn, '.png') }
+    @names ||= Dir["#{PATH}/../images/*.png"].sort.map { |fn| File.basename(fn, '.png') }
   end
 
   def self.replace(string)