jtv 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d085a732bc7bbe64b5b2e585c7cbfa014843ad5
-  data.tar.gz: 4be3c9e63ebf8088c69bd66cc37f47e428a49796
+  metadata.gz: a0454f3e0561798a0d6df4d666c1fc46cfe477c3
+  data.tar.gz: e8fad1ba471ef2a2fafe9469c9bbc314af71b6bf
 SHA512:
-  metadata.gz: 6270b531f17caad9d4d230e12b33e8330eb0ce64bf7772529652a22242107128640da7bb926f7a06a02c09fd4e779077d3d73ec041a0a2a6d1450539eb80a47e
-  data.tar.gz: 3be926bab00fc3d9f4a74aa22435426ce3e511cfcda66d88f82e092131decd5697388de8e687addb167eda7db7d958772cc0d22d2292401ebfcd9055752c1ed3
+  metadata.gz: 7012b5ffe47031f3730932b3b25f6fe11e09268eff3764e7ffc862ac7c72e9b243da2a1e181e75248f6f2ada575bee884f67a406956006d6909eca1766941a8e
+  data.tar.gz: a971c9eecc1a2abd150b70693c9d1aff76433900911192f4ff65c92fead328abe73f3114aadc3b9a304ebb24bd2702c2309c83bd91a7eb3137e604b0bbc1aaae

data/README.md

@@ -68,18 +68,16 @@ category).
 
 You can include a channel, language, or category in your search params.
 
-#### List
+#### Featured
 
 Returns stream information for all live channels. The results are sorted by the
 current number of viewers, with the most popular channels first.
 
 ```ruby
-  Jtv.list category: 'gaming', limit: 1
+  Jtv.featured
   # [{'name' => 'live_user_wingsofdeath'...}]
 ```
 
-You can include a channel, category, title, language, limit, and offset.
-
 #### Search
 
 Returns stream information for the live channels that match a search query. The
@@ -107,17 +105,6 @@ Returns extended information for a user, specified by user id or login.
 
 Pass in a user's login.
 
-#### Favorites
-
-Get all channels who are favorites of a user.
-
-```ruby
-  Jtv.favorites 'mockra'
-  # [{}]
-```
-
-Pass in a user's login.
-
 ### Channel
 
 #### Show
@@ -160,29 +147,6 @@ channel id or login must be included as a param. Optional limit and offset
 params (defaults are 20 for limit and 0 for offset). Results returned are
 limited to 100. Results are returned in create date order
 
-#### Embed
-
-Get embed code for a channel.
-
-```ruby
-  Jtv.embed 'justin', volume: 50
-  # "<object></object>"
-```
-
-You can supply params volume, publisher_guard (for the default channel password
-to try), height, width, and watermark_position
-
-#### Chat Embed
-
-Get chat embed code for a channel.
-
-```ruby
-  Jtv.chat_embed 'justin', height: 1000
-  # "<iframe></iframe>"
-```
-
-You can supply params height and width.
-
 ## Contributing
 
 Contributions and feedback are more than welcome and highly encouraged.

data/lib/jtv/channel.rb

@@ -1,25 +1,18 @@
 module Jtv
   module Channel
     def channel_show id
-      get "channel/show/#{id}.json"
+      get "channels/#{id}.json"
     end
 
     def fans params = {}
+      # authenticated
       id = params[:id] || params[:channel]
-      get "channel/fans/#{id}.json", params
+      get "channels/#{id}/follows.json", params
     end
 
     def archives params = {}
       id = params[:id] || params[:channel]
-      get "channel/archives/#{id}.json", params
-    end
-
-    def embed id, params = {}
-      request(:get, "channel/embed/#{id}", params)[:body]
-    end
-
-    def chat_embed id, params = {}
-      request(:get, "channel/chat_embed/#{id}", params)[:body]
+      get "channels/#{id}/videos.json", params
     end
   end
 end

data/lib/jtv/client.rb

@@ -37,7 +37,7 @@ module Jtv
     end
 
     def connection
-      @connection ||= Faraday.new 'http://api.justin.tv', options
+      @connection ||= Faraday.new 'https://api.twitch.tv/kraken', options
     end
 
     def req_header method, path, params

data/lib/jtv/stream.rb

