Permalink
Browse files

Move music path settings to their own file

(helps the development…)
  • Loading branch information...
1 parent 404346e commit 6f91866fc90a0b6839c7e87e5882ffb2a89d504b @Darep committed Jul 28, 2012
View
@@ -18,11 +18,9 @@ gem 'jquery-rails'
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', :require => 'jdbc-sqlite3', :require =>'arjdbc'
-# gem 'ruby-mp3info'
end
platforms :ruby, :mingw, :mswin do
gem 'sqlite3'
-# gem 'taglib-ruby'
end
gem 'mp3info'
View
@@ -22,6 +22,10 @@ GEM
activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
+ activerecord-jdbc-adapter (1.2.2)
+ activerecord-jdbcsqlite3-adapter (1.2.2)
+ activerecord-jdbc-adapter (~> 1.2.2)
+ jdbc-sqlite3 (~> 3.7.2)
activeresource (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
@@ -43,12 +47,16 @@ GEM
multi_json (~> 1.0)
hike (1.2.1)
hpricot (0.8.6)
+ hpricot (0.8.6-java)
i18n (0.6.0)
+ jdbc-sqlite3 (3.7.2)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.3)
+ json (1.7.3-java)
+ libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -99,7 +107,10 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
sqlite3 (1.3.6-x86-mingw32)
+ therubyracer (0.10.1)
+ libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -111,6 +122,8 @@ GEM
multi_json (~> 1.3)
PLATFORMS
+ java
+ ruby
x86-mingw32
DEPENDENCIES
@@ -2,7 +2,8 @@
require 'find'
require 'logger'
-MUSIC_PATH = Rails.application.config.MUSIC_PATH
+MUSIC_PATH = Rails.application.config.music_paths['music_path']
+
SONGS_JSON_FILE = Rails.root.join('public/songs.json')
class SongsController < ApplicationController
@@ -36,8 +36,4 @@
config.assets.debug = true
config.serve_static_assets = true
-
- config.MUSIC_PATH = '/Users/ajk/Music/'
- config.MUSIC_PATH = 'C:/Users/ajk/Music/'
-# config.MUSIC_PATH = '/work/Musa/'
end
@@ -0,0 +1,2 @@
+rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
+Rails.application.config.music_paths = YAML.load_file(rails_root + '/config/musicpaths.yml')
View
@@ -0,0 +1 @@
+music_path: '/Users/ajk/Music/'
View
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120409132337) do
+ActiveRecord::Schema.define(:version => 20120312194635) do
create_table "users", :force => true do |t|
t.string "username"

0 comments on commit 6f91866

Please sign in to comment.