twitchus 0.0.4 → 0.1.0

data/TODO

@@ -0,0 +1 @@
+Figure out why there is a Service Unavailable exception and handle it accordingly. It should probably notify a exception logging service.

data/lib/twitchus/checker.rb

@@ -3,9 +3,12 @@ require "json"
 
 module Twitchus
   class Checker
+    def initialize(config = nil)
+      @config = config
+    end
 
-    def fetch_all(channels, timeout = 0)
-      channels.map { |channel| check(channel); sleep timeout if timeout }.select { |c| !c.nil? }
+    def fetch_all(channels)
+      channels.map { |channel| check(channel) }.select { |c| !c.nil? }
     end
 
     # Return a list of online channel names
@@ -15,11 +18,12 @@ module Twitchus
 
     def check(channel)
       raise ArgumentError, "Channel is required." unless channel
-      response = JSON.parse(RestClient.get(base_url + channel))
+      response = RestClient.get(base_url + channel)
+      response = JSON.parse(response)
 
-      response.first
+      response["stream"]
     rescue RestClient::BadRequest => e
-      $stderr.puts "RestClient::BadRequest for #{channel}, #{e}"
+      $stderr.puts "Request failed due to rate limit, channel: #{channel}, #{e}"
       nil
     end
 
@@ -27,8 +31,14 @@ module Twitchus
       !check(channel).nil?
     end
 
+    def url_for(channel)
+      url = base_url + channel
+      url += "?client_key=#{@config.client_key}" if @config
+      url
+    end
+
     def base_url
-      "http://api.justin.tv/api/stream/list.json?channel="
+      "https://api.twitch.tv/kraken/streams/"
     end
   end
 end

data/lib/twitchus/cli.rb

@@ -2,7 +2,6 @@ require "optparse"
 
 module Twitchus
   class Cli
-
     attr_reader :options
 
     def initialize
@@ -58,5 +57,4 @@ module Twitchus
     end
 
   end
-
 end

data/lib/twitchus/config.rb

@@ -21,9 +21,8 @@ module Twitchus
       @data["key"]
     end
 
-    # TODO - remove duplication
-    def channels
-      @streams
+    def client_key
+      @data["client_key"]
     end
 
   end

data/lib/twitchus/version.rb

@@ -1,3 +1,3 @@
 module Twitchus
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/twitchus/worker.rb

@@ -3,22 +3,22 @@ module Twitchus
     def initialize(config_file)
       @config = Twitchus::Config.new
       @config.load(config_file)
-      @checker = Twitchus::Checker.new
+      @checker = Twitchus::Checker.new(@config)
     end
 
     def run
       @storage = Twitchus::Storage.new(@config.host, @config.port, @config.key)
-      # Empty the online channel list first
+      # Since this can run periodically, clean the list first
       @storage.clear
 
-      online_channels = @checker.fetch_all(@config.channels, 0.5)
-      online_channels.each do |channel|
-        next if Integer === channel
-
+      online_streams = @checker.fetch_all(@config.streams)
+      online_streams.each do |data|
+        channel = data["channel"]
         data = {
-          name:    channel["title"],
-          channel: c["login"],
-          image:   c["image_url_huge"]
+          title:   channel["status"],
+          name:    channel["name"],
+          image:   channel["banner"],
+          preview: data["preview"]
         }
 
         @storage.push data.to_json

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 require "twitchus"
 require "pry"
-require "vcr"
 
-VCR.configure do |c|
-  c.cassette_library_dir = "spec/fixtures/vcr"
-  c.hook_into :webmock
-end
+require "webmock"
+include WebMock::API

data/spec/twitchus/checker_spec.rb

@@ -3,30 +3,41 @@ require "spec_helper"
 module Twitchus
 
   describe Checker do
+    context "without a config" do
+      let(:checker) { Checker.new }
 
-    let(:c) { Checker.new }
+      it "can tell if a channel is online" do
+        stub_request(:get, "https://api.twitch.tv/kraken/streams/scvrush1")
+          .to_return(status: 200, body: { "stream" => {} }.to_json)
 
-    it "can tell if a channel is online" do
-      VCR.use_cassette "justin.tv", record: :new_episodes do
-        c.should be_online("dreamhacktv")
+        checker.should be_online("scvrush1")
       end
-    end
 
