hypem 0.1.6 → 0.2.0

data/README.md

@@ -70,31 +70,32 @@ Blogs can be retrieved using a blog's unique id via `Hypem.blog(1234)` and have
 ******
 
 ### Track ###
-All Playlist objects have a `tracks` attribute containing an array of `Hypem::Track`'s. A sample object inspect is as follows:
-
-      #<Hypem::Track
-        artist="Hot Chip"
-        date_loved=1332109580
-        date_posted=1332252311
-        description="O Hot Chip está de volta com um novo álbum, In Our Heads, que vai ser lançado oficialmente em junho, mas já conta com seu primeiro vídeo, “Flutes”, disponível para visualização. A faixa serve de abertura para o novo álbum dos já bem sucedidos garotos, e p"
-        itunes_link="http://hypem.com/go/itunes_search/Hot%20Chip"
-        loved_count=4912
-        media_id="1jsw9"
-        post_id=1753700
-        post_url="http://www.ohmyrock.net/2012/03/hot-chip-flutes/"
-        posted_count=14
-        site_id=14635
-        sitename="Oh My Rock"
-        thumb_url="http://static-ak.hypem.net/images/albumart4.gif"
-        thumb_url_large="http://static-ak.hypem.net/images/blog_images/14635.png"
-        time=425
-        title="Flutes">
+Tracks can be initialized using a known `media_id` via `Hypem.track('media_id')` and synced using the `get` method on any instance. Depending on the playlist type, some tracks may have more detailed attributes than other.
+
+An example track object inspection is as follows:
+
+``` 
+@media_id="1jsw9",
+@artist="Hot Chip",
+@title="Flutes",
+@date_posted=#<DateTime: 2012-06-08T16:57:00-07:00 ((2456087j,86220s,0n),-25200s,2299161j)>,
+@site_id=16116,
+@site_name="the untz and the indie",
+@post_url="http://theuntzandtheindie.com/2012/06/08/hot-chip-party/",
+@post_id=1835105,
+@loved_count=9050,
+@posted_count=33,
+@thumb_url="http://static-ak.hypem.net/images/albumart0.gif",
+@thumb_url_large="http://static-ak.hypem.net/images/blog_images/16116.png",
+@time=425,
+@description="Today’s Indie: If I Was Your Girlfriend (Hot Chip Cover) / Prince /// Motion Sickness / Hot Chip /// Flutes / Hot Chip So the indie extraordinaire and goddess of all things awesome is out of town up in the Pac NW gettin silly and listening to dAHnce music",
+@itunes_link="http://hypem.com/go/itunes_search/Hot%20Chip"
+```
 
 ****** 
 
 ## TODO ###
 - Blogs with given tag
-- Single track info
 - Authenticated Requests
 - Favorite a track
 - Log Playback

data/fixtures/vcr_cassettes/single_track.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://hypem.com/playlist/item/1jsw9/json/1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx/1.0.12
+      date:
+      - Sat, 09 Jun 2012 02:48:22 GMT
+      content-type:
+      - text/javascript; charset=UTF-8
+      transfer-encoding:
+      - chunked
+      connection:
+      - close
+      set-cookie:
+      - AUTH=03%3Ae48651417fd18bf71afd356c3c50506e%3A1339210102%3A1276002699%3ACA-US;
+        expires=Mon, 05-Jun-2028 02:48:22 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:
+      - ! '*'
+      vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: ! '{"version":"1.1","0":{"mediaid":"1jsw9","artist":"Hot Chip","title":"Flutes","dateposted":1339199820,"siteid":16116,"sitename":"the
+        untz and the indie","posturl":"http:\/\/theuntzandtheindie.com\/2012\/06\/08\/hot-chip-party\/","postid":1835105,"loved_count":9049,"posted_count":33,"thumb_url":"http:\/\/static-ak.hypem.net\/images\/albumart2.gif","thumb_url_large":"http:\/\/static-ak.hypem.net\/images\/blog_images\/16116.png","time":425,"description":"Today\u2019s
+        Indie: If I Was Your Girlfriend (Hot Chip Cover) \/ Prince \/\/\/ Motion Sickness
+        \/ Hot Chip \/\/\/ Flutes \/ Hot Chip So the indie extraordinaire and goddess
+        of all things awesome is out of town up in the Pac NW gettin silly and listening
+        to dAHnce music","itunes_link":"http:\/\/hypem.com\/go\/itunes_search\/Hot%20Chip"}}'
+    http_version: 
+  recorded_at: Sat, 09 Jun 2012 02:48:27 GMT
+recorded_with: VCR 2.1.1

data/hypem.gemspec

@@ -23,6 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_dependency 'faraday', '~> 0.7'
   s.add_dependency 'multi_json', '~> 1.1'
-  s.add_dependency 'hashie', '~> 1.2'
 
 end

data/lib/hypem/blog.rb

@@ -1,5 +1,3 @@
-require 'hashie'
-
 module Hypem
   class Blog
     attr_reader :blog_image, :blog_image_small, :first_posted,

data/lib/hypem/playlist.rb

@@ -15,8 +15,7 @@ module Hypem
     def get
       response = Request.new(@path).tap(&:get).response
       @tracks = []
-      # getting rid of version cell
-      response.body.shift
+      response.body.shift # getting rid of version cell
       response.body.each_value{|v| @tracks << Track.new(v)}
     end
 
@@ -38,7 +37,7 @@ module Hypem
 
     def self.new_from_tracks(tracks)
       track_params = tracks.map(&:id).join(',')
-      Playlist.new('set',track_params)
+      Playlist.new('set',track_params).tap { |p| p.tracks = tracks }
     end
 
     def self.latest(filter=:all,page=nil)

data/lib/hypem/track.rb

@@ -1,35 +1,51 @@
-require 'hashie'
-
 module Hypem
+  class Track
+    attr_accessor :media_id
 
-  class Track < Hashie::Trash
-    property :media_id, from: :mediaid
-    property :artist
-    property :title
-    property :date_posted, from: :dateposted
-    property :site_id, from: :siteid
-    property :sitename
-    property :post_url, from: :posturl
-    property :post_url_first, from: :posturl_first
-    property :post_id, from: :postid
-    property :date_posted_first, from: :dateposted_first
-    property :site_id_first, from: :siteid_first
-    property :site_name_first, from: :sitename_first
-    property :post_id_first, from: :postid_first
-    property :loved_count
-    property :posted_count
-    property :thumb_url
-    property :thumb_url_large
-    property :time
-    property :description
-    property :itunes_link
-    property :date_played, from: :dateplayed
-    property :date_loved, from: :dateloved
-    property :user_name, from: :username
-    property :full_name, from: :fullname
-    property :via_query
-    property :plays #used by obsessed playlist
+    def initialize(arg)
+      if arg.is_a? Hash
+        keys_to_attributes arg
+      elsif arg.is_a? String
+        @media_id = arg
+      end
+    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
+
+    KEY_CONVERSIONS = {
+      mediaid: :media_id,
+      dateposted: :dated_posted,
+      siteid: :site_id,
+      posturl: :post_url,
+      posturl_first: :post_url_first,
+      postid: :post_id,
+      postid_first: :post_id_first,
+      dateposted_first: :date_posted_first,
+      siteid_first: :site_id_first,
+      sitename: :site_name,
+      dateposted: :date_posted,
+      sitename_first: :site_name_first
+    }
+
+    DATETIME_CONVERSIONS = [: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 }
+      end
+    end
+
+  end
 end

data/lib/hypem/version.rb

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

data/spec/playlist_spec.rb

@@ -13,30 +13,21 @@ describe Hypem::Playlist do
 
   ########################################
   
-  context "when initialized" do
-    its(:path) { should == "/playlist/latest/all/json/1" }
+  its(:path) { should == "/playlist/latest/all/json/1" }
+  its(:tracks) { should_not be_empty }
 
-    it "assigns proper path for blog" do
-      blog_playlist.path.should == "/playlist/blog/1/json/1"
+  describe "#url" do
+    it "returns the correct playlist url " do
+      subject.url.should == 'http://hypem.com/playlist/latest/all/json/1'
     end
   end
 
-  context "after get" do
-    its(:tracks) { should_not be_empty }
-  end
-
   describe ".new_from_tracks" do
     let(:tracks) {[mock('Hypem::Track',id: 'track1',), mock('Hypem::Track',id:'track2')]}
     subject { Hypem::Playlist.new_from_tracks(tracks) }
     it { should be_a Hypem::Playlist }
     its(:path) { should == '/playlist/set/track1,track2/json/1' }
-
-  end
-
-  describe "#url" do
-    it "returns the correct playlist url " do
-      subject.url.should == 'http://hypem.com/playlist/latest/all/json/1'
-    end
+    its(:tracks) { should_not be_empty }
   end
 
   describe ".latest" do
@@ -121,6 +112,43 @@ describe Hypem::Playlist do
     end
   end
 
