From 412dd30fe969a8225364ce3b5897a30dcb9fac81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Bucho=CC=88ster?=
 <tbuchoester.mmt-b2009@fh-salzburg.ac.at>
Date: Tue, 7 Jun 2011 00:51:24 +0200
Subject: [PATCH] removed robots.txt, changed validator class to validator
 module, little optical code improvements

---
 app/models/track.rb                         | 1 +
 app/models/user.rb                          | 1 +
 app/views/devise/shared/_links.erb          | 2 +-
 config/initializers/devise.rb               | 2 +-
 db/migrate/20110605230130_create_artists.rb | 2 +-
 db/schema.rb                                | 2 +-
 lib/last_fm/validator.rb                    | 2 +-
 robots.txt                                  | 2 --
 8 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 robots.txt

diff --git a/app/models/track.rb b/app/models/track.rb
index 8c4f933..049b359 100644
--- a/app/models/track.rb
+++ b/app/models/track.rb
@@ -1,4 +1,5 @@
 class Track < ActiveRecord::Base
   belongs_to :artist
   has_many :playlists, :through => :playlists_tracks
+  
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index d5d6d7f..d66a96a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
   has_and_belongs_to_many :artists
+  
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable, :omniauthable,
          :recoverable, :rememberable, :trackable, :validatable
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index acc90fd..5c8263e 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -20,5 +20,5 @@
 
 <%- if devise_mapping.omniauthable? %>
   <%= link_to "Sign in with Facebook", user_omniauth_authorize_path(:facebook) %><br />
-	<%= link_to "Sign in with Google", user_omniauth_authorize_path(:open_id, :openid_url =>'https://www.google.com/accounts/o8/id') %><br />
+	<%= link_to "Sign in with Google", user_omniauth_authorize_path(:open_id, :openid_url => 'https://www.google.com/accounts/o8/id') %><br />
 <% end -%>
\ No newline at end of file
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 1f8cd74..7a9ebcd 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -193,7 +193,7 @@ Devise.setup do |config|
     config.omniauth :facebook, 'APP_ID', 'APP_SECRET'
   end
   config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp')
-  # config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp'), :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
+  # config.omniauth :google_apps, OpenID::Store::Filesystem.new('/tmp'), :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
   # config.omniauth :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
 
   # ==> Warden configuration
diff --git a/db/migrate/20110605230130_create_artists.rb b/db/migrate/20110605230130_create_artists.rb
index f8b4913..d35eee3 100644
--- a/db/migrate/20110605230130_create_artists.rb
+++ b/db/migrate/20110605230130_create_artists.rb
@@ -6,7 +6,7 @@ class CreateArtists < ActiveRecord::Migration
       t.timestamps
     end
     
-    create_table :artists_users do |t|
+    create_table :artists_users, :id => false do |t|
       t.references :user
       t.references :artist
     end
diff --git a/db/schema.rb b/db/schema.rb
index 8c26cd9..418df72 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -18,7 +18,7 @@ ActiveRecord::Schema.define(:version => 20110606000240) do
     t.datetime "updated_at"
   end
 
-  create_table "artists_users", :force => true do |t|
+  create_table "artists_users", :id => false, :force => true do |t|
     t.integer "user_id"
     t.integer "artist_id"
   end
diff --git a/lib/last_fm/validator.rb b/lib/last_fm/validator.rb
index be2ea33..9a96b2a 100644
--- a/lib/last_fm/validator.rb
+++ b/lib/last_fm/validator.rb
@@ -1,6 +1,6 @@
 module LastFM
   
-  class Validator
+  module Validator
     
     def self.validate_mash mash, *args
       args.flatten!
diff --git a/robots.txt b/robots.txt
deleted file mode 100644
index e4cfec3..0000000
--- a/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# WebMatrix 1.0