officialfm 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    officialfm (0.2.1)
+    officialfm (0.2.2)
       faraday (~> 0.8.1)
       faraday_middleware (~> 0.8.8)
       hashie (~> 1.2)

data/README.md

@@ -121,12 +121,24 @@ Search results being paged, you can request a specific page with the page parame
 officialfm.tracks('Kids', page: 2)
 ```
 
+Filter results by track type (original, remix, cover, mashup, mixtape):
+
+```ruby
+officialfm.tracks('Mac Miller', types: ['original', 'remix'])
+```
+
 Get info about a specific track:
 
 ```ruby
 officialfm.track('1nnQ')
 ```
 
+Get the artwork and streaming urls
+
+```ruby
+officialfm.track('1nnQ', fields: ['cover', 'streaming'])
+```
+
 ### Playlists
 
 Search for a playlist (again you can pass an optional `page` parameter to get a

data/lib/officialfm/client.rb

@@ -93,5 +93,16 @@ module OfficialFM
       response.extend(mixin_module)
     end
 
+    def get(url, options={})
+      # Arrays should be transformed into comma separated lists
+      options.each do |k, v|
+        if v.is_a? Array
+          options[k] = v.join(',')
+        end
+      end
+
+      connection.get(url, options)
+    end
+
   end
 end

data/lib/officialfm/playlists.rb

@@ -3,7 +3,7 @@ module OfficialFM
 
     # Search for a playlist
     def playlists(search_param, options={})
-      response = connection.get '/playlists/search', options.merge(:q => search_param)
+      response = get '/playlists/search', options.merge(:q => search_param)
 
       response.body.playlists.map! do |p|
         # remove the unnecessary root
@@ -21,14 +21,14 @@ module OfficialFM
     def playlist(id, options={})
       url = resource_url(id, parent: 'playlists')
 
-      response = connection.get(url, options).body.playlist
+      response = get(url, options).body.playlist
       extend_response(response, PlaylistMethods)
     end
 
     def playlist_tracks(id, options={})
       url = resource_url(id, { parent: 'playlists', child: 'tracks' })
 
-      response = connection.get url, options
+      response = get url, options
 
       tracks = response.body.tracks.map do |t|
         # remove the unnecessary root

data/lib/officialfm/projects.rb

@@ -3,7 +3,7 @@ module OfficialFM
 
     # Search for a project
     def projects(search_param, options={})
-      response = connection.get '/projects/search', options.merge(:q => search_param)
+      response = get '/projects/search', options.merge(:q => search_param)
 
       response.body.projects.map! do |p|
         # remove the unnecessary root
@@ -21,14 +21,14 @@ module OfficialFM
     def project(id, options={})
       url = resource_url(id, parent: 'projects')
 
-      response = connection.get(url, options).body.project
+      response = get(url, options).body.project
       extend_response(response, ProjectMethods)
     end
 
     def project_playlists(id, options={})
       url = resource_url(id, { parent: 'projects', child: 'playlists' })
 
-      response = connection.get url, options
+      response = get url, options
 
       playlists = response.body.playlists.map do |p|
         # remove the unnecessary root
@@ -41,7 +41,7 @@ module OfficialFM
     def project_tracks(id, options={})
       url = resource_url(id, { parent: 'projects', child: 'tracks' })
 
-      response = connection.get url, options
+      response = get url, options
 
       tracks = response.body.tracks.map do |t|
         # remove the unnecessary root

data/lib/officialfm/tracks.rb

@@ -3,7 +3,7 @@ module OfficialFM
 
     # Search for tracks
     def tracks(search_param, options={})
-      response = connection.get '/tracks/search', options.merge(:q => search_param)
+      response = get '/tracks/search', options.merge(:q => search_param)
 
       response.body.tracks.map! do |t|
         # remove useless root
@@ -17,7 +17,7 @@ module OfficialFM
     def track(id, options={})
       url = resource_url(id, parent: 'tracks')
 
-      response = connection.get url, options
+      response = get url, options
       response.body.track
     end
 

data/lib/officialfm/version.rb

@@ -1,3 +1,3 @@
 module OfficialFM
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/tracks_test.rb

@@ -18,8 +18,6 @@ class TracksTest < Test::Unit::TestCase
       should "return a track" do
         id = 42
         @stubs.get("/tracks/#{id}") {[200, {}, 'test']}
-        raise "Implement"
-        @client.track(id)
 
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: officialfm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &12505040 !ruby/object:Gem::Requirement
+  requirement: &18552540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *12505040
+  version_requirements: *18552540
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &12502720 !ruby/object:Gem::Requirement
+  requirement: &18550200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.8
   type: :runtime
   prerelease: false
-  version_requirements: *12502720
+  version_requirements: *18550200
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &12502120 !ruby/object:Gem::Requirement
+  requirement: &18543260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *12502120
+  version_requirements: *18543260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12501100 !ruby/object:Gem::Requirement
+  requirement: &18540680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *12501100
+  version_requirements: *18540680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12500040 !ruby/object:Gem::Requirement
+  requirement: &18536920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *12500040
+  version_requirements: *18536920
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &12498640 !ruby/object:Gem::Requirement
+  requirement: &18535700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *12498640
+  version_requirements: *18535700
 - !ruby/object:Gem::Dependency
   name: jnunemaker-matchy
-  requirement: &12487520 !ruby/object:Gem::Requirement
+  requirement: &18534860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *12487520
+  version_requirements: *18534860
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &12486460 !ruby/object:Gem::Requirement
+  requirement: &18532180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *12486460
+  version_requirements: *18532180
 description: Official Ruby bindings for the official.fm v2 API
 email:
 - dimiter@official.fm