kappa 0.1.4.pre → 0.1.5.pre

data/README.md

@@ -81,4 +81,4 @@ Games are categories (e.g. League of Legends, Diablo 3) used by [streams](#strea
 
 Copyright © 2013 Chris Schmich
 <br />
-MIT License, see LICENSE for details.
+MIT License, See [LICENSE](LICENSE) for details.

data/lib/kappa/connection.rb

@@ -23,10 +23,6 @@ module Kappa
     def get(path, query = nil)
       request_url = @base_url + path
 
-      # Handle non-JSON response
-      # Handle invalid JSON
-      # Handle non-200 codes
-
       headers = {
         'Client-ID' => @client_id,
       }.merge(custom_headers)
@@ -35,6 +31,10 @@ module Kappa
         self.class.get(request_url, :headers => headers, :query => query)
       end
 
+      # TODO: Handle non-JSON response
+      # TODO: Handle invalid JSON
+      # TODO: Handle non-200 codes
+
       json = response.body
       return JSON.parse(json)
     end
@@ -84,14 +84,11 @@ module Kappa
       params.delete(:limit)
       params.delete(:offset)
 
+      json = get(request_url, params)
+
       # TODO: Hande request retry.
       loop do
-        json = get(request_url, params)
-
-        if json['error'] && (json['status'] == 503)
-          break
-        end
-
+        break if json['error'] && (json['status'] == 503)
         break if !yield(json)
 
         links = json['_links']
@@ -104,6 +101,7 @@ module Kappa
         break if total && (offset > total)
 
         request_url = next_url
+        json = get(request_url)
       end
     end
 

data/lib/kappa/version.rb

@@ -1 +1 @@
-$version = '0.1.4.pre'
+$version = '0.1.5.pre'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kappa
 version: !ruby/object:Gem::Version
-  version: 0.1.4.pre
+  version: 0.1.5.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26379276 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+  version_requirements: *26379276
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26378880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 2.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.3
+  version_requirements: *26378880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26378304 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  version_requirements: *26378304
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26394384 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.11.0
+  version_requirements: *26394384
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26394048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *26394048
 - !ruby/object:Gem::Dependency
   name: coveralls
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &26393772 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,14 +76,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "    A Ruby library for interfacing with the Twitch.tv Kraken API\n
-  \   including users, channels, streams, and followers.\n"
+  version_requirements: *26393772
+description: ! "    A Ruby library for interfacing with the Twitch.tv API\n    including
+  users, channels, streams, and followers.\n"
 email: schmch@gmail.com
 executables: []
 extensions: []
@@ -147,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Ruby library for interfacing with the Twitch.tv Kraken API.
+summary: Ruby library for interfacing with the Twitch.tv API.
 test_files: []
-has_rdoc: