hypem 0.2.0 → 0.2.1

data/hypem.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "vcr", "~> 2.0"
+  s.add_development_dependency "webmock"
   s.add_development_dependency "rake"
-  s.add_dependency 'faraday', '~> 0.7'
+  s.add_dependency 'httparty'
+  s.add_dependency 'andand'
   s.add_dependency 'multi_json', '~> 1.1'
 
 end

data/lib/hypem.rb

@@ -1,3 +1,5 @@
+require "andand"
+require "hypem/helper"
 require "hypem/response"
 require "hypem/request"
 require "hypem/user"

data/lib/hypem/blog.rb

@@ -1,9 +1,14 @@
 module Hypem
   class Blog
+    include Helper
+
     attr_reader :blog_image, :blog_image_small, :first_posted,
                 :followers, :last_posted, :site_name, :site_url,
                 :total_tracks, :id
 
+    convert_keys(siteid: :id, sitename: :site_name, siteurl: :site_url)
+    convert_datetimes(:first_posted, :last_posted)
+
     def initialize(*args)
       if args.count == 1
         @id = args.first.is_a?(Integer) ? args.first : args.first.to_i
@@ -11,31 +16,13 @@ module Hypem
     end
 
     def get_info
-      unless @has_info
-        response = Request.new("/api/get_site_info?siteid=#{@id}").tap(&:get).response.body
-        update_from_response(response)
-        @has_info = true
-      end
-    end
-
-    def update_from_response(rsp)
-      @id ||= rsp[:site_id]
-      @blog_image ||= rsp['blog_image']
-      @blog_image_small ||= rsp['blog_image_small']
-      @followers ||= rsp['followers']
-      @id ||= rsp['siteid']
-      @site_name ||= rsp['sitename']
-      @site_url ||= rsp['siteurl']
-      @total_tracks ||= rsp['total_tracks']
-
-      # only from get_info
-      @first_posted ||= Time.at(rsp['first_posted']) unless rsp['first_posted'].nil?
-      @last_posted ||= Time.at(rsp['last_posted']) unless rsp['last_posted'].nil?
-
+      response = Request.get_resource("/get_site_info?siteid=#{id}")
+      update_from_response(response)
+      self
     end
 
     def self.all
-      response = Request.new("/api/get_all_blogs").tap(&:get).response.body
+      response = Request.get_resource("/get_all_blogs")
       response.map { |b| self.new.tap {|blog| blog.update_from_response(b) } }
     end
   end

data/lib/hypem/helper.rb

@@ -0,0 +1,37 @@
+module Hypem
+  module Helper
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def update_from_response(raw_hash)
+      raw_hash.each_pair do |key,value|
+        key = key.to_sym
+        new_key = self.class.key_conversions[key]
+        key = new_key unless new_key.nil?
+
+        if self.class.datetime_conversions.andand.include? key
+          value = Time.at(value).to_datetime 
+        end
+
+        instance_variable_set("@#{key}",value)
+
+        self.class.class_eval { attr_reader key }
+      end
+    end
+
+    module ClassMethods
+      attr_reader :key_conversions, :datetime_conversions
+
+      def convert_keys(values)
+        @key_conversions = values
+      end
+
+      def convert_datetimes(*values)
+        @datetime_conversions = values
+      end
+    end
+
+  end
+end

data/lib/hypem/playlist.rb

@@ -9,30 +9,26 @@ module Hypem
       @type = type
       @arg = arg
       @page = page
-      @path = "/playlist/#{@type}/#{@arg}/json/#{@page}"
+      @path = "/playlist/#{@type}/#{@arg}"
     end
 
     def get
-      response = Request.new(@path).tap(&:get).response
-      @tracks = []
-      response.body.shift # getting rid of version cell
-      response.body.each_value{|v| @tracks << Track.new(v)}
+      response = Request.get_data(path)
+      @tracks ||= []
+      response.each{|v| tracks << Track.new(v)}
+      self
     end
 
     def next_page
-      Playlist.new(@type,@arg,@page+1).tap(&:get)
+      Playlist.new(@type,@arg,@page+1).get
     end
 
     def prev_page
-      Playlist.new(@type,@arg,@page-1).tap(&:get)
+      Playlist.new(@type,@arg,@page-1).get
     end
 
     def page(num)
-      Playlist.new(@type,@arg,num).tap(&:get)
-    end
-
-    def url
-      Hypem::ROOT_PATH + path
+      Playlist.new(@type,@arg,num).get
     end
 
     def self.new_from_tracks(tracks)
@@ -42,7 +38,7 @@ module Hypem
 
     def self.latest(filter=:all,page=nil)
       raise ArgumentError unless [:all, :noremix, :remix, :fresh].include? filter
