hypem 0.1.3 → 0.1.4

data/lib/exceptions.rb

@@ -0,0 +1,4 @@
+module Hypem
+  class RequestError < StandardError; end
+
+end

data/lib/hypem.rb

@@ -4,6 +4,7 @@ require "hypem/user"
 require "hypem/track"
 require "hypem/playlist"
 require "hypem/blog"
+require "exceptions"
 
 module Hypem
 

data/lib/hypem/blog.rb

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

data/lib/hypem/playlist.rb

@@ -14,24 +14,23 @@ module Hypem
     end
 
     def get
-      response = Request.new(@path).get.response
+      response = Request.new(@path).tap(&:get).response
       @tracks = []
       # getting rid of version cell
       response.body.shift
       response.body.each_value{|v| @tracks << Track.new(v)}
-      return self
     end
 
     def next_page
-      Playlist.new(@type,@arg,@page+1).get
+      Playlist.new(@type,@arg,@page+1).tap(&:get)
     end
 
     def prev_page
-      Playlist.new(@type,@arg,@page-1).get
+      Playlist.new(@type,@arg,@page-1).tap(&:get)
     end
 
     def page(num)
-      Playlist.new(@type,@arg,num).get
+      Playlist.new(@type,@arg,num).tap(&:get)
     end
 
     def self.create_url(tracks)
@@ -42,21 +41,21 @@ module Hypem
     end
 
     def self.latest(page=nil)
-      Playlist.new(:time,:today,page).get
+      Playlist.new(:time,:today,page).tap(&:get)
     end
 
     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,page).get
+      Playlist.new(:popular,arg,page).tap(&:get)
     end
 
     def self.friends_history(user,page=nil)
-      Playlist.new(:people_history,user,page).get
+      Playlist.new(:people_history,user,page).tap(&:get)
     end
 
     def self.friends_favorites(user,page=nil)
-      Playlist.new(:people,user,page).get
+      Playlist.new(:people,user,page).tap(&:get)
     end
 
     def self.tags(list,page)
@@ -68,7 +67,7 @@ module Hypem
     # meta method definitions for generic playlists
     GENERIC_METHODS.each do |method|
       define_singleton_method(method) do |arg,page=nil|
-        Playlist.new(method,arg,page).get
+        Playlist.new(method,arg,page).tap(&:get)
       end
     end
 

data/lib/hypem/request.rb

@@ -3,7 +3,6 @@ require 'faraday'
 module Hypem
   ROOT_PATH = 'http://hypem.com'
   class Request
-    attr_accessor :response
     attr_reader :url
 
     def initialize(url)
@@ -11,9 +10,11 @@ module Hypem
     end
 
     def get
-      raw_response = connection.get(@url)
-      @response = Response.new(raw_response)
-      return self
+      @raw_response = connection.get(@url)
+    end
+
+    def response
+      @response ||= Response.new(@raw_response)
     end
 
     private
@@ -21,7 +22,6 @@ module Hypem
     def connection
       @@conn ||= Faraday.new(url: ROOT_PATH) do |builder|
         builder.request :url_encoded
-        #builder.response :logger
         builder.adapter :net_http
       end
     end

data/lib/hypem/response.rb

@@ -5,8 +5,8 @@ module Hypem
     attr_accessor :body
 
     def initialize(raw_response)
-      raise ArgumentError if raw_response.nil?
-      # raise on body error here
+      raise RequestError if raw_response.body == 'null'
+
       @body = MultiJson.decode raw_response.body
     end
 

data/lib/hypem/user.rb

@@ -10,7 +10,9 @@ module Hypem
     end
 
     def api_request(path)
-      Request.new("/api/#{path}?username=#{@name}").get.response.body
+      request = Request.new("/api/#{path}?username=#{@name}")
+      request.get
+      request.response.body
     end
 
     def get_profile
@@ -66,24 +68,24 @@ module Hypem
 
     #playlist requests
 
-    def loved_playlist
-      @l_p ||= Playlist.loved(@name)
+    def loved_playlist(page=1)
+      @l_p ||= Playlist.loved(@name,page)
     end
 
-    def obsessed_playlist
-      @o_p ||= Playlist.obsessed(@name)
+    def obsessed_playlist(page=1)
+      @o_p ||= Playlist.obsessed(@name,page)
     end
 
-    def feed_playlist
-      @f_p ||= Playlist.feed(@name)
+    def feed_playlist(page=1)
+      @f_p ||= Playlist.feed(@name,page)
     end
 
-    def friends_favorites_playlist
-      @f_f_p ||= Playlist.friends_favorites(@name)
+    def friends_favorites_playlist(page=1)
+      @f_f_p ||= Playlist.friends_favorites(@name,page)
     end
 
-    def friends_history_playlist
-      @f_h_p ||= Playlist.friends_history(@name)
+    def friends_history_playlist(page=1)
+      @f_h_p ||= Playlist.friends_history(@name,page)
     end
   end
 end

