hypem 0.1.2 → 0.1.3

data/README.md

@@ -51,7 +51,7 @@ This is an unoffical Ruby gem for the **Hype Machine** read-only API. It support
         </tbody>
       </table>
 
-Each playlist has a `tracks` attribute containing an array of `Hypem::Tracks`'s. Pagination is supported with the `.next_page` and `.prev_page` methods.
+Each playlist has a `tracks` attribute containing an array of `Hypem::Tracks`'s. Pagination is supported with the `.next_page` and `.prev_page`, `page(num)` methods.
 
 ******
 

data/lib/hypem/blog.rb

@@ -13,8 +13,11 @@ module Hypem
     end
 
     def get_info
-      response = Request.new("/api/get_site_info?siteid=#{@id}").get.response.body
-      update_from_response(response)
+      unless @has_info
+        response = Request.new("/api/get_site_info?siteid=#{@id}").get.response.body
+        update_from_response(response)
+        @has_info = true
+      end
       return self
     end
 

data/lib/hypem/playlist.rb

@@ -5,7 +5,8 @@ module Hypem
     attr_accessor :path, :tracks
     attr_reader :extended
 
-    def initialize(type,arg,page=1)
+    def initialize(type,arg,page=nil)
+      page = 1 if page.nil?
       @type = type
       @arg = arg
       @page = page
@@ -29,6 +30,10 @@ module Hypem
       Playlist.new(@type,@arg,@page-1).get
     end
 
+    def page(num)
+      Playlist.new(@type,@arg,num).get
+    end
+
     def self.create_url(tracks)
       raise ArgumentError if (!tracks.is_a? Array) || (!tracks.first.is_a? Hypem::Track)
       track_params = tracks.map(&:id).join(',')
@@ -36,33 +41,35 @@ module Hypem
       return Hypem::ROOT_PATH + playlist.path
     end
 
-    def self.latest
-      Playlist.new(:time,:today).get
+    def self.latest(page=nil)
+      Playlist.new(:time,:today,page).get
     end
 
-    def self.popular(arg=POPULAR_ARGS.first)
+    def self.popular(arg=POPULAR_ARGS.first,page=nil)
       arg = arg.to_sym if arg.is_a? String
       raise ArgumentError unless POPULAR_ARGS.include?(arg)
-      Playlist.new(:popular,arg).get
+      Playlist.new(:popular,arg,page).get
     end
 
-    def self.friends_history(user)
-      Playlist.new(:people_history,user).get
+    def self.friends_history(user,page=nil)
+      Playlist.new(:people_history,user,page).get
     end
 
-    def self.friends_favorites(user)
-      Playlist.new(:people,user).get
+    def self.friends_favorites(user,page=nil)
+      Playlist.new(:people,user,page).get
     end
 
-    def self.tags(input)
-      input = input.join(',') if input.is_a? Array
-      Playlist.new(:tags,input)
+    def self.tags(list,page)
+      list = list.join(',') if list.is_a? Array
+      Playlist.new(:tags,list,page)
     end
     
 
     # meta method definitions for generic playlists
     GENERIC_METHODS.each do |method|
-      define_singleton_method(method) {|arg| Playlist.new(method,arg).get }
+      define_singleton_method(method) do |arg,page=nil|
+        Playlist.new(method,arg,page).get
+      end
     end
 
   end

data/lib/hypem/version.rb

@@ -1,3 +1,3 @@
 module Hypem
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/blog_spec.rb

@@ -18,7 +18,7 @@ describe Hypem::Blog do
       Hypem::Blog.new('4632').id.should === 4632
     end
 
-    describe ".get_info" do
+    describe "#get_info" do
       subject do
         VCR.use_cassette('blog') {blog.get_info}
       end
@@ -32,6 +32,12 @@ describe Hypem::Blog do
       specify {subject.last_posted.should be_a Time}
       specify {subject.followers.should == 1345}
 
