livefyre 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBlODNiYWZhMWJhOTgxNDljYzJkOWZlNDVmZThhNTg1YWQ4ZjI2Yg==
+    YTUwODdmZjljOWQwZmZiZGQzODdlMDMzMmMzNTQ0ZjAyNDhkNTFlNQ==
   data.tar.gz: !binary |-
-    NWEzYTU3MTRmNjg1YWMwMDQzYWM5MWIzZmU4YTY1ZWE1MTNjOTVjZg==
+    ZmIyYjY3MDY4OWExYjYwMTZjM2MzNzMxZWViNTVmMTZkOWE5MmY3YQ==
 SHA512:
   metadata.gz: !binary |-
-    NTIzZTM1YTIzZTM0NDcxM2U3Y2YzMmQxMzcxZTU1OTc3NTJjNGI2ZDIzOWUy
-    ZTVhYTkzOTcyMWRmOGU3NDc0ZjQ0YWNlNmVmYjcwM2M5ZmM1ZTI2ZmNiYzQw
-    OGQxMTRiNjM3NGQwNWVjOGQ2ZDQ2ODNhMDJkMGY2Y2I1MzBjYmI=
+    ZTY1ZGI1NDlhZDlkZjg3MWZjZmRjYWNkMzQyZmY0MDk1MmZkYjgzMDI1NWEy
+    MzRhZGE1NGNjZjdiZTVjNmM0ZGUyMjc5NTI5NjMyNDZjMTAwZTg2YzNjYTcx
+    MDg2NWU2OGU5NTllYzdlYjVlZjIyNjk4N2M0NWFhNTFiYzNjOGU=
   data.tar.gz: !binary |-
-    YTM2NDYzODM3OTNiMWY3MWFhNzZiMjdiODZkNDZhMWUwYTA0Yzg5YzA3NTY4
-    OGNiYTZkMjkyNWQ2NmQ1ZDY5ZjU1ODYzOGZjZDA1MTNhNjNmZjcwZTUxMDUx
-    Njk0OTdmN2JiMzRmN2E2YTM5NTEzNzAwOTFiMWJmOTQ0NmE0MjM=
+    ZjEzMWM2Y2RjYTY5OWFkN2E1NzZmNTNkOGU4ODZmOTAyMjE0ZmUwZjRiMGMy
+    Nzc3NWRmMmU4MGUyYWIxNTYzZWVlZmQ5ZGU3ZDA4NTQ0ODYxYTE2YTlhNGM2
+    Nzg4YjgzOTQ5NDhhZThmODgzODIzODEzYjYwNjgxNjU5ZDYyMDU=

data/README.md

@@ -53,10 +53,10 @@ site = network.get_site('site_id', 'site_key')
 ```
 
 Building a collection meta token:
-*The 'tags' and stream' arguments are optional.*
+*The 'tags' and type' arguments are optional.*
 
 ```ruby
-site.build_collection_meta_token('title', 'article_id', 'url', 'tags', 'stream')
+site.build_collection_meta_token('title', 'article_id', 'url', 'tags', 'type')
 ```
 
 Building a checksum:

data/lib/livefyre/core.rb

@@ -63,13 +63,16 @@ module Livefyre
 		end
 
 		class Site
+			TYPE = ['reviews', 'sidenotes']
+			STREAM_TYPE = ['liveblog', 'livechat', 'livecomments']
+
 			def initialize(network_name, site_id, site_key)
 				@network_name = network_name
 				@site_id = site_id
 				@site_key = site_key
 			end
 	
-			def build_collection_meta_token(title, article_id, url, tags='', stream=nil)
+			def build_collection_meta_token(title, article_id, url, tags='', type=nil)
 				raise ArgumentError, 'provided url is not a valid url' if !uri?(url)
 				raise ArgumentError, 'title length should be under 255 char' if title.length > 255
 				
@@ -79,8 +82,14 @@ module Livefyre
 					title: title,
 					articleId: article_id
 				}
-				if stream
-					collection_meta[:type] = stream
+				if type
+					if TYPE.include? type
+						collection_meta[:type] = type
+					elsif STREAM_TYPE.include? type
+						collection_meta[:stream_type] = type
+					else
+						raise ArgumentError, 'type is not a recognized type. should be liveblog, livechat, livecomments, reviews, sidenotes, or an empty string'
+					end
 				end
 
 				JWT.encode(collection_meta, @site_key)

data/lib/livefyre/version.rb

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

data/spec/livefyre/core_spec.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 require 'livefyre'
+require 'jwt'
 
 describe Livefyre::Network do
 	before(:each) do
@@ -22,7 +23,7 @@ end
 
 describe Livefyre::Network::Site do
 	before(:each) do
-		@site = Livefyre.get_network('networkName', 'networkKey').get_site('siteId', "siteKey")
+		@site = Livefyre.get_network('networkName', 'networkKey').get_site('siteId', 'siteKey')
 	end
 
 	it 'should raise ArgumentError if url is not a valid url for cmt' do
@@ -33,6 +34,22 @@ describe Livefyre::Network::Site do
 		expect{ @site.build_collection_meta_token('1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456', 'test', 'http://test.com', 'test') }.to raise_error(ArgumentError)
 	end
 
+	it 'should raise ArgumentError if not a valid type is passed in when building a collection meta token' do
+		expect{ @site.build_collection_meta_token('', '', 'http://livefyre.com', '', 'bad type') }.to raise_error(ArgumentError)
+	end
+
+	it 'should check type and assign them to the correct field in the collection meta token' do
+		@token = @site.build_collection_meta_token('', '', 'http://livefyre.com', '', 'reviews')
+		@decoded = JWT.decode(@token, 'siteKey')
+
+		expect(@decoded['type']).to eq('reviews')
+
+		@token = @site.build_collection_meta_token('', '', 'http://livefyre.com', '', 'liveblog')
+		@decoded = JWT.decode(@token, 'siteKey')
+
+		expect(@decoded['stream_type']).to eq('liveblog')
+	end
+
 	it 'should return a collection meta token' do
 		expect{ @site.build_collection_meta_token('title', 'article_id', 'https://www.url.com', 'tags') }.to be_true
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livefyre
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Livefyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler