livefyre 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkyNWUzNzE3OGFhNTJiNTc1ZjBmN2I4ZDY5OGVlYjkyOGVjMzE1Mg==
+    MjBlODNiYWZhMWJhOTgxNDljYzJkOWZlNDVmZThhNTg1YWQ4ZjI2Yg==
   data.tar.gz: !binary |-
-    ZjBjMTkyMTIxMmRlMjQ2YWI4NGVmYmRhODZmZjQxNzk5M2Q1NDVhMg==
+    NWEzYTU3MTRmNjg1YWMwMDQzYWM5MWIzZmU4YTY1ZWE1MTNjOTVjZg==
 SHA512:
   metadata.gz: !binary |-
-    Y2VhZGI2MmMyOTZkOGZhN2UzMTY2YWYzNmE4NGRhYTJiMzZjYWE2YzdlZmE4
-    YWMwZjA5NGVjMTQ1NmVkNjNlZTMyN2ViMjBiYWU2MTNhNWNhNWI1Y2E5MDQ2
-    MDIyZTExNTY0ZTQ2NTYwMWNkM2JiOTVjN2RhMDQ3MjZkZWU1MzI=
+    NTIzZTM1YTIzZTM0NDcxM2U3Y2YzMmQxMzcxZTU1OTc3NTJjNGI2ZDIzOWUy
+    ZTVhYTkzOTcyMWRmOGU3NDc0ZjQ0YWNlNmVmYjcwM2M5ZmM1ZTI2ZmNiYzQw
+    OGQxMTRiNjM3NGQwNWVjOGQ2ZDQ2ODNhMDJkMGY2Y2I1MzBjYmI=
   data.tar.gz: !binary |-
-    NDBhMWRjMDA3MWMxODA0MDY5MjIzYmU5ZTAzZjVmMGQyNDlhNGJlNmFjOTBh
-    MGUzMDhkNGExZDkzM2ZiMDFjMGM4MTlkNDg4NjRkOTEwYjhiNjUzODQ4NGY5
-    Yjg5NWI5MWRhZjhiZDg3NDg3ZDgzY2M0YTkxMGIyYmRkZDE3NjU=
+    YTM2NDYzODM3OTNiMWY3MWFhNzZiMjdiODZkNDZhMWUwYTA0Yzg5YzA3NTY4
+    OGNiYTZkMjkyNWQ2NmQ1ZDY5ZjU1ODYzOGZjZDA1MTNhNjNmZjcwZTUxMDUx
+    Njk0OTdmN2JiMzRmN2E2YTM5NTEzNzAwOTFiMWJmOTQ0NmE0MjM=

data/lib/livefyre/core.rb

@@ -3,7 +3,7 @@ require 'digest'
 require 'json'
 require 'jwt'
 require 'rest-client'
-require 'uri'
+require 'addressable/uri'
 
 module Livefyre
 	class Network
@@ -111,11 +111,11 @@ module Livefyre
 			end
 
 			def uri?(string)
-			  uri = URI.parse(string)
-			  %w( http https ).include?(uri.scheme)
-			rescue URI::BadURIError
+			  uri = Addressable::URI.parse(string)
+			  %w( ftp ftps http https ).include?(uri.scheme)
+			rescue Addressable::URI::BadURIError
 			  false
-			rescue URI::InvalidURIError
+			rescue Addressable::URI::InvalidURIError
 			  false
 			end
 		end

data/lib/livefyre/version.rb

@@ -1,3 +1,3 @@
 module Livefyre
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/livefyre.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rest-client", '~> 1.6', ">= 1.6.7"
   spec.add_development_dependency "jwt", '~> 0.1', ">= 0.1.11"
   spec.add_development_dependency "rspec", '~> 2.14', ">= 2.14.1"
+  spec.add_development_dependency "addressable", '~> 2.3', ">= 2.3.6"
 end

data/spec/livefyre/core_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'livefyre'
 
 describe Livefyre::Network do
@@ -46,4 +48,15 @@ describe Livefyre::Network::Site do
 	it 'should return a valid checksum' do
 		expect(@site.build_checksum('title', 'https://www.url.com', 'tags')).to eq('6e2e4faf7b95f896260fe695eafb34ba')
 	end
+
+	it 'should check for valid and invalid urls' do
+		expect{ @site.build_checksum('', 'test.com', '') }.to raise_error(ArgumentError)
+		
+		@site.build_checksum('', 'http://localhost:8000', '')
+		@site.build_checksum('', 'http://清华大学.cn', '')
+		@site.build_checksum('', 'http://www.mysite.com/myresumé.html', '')
+		@site.build_checksum('', 'https://test.com/', '')
+		@site.build_checksum('', 'ftp://test.com/', '')
+		@site.build_checksum('', "https://test.com/path/test.-_~!$&'()*+,;=:@/dash", '')
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livefyre
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Livefyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,26 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 description: Livefyre Ruby utility classes
 email:
 - tools@livefyre.com