+      it "caches its response" do
+        subject
+        Hypem::Request.should_not_receive :new
+        VCR.use_cassette('blog') { blog.get_info }
+      end
+
     end
   end
 

data/spec/playlist_spec.rb

@@ -96,33 +96,33 @@ describe Hypem::Playlist do
     
     describe ".blog" do  
       it "calls new with type blog" do
-        Hypem::Playlist.should_receive(:new).with(:blog,1)
-        Hypem::Playlist.blog(1)
+        Hypem::Playlist.should_receive(:new).with(:blog,1,5)
+        Hypem::Playlist.blog(1,5)
       end
     end
   
     describe ".tags" do
       it "creates a tag playlist from a string" do
-        Hypem::Playlist.should_receive(:new).with(:tags,'tag1,tag2')
-        Hypem::Playlist.tags('tag1,tag2')
+        Hypem::Playlist.should_receive(:new).with(:tags,'tag1,tag2',5)
+        Hypem::Playlist.tags('tag1,tag2',5)
       end
       it "creates a tag playlist from an array of strings" do
-        Hypem::Playlist.should_receive(:new).with(:tags,'tag1,tag2')
-        Hypem::Playlist.tags(['tag1','tag2'])
+        Hypem::Playlist.should_receive(:new).with(:tags,'tag1,tag2',5)
+        Hypem::Playlist.tags(['tag1','tag2'],5)
       end
     end
   
     describe ".search" do
       it "calls new with type search" do
-        Hypem::Playlist.should_receive(:new).with(:search,'query')
-        Hypem::Playlist.search('query')
+        Hypem::Playlist.should_receive(:new).with(:search,'query',5)
+        Hypem::Playlist.search('query',5)
       end
     end
   
     describe ".artist" do
       it "calls new with type artist" do
-        Hypem::Playlist.should_receive(:new).with(:artist,'name')
-        Hypem::Playlist.artist('name')
+        Hypem::Playlist.should_receive(:new).with(:artist,'name',5)
+        Hypem::Playlist.artist('name',5)
       end
     end
   end
@@ -133,14 +133,25 @@ describe Hypem::Playlist do
       Hypem::Playlist.stub_chain(:new,:get)
     end
 
-    it "can get next page" do
-      Hypem::Playlist.should_receive(:new).with(:time,:today,2)
-      playlist.next_page
+    describe "#next_page" do
+      it "gets next page" do
+        Hypem::Playlist.should_receive(:new).with(anything,anything,2)
+        playlist.next_page
+      end
     end
 
-    it "also gets previous page" do
-      Hypem::Playlist.should_receive(:new).with(:time,:today,0)
-      playlist.prev_page
+    describe "#prev_page" do
+      it "gets previous page" do
+        Hypem::Playlist.should_receive(:new).with(anything,anything,0)
+        playlist.prev_page
+      end
+    end
+
+    describe "#page" do
+      it "gets any page number" do
+        Hypem::Playlist.should_receive(:new).with(anything,anything,5)
+        playlist.page(5)
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226383951100 !ruby/object:Gem::Requirement
+  requirement: &70219620218660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70226383951100
+  version_requirements: *70219620218660
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70226383950640 !ruby/object:Gem::Requirement
+  requirement: &70219620218200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70226383950640
+  version_requirements: *70219620218200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70226383950260 !ruby/object:Gem::Requirement
+  requirement: &70219620217820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226383950260
+  version_requirements: *70219620217820
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70226383949720 !ruby/object:Gem::Requirement
+  requirement: &70219620217280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70226383949720
+  version_requirements: *70219620217280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70226383949220 !ruby/object:Gem::Requirement
+  requirement: &70219620216780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70226383949220
+  version_requirements: *70219620216780
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70226383948760 !ruby/object:Gem::Requirement
+  requirement: &70219620216320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70226383948760
+  version_requirements: *70219620216320
 description: 
 email:
 - jackcanderson@gmail.com
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1615421271881713189
+      hash: -553475673543070860
 requirements: []
 rubyforge_project: hypem
 rubygems_version: 1.8.10