-    it "can tell if a channel is offline" do
-      VCR.use_cassette "justin.tv", record: :new_episodes do
-        c.should_not be_online("scvrush1")
+      it "can tell if a channel is offline" do
+        stub_request(:get, "https://api.twitch.tv/kraken/streams/scvrush1")
+          .to_return(status: 200, body: { "stream" => nil }.to_json)
+
+        checker.should_not be_online("scvrush1")
+      end
+
+      it "selects online streams from a list" do
+        stub_request(:get, "https://api.twitch.tv/kraken/streams/online")
+          .to_return(status: 200, body: { "stream" => { "name" => "online"} }.to_json)
+        stub_request(:get, "https://api.twitch.tv/kraken/streams/offline")
+          .to_return(status: 200, body: { "stream" => nil }.to_json)
+
+        checker.fetch_all(%w(online offline)).should == [ { "name" => "online" } ]
       end
     end
 
-    describe "#check_all" do
+    context "with a config" do
+      let(:config)  { Struct.new(:client_key).new("foobarkey") }
+      let(:checker) { Checker.new(config) }
 
-      it "selects only those channels which are online" do
-        VCR.use_cassette "justin.tv", record: :new_episodes do
-          c.check_all(%w{dreamhacktv scvrush1}).should == ["dreamhacktv"]
-        end
+      it "appends the client key to base_url" do
+        checker.url_for("scvrush1").should == "https://api.twitch.tv/kraken/streams/scvrush1?client_key=foobarkey"
       end
     end
 
   end
-
 end

data/spec/twitchus/config_spec.rb

@@ -6,7 +6,7 @@ module Twitchus
 
     let(:config) { Config.new }
 
-    it "can load config with multiple streams" do
+    it "load config with multiple streams" do
       file =<<YAML
 streams:
   - scvrush1
@@ -17,5 +17,14 @@ YAML
       config.streams.should == %w{scvrush1 scvrush2}
     end
 
+    it "loads client key" do
+      file =<<YAML
+client_key: foo
+YAML
+      File.write("./tmp/config.yml", file)
+      config.load("./tmp/config.yml")
+      config.client_key.should == "foo"
+    end
+
   end
 end

data/twitchus.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "redis",       "~> 3.0.1"
 
   gem.add_development_dependency "webmock",  "~> 1.8.10"
-  gem.add_development_dependency "vcr",      "~> 2.2.5"
   gem.add_development_dependency "pry",      "~> 0.9.10"
   gem.add_development_dependency "rake",     "~> 0.9.2.2"
   gem.add_development_dependency "rspec",    "~> 2.11.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitchus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.10
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +153,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO
 - bin/twitchus
 - config.example.yml
 - features/config.feature
@@ -180,7 +165,6 @@ files:
 - lib/twitchus/storage.rb
 - lib/twitchus/version.rb
 - lib/twitchus/worker.rb
-- spec/fixtures/vcr/justin_tv.yml
 - spec/spec_helper.rb
 - spec/twitchus/checker_spec.rb
 - spec/twitchus/cli_spec.rb
@@ -203,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1490566209112504012
+      hash: -2009003698380875512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1490566209112504012
+      hash: -2009003698380875512
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -222,7 +206,6 @@ summary: Twitchus is a gem for managing a list of Twitch.tv streams
 test_files:
 - features/config.feature
 - features/support/env.rb
-- spec/fixtures/vcr/justin_tv.yml
 - spec/spec_helper.rb
 - spec/twitchus/checker_spec.rb
 - spec/twitchus/cli_spec.rb

data/spec/fixtures/vcr/justin_tv.yml

