emoji 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a107032c52334744a9ea531dc52687ad3734542
-  data.tar.gz: 02a61e602aafe01ed88f7f536f35e06846463854
+  metadata.gz: 174fb12d6b0501388fb5ff4017d09367b6aa5d03
+  data.tar.gz: 59ab1a8c80158fe30fe85589ef1dd16ffd5cabf6
 SHA512:
-  metadata.gz: 109658ab8eb1bf45b80cbbe27e3eed081bb702d68b16f6e2a05e95a4de14811556ad915ffbc6e23fc5e19d37d335d8b77ae2f47554329dd1f4e149077ab09a73
-  data.tar.gz: 1bdfd0c4687546ff3ba1a6676e93eab048471ac0e19220c576d5b1f9841db71279c97e4a078680938a5cccc6ac9c994c29737d4250c6689875e31b830603e902
+  metadata.gz: b6f16c86fcea49a221d4fe0e4945ade156f2c362907731568cd1d31f3cb7fe3be606638ac4413eafaac200e000ce00913ae25b7a9f28f3ad23b760539599e308
+  data.tar.gz: 45172ab36a11c69ab9709b0565354ca4c54bf89931a315cf96d79ebfd184276cc3b3c546aba9aa900042d0de0f0e618221e69d2b4e3e0e47c164ed4dee830b22

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Releases / Changes
 
+## 1.0.4
+
+* Moved Homepage/repo to wpeterson/emoji
+
+## 1.0.3
+
+* Allow empty Emoji.asset_host and more asset_host formatting support
+
 ## 1.0.2
 
 * Improved Emoji.asset_host configuration/handling

data/README.md

@@ -108,6 +108,10 @@ gem 'escape_utils'
 ```
 ## Contributors: :heart:
 
+This project was spawned from conversation at the BurlingtonRB conference between Steve/Winfield.  Together they built the initial gem.  Huge thanks to everyone else who's submitted code and work to the project.
+
+* [@steveklabnik](https://github.com/steveklabnik): Created this project and made it all happen
+* [@wpeterson](https://github.com/wpeterson): gem implementation
 * [@ryan-orr](https://github.com/ryan-orr): Granted the official `emoji` rubygems account
 * [@mikowitz](https://github.com/mikowitz): `String` ext helpers
 * [@semanticart](https://github.com/semanticart): Cleanup/Ruby 1.9.3 support

data/emoji.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["steve@steveklabnik.com", "winfield.peterson@gmail.com"]
   spec.description   = %q{A Ruby gem. For emoji. For everyone. :heart:}
   spec.summary       = %q{A Ruby gem. For emoji. For everyone. :heart:}
-  spec.homepage      = "http://github.com/steveklabnik/emoji"
+  spec.homepage      = "http://github.com/wpeterson/emoji"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/emoji.rb

@@ -28,16 +28,31 @@ module Emoji
   end
 
   def self.parse_and_validate_asset_host(asset_host_spec)
-    begin
-      uri = URI.parse(asset_host_spec)
+    unless asset_host_spec && asset_host_spec.size >= 1
+      return ''
+    end
+
+    # Special Case for 'hostname:port' style URIs, not parse properly by URI.parse
+    if asset_host_spec.match(/^[^:]+:\d+$/)
+      components = asset_host_spec.split(':')
+      scheme_string = 'http://'
+      hostname = components.first
+      port_string = ":#{components.last}"
+    else
+      uri = parse_asset_host_uri(asset_host_spec)
       scheme_string = extract_uri_scheme_string(asset_host_spec, uri)
       hostname = uri.hostname || uri.path
       port_string = extract_port_string(uri)
+    end
       
-      return "#{ scheme_string }#{ hostname }#{ port_string }"
+     "#{ scheme_string }#{ hostname }#{ port_string }"
+  end
+
+  def self.parse_asset_host_uri(asset_host_spec)
+    URI.parse(asset_host_spec)
+
     rescue URI::InvalidURIError
       raise 'Invalid Emoji.asset_host, should be a hostname or URL prefix'
-    end
   end
 
   def self.extract_uri_scheme_string(asset_host_spec, uri)

data/lib/emoji/version.rb

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

data/test/emoji_test.rb

@@ -7,6 +7,12 @@ describe Emoji do
     it 'should generate url' do
       assert_equal 'http://localhost:3000/cyclone.png', Emoji.image_url_for_name('cyclone')
     end
+
+    it 'should allow empty asset_host' do
+      with_emoji_config(:asset_host, '') do
+        assert_equal '/cyclone.png', Emoji.image_url_for_name('cyclone')
+      end
+    end
   end
 
   describe "image_url_for_unicode_moji" do
@@ -20,6 +26,12 @@ describe Emoji do
       assert_equal 'http://localhost:3000', Emoji.asset_host
     end
 
+    it 'should allow hostname and port simple' do
+      with_emoji_config(:asset_host, 'emoji:3000') do
+        assert_equal 'http://emoji:3000', Emoji.asset_host
+      end
+    end
+
     it 'should allow hostname only and default scheme to http' do
       with_emoji_config(:asset_host, 'emoji') do
         assert_equal 'http://emoji', Emoji.asset_host
@@ -45,9 +57,12 @@ describe Emoji do
 
     end
 
-    it 'should validate hostname' do
-      assert_raises(RuntimeError) do
-        with_emoji_config(:asset_host, nil) {}
+    it 'should coerce nil/empty URI' do
+      with_emoji_config(:asset_host, nil) do
+        assert_equal '', Emoji.asset_host
+      end
+      with_emoji_config(:asset_host, '') do
+        assert_equal '', Emoji.asset_host
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emoji
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Klabnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -585,7 +585,7 @@ files:
 - test/index_test.rb
 - test/string_ext_test.rb
 - test/test_helper.rb
-homepage: http://github.com/steveklabnik/emoji
+homepage: http://github.com/wpeterson/emoji
 licenses:
 - MIT
 metadata: {}