emoji 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174fb12d6b0501388fb5ff4017d09367b6aa5d03
-  data.tar.gz: 59ab1a8c80158fe30fe85589ef1dd16ffd5cabf6
+  metadata.gz: c3db53a871c5e23c6351a7f65f4a42d553cf9939
+  data.tar.gz: 887e181e6e54b5f55426c7a2ad0a338cf50660e7
 SHA512:
-  metadata.gz: b6f16c86fcea49a221d4fe0e4945ade156f2c362907731568cd1d31f3cb7fe3be606638ac4413eafaac200e000ce00913ae25b7a9f28f3ad23b760539599e308
-  data.tar.gz: 45172ab36a11c69ab9709b0565354ca4c54bf89931a315cf96d79ebfd184276cc3b3c546aba9aa900042d0de0f0e618221e69d2b4e3e0e47c164ed4dee830b22
+  metadata.gz: 48be0c44cad71b861e291e96a47bed6f49e355e743b0c2b03feb63151471a7efeba82d9226a2749a97c9230bfeb592d9229c33241141011e901609d7121e689f
+  data.tar.gz: 9a6a4ec187f2d1afeb022627c5bb3abe462368b14f49a8762d0b050bcf504006fa0cf46ce50a1890be7c4ac8a6f021dd138bdf47e6ce9462eaa1928c6adf87d3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Releases / Changes
 
+## 1.0.5
+
+* Adds support for dynamic Emoji.asset_host as a proc (ala Rails.asset_host)
+
 ## 1.0.4
 
 * Moved Homepage/repo to wpeterson/emoji

data/README.md

@@ -2,7 +2,7 @@
 
 A Ruby gem. For emoji. For everyone. :heart:
 
-[![Build Status](https://travis-ci.org/steveklabnik/emoji.svg?branch=master)](https://travis-ci.org/steveklabnik/emoji)
+[![Build Status](https://travis-ci.org/wpeterson/emoji.svg?branch=master)](https://travis-ci.org/wpeterson/emoji)
 
 This gem exposes the [Phantom Open Emoji library](https://github.com/Genshin/PhantomOpenEmoji) unicode/image assets and APIs for working with them.
 
@@ -62,6 +62,9 @@ Emoji Library Index APIs:
 
 > index.find_by_moji('❤')
 => {"moji"=>"❤", "name"=>"heart", "name-ja"=>"ハート", "category"=>"abstract", "unicode"=>"2764"}
+
+> index.find_by_unicode('2764')
+=> {"moji"=>"❤", "name"=>"heart", "name-ja"=>"ハート", "category"=>"abstract", "unicode"=>"2764"}
 ```
 Default configuration integrates with Rails, but you can change it with an initializer:
    
@@ -95,6 +98,17 @@ and call methods directly on your string to return the same results:
 => {"moji"=>"❤", "name"=>"heart", "name-ja"=>"ハート", "category"=>"abstract", "unicode"=>"2764"}
 ```
 
+## Emoji Asset host
+By default, if used with Rails this gem will inherit Rails configured `Rails.asset_host`.  Otherwise, you will need to configure the `Emoji.asset_host` as a string URL or a lambda/proc.
+
+```ruby
+# String URL
+Emoji.asset_host = 'http://your.com'
+
+# Custom Host Proc, takes asset path as a param
+Emoji.asset_host = lambda {|path| path.size % 2 == 0 ? 'http://even.com' : 'http://odd.com'}
+```
+
 ## HTML Safety and Performance
 
 This gem uses pure ruby code for compatibility with different Ruby virtual machines.  However, there can be significant performance gains to escaping incoming HTML strings using optimized, native code in the `escape_utils` gem.

data/lib/emoji.rb

@@ -28,9 +28,12 @@ module Emoji
   end
 
   def self.parse_and_validate_asset_host(asset_host_spec)
-    unless asset_host_spec && asset_host_spec.size >= 1
-      return ''
+    return '' unless asset_host_spec
+    return asset_host_spec if asset_host_spec.respond_to?(:call)
+    unless asset_host_spec.kind_of?(String)
+      raise 'Invalid Emoji.asset_host, should be a hostname or URL prefix'
     end
+    return '' unless asset_host_spec.size >= 1
 
     # Special Case for 'hostname:port' style URIs, not parse properly by URI.parse
     if asset_host_spec.match(/^[^:]+:\d+$/)
@@ -91,8 +94,16 @@ module Emoji
     @use_plaintext_alt_tags = bool
   end
 
+  def self.asset_host_for_asset(asset_path)
+    return asset_host if asset_host.kind_of?(String)
+
+    asset_host.call(asset_path)
+  end
+
   def self.image_url_for_name(name)
-    "#{asset_host}#{ File.join(asset_path, name) }.png"
+    path = "#{ File.join(asset_path, name) }.png"
+    host = asset_host_for_asset(path)
+    "#{host}#{path}"
   end
 
   def self.image_url_for_unicode_moji(moji)

data/lib/emoji/version.rb

@@ -1,3 +1,3 @@
 module Emoji
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/test/emoji_test.rb

@@ -13,6 +13,12 @@ describe Emoji do
         assert_equal '/cyclone.png', Emoji.image_url_for_name('cyclone')
       end
     end
+
+    it 'should use proc asset_host' do
+      with_emoji_config(:asset_host, lambda {|path| 'http://proc.com' }) do
+        assert_equal 'http://proc.com/cyclone.png', Emoji.image_url_for_name('cyclone')
+      end
+    end
   end
 
   describe "image_url_for_unicode_moji" do
@@ -65,6 +71,13 @@ describe Emoji do
         assert_equal '', Emoji.asset_host
       end
     end
+
+    it 'should allow proc' do
+      asset_proc = lambda {|path| "proc.com"}
+      with_emoji_config(:asset_host, asset_proc) do
+        assert_equal asset_proc, Emoji.asset_host
+      end
+    end
   end
 
   describe "asset_path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emoji
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Steve Klabnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json