@@ -5,6 +5,7 @@ config/accelerator_tasks.rb config/deploy.rb config/deploy/* config/alonetone.yml +config/config.yml config/database.yml config/amazon_s3.yml config/defensio.yml .gitignore @@ -1,7 +1,7 @@ class ApplicationController < ActionController::Base - helper :all # include all helpers, all the time + helper :all # all helpers, all the time - protect_from_forgery :secret => YAML.load_file(File.join(RAILS_ROOT,'config','alonetone.yml'))['alonetone']['secret'] + protect_from_forgery :secret => ALONETONE.secret include AuthenticatedSystem include ExceptionLoggable @@ -82,12 +82,12 @@ class ApplicationController < ActionController::Base @user = User.find_by_login(login) || current_user end - def current_use_is_admin_or_user?(user) + def current_user_is_admin_or_owner?(user) logged_in? && (current_user.id.to_s == user.id.to_s || current_user.admin?) end - def current_use_is_admin_or_moderator_or_user?(user) - current_use_is_admin_or_user? || moderator? + def current_user_is_admin_or_moderator_or_owner?(user) + current_user_is_admin_or_owner? || moderator? end def find_asset app/controllers/application.rb @@ -245,7 +245,7 @@ class AssetsController < ApplicationController def authorized? # admin or the owner of the asset can edit/update/delete - params[:permalink].nil? || current_use_is_admin_or_user?(@asset.user) + params[:permalink].nil? || current_user_is_admin_or_owner?(@asset.user) end def register_listen app/controllers/assets_controller.rb @@ -12,7 +12,7 @@ class PlaylistsController < ApplicationController # GET /playlists # GET /playlists.xml def index - @all_playlists = current_use_is_admin_or_user?(@user) ? + @all_playlists = current_user_is_admin_or_owner?(@user) ? @user.playlists.include_private : @user.playlists.public @@ -36,7 +36,7 @@ class PlaylistsController < ApplicationController def sort redirect_to user_home_url(@user) \ - unless current_use_is_admin_or_user?(@user) + unless current_user_is_admin_or_owner?(@user) respond_to do |format| format.html { @playlists = @user.playlists.include_private.find(:all) } @@ -193,7 +193,7 @@ class PlaylistsController < ApplicationController end def authorized? - current_use_is_admin_or_user?(@playlist.user) || + current_user_is_admin_or_owner?(@playlist.user) || %w[ destroy admin edit update remove_track attach_pic sort_tracks add_track set_playlist_description set_playlist_title ].include?(action_name) == false end app/controllers/playlists_controller.rb @@ -82,7 +82,7 @@ class TopicsController < ApplicationController protected def authorized? not %w(destroy edit update).include?(action_name) || - current_use_is_admin_or_moderator_or_user?(@topic.user) + current_user_is_admin_or_moderator_or_owner?(@topic.user) end def find_forum app/controllers/topics_controller.rb @@ -35,11 +35,11 @@ class Asset cattr_reader *%w(movie audio image other).collect! { |t| "#{t}_condition".to_sym } - has_attachment :storage => APP_CONFIG.storage, + has_attachment :storage => ALONETONE.storage, :processor => :mp3info, # :content_type => ['audio/mpeg','application/zip'], :max_size => 40.megabytes, - :path_prefix => "#{APP_CONFIG.path_prefix}mp3" + :path_prefix => "#{ALONETONE.path_prefix}mp3" validates_as_attachment app/models/asset/uploading.rb @@ -6,8 +6,8 @@ class Pic < ActiveRecord::Base :max_size => 2048.kilobytes, :resize_to => 'x400', :content_type => :image, - :storage => APP_CONFIG.storage, - :path_prefix => "#{APP_CONFIG.path_prefix}pics", + :storage => ALONETONE.storage, + :path_prefix => "#{ALONETONE.path_prefix}pics", :processor => :Rmagick, :thumbnails => { :tiny => [ 25, 25], app/models/pic.rb @@ -1,10 +1,10 @@ class SourceFile < ActiveRecord::Base belongs_to :user - has_attachment :storage => APP_CONFIG.storage, + has_attachment :storage => ALONETONE.storage, :content_type => ['audio/x-aiff','audio/x-wav'], :max_size => 100.megabytes, - :path_prefix => "#{APP_CONFIG.path_prefix}source_files", + :path_prefix => "#{ALONETONE.path_prefix}source_files", :s3_access => :authenticated_read validates_as_attachment app/models/source_file.rb @@ -45,7 +45,7 @@ class User end def site - "#{APP_CONFIG.site_url}/#{login}" + "#{ALONETONE.url}/#{login}" end def printable_bio app/models/user/profile.rb @@ -6,25 +6,25 @@ class UserMailer < ActionMailer::Base def forgot_password(user) setup_email(user) @subject += 'Change your alonetone password' - @body[:url] = "http://#{APP_CONFIG.site_url}/activate/#{user.activation_code}" + @body[:url] = "http://#{ALONETONE.url}/activate/#{user.activation_code}" end def signup(user) setup_email(user) - @body[:url] = "http://#{APP_CONFIG.site_url}/activate/#{user.activation_code}" + @body[:url] = "http://#{ALONETONE.url}/activate/#{user.activation_code}" end def activation(user) setup_email(user) @subject += 'Your alonetone account has been activated!' - @body[:url] = "http://#{APP_CONFIG.site_url}/#{user.login}" + @body[:url] = "http://#{ALONETONE.url}/#{user.login}" end protected def setup_email(user) @recipients = "#{user.email}" - @from = "#{@@mail_from}" - @subject = "[#{APP_CONFIG.site_url}] " + @from = "#{ALONETONE.email}" + @subject = "[#{ALONETONE.url}] " @sent_on = Time.now @body[:user] = user end app/models/user_mailer.rb @@ -1,16 +1,16 @@ xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8" xml.rss "xmlns:itunes"=> "http://www.itunes.com/dtds/podcast-1.0.dtd", "version"=>"2.0" do xml.channel do - xml.title "Latest uploaded mp3s from artists at #{APP_CONFIG.site_url}" + xml.title "Latest uploaded mp3s from artists at #{ALONETONE.url}" - xml.link "http://#{APP_CONFIG.site_url}/" - xml.description "The artists on #{APP_CONFIG.site_url} give away their music. Listen to the lastest by subscribing" + xml.link "http://#{ALONETONE.url}/" + xml.description "The artists on #{ALONETONE.url} give away their music. Listen to the lastest by subscribing" xml.language "en-us" xml.lastBuildDate rss_date @assets.first.created_at xml.image do - xml.url "http://www.#{APP_CONFIG.site_url}/images/no-cover-200.jpg" - xml.title "Latest uploaded mp3s from artists at #{APP_CONFIG.site_url}" + xml.url "http://#{ALONETONE.url}/images/no-cover-200.jpg" + xml.title "Latest uploaded mp3s from artists at #{ALONETONE.url}" xml.width 200 xml.height 200 end app/views/assets/latest.rss.builder @@ -25,7 +25,7 @@ <% if @asset.youtube_embed && !@asset.youtube_embed.empty? %> <div class='static_content'> - <object <%= APP_CONFIG.video_size %><param name="movie" value="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0" type="application/x-shockwave-flash" wmode="transparent" <%= APP_CONFIG.video_size %>></embed></object> + <object <%= ALONETONE.video_size %><param name="movie" value="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0" type="application/x-shockwave-flash" wmode="transparent" <%= ALONETONE.video_size %>></embed></object> </div> <% end %> app/views/assets/show.html.erb @@ -52,7 +52,7 @@ <div class="clear"> </div> <%= yield :bottom %> </div> <!-- end columns --> - <% if APP_CONFIG.show_debug_info %> + <% if ALONETONE.show_debug_info %> <div style="width:100%;min-height:200px;color:#fff"> <% if current_user %> last seen at <%= current_user.last_seen_at %><br/> app/views/layouts/application.html.erb @@ -1,3 +1,23 @@ -# use rake secret to generate a hash for this -alonetone: - secret: (big long secret string) \ No newline at end of file +--- +development: &defaults + show_debug_info: true + app_name: Your Name Here + url: example.com + email: yourname@example.com + secret: adba8d02b662d7a087f2da7e572deac650bc9dafa31043e814a93547c87ac007bbcf3d79960d0be5f9316d2f9b8eb88c87b58b4569252220b42f27e4797ea091 + storage: file_system + path_prefix: public/ + video_size: width="370" height="308" + enable_facebook: false + enable_defensio: false + +test: + <<: *defaults + show_debug_info: false + +production: + <<: *defaults + storage: s3 + path_prefix: "" + site_url: yourwebsite.com + show_debug_info: false config/alonetone.example.yml @@ -33,7 +33,7 @@ Rails::Initializer.run do |config| config.gem 'ruby-mp3info', :lib => 'mp3info' config.gem 'rubyzip', :lib => 'zip/zip' config.gem 'googlecharts', :lib => 'gchart' - config.gem 'rmagick' + # config.gem 'rmagick' # Force all environments to use the same logger level # (by default production uses :info, the others :debug) config/environment.rb @@ -1,7 +1,8 @@ -APP_CONFIG = YAML.load_file("#{RAILS_ROOT}/config/config.yml")[RAILS_ENV] +ALONETONE = YAML.load_file("#{RAILS_ROOT}/config/alonetone.yml")[RAILS_ENV] -class << APP_CONFIG - APP_CONFIG.keys.each do |key| - class_eval "def #{key}; APP_CONFIG['#{key}']; end" +class << ALONETONE + ALONETONE.keys.each do |key| + class_eval "def #{key}; ALONETONE['#{key}']; end" end end + \ No newline at end of file config/initializers/load_config.rb @@ -1,9 +1,3 @@ - -# you are working with git -SVN_COMMAND = 'svn info' -BRIGHTNESS = '' -LASTCHANGED = Date.today - # MAKE FACEBOOKER HAPPY ActionController::Base.asset_host = '' @@ -12,8 +6,8 @@ FLASH_PLAYER = 'http://alonetone.com/flash/alonetone_player.swf' # MAILER STUFF -UserMailer.default_url_options[:host] = 'alonetone.com' -UserMailer.mail_from = 'music@alonetone.com' +UserMailer.default_url_options[:host] = ALONETONE.url +UserMailer.mail_from = ALONETONE.email # GENERATE THE NEEDED CSS STYLESHEETS Sass::Plugin.options[:always_check] = true config/initializers/setup.rb config/basecamp.example.yml config/config.yml 510cad1435e9463934a22a42d42a51117429b507 Sudara sudara@alonetone.com http://github.com/sudara/alonetone/commit/78d3aab8be9552c5c92de9ad44f71e8a09d0bb4b 78d3aab8be9552c5c92de9ad44f71e8a09d0bb4b 2008-10-11T04:56:40-07:00 2008-10-11T04:56:40-07:00 Lets use alonetone.yml and make it alonetone.example.yml so people know to change it. Tweak the configuration naming and options c1126c3b40481f845b54c9543663f98c1b6a6c0c Sudara sudara@alonetone.com