soundcloud-ruby-api-wrapper 0.4.4 → 0.4.5

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "soundcloud-ruby-api-wrapper"
-    gem.summary = %Q{A ruby wrapper for the SoundCloud API}
+    gem.summary = "A ruby wrapper for the SoundCloud API"
     gem.email = "johannes@wagener.cc"
     gem.homepage = "http://github.com/soundcloud/ruby-api-wrapper"
     gem.authors = ["Johannes Wagener"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 4 
-:patch: 4
+:patch: 5 

data/lib/soundcloud.rb

@@ -44,7 +44,27 @@ module Soundcloud
   #
   def self.register(options = {})
     options[:site] = options[:site] || 'http://api.soundcloud.com'
-    OAuthActiveResource.register(self.ancestors.first, self.ancestors.first.const_get('Models'), options)
+    mod = OAuthActiveResource.register(self.ancestors.first, self.ancestors.first.const_get('Models'), options)
+    add_resolver_to_mod(mod)
+  end
+  
+  
+  # Quick hack to add support api.soundcloud.com/resolve . TODO jw cleanup :) 
+  def self.add_resolver_to_mod(mod)
+    mod.module_eval do 
+      def self.resolve(url)
+        base = self.const_get('Base')
+        response = base.oauth_connection.get("/resolve?url=#{url}")
+        if response.code == "302"
+          path = URI.parse(response.header['Location']).path
+          resource_class = base.new.send(:find_or_create_resource_for_collection, path.split('/')[-2])
+          resource_class.find(:one, :from => path)
+        else
+          raise ActiveResource::ResourceNotFound.new(response)
+        end
+      end
+    end
+    mod
   end
 end
 
@@ -54,4 +74,6 @@ require 'soundcloud/models/comment'
 require 'soundcloud/models/event'
 require 'soundcloud/models/playlist'
 require 'soundcloud/models/track'
+require 'soundcloud/models/group'
+
 

data/lib/soundcloud/models/group.rb

@@ -0,0 +1,24 @@
+module Soundcloud
+  module Models  
+    # Look up the resource attributes and filtering usage here:
+    #
+    # SC API Attributes (as of 26/05/09):
+    # ......
+    # * users (array)
+    # * moderators (array)
+    # * members (array)
+    # * contributors (array)
+    # * tracks (array)
+    
+    class Group < Base
+      has_many :users, :moderators, :members, :contributors, :tracks
+      
+      # NOT IMPLEMENTED ON THE API YET
+      #cattr_accessor :data_attributes
+      #self.data_attributes = ['artwork_data']      
+      
+      cattr_accessor :element_name
+      self.element_name = 'group'   
+    end    
+  end
+end

data/lib/soundcloud/models/user.rb

@@ -97,7 +97,19 @@ module Soundcloud
     end
     
     class Fan < User #:nodoc:
-    end    
+    end
+        
+    class Creator < User #:nodoc:
+    end
+    
+    class Contributor < User
+    end
+    
+    class Member < User #:nodoc:
+    end
+    
+    class Moderator < User #:nodoc:
+    end
   end
 end
 

data/soundcloud-ruby-api-wrapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soundcloud-ruby-api-wrapper}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Wagener"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2009-11-21}
   s.email = %q{johannes@wagener.cc}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "lib/soundcloud/models/base.rb",
      "lib/soundcloud/models/comment.rb",
      "lib/soundcloud/models/event.rb",
+     "lib/soundcloud/models/group.rb",
      "lib/soundcloud/models/playlist.rb",
      "lib/soundcloud/models/track.rb",
      "lib/soundcloud/models/user.rb",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/test_track.mp3",
      "spec/soundcloud_comment_spec.rb",
      "spec/soundcloud_event_spec.rb",
+     "spec/soundcloud_group_spec.rb",
      "spec/soundcloud_playlist_spec.rb",
      "spec/soundcloud_spec.rb",
      "spec/soundcloud_track_spec.rb",
@@ -48,6 +50,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/soundcloud_comment_spec.rb",
      "spec/soundcloud_event_spec.rb",
+     "spec/soundcloud_group_spec.rb",
      "spec/soundcloud_playlist_spec.rb",
      "spec/soundcloud_spec.rb",
      "spec/soundcloud_track_spec.rb",

data/spec/soundcloud_group_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Soundcloud::Models::Group" do 
+  before(:all) do
+    @sc = Soundcloud.register({:access_token=> valid_oauth_access_token, :site => soundcloud_site})
+
+    @api_test_1 = @sc.User.find('api-test-1')    
+    @api_test_2 = @sc.User.find('api-test-2')    
+    @api_test_3 = @sc.User.find('api-test-3')
+  end
+  
+  # static-test-group id = 2937
+  # api_test_1 - creator
+  # api_test_3 - member
+  # api_test_2 track1 should be contributied
+  
+  it 'should find all (50) groups' do
+    @sc.Group.find(:all)
+  end
+  
+  it 'should get the fixture group' do
+    group = @sc.Group.find(2937)
+    group.name.should == "static-test-group"
+  end
+  
+  
+  describe 'users' do
+    before do
+      @group = @sc.Group.find(2937)
+    end
+    
+    it 'should have the right creatotr api_test_1' do
+      @group.creator.uri.should == @api_test_1.uri
+    end
+    
+    it 'should have api_test_3 has a member' do
+      @group.members.should include(@api_test_3)
+    end
+    
+    it 'should have api_test_2 as a contributor' do
+      @group.contributors.should include(@api_test_2)
+    end
+    
+    it 'should have a contributed track' do
+      @group.tracks.map(&:uri).should include('http://api.sandbox-soundcloud.com/tracks/875948')
+    end
+    
+  end
+  
+end

data/spec/soundcloud_spec.rb

@@ -38,6 +38,5 @@ describe "Soundcloud" do
     sc = Soundcloud.register({:access_token=> valid_oauth_access_token, :site => soundcloud_site})
     sc.to_s.should match(/Soundcloud::.+/)
     lambda{ sc.User.find(:one, :from => "/me")}.should_not raise_error ActiveResource::UnauthorizedAccess
-  end  
-  
+  end    
 end

data/spec/soundcloud_track_spec.rb

@@ -178,4 +178,7 @@ describe "Soundcloud::Models::Track" do
     @test_track_1.user.online.should_not be nil
   end
 
+  it 'should resolve a track' do
+    @sc.resolve(@test_track_1.permalink_url).should == @test_track_1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud-ruby-api-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +01:00
+date: 2009-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/soundcloud/models/base.rb
 - lib/soundcloud/models/comment.rb
 - lib/soundcloud/models/event.rb
+- lib/soundcloud/models/group.rb
 - lib/soundcloud/models/playlist.rb
 - lib/soundcloud/models/track.rb
 - lib/soundcloud/models/user.rb
@@ -63,6 +64,7 @@ files:
 - spec/fixtures/test_track.mp3
 - spec/soundcloud_comment_spec.rb
 - spec/soundcloud_event_spec.rb
+- spec/soundcloud_group_spec.rb
 - spec/soundcloud_playlist_spec.rb
 - spec/soundcloud_spec.rb
 - spec/soundcloud_track_spec.rb
@@ -99,6 +101,7 @@ summary: A ruby wrapper for the SoundCloud API
 test_files: 
 - spec/soundcloud_comment_spec.rb
 - spec/soundcloud_event_spec.rb
+- spec/soundcloud_group_spec.rb
 - spec/soundcloud_playlist_spec.rb
 - spec/soundcloud_spec.rb
 - spec/soundcloud_track_spec.rb