soundcloud-ruby-api-wrapper 0.3.3 → 0.3.4

data/VERSION.yml

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

data/lib/soundcloud/models/base.rb

@@ -4,6 +4,29 @@ module Soundcloud
       #      self.site = 'http://api.soundcloud.dev'
       
       
+      def send_files(method,path,resource)
+       params = ActiveSupport::OrderedHash.new
+       self.attributes.reject { |k,v| data_attributes.include?(k)}.each { |k,v| 
+           params["#{resource}[#{k}]".to_sym] = v 
+       }
+       
+       # ignore is added because the multipart gem is adding an extra new line 
+       # to the last parameter which will break parsing of track[sharing]
+       params[:ignore] = 'multipart bug'
+       
+       files = {}
+       data_attributes.each do |attr|
+         files["#{resource}[#{attr}]".to_sym] = self.attributes[attr] if self.attributes.has_key?(attr)
+         self.attributes[attr] = nil
+       end
+       
+       response = connection.handle_response(self.class.send_multipart_request(method,path,files,params))
+
+       self.id = id_from_response(response)
+       load_attributes_from_response(response)
+      
+      end
+      
       # has_many_single_changeable and can_be_a_single_changeable is mostly used in combination with has_many.
       #
       # can_be_a_single_changeable expects to have a resource /me which is the logged-in user
@@ -39,7 +62,7 @@ module Soundcloud
       #
       #   friend.has_friend?(stranger.id)
       #  => checks if stranger and friend are friend, returns true or false
-      
+
       def self.can_be_a_single_changeable(*args)
         args.each do |k| 
           singular = k.to_s

data/lib/soundcloud/models/playlist.rb

@@ -41,6 +41,8 @@ module Soundcloud
     class Playlist < Base
       belongs_to :user
       #      has_many :permissions
+      cattr_accessor :data_attributes
+      self.data_attributes = ['artwork_data']
       cattr_accessor :element_name    
       self.element_name = 'playlist'    
       def initialize(*args)
@@ -48,6 +50,26 @@ module Soundcloud
         #create empty tracks array if not existing
         attributes['tracks'] = Array.new if not self.tracks?
       end
+      
+      def update
+        if data_attributes.all? { |attr| self.attributes[attr].nil? }
+          super
+        else
+          send_files(:put,"/playlists/#{self.id}",'playlist')
+        end
+      end
+                
+      def create
+        if data_attributes.all? { |attr| self.attributes[attr].nil? }
+          super
+        else
+         # default to private
+         if self.sharing?.nil? 
+           self.sharing = 'private'
+         end
+         send_files(:post,'/playlists', 'playlist')
+        end
+      end
     end        
   end
 end

data/lib/soundcloud/models/track.rb

@@ -85,7 +85,9 @@ module Soundcloud
       belongs_to :user
       has_many :permissions, :comments
       can_be_a_single_changeable :favorite
-            
+      cattr_accessor :data_attributes
+      self.data_attributes = ['asset_data', 'artwork_data']      
+      
       cattr_accessor :element_name
       self.element_name = 'track'
      
@@ -111,38 +113,22 @@ module Soundcloud
       end
         
       def update
-        unless attributes[:asset_data].nil?
-          raise 'Multipart update is NotImplemented'
-          self.class.send_multipart_request(:put,'/tracks/#{self.id}','replacement[asset_data]',@asset_data)
+        if data_attributes.all? { |attr| self.attributes[attr].nil? }
+          super
+        else
+          send_files(:put,"/tracks/#{self.id}",'track')
         end
-        super
       end
                 
       def create
-        if self.asset_data.nil?
+        if data_attributes.all? { |attr| self.attributes[attr].nil? }
           super
         else
-         #post asset_data 
-         
          # default to private
          if self.sharing?.nil? 
            self.sharing = 'private'
          end
-         
-         params = ActiveSupport::OrderedHash.new
-         self.attributes.reject { |k,v| k.to_s == 'asset_data'}.each { |k,v| 
-             params["track[#{k}]".to_sym] = v 
-         }
-         
-         # ignore is added because the multipart gem is adding an extra new line 
-         # to the last parameter which will break parsing of track[sharing]
-         params[:ignore] = 'multipart bug'
-         
-         response = connection.handle_response(self.class.send_multipart_request(:post,'/tracks','track[asset_data]',self.asset_data,params))
-
-         self.id = id_from_response(response)
-         load_attributes_from_response(response)
-         self.asset_data = nil
+         send_files(:post,'/tracks','track')
       end
     end      
   end    

data/ruby-api-wrapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-api-wrapper}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Wagener"]
-  s.date = %q{2009-07-22}
+  s.date = %q{2009-09-03}
   s.email = %q{johannes@wagener.cc}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/soundcloud/models/track.rb",
      "lib/soundcloud/models/user.rb",
      "ruby-api-wrapper.gemspec",
+     "spec/fixtures/test_artwork.gif",
      "spec/fixtures/test_track.mp3",
      "spec/soundcloud_comment_spec.rb",
      "spec/soundcloud_event_spec.rb",

data/spec/soundcloud_playlist_spec.rb

