Diff
Modified: trunk/app/controllers/blobs_controller.rb (3425 => 3426)
--- trunk/app/controllers/blobs_controller.rb 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/app/controllers/blobs_controller.rb 2013-02-15 15:40:12 UTC (rev 3426)
@@ -38,7 +38,7 @@
send_data(@version.content_blob.data, :filename => @version.local_name, :type => @version.content_type.mime_type)
- #send_file("#{RAILS_ROOT}/#{controller_name}/address@hidden/address@hidden/address@hidden", :filename => @blob.local_name, :type => @blob.content_type.mime_type)
+ #send_file("#{Rails.root}/#{controller_name}/address@hidden/address@hidden/address@hidden", :filename => @blob.local_name, :type => @blob.content_type.mime_type)
end
# GET /files/:id/download/:name
Modified: trunk/app/controllers/openid_controller.rb (3425 => 3426)
--- trunk/app/controllers/openid_controller.rb 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/app/controllers/openid_controller.rb 2013-02-15 15:40:12 UTC (rev 3426)
@@ -72,7 +72,7 @@
def consumer
# create the OpenID store for storing associations and nonces,
# putting it in your app's db directory
- store_dir = Pathname.new(RAILS_ROOT).join('db').join('openid-store')
+ store_dir = Pathname.new(Rails.root).join('db').join('openid-store')
store = OpenID::Store::Filesystem.new(store_dir)
return OpenID::Consumer.new(session, store)
Modified: trunk/app/controllers/sessions_controller.rb (3425 => 3426)
--- trunk/app/controllers/sessions_controller.rb 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/app/controllers/sessions_controller.rb 2013-02-15 15:40:12 UTC (rev 3426)
@@ -178,7 +178,7 @@
def consumer
# create the OpenID store for storing associations and nonces,
# putting it in your app's db directory
- store_dir = Pathname.new(RAILS_ROOT).join('db').join('openid-store')
+ store_dir = Pathname.new(Rails.root).join('db').join('openid-store')
store = OpenID::Store::Filesystem.new(store_dir)
return OpenID::Consumer.new(session, store)
Modified: trunk/lib/workflow_types_handler.rb (3425 => 3426)
--- trunk/lib/workflow_types_handler.rb 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/lib/workflow_types_handler.rb 2013-02-15 15:40:12 UTC (rev 3426)
@@ -131,7 +131,7 @@
# so that they are then accessible via the ObjectSpace.
# We assume (and this is a rails convention for anything in the /lib/ directory),
# that filenames for example "my_class.rb" correspond to class names for example MyClass.
-Dir.chdir(File.join(RAILS_ROOT, "lib/workflow_processors")) do
+Dir.chdir(File.join(Rails.root, "lib/workflow_processors")) do
Dir.glob("*.rb").each do |f|
("workflow_processors/" + f.gsub(/.rb/, '')).camelize.constantize
end
Modified: trunk/test/fixtures/content_blobs.yml (3425 => 3426)
--- trunk/test/fixtures/content_blobs.yml 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/test/fixtures/content_blobs.yml 2013-02-15 15:40:12 UTC (rev 3426)
@@ -2,7 +2,7 @@
# or http://www.realityforge.org/articles/2006/04/06/loading-binary-data-into-rails-fixtures
<%
def load_blob_data(name)
- filename = "#{RAILS_ROOT}/test/fixtures/files/#{name}"
+ filename = "#{Rails.root}/test/fixtures/files/#{name}"
data = ""
"!binary | #{[data].pack('m').gsub(/\n/,"\n ")}\n"
end
@@ -26,4 +26,4 @@
component_workflow_blob:
id: 5
- data: <%= load_blob_data('image_to_tiff_migration.t2flow') %>
\ No newline at end of file
+ data: <%= load_blob_data('image_to_tiff_migration.t2flow') %>
Modified: trunk/test/fixtures/pictures.yml (3425 => 3426)
--- trunk/test/fixtures/pictures.yml 2013-02-15 15:38:28 UTC (rev 3425)
+++ trunk/test/fixtures/pictures.yml 2013-02-15 15:40:12 UTC (rev 3426)
@@ -4,7 +4,7 @@
# or http://www.realityforge.org/articles/2006/04/06/loading-binary-data-into-rails-fixtures
<%
def load_blob_data(name)
- filename = "#{RAILS_ROOT}/test/fixtures/files/#{name}"
+ filename = "#{Rails.root}/test/fixtures/files/#{name}"
data = ""
"!binary | #{[data].pack('m').gsub(/\n/,"\n ")}\n"
end