data/lib/hypem/version.rb

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

data/spec/blog_spec.rb

@@ -20,7 +20,7 @@ describe Hypem::Blog do
 
     describe "#get_info" do
       subject do
-        VCR.use_cassette('blog') {blog.get_info}
+        VCR.use_cassette('blog') {blog.tap(&:get_info)}
       end
       specify {subject.should be_a Hypem::Blog}
       specify {subject.site_name.should == 'Pasta Primavera'}

data/spec/playlist_spec.rb

@@ -57,32 +57,32 @@ describe Hypem::Playlist do
     before {Hypem::Playlist.stub_chain(:new, :get)}
 
     it "converts strings to symbols" do
-      Hypem::Playlist.should_receive(:new).with(:popular,%s(3day))
+      Hypem::Playlist.should_receive(:new).with(:popular,%s(3day),anything)
       Hypem::Playlist.popular('3day')
     end
 
     it "retrieves 3day by default" do
-      Hypem::Playlist.should_receive(:new).with(:popular,%s(3day))
+      Hypem::Playlist.should_receive(:new).with(:popular,%s(3day),anything)
       Hypem::Playlist.popular
     end
 
     it "accepts lastweek" do
-      Hypem::Playlist.should_receive(:new).with(:popular,:lastweek)
+      Hypem::Playlist.should_receive(:new).with(:popular,:lastweek,anything)
       Hypem::Playlist.popular(:lastweek)
     end
 
     it "accepts noremix" do
-      Hypem::Playlist.should_receive(:new).with(:popular,:noremix)
+      Hypem::Playlist.should_receive(:new).with(:popular,:noremix,anything)
       Hypem::Playlist.popular(:noremix)
     end
 
     it "accepts artists" do
-      Hypem::Playlist.should_receive(:new).with(:popular,:artists)
+      Hypem::Playlist.should_receive(:new).with(:popular,:artists,anything)
       Hypem::Playlist.popular(:artists)
     end
 
     it "accepts twitter" do
-      Hypem::Playlist.should_receive(:new).with(:popular,:twitter)
+      Hypem::Playlist.should_receive(:new).with(:popular,:twitter,anything)
       Hypem::Playlist.popular(:twitter)
     end
 

data/spec/request_spec.rb

@@ -8,7 +8,7 @@ describe Hypem::Request do
 
   let(:response) do
     VCR.use_cassette('fresh_playlist') do
-      request.get.response
+      request.tap(&:get).response
     end
   end
 

data/spec/response_spec.rb

@@ -3,12 +3,20 @@ require 'spec_helper'
 describe Hypem::Response do
 
   context "at initialization" do
-    let(:response) do
+    let(:request) do
+      Hypem::Request.new('/playlist/latest/fresh/json/1')
+    end
+
+    let(:gotten_request) do
       VCR.use_cassette('fresh_playlist') do
-        Hypem::Request.new('/playlist/latest/fresh/json/1').get.response
+        request.get
       end
     end
 
+    let(:response) do
+      described_class.new(gotten_request)
+    end
+
     it "uses a raw response parameter" do
       response.body.should_not be_nil
     end
@@ -16,6 +24,12 @@ describe Hypem::Response do
     it "assigns the body attribute" do
       response.body.should be_a Hash
     end
+
+    it "raises RequestError with null body" do
+      raw_response = double('RawResponse')
+      raw_response.stub(:body).and_return('null')
+      expect { described_class.new(raw_response) }.to raise_error Hypem::RequestError
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypem
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219620218660 !ruby/object:Gem::Requirement
+  requirement: &70124648838920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70219620218660
+  version_requirements: *70124648838920
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70219620218200 !ruby/object:Gem::Requirement
+  requirement: &70124648838460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70219620218200
+  version_requirements: *70124648838460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219620217820 !ruby/object:Gem::Requirement
+  requirement: &70124648838080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219620217820
+  version_requirements: *70124648838080
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70219620217280 !ruby/object:Gem::Requirement
+  requirement: &70124648837540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70219620217280
+  version_requirements: *70124648837540
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70219620216780 !ruby/object:Gem::Requirement
+  requirement: &70124648837040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70219620216780
+  version_requirements: *70124648837040
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70219620216320 !ruby/object:Gem::Requirement
+  requirement: &70124648836580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70219620216320
+  version_requirements: *70124648836580
 description: 
 email:
 - jackcanderson@gmail.com
@@ -104,6 +104,7 @@ files:
 - fixtures/vcr_cassettes/user_friends.yml
 - fixtures/vcr_cassettes/user_profile.yml
 - hypem.gemspec
+- lib/exceptions.rb
 - lib/hypem.rb
 - lib/hypem/blog.rb
 - lib/hypem/playlist.rb
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -553475673543070860
+      hash: 1984432069541911698
 requirements: []
 rubyforge_project: hypem
 rubygems_version: 1.8.10