-      Playlist.new(:latest,filter,page).tap(&:get)
+      Playlist.new(:latest,filter,page).get
     end
 
     def self.popular(arg=POPULAR_ARGS.first,page=nil)
@@ -52,11 +48,11 @@ module Hypem
     end
 
     def self.friends_history(user,page=nil)
-      Playlist.new(:people_history,user,page).tap(&:get)
+      Playlist.new(:people_history,user,page)
     end
 
     def self.friends_favorites(user,page=nil)
-      Playlist.new(:people,user,page).tap(&:get)
+      Playlist.new(:people,user,page)
     end
 
     def self.tags(list,page)
@@ -69,7 +65,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).tap(&:get)
+        Playlist.new(method,arg,page)
       end
     end
 

data/lib/hypem/request.rb

@@ -1,29 +1,25 @@
-require 'faraday'
+require 'httparty'
 
 module Hypem
-  ROOT_PATH = 'http://hypem.com'
   class Request
-    attr_reader :url
+    include HTTParty
 
-    def initialize(url)
-      @url = url
-    end
+    debug_output
+    base_uri 'http://api.hypem.com'
+    headers 'Accept' => 'text/html'
+    format :json
 
-    def get
-      @raw_response = connection.get(@url)
+    def self.get_resource(path, query=nil)
+      get('/api' + path, query: query)
     end
 
-    def response
-      @response ||= Response.new(@raw_response)
+    def self.get_data(path, page=1)
+      url = [path, 'json', page].join('/')
+      response = get(url)
+      response.delete("version")
+      values = response.values
+      values.size == 1 ? values.first : values
     end
 
-    private
-    
-    def connection
-      @@conn ||= Faraday.new(url: ROOT_PATH) do |builder|
-        builder.request :url_encoded
-        builder.adapter :net_http
-      end
-    end
   end
 end

data/lib/hypem/track.rb

@@ -1,22 +1,10 @@
 module Hypem
   class Track
-    attr_accessor :media_id
+    include Helper
 
-    def initialize(arg)
-      if arg.is_a? Hash
-        keys_to_attributes arg
-      elsif arg.is_a? String
-        @media_id = arg
-      end
-    end
-
-    def get
-      request = Request.new("/playlist/item/#{media_id}/json/1").tap(&:get)
-      raw_hash = request.response.body.tap(&:shift)["0"]
-      keys_to_attributes raw_hash
-    end
+    attr_accessor :media_id
 
-    KEY_CONVERSIONS = {
+    convert_keys(
       mediaid: :media_id,
       dateposted: :dated_posted,
       siteid: :site_id,
@@ -29,23 +17,26 @@ module Hypem
       sitename: :site_name,
       dateposted: :date_posted,
       sitename_first: :site_name_first
-    }
+    )
 
-    DATETIME_CONVERSIONS = [:date_posted, :date_posted_first]
+    convert_datetimes :date_posted, :date_posted_first
 
-    private
-
-    def keys_to_attributes(raw_hash)
-      raw_hash.each_pair do |key,value|
-        converted_key = KEY_CONVERSIONS[key.to_sym]
-        key = converted_key unless converted_key.nil?
-
-        value = Time.at(value).to_datetime if DATETIME_CONVERSIONS.include? key
-        instance_variable_set("@#{key}",value)
-
-        self.class.class_eval { attr_reader key }
+    def initialize(arg)
+      if arg.is_a? Hash
+        update_from_response arg
+      elsif arg.is_a? String
+        @media_id = arg
+      else
+        raise
       end
     end
 
+    def get
+      response = Request.get_data("/playlist/item/#{media_id}")
+      update_from_response response
+      self
+    end
+
+
   end
 end

data/lib/hypem/user.rb

@@ -1,5 +1,10 @@
 module Hypem
   class User
+    include Helper
+
+    convert_keys fullname: :full_name, userpic: :image_url, joined_ts: :joined_at
+    convert_datetimes :joined_at
+
     attr_reader :name, :full_name, :joined_at, :location, :twitter_username, :image_url,
                 :followed_users_count, :followed_items_count, :followed_sites_count,
                 :followed_queries_count, :friends
@@ -9,23 +14,19 @@ module Hypem
       @name = name
     end
 
-    def api_request(path)
-      request = Request.new("/api/#{path}?username=#{@name}")
-      request.get
-      request.response.body
+    def get(resource)
+      Request.get_resource("#{resource}?username=#{@name}")
     end
 
     def get_profile