@@ -1,136 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://api.justin.tv/api/stream/list.json?channel=dreamhacktv
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*; q=0.5, application/xml'
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: !binary |-
-        T0s=
-    headers:
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbng=
-      !binary "RGF0ZQ==":
-      - !binary |-
-        U3VuLCAyMyBTZXAgMjAxMiAxNTo1MDozMiBHTVQ=
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbg==
-      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
-      - !binary |-
-        Y2h1bmtlZA==
-      !binary "Q29ubmVjdGlvbg==":
-      - !binary |-
-        Y2xvc2U=
-      !binary "U3RhdHVz":
-      - !binary |-
-        MjAwIE9L
-      !binary "Vmlh":
-      - !binary |-
-        VHdpY2UgMC4yIHdlYjExOjMzNDc=
-      !binary "WC1SdW50aW1l":
-      - !binary |-
-        MC4wMjQ4NjA=
-      !binary "WC1VYS1Db21wYXRpYmxl":
-      - !binary |-
-        SUU9RWRnZSxjaHJvbWU9MQ==
-      !binary "Q2FjaGUtQ29udHJvbA==":
-      - !binary |-
-        bWF4LWFnZT0wLCBwcml2YXRlLCBtdXN0LXJldmFsaWRhdGU=
-      !binary "WC1HZW8=":
-      - !binary |-
-        Q1o=
-      !binary "RnJvbnQtRW5kLUh0dHBz":
-      - !binary |-
-        b2Zm
-      !binary "Q29udGVudC1FbmNvZGluZw==":
-      - !binary |-
-        Z3ppcA==
-    body:
-      encoding: ASCII-8BIT
-      string: !binary |-
-        H4sIAAAAAAAAA7VWbW/bNhD+KwIH9JNtvdmWLTQdgr5sAYrlg7EO2zIIlHSS
-        mFKkQJGWvaH/fUcpipQsWFMENSDAlO6Od8899/LnPwTqFPIkk0ZoEpOtt16T
-        BRG0BjxxdoTEtKCSXAGtK5p91kf83Gp7vFfyg2gb4OuMaiilOqNmSWsmSnxX
-        SFVTa9nasjIVFQL4qLvZ+n60IJppbi98Z+3+jNc476/+uHauGxCx84lyEBmj
-        zoerXy4/Ou8uf7d2gWqjICexVgbQJaZhiiLydyhDU/Q9UdBIpa1kQXmLoncu
-        kHgMHgRN+cxUpgBEktEmMYonNeTM1OhcpXUTu26rqWbZMsvF6lYfRbcSoN1G
-        wZFB17pPQrb0N97J98PVbWMxGaO9LgqGcXFnCvvQI4syCBqGR2JhOJ+QTUbV
-        n0Z8W5NOsD8UnqdhzHJuUXbw91qmt5BpR58buLghtGk4Q0NMCve0bCuZfe7o
-        EZYFp211Q5wKWFlpFAz2Gzx2LNcVnsJNiCeW498+8OGahtMzcmbUzammKHAH
-        X9d1q1vTaiZW+uiioRL0HWxz7VXbFT/eZepixj68Li0zyaVCkz94/e+GvHnd
-        UEVrx/LWRsO57D4gcoc+lahzpNzYL5YseHSfUmgzxRpNswzadqZCeUfP9sVj
-        pVpiymeC3x7gE0Z70I5UPfDAaJlYUC96Br96ApZXyEqlk6PkBhEIbI7QXXdI
-        8psbgYzC8Oa0bmtE6WWsjrzTZuQ0q2mJvQLr5TmGsXCGvtKwzPK8dWcpXjZK
-        FoxD0ttcbmC/XYdB5EOR5Wm4X+K1kYelBLaWbDWa9ptah2Y1/C2FrYT3RskG
-        3INGvleS28KbFdRYbUNZTRFWprTK/9cPXhTg1vNO+IwhIhy5yUCNrW5yBIvI
-        Ntvv5gh2rc29Gww7aOCH3hZbwIJMTnCqvi8cIcKBzwjHOEGQa1PsD7vKo2n1
-        kPjPyN5Xuvk29E7raGQ+p6I0SFR0Bmyd9XNgmo17LwiitY8fJsieNVJeRKF+
-        4Ey5e1T7z0nZVzAIA+8UrG1S+olGS6zBoU64LJlAMOZJ+GJhyUEmwxwhcRR4
-        C/Jf5KxIyrTCRQLJtg3DVeB7+zCyhEP6kXC3Cfz1Pth5eGkNmia4aFjkD9j+
-        3ipaaOfqKnZ+w92jdWThfGQpKH1G4VRJmme01baOSIFKs3cJTg/cUUJcGUzO
-        JCYvhwzF6iZEMdNgIxhuMcI5QOMEoeNt4rUXr/dO4Pl29xnC6+ciiX10cEFK
-        kGjj1wN+HTlruTFSw99tvV24w+1n/IqtZ5hBOIXvt5VhKD5eUYYFzA5vvOJu
-        tRpcGH2//PSWfPnrX1m4nUXhCQAA
-    http_version: 
-  recorded_at: Sun, 23 Sep 2012 15:50:32 GMT
-- request:
-    method: get
-    uri: http://api.justin.tv/api/stream/list.json?channel=scvrush1
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*; q=0.5, application/xml'
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Sun, 23 Sep 2012 15:51:43 GMT
-      Content-Type:
-      - application/json
-      Content-Length:
-      - '2'
-      Connection:
-      - close
-      Status:
-      - 200 OK
-      Via:
-      - Twice 0.2 web9:3347
-      X-Runtime:
-      - '0.014319'
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      X-Geo:
-      - CZ
-      Front-End-Https:
-      - 'off'
-    body:
-      encoding: US-ASCII
-      string: ! '[]'
-    http_version: 
-  recorded_at: Sun, 23 Sep 2012 15:51:44 GMT
-recorded_with: VCR 2.2.5