@@ -3,16 +3,16 @@ require 'uri'
 module Jtv
   module Stream
     def summary params = {}
-      get 'stream/summary.json', params
+      get 'streams/summary.json', params
     end
 
-    def list params = {}
-      get 'stream/list.json', params
+    def featured params = {}
+      get 'streams/featured.json', params
     end
 
     def search query, params = {}
       query = URI.escape query
-      get "stream/search/#{query}.json", params
+      get "search/streams.json?q=#{query}", params
     end
   end
 end

data/lib/jtv/user.rb

@@ -1,11 +1,7 @@
 module Jtv
   module User
     def user_show id
-      get "user/show/#{id}.json"
-    end
-
-    def favorites id
-      get "user/favorites/#{id}.json"
+      get "users/#{id}.json"
     end
   end
 end

data/lib/jtv/version.rb

@@ -1,3 +1,3 @@
 module Jtv
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/spec/features/channel_spec.rb

@@ -5,44 +5,25 @@ describe Jtv::Channel do
   describe '#fans', :vcr do
     it 'fetches fans for a given channel' do
       fans = Jtv.fans id: 'officecam'
-      expect(fans).to be_an Array
-      expect(fans.first).to be_a Hash
-      expect(fans.first['id']).to be_an Integer
+      expect(fans['follows']).to be_an Array
+      expect(fans['follows'].first).to be_a Hash
+      expect(fans['follows'].first['user']['_id']).to be_an Integer
     end
   end
 
   describe '#archives', :vcr do
    it 'returns an array of archives for given channel' do
-      archives = Jtv.archives channel: 'dotahut', limit: 2
-      expect(archives).to be_an Array
-      expect(archives.count).to eq 2
-      expect(archives.first['video_codec']).to eq 'AVC'
+      archives = Jtv.archives channel: 'test_channel', limit: 2
+      expect(archives['videos']).to be_an Array
+      expect(archives['videos'].count).to eq 2
+      expect(archives['videos'].first['broadcast_type']).to eq 'highlight'
     end
   end
 
   describe '#channel_show', :vcr do
     it 'provides information for a given channel' do
       channel = Jtv.channel_show 'apidemo'
-      expect(channel['login']).to eq 'apidemo'
-    end
-  end
-
-  describe '#embed', :vcr do
-    it 'returns a string containing an embed object' do
-      embed = Jtv.embed 'justin', volume: 50
-      expect(embed).to be_a String
-      expect(embed).to include 'volume=50'
-      expect(embed).to include 'object'
-      expect(embed).to include 'x-shockwave-flash'
-    end
-  end
-
-  describe '#chat_embed', :vcr do
-    it 'returns an iframe for chat' do
-      chat = Jtv.chat_embed 'justin', height: 50
-      expect(chat).to be_a String
-      expect(chat).to include '50'
-      expect(chat).to include 'iframe'
+      expect(channel['display_name']).to eq 'Apidemo'
     end
   end
 end

data/spec/features/stream_spec.rb

@@ -3,25 +3,23 @@ require 'vcr_config'
 
 describe Jtv::Stream do
   describe '#summary', :vcr do
-    it 'returns a summary of Jutstin.tv data' do
+    it 'returns a summary of Justin.tv data' do
       summary = Jtv.summary
-      expect(summary['streams_count']).to be > 0
+      expect(summary['viewers']).to be > 0
     end
   end
 
-  describe '#list', :vcr do
-    it 'returns a list of streams for a category' do
-      list = Jtv.list category: 'gaming'
-      expect(list.count).to eq 50
-      expect(list.first['category']).to match(/gaming/i)
+  describe '#featured', :vcr do
+    it 'returns a list of streams' do
+      list = Jtv.featured
+      expect(list['featured'].count).to eq 25
     end
   end
 
   describe '#search', :vcr do
     it 'returns streams based on search query' do
-      search = Jtv.search 'league of legends', limit: 10
-      expect(search.count).to eq 10
-      expect(search.first['category']).to eq 'entertainment'
+      search = Jtv.search 'starcraft'
+      expect(search['_total']).to be > 0
     end
   end
 end

data/spec/features/user_spec.rb

@@ -5,14 +5,7 @@ describe Jtv::User do
   describe '#user_show', :vcr do
     it 'fetches information on user' do
       user = Jtv.user_show 'augury'