-      unless @has_profile
-        response = api_request('get_profile')
-        update_from_response(response)
-        @has_profile = true
-      end
-      return self
+      response = get('/get_profile')
+      flattened_response = flatten_response(response)
+      update_from_response(response)
+      self
     end
 
-    def get_favorite_blogs
-      response = api_request('get_favorite_blogs')
+    def favorite_blogs
+      response = get('/get_favorite_blogs')
 
       response.map do |r|
         blog = Hypem::Blog.new(r['siteid'])
@@ -34,12 +35,8 @@ module Hypem
       end
     end
 
-    def favorite_blogs
-      @favorite_blogs ||= get_favorite_blogs
-    end
-
-    def get_friends
-      response = api_request('get_friends')
+    def friends
+      response = get('/get_friends')
 
       response.map do |r|
         user = User.new(r['username'])
@@ -48,23 +45,6 @@ module Hypem
       end
     end
 
-    def friends
-      @friends ||= get_friends
-    end
-
-    def update_from_response(response)
-      @full_name              ||= response['fullname']
-      @location               ||= response['location']
-      @image_url              ||= response['userpic']
-      @followed_users_count   ||= response['favorites_count']['user']
-      @followed_items_count   ||= response['favorites_count']['item']
-      @followed_sites_count   ||= response['favorites_count']['site']
-      @followed_queries_count ||= response['favorites_count']['query']
-
-      # only returned on get_profile
-      @joined_at ||= Time.at(response['joined_ts']) unless response['joined_ts'].nil?
-      @twitter_username ||= response['twitter_username']
-    end
 
     #playlist requests
 
@@ -87,5 +67,16 @@ module Hypem
     def friends_history_playlist(page=1)
       @f_h_p ||= Playlist.friends_history(@name,page)
     end
+
+    private
+
+    def flatten_response(response)
+      count_hash = response.delete('favorites_count')
+      count_hash.each do |k,v|
+        pluralized_key = k == 'query' ? 'queries' : k + 's'
+        response["followed_#{pluralized_key}_count"] = v
+      end
+      response
+    end
   end
 end

data/lib/hypem/version.rb

@@ -1,3 +1,3 @@
 module Hypem
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/blog_spec.rb

@@ -14,23 +14,17 @@ describe Hypem::Blog do
 
     describe "#get_info" do
       subject do
-        VCR.use_cassette('blog') {blog.tap(&:get_info)}
+        VCR.use_cassette('blog') {blog.get_info}
       end
       specify {subject.should be_a Hypem::Blog}
       specify {subject.site_name.should == 'Pasta Primavera'}
       specify {subject.blog_image.should == 'http://static-ak.hypem.net/images/blog_images/4632.jpg'}
       specify {subject.blog_image_small.should == 'http://static-ak.hypem.net/images/blog_images/small/4632.jpg'}
       specify {subject.site_url.should == 'http://pastaprima.net'}
-      specify {subject.total_tracks.should == 4026}
-      specify {subject.first_posted.should be_a Time}
-      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
+      specify {subject.total_tracks.should be_an Integer}
+      specify {subject.first_posted.should be_a DateTime}
+      specify {subject.last_posted.should be_a DateTime}
+      specify {subject.followers.should be_an Integer}
 
     end
 

data/spec/fixtures/vcr_cassettes/blog.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.hypem.com/api/get_site_info?siteid=4632
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - text/html
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.0.12
+      Date:
+      - Tue, 26 Jun 2012 02:52:09 GMT
+      Content-Type:
+      - text/html
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - timeout=10
+      Set-Cookie:
+      - AUTH=03%3Af1682d84385b013d5d5ddb49ad4b6aba%3A1340679128%3A1276002699%3ACA-US;
+        expires=Thu, 22-Jun-2028 02:52:08 GMT; path=/; domain=hypem.com
+      X-Hacker:
+      - Hey, if you're reading this, you should drop us an email at hypem.com/contact,
+        maybe we can work together!
+      Access-Control-Allow-Origin:
+      - ! '*'
+      Access-Control-Allow-Headers:
+      - ! '*'
+    body:
+      encoding: US-ASCII
+      string: ! '{"siteid":"4632","sitename":"Pasta Primavera","siteurl":"http:\/\/pastaprima.net","followers":1359,"is_favorite":null,"total_tracks":4104,"last_posted":1340641909,"first_posted":1192804200,"blog_image":"http:\/\/static-ak.hypem.net\/images\/blog_images\/4632.jpg","blog_image_small":"http:\/\/static-ak.hypem.net\/images\/blog_images\/small\/4632.jpg"}'
+    http_version: 
+  recorded_at: Tue, 26 Jun 2012 02:52:38 GMT
+recorded_with: VCR 2.2.0