soundcloud-ruby-api-wrapper 0.2.1 → 0.3.1

data/VERSION.yml

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

data/lib/soundcloud/models/track.rb

@@ -87,7 +87,6 @@ module Soundcloud
       can_be_a_single_changeable :favorite
             
       cattr_accessor :element_name
-      attr_accessor :asset_data
       self.element_name = 'track'
      
       def download_url
@@ -106,14 +105,13 @@ module Soundcloud
       end
       
       # multipart stuff, to upload a soundfile 
-          
-      @asset_data = nil
+        
       def set_asset_data(file)
-        @asset_data = file          
+        self.asset_data = file          
       end
         
       def update
-        if not @asset_data.nil?
+        if not self.asset_data.nil?
           raise 'Multipart update is NotImplemented'
           self.class.send_multipart_request(:put,'/tracks/#{self.id}','replacement[asset_data]',@asset_data)
         end
@@ -121,16 +119,30 @@ module Soundcloud
       end
                 
       def create
-        if @asset_data.nil?
+        if self.asset_data.nil?
           super
         else
-         #post asset_data            
-         params = {'track[title]' => self.title,'track[sharing]' => self.sharing}
-         response = connection.handle_response(self.class.send_multipart_request(:post,'/tracks','track[asset_data]',@asset_data,params))
+         #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)
-         @asset_data = nil
-         # second, 'normal' update request
-         update
+         load_attributes_from_response(response)
+         self.asset_data = nil
       end
     end      
   end    

data/lib/soundcloud.rb

@@ -23,8 +23,7 @@ module Soundcloud
         :site               => site,
         :request_token_path => "/oauth/request_token",
         :access_token_path  => "/oauth/access_token",
-        :authorize_path     => "/oauth/authorize",
-        :scheme             => :query_string
+        :authorize_path     => "/oauth/authorize"
       })    
   end
 

data/ruby-api-wrapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-api-wrapper}
-  s.version = "0.2.1"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Wagener"]
-  s.date = %q{2009-07-03}
+  s.date = %q{2009-07-10}
   s.email = %q{johannes@wagener.cc}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -21,37 +21,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
-     "doc/classes/Soundcloud.html",
-     "doc/classes/Soundcloud.src/M000001.html",
-     "doc/classes/Soundcloud.src/M000002.html",
-     "doc/classes/Soundcloud/Models.html",
-     "doc/classes/Soundcloud/Models/Comment.html",
-     "doc/classes/Soundcloud/Models/Comment.src/M000007.html",
-     "doc/classes/Soundcloud/Models/Event.html",
-     "doc/classes/Soundcloud/Models/Event.src/M000009.html",
-     "doc/classes/Soundcloud/Models/Playlist.html",
-     "doc/classes/Soundcloud/Models/Playlist.src/M000009.html",
-     "doc/classes/Soundcloud/Models/Playlist.src/M000010.html",
-     "doc/classes/Soundcloud/Models/Track.html",
-     "doc/classes/Soundcloud/Models/Track.src/M000003.html",
-     "doc/classes/Soundcloud/Models/Track.src/M000004.html",
-     "doc/classes/Soundcloud/Models/Track.src/M000005.html",
-     "doc/classes/Soundcloud/Models/Track.src/M000006.html",
-     "doc/classes/Soundcloud/Models/User.html",
-     "doc/classes/Soundcloud/Models/User.src/M000008.html",
-     "doc/created.rid",
-     "doc/files/lib/soundcloud/models/base_rb.html",
-     "doc/files/lib/soundcloud/models/comment_rb.html",
-     "doc/files/lib/soundcloud/models/event_rb.html",
-     "doc/files/lib/soundcloud/models/playlist_rb.html",
-     "doc/files/lib/soundcloud/models/track_rb.html",
-     "doc/files/lib/soundcloud/models/user_rb.html",
-     "doc/files/lib/soundcloud_rb.html",
-     "doc/fr_class_index.html",
-     "doc/fr_file_index.html",
-     "doc/fr_method_index.html",
-     "doc/index.html",
-     "doc/rdoc-style.css",
      "lib/soundcloud.rb",
      "lib/soundcloud/models/base.rb",
      "lib/soundcloud/models/comment.rb",

data/spec/soundcloud_comment_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'Soundcloud::Models::Comment' do
    before(:all) do

data/spec/soundcloud_event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'Soundcloud::Models::Event' do
    before(:all) do

data/spec/soundcloud_playlist_spec.rb

@@ -1,5 +1,4 @@
-require 'spec_helper'
-
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'Soundcloud::Models::Playlist' do
    before(:all) do

data/spec/soundcloud_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 # this spec tests against api.sandbox-soundcloud.com
 # it makes the follwing assumptions

