soundcloud-auth 0.1.1 → 0.1.2

data/.gitignore

@@ -0,0 +1 @@
+pkg/**/*

data/README.markdown

@@ -1,16 +1,16 @@
-SoundcloudAuth
+SoundCloudAuth
 ===========
 
-SoundcloudAuth aims to provide a complete authentication and API access solution for creating SoundCloud applications in Rails. It provides a generator and all of the necessary components to use Soundcloud as the sole authentication provider for an application using OAuth.
+SoundCloudAuth aims to provide a complete authentication and API access solution for creating SoundCloud applications in Rails. It provides a generator and all of the necessary components to use Soundcloud as the sole authentication provider for an application using OAuth.
 
 ### Major Props
 
-SoundcloudAuth is largely influenced and in a lot of ways identical to [Michael Bleigh's](http://github.com/mbleigh) amazing [TwitterAuth](http://github.com/mbleigh/twitter-auth) plugin. I've used TwitterAuth so many times on my Twitter app development that I found it sorely missed when I tried to tackle the SoundCloud platform.  All props and donations should be forwarded to Michael.
+SoundCloudAuth is largely influenced and in a lot of ways identical to [Michael Bleigh's](http://github.com/mbleigh) amazing [TwitterAuth](http://github.com/mbleigh/twitter-auth) plugin. I've used TwitterAuth so many times on my Twitter app development that I found it sorely missed when I tried to tackle the SoundCloud platform.  All props and donations should be forwarded to Michael.
 
 Installation
 ============
 
-You can include SoundcloudAuth as a gem in your project like so:
+You can include SoundCloudAuth as a gem in your project like so:
 
     config.gem `soundcloud-auth`, :lib => `soundcloud_auth`
 
@@ -18,23 +18,23 @@ Or you can install it as a traditional Rails plugin:
 
     script/plugin install git://github.com/leemartin/soundcloud-auth.git
 
-Note that because SoundcloudAuth utilizes Rails Engines functionality introduced in Rails 2.3, it will not work with earlier versions of Rails.
+Note that because SoundCloudAuth utilizes Rails Engines functionality introduced in Rails 2.3, it will not work with earlier versions of Rails.
 
 Usage
 =====
 
-To utilize SoundcloudAuth in your application you will need to run the generator:
+To utilize SoundCloudAuth in your application you will need to run the generator:
 
     script/generate soundcloud_auth
 
-This will generate a migration as well as set up the stubs needed to use the Rails Engines controllers and models set up by SoundcloudAuth. It will also create a User class that inherits from SoundcloudUser, abstracting away all of the SoundCloud authentication functionality and leaving you a blank slate to work with for your application. 
+This will generate a migration as well as set up the stubs needed to use the Rails Engines controllers and models set up by SoundCloudAuth. It will also create a User class that inherits from SoundcloudUser, abstracting away all of the SoundCloud authentication functionality and leaving you a blank slate to work with for your application. 
 
 Finally, it will create a configuration file in `config/soundcloud_auth.yml` in which you should input your OAuth consumer key and secret as well as a custom callback for development (the 'oauth_callback' option is where SoundCloud will send the browser after authentication is complete).
 
 Usage Basics
 ------------
 
-SoundcloudAuth borrows heavily from [Restful Authentication](http://github.com/technoweenie/restful-authentication) for its API because it's simple and well-known. Here are some of the familiar methods that are available:
+SoundCloudAuth borrows heavily from [Restful Authentication](http://github.com/technoweenie/restful-authentication) for its API because it's simple and well-known. Here are some of the familiar methods that are available:
 
 * `login_required`: a before filter that can be added to a controller to require that a user logs in before he/she can view the page.
 * `current_user`: returns the logged in user if one exists, otherwise returns `nil`.
@@ -46,24 +46,20 @@ SoundcloudAuth borrows heavily from [Restful Authentication](http://github.com/t
 Accessing the SoundCloud API
 -------------------------
 
-The `User` class will have a `soundcloud` method that provides a generic dispatcher with HTTP verb commands available (`get`, `put`, `post`, and `delete`). These are automatically initialized to the `base_url` you specified in the `twitter_auth.yml` file, so you need only specify a path. Additionally, it will automatically append a .json extension and parse the JSON if you don't provide.
+The `User` class will have a `soundcloud` method that interfaces with the [SoundCloud Ruby API Wrapper](http://wiki.github.com/soundcloud/ruby-api-wrapper/) allowing you to easily access the [SoundCloud API](http://wiki.github.com/soundcloud/api/). Check out the [Wiki](http://wiki.github.com/soundcloud/ruby-api-wrapper/getting-started) for more info.
 
-    user.soundcloud.get('/me')
-    # => {'username' => 'leemartin', 'full_name' => 'Lee Martin' ... }
+    user.soundcloud.User.find_me
 
-		user.soundcloud.put('/me', 'user[website]=http://lee.ma/rtin')
-		# => {'username' => 'leemartin', 'website' => 'http://lee.ma/rtin'}
+    user.soundcloud.Track.find(:all)
 
-If SoundCloud returns something other than a 200 response code, SoundcloudAuth will catch it and try to raise a salient error message. The exception class is `SoundcloudAuth::Dispatcher::Error`.
-
-Customizing SoundcloudAuth
+Customizing SoundCloudAuth
 -----------------------
 
-There are a number of hooks to extend the functionality of SoundcloudAuth. Here is a brief description of each of them.
+There are a number of hooks to extend the functionality of SoundCloudAuth. Here is a brief description of each of them.
 
 ### Controller Methods
 
-SoundcloudAuth provides some default controller methods that may be overridden in your `ApplicationController` to behave differently.
+SoundCloudAuth provides some default controller methods that may be overridden in your `ApplicationController` to behave differently.
 
 * `authentication_failed(message)`: called when SoundCloud authorization has failed during the process. By default, simply redirects to the site root and sets the `flash[:error]`.
 * `authentication_succeeded(message=default)`: called when SoundCloud authorization has completed successfully. By default, simply redirects to the site root and sets the `flash[:notice]`.
@@ -72,4 +68,4 @@ SoundcloudAuth provides some default controller methods that may be overridden i
 Copyright
 ---------
 
-**SoundcloudAuth** is Copyright (c) 2010 [Lee Martin](http://lee.ma/rtin), released under the MIT License.
+**SoundCloudAuth** is Copyright (c) 2010 [Lee Martin](http://lee.ma/rtin), released under the MIT License.

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gemspec.homepage = "http://github.com/leemartin/soundcloud-auth"
     gemspec.authors = ["Lee Martin"]
     gemspec.add_dependency('oauth', '>= 0.3.1')
+    gemspec.add_dependency('soundcloud-ruby-api-wrapper')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/models/soundcloud_auth/generic_user.rb

@@ -89,13 +89,17 @@ module SoundcloudAuth
       user.save
       user
     end
+    
+    def token
+      OAuth::AccessToken.new(SoundcloudAuth.consumer, access_token, access_secret)
+    end
 
     def utilize_default_validations
       true
     end
 
     def soundcloud
-      SoundcloudAuth::Dispatcher::Oauth.new(self)
+      Soundcloud.register({:access_token => token})
     end
 
     def remember_me

data/lib/soundcloud_auth.rb

@@ -45,12 +45,4 @@ module SoundcloudAuth
   
 end
 
-require 'soundcloud_auth/controller_extensions'
-require 'soundcloud_auth/dispatcher/oauth'
-
-module SoundcloudAuth
-  module Dispatcher
-    class Error < StandardError; end
-    class Unauthorized < Error; end
-  end
-end
+require 'soundcloud_auth/controller_extensions'

data/rails/init.rb

@@ -1,6 +1,7 @@
-# Gem Dependencies
-config.gem 'oauth'
+gem 'oauth'
+gem 'soundcloud-ruby-api-wrapper'
 
+require 'soundcloud'
 require 'json'
 require 'soundcloud_auth'
 

data/soundcloud-auth.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soundcloud-auth}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lee Martin"]
-  s.date = %q{2010-06-25}
+  s.date = %q{2010-06-27}
   s.description = %q{SoundcloudAuth is a Rails plugin gem that provides Single Sign-On capabilities for Rails applications via SoundCloud.}
   s.email = %q{lee@soundcloud.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    "README.markdown",
+    ".gitignore",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "app/controllers/sessions_controller.rb",
@@ -30,8 +31,6 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/soundcloud_auth.rb",
      "lib/soundcloud_auth/controller_extensions.rb",
-     "lib/soundcloud_auth/dispatcher/oauth.rb",
-     "pkg/soundcloud-auth-0.1.0.gem",
      "rails/init.rb",
      "soundcloud-auth.gemspec"
   ]
@@ -47,10 +46,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.1"])
+      s.add_runtime_dependency(%q<soundcloud-ruby-api-wrapper>, [">= 0"])
     else
       s.add_dependency(%q<oauth>, [">= 0.3.1"])
+      s.add_dependency(%q<soundcloud-ruby-api-wrapper>, [">= 0"])
     end
   else
     s.add_dependency(%q<oauth>, [">= 0.3.1"])
+    s.add_dependency(%q<soundcloud-ruby-api-wrapper>, [">= 0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud-auth
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Lee Martin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,20 @@ dependencies:
         version: 0.3.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: soundcloud-ruby-api-wrapper
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: SoundcloudAuth is a Rails plugin gem that provides Single Sign-On capabilities for Rails applications via SoundCloud.
 email: lee@soundcloud.com
 executables: []
@@ -43,6 +57,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gitignore
 - README.markdown
 - Rakefile
 - VERSION
@@ -57,8 +72,6 @@ files:
 - init.rb
 - lib/soundcloud_auth.rb
 - lib/soundcloud_auth/controller_extensions.rb
-- lib/soundcloud_auth/dispatcher/oauth.rb
-- pkg/soundcloud-auth-0.1.0.gem
 - rails/init.rb
 - soundcloud-auth.gemspec
 has_rdoc: true

data/lib/soundcloud_auth/dispatcher/oauth.rb

@@ -1,56 +0,0 @@
-require 'oauth'
-
-module SoundcloudAuth
-  module Dispatcher
-    class Oauth < OAuth::AccessToken
-    
-      attr_accessor :user
-    
-      def append_extension_to(path)
-        path, query_string = *(path.split("?"))
-        path << '.json' unless path.match(/\.(:?xml|json)\z/i)
-        "#{path}#{"?#{query_string}" if query_string}"
-      end
-    
-      def handle_response(response)
-        case response
-        when Net::HTTPOK 
-          begin
-            JSON.parse(response.body)
-          rescue JSON::ParserError
-            response.body
-          end
-        when Net::HTTPUnauthorized
-          raise SoundcloudAuth::Dispatcher::Unauthorized, 'The credentials provided did not authorize the user.'
-        else
-          message = begin
-            JSON.parse(response.body)['error']
-          rescue JSON::ParserError
-            if match = response.body.match(/<error>(.*)<\/error>/)
-              match[1]
-            else
-              'An error occurred processing your SoundCloud request.'
-            end
-          end
-
-          raise SoundcloudAuth::Dispatcher::Error, message
-        end
-      end
-    
-      def initialize(user)
-        self.user = user
-        super(SoundcloudAuth.consumer, user.access_token, user.access_secret)
-      end
-
-      def request(http_method, path, *arguments)
-        path = SoundcloudAuth.path_prefix + path
-        path = append_extension_to(path)
-
-        response = super
-
-        handle_response(response)
-      end
-
-  end
- end
-end