livefyre 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6945f16fc5007e1eacf3a6013ebd4b4f33683b
-  data.tar.gz: 1a6816b2c74e18df6f9b5d441ebc2b16b67839a7
+  metadata.gz: fd28a1df6805abeda6fa8cfb9b0f1c9a9a4733c8
+  data.tar.gz: 54d3b9c90d625514667abff650bda773e541b88a
 SHA512:
-  metadata.gz: 2dfa0932c258931b1b35521180d987450a87d50ac4f0fd1fe52d56bd04b8c988e4c258265e02b772fca2d5d1c8c171327ce3aa265a099e3c956920b9d13bf744
-  data.tar.gz: 26643c903bc2958113165b44d5638d64cc7433c1e8d24cc1d51160744d8e88022736cd722d8e6b3081f96e4ce49653a68950cd0ab9fb87a0596c5ead5a2bc262
+  metadata.gz: 2c964de771667b816846aebf5382f63542d4891e69ed7116ed3b9f79117ce365520a3537167311484d84ad5ab7c8702a6c939163591d17ef398ec66fc5b9c463
+  data.tar.gz: 443685c1978d7feb3f6cdcfc0d0d9fb3efbbddc6841f20061786e14d2be160a727348f4a226d61339cf467a2fa3e81eb7df8d6a5fa862b4e73d9e887226613a8

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 2.0.2 2015-05-12
+
+* Updated dependencies.
+
 === 2.0.1 2014-12-01
 
 * Updated Collection.create_or_update to update collection id on update.

data/lib/livefyre/api/personalized_stream.rb

@@ -146,8 +146,8 @@ module Livefyre
 		end
 
 		def self.add_subscriptions(network, user_token, topics)
-      user_id = JWT.decode(user_token, network.data.key)['user_id']
-      user_urn = network.get_urn_for_user(user_id)
+      claims, _ = JWT.decode(user_token, network.data.key)
+      user_urn = network.get_urn_for_user(claims['user_id'])
       
 			url = self.base_url(network) + self.user_subscription_path(user_urn)
       headers = self.get_headers(network, user_token)
@@ -161,8 +161,8 @@ module Livefyre
 		end
 
 		def self.replace_subscriptions(network, user_token, topics)
-      user_id = JWT.decode(user_token, network.data.key)['user_id']
-      user_urn = network.get_urn_for_user(user_id)
+      claims, _ = JWT.decode(user_token, network.data.key)
+      user_urn = network.get_urn_for_user(claims['user_id'])
       
 			url = self.base_url(network) + self.user_subscription_path(user_urn)
       headers = self.get_headers(network, user_token)
@@ -176,8 +176,8 @@ module Livefyre
 		end
 
 		def self.remove_subscriptions(network, user_token, topics)
-      user_id = JWT.decode(user_token, network.data.key)['user_id']
-      user_urn = network.get_urn_for_user(user_id)
+      claims, _ = JWT.decode(user_token, network.data.key)
+      user_urn = network.get_urn_for_user(claims['user_id'])
       
 			url = self.base_url(network) + self.user_subscription_path(user_urn)
       headers = self.get_headers(network, user_token)

data/lib/livefyre/core/network.rb

@@ -9,6 +9,7 @@ require 'livefyre/validator/network_validator'
 
 module Livefyre
   class Network
+    ALPHA_DASH_UNDER_DOT_REGEX = /^[a-zZA-Z0-9_\.-]+$/
     DEFAULT_USER = 'system'
     DEFAULT_EXPIRES = 86400
 
@@ -47,8 +48,9 @@ module Livefyre
       build_user_auth_token(DEFAULT_USER, DEFAULT_USER, DEFAULT_EXPIRES)
     end
 
+
     def build_user_auth_token(user_id, display_name, expires)
-      raise ArgumentError, 'user_id must be alphanumeric' if !(user_id =~ /^[a-zZA-Z0-9_\.-]+$/)
+      raise ArgumentError, "userId is not alphanumeric. Ensure the following regex pattern is respected #{ALPHA_DASH_UNDER_DOT_REGEX}" if !(user_id =~ ALPHA_DASH_UNDER_DOT_REGEX)
       raise ArgumentError, 'expires must be a number' if !expires.is_a? Numeric
 
       JWT.encode({
@@ -60,8 +62,8 @@ module Livefyre
     end
 
     def validate_livefyre_token(lf_token)
-      token_attributes = JWT.decode(lf_token, @data.key)
-      token_attributes['domain'] == @data.name && token_attributes['user_id'] == DEFAULT_USER && token_attributes['expires'] >= Time.new.to_i
+      claims, _ = JWT.decode(lf_token, @data.key)
+      claims['domain'] == @data.name && claims['user_id'] == DEFAULT_USER && claims['expires'] >= Time.new.to_i
     end
 
     def get_site(site_id, site_key)

data/livefyre.gemspec

@@ -1,9 +1,7 @@
 # coding: utf-8
-require File.expand_path('../lib/livefyre/version', __FILE__)
-
 Gem::Specification.new do |spec|
   spec.name          = 'livefyre'
-  spec.version       = Livefyre::VERSION
+  spec.version       = '2.0.2'
   spec.authors       = ['Livefyre']
   spec.email         = ['tools@livefyre.com']
   spec.description   = %q{Livefyre Ruby utility classes}
@@ -22,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rake'
-  spec.add_runtime_dependency 'rest-client', '~> 1.7', '>= 1.7.2'
-  spec.add_runtime_dependency 'jwt', '~> 0.1', '>= 0.1.13'
+  spec.add_runtime_dependency 'rest-client', '~> 1.8', '>= 1.8.0'
+  spec.add_runtime_dependency 'jwt', '~> 1.4', '>= 1.4.1'
   spec.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.6'
   spec.add_development_dependency 'bundler', '~> 1.7', '>= 1.7.4'
   spec.add_development_dependency 'rspec', '~> 3.1', '>= 3.1'

data/spec/livefyre/core/collection_spec.rb

@@ -33,12 +33,12 @@ describe Livefyre::Collection do
 
   it 'should check type and assign them to the correct field in the collection meta token' do
     @token = @site.build_reviews_collection(TITLE, ARTICLE_ID, URL).build_collection_meta_token
-    @decoded = JWT.decode(@token, SITE_KEY)
+    @decoded, _ = JWT.decode(@token, SITE_KEY)
 
     expect(@decoded['type']).to eq('reviews')
 
     @token = @site.build_blog_collection(TITLE, ARTICLE_ID, URL).build_collection_meta_token
-    @decoded = JWT.decode(@token, SITE_KEY)
+    @decoded, _ = JWT.decode(@token, SITE_KEY)
 
     expect(@decoded['type']).to eq('liveblog')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livefyre
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Livefyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,6 @@ files:
 - lib/livefyre/validator/cursor_validator.rb
 - lib/livefyre/validator/network_validator.rb
 - lib/livefyre/validator/site_validator.rb
-- lib/livefyre/version.rb
 - livefyre.gemspec
 - spec/livefyre/api/domain_spec.rb
 - spec/livefyre/api/personalized_stream_spec.rb

data/lib/livefyre/version.rb

@@ -1,3 +0,0 @@
-module Livefyre
-  VERSION = '2.0.1'
-end