data/spec/soundcloud_track_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Soundcloud::Models::Track" do 
   before(:all) do
@@ -25,13 +25,28 @@ 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})  
+    track.sharing.should == 'private'
+    track.permalink.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})
+    track.sharing.should == 'public'
+    track.permalink.should_not == nil
+    track.destroy
+  end
+  
   it 'should be able to create a new track and remove it' do
-    test_track_file = File.new('spec/fixtures/test_track.mp3')
+    test_track_file = File.new(File.dirname(__FILE__) + '/fixtures/test_track.mp3')
 
     track = @sc.Track.new
     track.title = 'API Test 1'
-    track.sharing = 'private'
-#    track.set_asset_data(test_track_file)    
+    track.sharing = 'private' 
     track.asset_data = test_track_file
     track.save
 

data/spec/soundcloud_user_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Soundcloud::Models::User" do 
   before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud-ruby-api-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,37 +50,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
-- doc/classes/Soundcloud.html
-- doc/classes/Soundcloud.src/M000001.html
-- doc/classes/Soundcloud.src/M000002.html
-- doc/classes/Soundcloud/Models.html
-- doc/classes/Soundcloud/Models/Comment.html
-- doc/classes/Soundcloud/Models/Comment.src/M000007.html
-- doc/classes/Soundcloud/Models/Event.html
-- doc/classes/Soundcloud/Models/Event.src/M000009.html
-- doc/classes/Soundcloud/Models/Playlist.html
-- doc/classes/Soundcloud/Models/Playlist.src/M000009.html
-- doc/classes/Soundcloud/Models/Playlist.src/M000010.html
-- doc/classes/Soundcloud/Models/Track.html
-- doc/classes/Soundcloud/Models/Track.src/M000003.html
-- doc/classes/Soundcloud/Models/Track.src/M000004.html
-- doc/classes/Soundcloud/Models/Track.src/M000005.html
-- doc/classes/Soundcloud/Models/Track.src/M000006.html
-- doc/classes/Soundcloud/Models/User.html
-- doc/classes/Soundcloud/Models/User.src/M000008.html
-- doc/created.rid
-- doc/files/lib/soundcloud/models/base_rb.html
-- doc/files/lib/soundcloud/models/comment_rb.html
-- doc/files/lib/soundcloud/models/event_rb.html
-- doc/files/lib/soundcloud/models/playlist_rb.html
-- doc/files/lib/soundcloud/models/track_rb.html
-- doc/files/lib/soundcloud/models/user_rb.html
-- doc/files/lib/soundcloud_rb.html
-- doc/fr_class_index.html
-- doc/fr_file_index.html
-- doc/fr_method_index.html
-- doc/index.html
-- doc/rdoc-style.css
 - lib/soundcloud.rb
 - lib/soundcloud/models/base.rb
 - lib/soundcloud/models/comment.rb

data/doc/classes/Soundcloud/Models/Comment.html

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: Soundcloud::Models::Comment</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Soundcloud::Models::Comment</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/lib/soundcloud/models/comment_rb.html">
-                lib/soundcloud/models/comment.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Base
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-SC API Attributes (as of 26/05/09):
-</p>
-<ul>
-<li>body
-
-</li>
-<li>timestamp
-
-</li>
-<li>id
-
-</li>
-<li>track_id
-
-</li>
-<li>user_id
-
-</li>
-<li>uri
-
-</li>
-</ul>
-<p>
-Custom Wrapper Attributes/Methods:
-</p>
-<ul>
-<li>user
-
-</li>
-<li>track
-
-</li>
-</ul>
-<p>
-Look up the resource attributes and filtering usage here:
-</p>
-<p>
-<a
-href="http://wiki.github.com/soundcloud/api/documentation#comment">wiki.github.com/soundcloud/api/documentation#comment</a>
-</p>
-<p>
-Examples:
-</p>
-<pre>
-  # add a comment to a track
-  some_track = sc_client.Track.find('some-track')
-  sc_client.Comment.create({:track =&gt; some_track, :body =&gt; 'Nice Track!'})
-
-  # optionally you can add a timestamp (in milliseconds)
-  sc_client.Comment.create({:track =&gt; some_track, :body =&gt; 'nice drums @ the 5th second!', :timestamp =&gt; 5000})
-
-  # display all comments of some track
-  some_track.comments.each do |comment|
-    p &quot;#{comment.user.full_name} wrote: #{comment.body}&quot;
-  end
-</pre>
-
-    </div>
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000007">new</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
-
-        <div class="method-heading">
-          <a href="Comment.src/M000007.html" target="Code" class="method-signature"
-            onclick="popupCode('Comment.src/M000007.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(options)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>