-      expect(user['login']).to eq 'augury'
-    end
-  end
-
-  describe '#favorites', :vcr do
-    it 'fetches favorites from user' do
-      user = Jtv.favorites 'augury'
-      expect(user.first['language']).to eq 'en'
+      expect(user['display_name']).to eq 'Augury'
     end
   end
 end

data/spec/jtv/channel_spec.rb

@@ -7,14 +7,14 @@ describe Jtv::Channel do
 
   describe '#channel_show' do
     it 'sends path with user to get' do
-      client.should_receive(:get).with 'channel/show/test.json'
+      expect(client).to receive(:get).with 'channels/test.json'
       client.channel_show 'test'
     end
   end
 
   describe '#fans' do
     it 'sends fans and params to get' do
-      client.should_receive(:get).with 'channel/fans/test.json',
+      expect(client).to receive(:get).with 'channels/test/follows.json',
         { channel: 'test' }
       client.fans channel: 'test'
     end
@@ -22,25 +22,9 @@ describe Jtv::Channel do
 
   describe '#archives' do
     it 'sends archives and params to get' do
-      client.should_receive(:get).with 'channel/archives/test.json',
+      expect(client).to receive(:get).with 'channels/test/videos.json',
         { id: 'test' }
       client.archives id: 'test'
     end
   end
-
-  describe '#embed' do
-    it 'sends :get, embed path with login and params to request' do
-      client.should_receive(:request).with(:get, 'channel/embed/test',
-        { volume: 50 }).and_return({})
-      client.embed 'test', volume: 50
-    end
-  end
-
-  describe '#chat_embed' do
-    it 'sends :get, chat_embed path with login and params to request' do
-      client.should_receive(:request).with(:get, 'channel/chat_embed/justin',
-        { height: 50 }).and_return({})
-      client.chat_embed 'justin', height: 50
-    end
-  end
 end

data/spec/jtv/client_spec.rb

@@ -6,7 +6,7 @@ describe Jtv::Client do
 
   describe '#get' do
     it 'fetches JSON based on method, path, and params' do
-      client.should_receive(:get_json).with(:get, '/test/', {})
+      expect(client).to receive(:get_json).with(:get, '/test/', {})
       client.get '/test/'
     end
   end
@@ -20,7 +20,7 @@ describe Jtv::Client do
   context 'when including stream' do
     it 'has access to summary, list, and search' do
       expect(client).to respond_to :summary
-      expect(client).to respond_to :list
+      expect(client).to respond_to :featured
       expect(client).to respond_to :search
     end
   end
@@ -28,7 +28,6 @@ describe Jtv::Client do
   context 'when including user' do
     it 'has access to show and favorites' do
       expect(client).to respond_to :user_show
-      expect(client).to respond_to :favorites
     end
   end
 
@@ -37,8 +36,6 @@ describe Jtv::Client do
       expect(client).to respond_to :channel_show
       expect(client).to respond_to :fans
       expect(client).to respond_to :archives
-      expect(client).to respond_to :embed
-      expect(client).to respond_to :chat_embed
     end
   end
 end

data/spec/jtv/defaults_spec.rb

@@ -5,20 +5,20 @@ class Client; include Jtv::Defaults; end
 describe Jtv::Defaults do
   describe '#credentials' do
     before do
-      Jtv.should_receive :consumer_key
-      Jtv.should_receive :consumer_secret
+      expect(Jtv).to receive(:consumer_key)
+      expect(Jtv).to receive(:consumer_secret)
     end
 
     it 'uses Jtv settings by default' do
-      Jtv.should_receive :oauth_token
-      Jtv.should_receive :oauth_secret
+      expect(Jtv).to receive(:oauth_token)
+      expect(Jtv).to receive(:oauth_secret)
       Client.new.credentials
     end
 
     it 'uses set oauth values if available' do
       client = Client.new
-      client.stub(:oauth_token) { 'token' }
-      client.stub(:oauth_secret) { 'secret' }
+      allow(client).to receive(:oauth_token).and_return 'token'
+      allow(client).to receive(:oauth_secret).and_return 'secret'
       client.credentials
     end
   end

data/spec/jtv/stream_spec.rb

@@ -7,22 +7,23 @@ describe Jtv::Stream do
 
   describe '#summary' do
     it 'sends summary and params to get' do
