hooloo 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85573d2b1b378c17ec0143207b0fe001e121e14b
-  data.tar.gz: 49a263beb1aebb40aad6122b973f047112bb91e4
+  metadata.gz: 1615bf1fea0dc7d8018501e31c3c7a1a283c0e22
+  data.tar.gz: 3c0e8b7ccce9c26f92567ffb82e2a0e0f5d8616d
 SHA512:
-  metadata.gz: 102aab5dee2acd6fe9638a091340adbade108ba5bc2077e9a127a874ba73c42d6a9431ea122c4ef7e09ea26f0eb7129d37d78336c20611702e91fb6d0ab0cf2e
-  data.tar.gz: dbe99bf1541d50a9033402201f6f69dcff16cfbcce0ea350c0f1dc3c80f0ddf94913c01e47ac10c8772acb5406caccdf0ab4558a3ace25709840515d9e355cc4
+  metadata.gz: d907d13bb38d54c27da515379cb891dcc63f197f2c05816441b3785ebbad93867cf2883f9846e18b3dfb629c23ce35ecfb7b2a9c97d1c1cb7ece0c0e3e54ec2c
+  data.tar.gz: 463a835292e78cb51ec5ac52475c848c8e75749cff28b2bf2aef56f5d6244c0f113dfb0f966a510e0d8f7c567301f9bf1101b95201615f9cc4c864811547ac65

data/lib/hooloo/genre.rb

@@ -7,9 +7,15 @@ class Hooloo::Genre < Hooloo::MozartHash
       @obj = obj
     end
   end
-  def shows(args={items_per_page: 10, position: 0})
-    args.merge!({genre: canonical_name, sort: 'release_with_popularity'})
-    Hooloo.request('shows', args)['data'].map { |x| Hooloo::Show.new x['show'] }
+  # List all shows in this genre
+  #
+  # @param args [Hash] (see Hooloo#request)
+  # @return [Enumerator<Hooloo::Show>] List of shows
+  def shows(args={})
+    Hooloo.paginated_request('shows', {
+      genre: canonical_name,
+      sort: 'release_with_popularity'
+    }.merge(args)) { |g, x| g << Hooloo::Show.new(x['show']) }
   end
   # List all genres known to Hulu
   #

data/lib/hooloo/hooloo.rb

@@ -24,6 +24,19 @@ class Hooloo
       # TODO: check if we get 403'd and request a new token
       MultiJson.load open(request_uri(*args)).read
     end
+    def paginated_request(path, args={}, page_size=70, &block)
+      # TODO: cache responses
+      Enumerator.new do |g|
+        loop.with_index do |_, i|
+          response = request(path, {
+            items_per_page: page_size,
+            position: i * page_size
+          }.merge(args))['data']
+          response.each { |x| block.call(g, x) }
+          break if response.length < page_size
+        end
+      end
+    end
     def tokens
       @tokens or begin
         @tokens = Hash[open(hulu_uri).read.scan(/([A-Z]+)_DONUT = '([a-zA-Z0-9\-_\/]+)';$/)]

data/lib/hooloo/mozart_hash.rb

@@ -49,8 +49,8 @@ class Hooloo::MozartHash
   end
   # Honestly, we should generate methods when we initially parse the Hash
   # instead of doing this crap in method_missing.  I'll do that later.
-  def method_missing(method)
-    @obj[method.to_s]
+  def method_missing(method, *args, &block)
+    @obj[method.to_s] or super
   end
   def respond_to?(method)
     @obj.has_key? method.to_s or super

data/lib/hooloo/show.rb

@@ -1,7 +1,8 @@
 class Hooloo::Show < Hooloo::MozartHash
-  def self.popular_today(args={limit: 10, position: 0})
-    args.merge!({sort: 'popular_today'})
-    Hooloo.request('shows', args)['data'].map { |x| new x['show'] }
+  def self.popular_today(args={})
+    Hooloo.paginated_request('shows', {
+      sort: 'popular_today'
+    }.merge(args)) { |g, x| g << Hooloo::Show.new(x['show']) }
   end
   def initialize(id)
     super
@@ -11,11 +12,10 @@ class Hooloo::Show < Hooloo::MozartHash
       @obj = id
     end
   end
-  def videos(season=1)
-    Hooloo.request("shows/#{id}/episodes", {
-      items_per_page: 128,
+  def videos(season=1, args={})
+    Hooloo.paginated_request("shows/#{id}/episodes", {
       season_number: season
-    })['data'].map { |x| Hooloo::Video.new x['video'] }
+    }.merge(args)) { |g, x| g << Hooloo::Video.new(x['video']) }
   end
   bool :embed_permitted, :has_captions
   date :cache_time

data/lib/hooloo/version.rb

@@ -1,3 +1,3 @@
 class Hooloo
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/hooloo/genre_spec.rb

@@ -11,7 +11,7 @@ describe Hooloo::Genre do
   describe 'Shows List' do
     let(:genre) { Hooloo::Genre.new 'anime' }
     it 'should return multiple shows' do
-      genre.shows.length.must_be :>, 0
+      genre.shows.count.must_be :>, 0
     end
     it 'should convert shows to Show objects' do
       genre.shows.each { |x| x.must_be_instance_of Hooloo::Show }

data/spec/hooloo/show_spec.rb

@@ -5,7 +5,7 @@ describe Hooloo::Show do
   describe 'Popular Today' do
     let(:shows) { Hooloo::Show.popular_today }
     it 'should retrieve popular_today' do
-      shows.length.must_equal 10
+      shows.count.must_equal 10
     end
   end
   describe 'Loading' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooloo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Lejeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json