@@ -43,4 +43,23 @@ describe 'Soundcloud::Models::Playlist' do
     pl.user.online.should_not be nil
   end
   
+  
+  it "should be able to update a playlist artwork" do
+    test_artwork_file = File.new( File.dirname(__FILE__) + '/fixtures/test_artwork.gif')
+    playlist = @sc.Playlist.find('my-static-playlist')
+    old_artwork = playlist.artwork_url
+    playlist.artwork_data = test_artwork_file
+    
+    playlist.save
+    playlist.artwork_url.should_not == old_artwork
+  end
+  
+  it "should be able to create a new playlist with artwork" do
+    #track = @sc.Track.find('static-test-track')   
+    test_artwork_file = File.new( File.dirname(__FILE__) + '/fixtures/test_artwork.gif')
+        
+    playlist = @sc.Playlist.create({:title => 'test', :artwork_data => test_artwork_file})
+    playlist.artwork_url.should_not == nil
+    #playlist.destroy
+  end
 end

data/spec/soundcloud_track_spec.rb

@@ -25,6 +25,7 @@ describe "Soundcloud::Models::Track" do
 
   end
   
+  
   it "should be able to create a new track and default to sharing=private" do
     test_track_file = File.new( File.dirname(__FILE__) + '/fixtures/test_track.mp3')
     track = @sc.Track.create({:title => "test", :asset_data => test_track_file})  
@@ -33,6 +34,15 @@ describe "Soundcloud::Models::Track" do
     track.destroy
   end
   
+  it "should be able to create a new track with artwork" do
+    test_track_file = File.new( File.dirname(__FILE__) + '/fixtures/test_track.mp3')
+    test_artwork_file = File.new( File.dirname(__FILE__) + '/fixtures/test_artwork.gif')
+    track = @sc.Track.create({:title => "test", :asset_data => test_track_file, :artwork_data => test_artwork_file})  
+    
+    track.artwork_url.should_not == nil
+    track.destroy
+  end
+  
   it "should be able to create a new public track and sharing should stay public" do
     test_track_file = File.new( File.dirname(__FILE__) + '/fixtures/test_track.mp3')
     track = @sc.Track.create({:title => "test", :sharing => 'public', :asset_data => test_track_file})
@@ -41,6 +51,17 @@ describe "Soundcloud::Models::Track" do
     track.destroy
   end
   
+  it "should be able to update a track artwork" do
+    test_artwork_file = File.new( File.dirname(__FILE__) + '/fixtures/test_artwork.gif')
+    track = @sc.Track.find('static-test-track')   
+    old_artwork = track.artwork_url
+    track.artwork_data = test_artwork_file
+    
+    track.save
+    track.artwork_url.should_not == old_artwork
+  end
+  
+  
   it 'should be able to create a new track and remove it' do
     test_track_file = File.new(File.dirname(__FILE__) + '/fixtures/test_track.mp3')
 
@@ -57,15 +78,61 @@ describe "Soundcloud::Models::Track" do
   
   it 'should be able to update an attribute' do
     track = @sc.Track.find('static-test-track')   
+    time = Time.now
+    track.title = "T #{time}"
+    track.save
+    track.title = 'something else'
+    
+    track.reload
 
-    track.title = 'This is updated'
+    track.title.should == "T #{time}"
+  end
+  
+  it 'should be able to update tag_list directly' do
+    track = @sc.Track.find('static-test-track')
+    time = Time.now
+    track.tag_list = "T#{time} B#{time}"
     track.save
+    track.tag_list = 'something else'
 
     track.reload
 
-    track.title.should == 'This is updated'
+    track.tag_list.should == "T#{time} B#{time}" 
   end
   
+ # it 'should be able to read the tags array' do
+ #   track = @sc.Track.new
+ #   
+ #   track.tag_list = "bla blub"
+ #   
+ #   track.tags.include?('bla').should == true
+ #   track.tags.include?('blub').should == true
+ # end
+ # 
+ # 
+ # it 'should be able to write to the tags array' do
+ #   track = @sc.Track.new
+ #   
+ #   track.tags << 'bla'
+ #   track.tags << 'blub'
+ #   
+ #   track.tag_list.should == "bla blub"
+ # end
+  
+  #it 'should be able to update the tags array' do 
+  #  track = @sc.Track.find('static-test-track')
+  #  time = Time.now
+  #  track.tags << "'bl ub'"
+  #  track.save
+  #  track.tags.include?("'bl ub'").should == true
+  #  
+  #  track.tags.delete('')
+  #  
+  #  #reload
+  #  #tag_list.should_contain
+  #  #tags.include? 'bla
+  #end
+  
   it 'should be able to add a user to permissions of a track and delete it again' do
     track = @sc.Track.find(:one, :from => '/users/api-test-1/tracks/static-test-track')   
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud-ruby-api-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/soundcloud/models/track.rb
 - lib/soundcloud/models/user.rb
 - ruby-api-wrapper.gemspec
+- spec/fixtures/test_artwork.gif
 - spec/fixtures/test_track.mp3
 - spec/soundcloud_comment_spec.rb
 - spec/soundcloud_event_spec.rb