-      client.should_receive(:get).with 'stream/summary.json',
+      expect(client).to receive(:get).with 'streams/summary.json',
         { channel: 'test' }
       client.summary channel: 'test'
     end
   end
 
-  describe '#list' do
-    it 'sends list and params to get' do
-      client.should_receive(:get).with 'stream/list.json', { channel: 'test' }
-      client.list channel: 'test'
+  describe '#featured' do
+    it 'sends featured and params to get' do
+      expect(client).to receive(:get).with 'streams/featured.json',
+        { channel: 'test' }
+      client.featured channel: 'test'
     end
   end
 
   describe '#search' do
     it 'sends search and params to get' do
-      client.should_receive(:get).with 'stream/search/test%20ruby.json',
+      expect(client).to receive(:get).with 'search/streams.json?q=test%20ruby',
         { limit: 50 }
       client.search 'test ruby', limit: 50
     end

data/spec/jtv/user_spec.rb

@@ -7,15 +7,8 @@ describe Jtv::User do
 
   describe '#user_show' do
     it 'sends path with user to get' do
-      client.should_receive(:get).with 'user/show/test.json'
+      expect(client).to receive(:get).with 'users/test.json'
       client.user_show 'test'
     end
   end
-
-  describe '#favorites' do
-    it 'sends favorites path with user to get' do
-      client.should_receive(:get).with 'user/favorites/test.json'
-      client.favorites 'test'
-    end
-  end
 end

data/spec/jtv_spec.rb

@@ -20,11 +20,11 @@ describe Jtv do
 
   context 'when delegating to client' do
     before do
-      Jtv.stub(:client) { client }
+      allow(Jtv).to receive(:client).and_return client
     end
 
     it 'calls the correct method on client' do
-      client.should_receive(:get).with '/test'
+      expect(client).to receive(:get).with '/test'
       Jtv.get '/test'
     end
 

data/spec/vcr_cassettes/Jtv_Channel/_archives/returns_an_array_of_archives_for_given_channel.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.justin.tv/channel/archives/dotahut.json?channel=dotahut&limit=2
+    uri: https://api.twitch.tv/kraken/channels/test_channel/videos.json?channel=test_channel&limit=2
     body:
       encoding: US-ASCII
       string: ''
@@ -12,8 +12,9 @@ http_interactions:
       User-Agent:
       - Jtv Gem
       Authorization:
-      - OAuth oauth_nonce="313bbd99f785484b9cf6e0f0152c1d9b", oauth_signature="OAnY7J6oMHXabdyDIx83PMfMjdw%3D",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1368408351", oauth_version="1.0"
+      - OAuth oauth_consumer_key="", oauth_nonce="8021230e12a94d3c88b2a1cb8267140d",
+        oauth_signature="5dKQdylAXEJlV2OgZISmN0fzApk%3D", oauth_signature_method="HMAC-SHA1",
+        oauth_timestamp="1424824758", oauth_token="", oauth_version="1.0"
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
   response:
@@ -24,44 +25,48 @@ http_interactions:
       Server:
       - nginx
       Date:
-      - Mon, 13 May 2013 01:25:50 GMT
+      - Wed, 25 Feb 2015 00:39:19 GMT
       Content-Type:
-      - application/json
-      Transfer-Encoding:
-      - chunked
+      - application/json; charset=utf-8
+      Content-Length:
+      - '395'
       Connection:
-      - close
+      - keep-alive
+      Status:
+      - 200 OK
+      X-Api-Version:
+      - '3'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Cache-Control:
+      - max-age=300, public
       Vary:
-      - Accept-Language, Cookie
-      Content-Language:
-      - en
+      - Accept-Encoding
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Etag:
+      - '"83df9a8094218f78b5b5710f333b01a9"'
+      X-Request-Id:
+      - d9907a8420f2d723dab29ff13bb1380e
+      X-Runtime:
+      - '0.058918'
+      Accept-Ranges:
+      - bytes
+      X-Varnish:
+      - '2681479047'
+      Age:
+      - '0'
+      Via:
+      - 1.1 varnish
+      X-Mh-Cache:
+      - appcache2; M
       Front-End-Https:
-      - 'off'
+      - 'on'
     body:
       encoding: UTF-8