+  shared_examples_for "generic method" do
+    before do
+      Hypem::Playlist.any_instance.stub(:get)
+    end
+    specify { described_class.send(method,:an_argument).should be_a described_class }
+  end
+
+  describe ".blog" do
+    let(:method) { :blog }
+    it_should_behave_like "generic method"
+  end
+
+  describe ".search" do
+    let(:method) { :search }
+    it_should_behave_like "generic method"
+  end
+
+  describe ".artist" do
+    let(:method) { :artist }
+    it_should_behave_like "generic method"
+  end
+
+  describe ".feed" do
+    let(:method) { :feed }
+    it_should_behave_like "generic method"
+  end
+
+  describe ".loved" do
+    let(:method) { :loved }
+    it_should_behave_like "generic method"
+  end
+
+  describe ".obsessed" do
+    let(:method) { :obsessed }
+    it_should_behave_like "generic method"
+  end
+
   describe "pagination" do
     before do
       playlist

data/spec/track_spec.rb

@@ -3,14 +3,61 @@ require 'spec_helper'
 describe Hypem::Track do
   let(:track_hash) do
     VCR.use_cassette('latest_playlist') do
-      Hypem::Playlist.latest.tracks.first
+      Hypem::Playlist.any_instance.stub(:get)
+      path = Hypem::Playlist.latest.path
+      # TODO this is fucking gross
+      Hypem::Request.new(path).tap(&:get).response.body.tap(&:shift)["0"]
     end
   end
 
-  let(:track) { Hypem::Track.new(track_hash) }
+  let(:media_id) { '1jsw9' }
+  let(:track_from_hash) { described_class.new(track_hash) }
+  let(:track_from_string) { described_class.new(media_id) }
 
-  it "is reformats variable names" do
-    track.media_id.should_not be_nil
+  shared_examples_for "a basic synced instance" do
+    its(:media_id) { should be_a String }
+    its(:artist) { should be_a String }
+    its(:title) { should be_a String }
+    its(:date_posted) { should be_a DateTime }
+    its(:site_id) { should be_an Integer }
+    its(:site_name) { should be_a String }
+    its(:post_url) { should be_a String }
+    its(:post_id) { should be_an Integer }
+    its(:loved_count) { should be_an Integer }
+    its(:posted_count) { should be_an Integer }
+    its(:thumb_url) { should be_a String }
+    its(:thumb_url_large) { should be_a String }
+    its(:time) { should be_an Integer }
+    its(:description) { should be_a String }
+    its(:itunes_link) { should be_a String }
+  end
+
+  shared_examples_for "a detailed synced instance" do
+    it_should_behave_like "a basic synced instance"
+    its(:post_url_first) { should be_a String }
+    its(:post_id_first) { should be_an Integer }
+    its(:site_name_first) { should be_a String }
+    its(:date_posted_first) { should be_a DateTime }
+    its(:site_id_first) { should be_an Integer }
+  end
+
+  describe "#initialize" do
+    context "from a hash" do
+      subject { track_from_hash }
+      it_should_behave_like "a detailed synced instance"
+    end
+
+    context "from a media_id" do
+      subject { track_from_string }
+      its(:media_id) { should == media_id }
+    end
+  end
+
+  describe "#get" do
+    subject do
+      VCR.use_cassette("single_track") { track_from_string.tap(&:get) }
+    end
+    it_should_behave_like "a basic synced instance"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypem
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70186325743340 !ruby/object:Gem::Requirement
+  requirement: &70340590270340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70186325743340
+  version_requirements: *70340590270340
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70186325742880 !ruby/object:Gem::Requirement
+  requirement: &70340590269880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70186325742880
+  version_requirements: *70340590269880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70186325742500 !ruby/object:Gem::Requirement
+  requirement: &70340590269500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186325742500
+  version_requirements: *70340590269500
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70186325741960 !ruby/object:Gem::Requirement
+  requirement: &70340590268960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70186325741960
+  version_requirements: *70340590268960
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70186325741460 !ruby/object:Gem::Requirement
+  requirement: &70340590268460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +65,7 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70186325741460
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &70186325741000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70186325741000
+  version_requirements: *70340590268460
 description: 
 email:
 - jackcanderson@gmail.com
@@ -101,6 +90,7 @@ files:
 - fixtures/vcr_cassettes/loved_playlist.yml
 - fixtures/vcr_cassettes/obsessed_playlist.yml
 - fixtures/vcr_cassettes/popular_playlist.yml
+- fixtures/vcr_cassettes/single_track.yml
 - fixtures/vcr_cassettes/user_favorite_blogs.yml
 - fixtures/vcr_cassettes/user_friends.yml
 - fixtures/vcr_cassettes/user_profile.yml
@@ -142,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3176725025681081128
+      hash: 3510540454550370987
 requirements: []
 rubyforge_project: hypem
 rubygems_version: 1.8.10