-      string: '[{"video_file_url": "http://store33.media33.justin.tv/archives/2013-3-3/live_user_dotahut_1362345627.flv",
-        "kind": null, "tag_list": "", "video_rotation": 0, "title": "DotaHut Invitational:
-        Fnatic vs. Mouz (Grand Finals) casted by Maut", "created_on": "2013-03-03
-        21:45:21 UTC", "stream_name": "live_user_dotahut", "filtered": "unchecked",
-        "video_bitrate": null, "updated_on": "2013-05-12 15:53:11 UTC", "save_forever":
-        "true", "id": 373537869, "file_name": "2013-3-3/live_user_dotahut_1362345627.flv",
-        "broadcaster": "delay", "broadcast_id": 5016397072, "user_id": 38409951, "origin_name":
-        "3842704", "file_size": 286290322, "deleted_by_user": "false", "broadcast_part":
-        "4", "keyframes": null, "length": "1470", "image_url_medium": "http://static-cdn.jtvnw.net/jtv.thumbs/archive-373537869-150x113.jpg",
-        "servers": "35", "start_time": "2013-03-03 21:20:27 UTC", "last_part": "",
-        "video_codec": "AVC", "audio_codec": "aac", "parent_archive_id": null, "description":
-        null, "include_on_channel": "none", "status": null}, {"video_file_url": "http://store21.media21.justin.tv/archives/2013-3-3/live_user_dotahut_1362343814.flv",
-        "kind": null, "tag_list": "", "video_rotation": 0, "title": "DotaHut Invitational:
-        Fnatic vs. Mouz (Grand Finals) casted by Maut", "created_on": "2013-03-03
-        21:20:42 UTC", "stream_name": "live_user_dotahut", "filtered": "unchecked",
-        "video_bitrate": null, "updated_on": "2013-03-03 21:20:44 UTC", "save_forever":
-        "true", "id": 373529497, "file_name": "2013-3-3/live_user_dotahut_1362343814.flv",
-        "broadcaster": "delay", "broadcast_id": 5016397072, "user_id": 38409951, "origin_name":
-        "3842704", "file_size": 253298632, "deleted_by_user": "false", "broadcast_part":
-        "3", "keyframes": null, "length": "1812", "image_url_medium": "http://static-cdn.jtvnw.net/jtv.thumbs/archive-373529497-150x113.jpg",
-        "servers": "22", "start_time": "2013-03-03 20:50:14 UTC", "last_part": "",
-        "video_codec": "AVC", "audio_codec": "aac", "parent_archive_id": null, "description":
-        null, "include_on_channel": "none", "status": null}]'
+      string: '{"_total":9,"_links":{"self":"https://api.twitch.tv/kraken/channels/test_channel/videos?limit=2&offset=0&user=test_channel","next":"https://api.twitch.tv/kraken/channels/test_channel/videos?limit=2&offset=2&user=test_channel"},"videos":[{"title":"robot
+        greeting 2","description":"greeting","broadcast_id":null,"status":"recorded","tag_list":"","_id":"c213462","recorded_at":"2009-12-15T10:03:04Z","game":null,"length":75,"preview":null,"url":"http://www.twitch.tv/test_channel/c/213462","views":2,"broadcast_type":"highlight","_links":{"self":"https://api.twitch.tv/kraken/videos/c213462","channel":"https://api.twitch.tv/kraken/channels/test_channel"},"channel":{"name":"test_channel","display_name":"Test_channel"}},{"title":"echobot2","description":"testing
+        the bot","broadcast_id":null,"status":"recorded","tag_list":"","_id":"c213497","recorded_at":"2009-12-15T07:58:43Z","game":null,"length":43,"preview":null,"url":"http://www.twitch.tv/test_channel/c/213497","views":0,"broadcast_type":"highlight","_links":{"self":"https://api.twitch.tv/kraken/videos/c213497","channel":"https://api.twitch.tv/kraken/channels/test_channel"},"channel":{"name":"test_channel","display_name":"Test_channel"}}]}'
     http_version: 
-  recorded_at: Mon, 13 May 2013 01:25:51 GMT
-recorded_with: VCR 2.4.0
+  recorded_at: Wed, 25 Feb 2015 00:39:19 GMT
+recorded_with: VCR 2.9.3