Application renamed to TravelSupport (just for sanity)

Rakefile

@@ -4,4 +4,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-TravelSupportProgram::Application.load_tasks
+TravelSupport::Application.load_tasks

app/controllers/payments_controller.rb

@@ -30,7 +30,7 @@ def file
   protected
 
   def load_methods
-    @methods = TravelSupportProgram::Config.setting :payment_methods
+    @methods = TravelSupport::Config.setting :payment_methods
   end
 
   def set_breadcrumbs

app/controllers/reimbursements_controller.rb

@@ -31,8 +31,8 @@ def check_request
     authorize! :read, @reimbursement
     authorize! :create, @reimbursement.payments.build
 
-    c_template = TravelSupportProgram::Config.setting(:check_request_template)
-    c_layout = TravelSupportProgram::Config.setting(:check_request_layout)
+    c_template = TravelSupport::Config.setting(:check_request_template)
+    c_layout = TravelSupport::Config.setting(:check_request_layout)
     if c_template.blank? or c_layout.blank?
       redirect_to request_reimbursement_path(@reimbursement.request)
     else

app/controllers/requests_controller.rb

@@ -44,7 +44,7 @@ def request_states_collection
   end
 
   def load_subjects 
-    @subjects = TravelSupportProgram::Config.setting :request_expense_subjects
+    @subjects = TravelSupport::Config.setting :request_expense_subjects
   end
 
 end

app/helpers/application_helper.rb

@@ -186,20 +186,20 @@ def bootstrap_flash_messages
   #            going to be defined. Only relevant if budget_limits are enabled.
   # @return [Array]  Array with the currency codes
   def currencies_for_select(field, event = nil)
-    if TravelSupportProgram::Config.setting(:budget_limits) &&
+    if TravelSupport::Config.setting(:budget_limits) &&
           event && event.budget && event.budget.currency &&
           %w(approved authorized).include?(field.to_s)
       currencies = [event.budget.currency]
     end
-    currencies ||= TravelSupportProgram::Config.setting("currencies_for_#{field}")
+    currencies ||= TravelSupport::Config.setting("currencies_for_#{field}")
     currencies ||= I18n.translate(:currencies).keys.sort
   end
 
   # Image to be used as header in pdf files
   #
   # @return [String] local path of the image
   def pdf_header_image
-    if theme = TravelSupportProgram::Config.setting(:theme)
+    if theme = TravelSupport::Config.setting(:theme)
       path = File.join(Rails.root.to_s, 'app', 'themes', theme, 'assets', 'images', 'pdf', 'header.png')
       return path if File.exists?(path)
     end

app/helpers/reimbursements_helper.rb

@@ -108,8 +108,8 @@ def reimbursement_payments(reimbursement)
   # @param [Reimbursement] reimbursement
   # @return [String] HTML output
   def check_request_link(reimbursement)
-    return "" if TravelSupportProgram::Config.setting(:check_request_layout).blank?
-    return "" if TravelSupportProgram::Config.setting(:check_request_template).blank?
+    return "" if TravelSupport::Config.setting(:check_request_layout).blank?
+    return "" if TravelSupport::Config.setting(:check_request_template).blank?
     url = check_request_request_reimbursement_path(reimbursement.request)
     link_to t(:check_request), url, :class => "btn"
   end

app/helpers/user_profiles_helper.rb

@@ -9,7 +9,7 @@ module UserProfilesHelper
   #
   # @return [String] HTML output
   def profile_info
-    if TravelSupportProgram::Config.setting :opensuse_connect, :enabled
+    if TravelSupport::Config.setting :opensuse_connect, :enabled
       content_tag(:div,
           t(:opensuse_profile_info, :url => ConnectUser.profile_url_for(current_user.nickname)).html_safe,
           :class => "alert alert-info")

app/mailers/application_mailer.rb

@@ -1,6 +1,6 @@
 class ApplicationMailer < ActionMailer::Base
   helper ApplicationHelper
-  default :from => Proc.new { TravelSupportProgram::Config.setting(:email_from) }
+  default :from => Proc.new { TravelSupport::Config.setting(:email_from) }
 
   # This method assumes that the first parameter of the mailer method is the
   # recipient address (:to)
@@ -20,7 +20,7 @@ def self.notify_to(targets, method, *args)
   end
 
   def self.notify(method, *args)
-   if TravelSupportProgram::Config.setting(:async_emails)
+   if TravelSupport::Config.setting(:async_emails)
       delay.send(method, *args)
     else
       send(method, *args).deliver

app/models/connect_user.rb

@@ -12,7 +12,7 @@ class ConnectUser
   # @return [ConnectUser]
   def initialize(login)
     begin
-      api_conf = TravelSupportProgram::Config.setting(:opensuse_connect)
+      api_conf = TravelSupport::Config.setting(:opensuse_connect)
       api_key = api_conf["api_key"]
       url = api_conf["base_url"] + "/services/api/rest/json"
       method = "connect.user.attribute.get"
@@ -40,7 +40,7 @@ def respond_to?(meth, include_private = false)
   end
 
   def self.profile_url_for(login)
-    TravelSupportProgram::Config.setting(:opensuse_connect, :base_url) + "/pg/profile/#{login}"
+    TravelSupport::Config.setting(:opensuse_connect, :base_url) + "/pg/profile/#{login}"
   end
 
 end

app/models/request.rb

@@ -186,7 +186,7 @@ def only_one_active_request
   # Validates that the approved amount doesn't exceed the total of the budgets
   # associated to the event.
   def dont_exceed_budget
-    if TravelSupportProgram::Config.setting :budget_limits
+    if TravelSupport::Config.setting :budget_limits
       budget = event.budget
       currency = budget ? budget.currency : nil
 

app/models/user.rb

@@ -8,10 +8,10 @@ class User < ActiveRecord::Base
   extend ActiveHash::Associations::ActiveRecordExtensions
 
   devise_modules = []
-  if TravelSupportProgram::Config.setting(:authentication, :ichain, :enabled)
+  if TravelSupport::Config.setting(:authentication, :ichain, :enabled)
     devise_modules += [:ichain_authenticatable, :ichain_registerable]
   end
-  if TravelSupportProgram::Config.setting(:authentication, :database, :enabled)
+  if TravelSupport::Config.setting(:authentication, :database, :enabled)
     devise_modules += [:database_authenticatable, :registerable, :recoverable,
       :rememberable, :trackable, :validatable]
 

app/models/user_profile.rb

@@ -58,7 +58,7 @@ def set_default_attrs
   # 
   # @return [Boolean] true if the information is correctly updated
   def refresh
-    if TravelSupportProgram::Config.setting :opensuse_connect, :enabled
+    if TravelSupport::Config.setting :opensuse_connect, :enabled
       update_attributes(connect_attrib_values)
     else
       true
@@ -71,7 +71,7 @@ def refresh
   # @return [Boolean] true unless the attributes is mean to be fetched from an
   #       external source (openSUSE Connect at this moment)
   def have_editable?(attrib)
-    return true unless TravelSupportProgram::Config.setting :opensuse_connect, :enabled
+    return true unless TravelSupport::Config.setting :opensuse_connect, :enabled
     not UserProfile::FROM_OPENSUSE_CONNECT.keys.include?(attrib.to_sym)
   end
 
@@ -81,7 +81,7 @@ def have_editable?(attrib)
   #
   # @return [Boolean] true unless some of the required attributes is missing
   def complete?
-    fields = TravelSupportProgram::Config.setting(:relevant_profile_fields)
+    fields = TravelSupport::Config.setting(:relevant_profile_fields)
     return true if fields.blank?
     fields.each do |f|
       return false if send(f.to_sym).blank?
@@ -92,7 +92,7 @@ def complete?
   protected
 
   def connect_attrib_values
-    return {} unless TravelSupportProgram::Config.setting :opensuse_connect, :enabled
+    return {} unless TravelSupport::Config.setting :opensuse_connect, :enabled
     new_values = {}
     connect = ConnectUser.new(user.nickname)
     UserProfile::FROM_OPENSUSE_CONNECT.each_pair do |k,v|

app/themes/bento/views/layouts/_footer.html.haml

@@ -2,5 +2,5 @@
   .container-fluid
     #footer-content
     #footer-legal
-      = t(:version, :version => TravelSupportProgram::VERSION)
+      = t(:version, :version => TravelSupport::VERSION)
       — © All content is made available under the terms of the GNU Free Documentation License version 1.2 ("GFDL") unless expressly indicated otherwise.

app/themes/bento/views/layouts/_subheader.html.haml

@@ -10,11 +10,11 @@
       - else
         = link_to t(:logout), destroy_user_session_path, :method => :delete
     - else
-      - if TravelSupportProgram::Config.setting :authentication, :database, :enabled
+      - if TravelSupport::Config.setting :authentication, :database, :enabled
         = link_to t(:sign_up), new_registration_path(User)
         |
         = link_to t(:login), new_user_session_path
-      - if TravelSupportProgram::Config.setting :authentication, :ichain, :enabled
+      - if TravelSupport::Config.setting :authentication, :ichain, :enabled
         = link_to t(:sign_up), new_ichain_registration_path(User)
         |
         = link_to t(:login), new_user_ichain_session_path, :id => "login-trigger"

app/views/final_note_mailer/creation.html.erb

@@ -10,4 +10,4 @@
 <p><%= t(:visit_machine) %><br/><%= link_to(*[machine_url(@machine)]*2) %></p>
 
 <p>--<br>
-<%= TravelSupportProgram::Config.setting :email_footer %></p>
+<%= TravelSupport::Config.setting :email_footer %></p>

app/views/has_state_mailer/state.html.erb

@@ -15,4 +15,4 @@
 <p><%= t(:visit_machine) %><br/><%= link_to(*[machine_url(@machine)]*2) %></p>
 
 <p>--<br>
-<%= TravelSupportProgram::Config.setting :email_footer %></p>
+<%= TravelSupport::Config.setting :email_footer %></p>

app/views/has_state_mailer/state.text.erb

@@ -13,4 +13,4 @@
 <%= machine_url(@machine) %>
 
 --
-<%= TravelSupportProgram::Config.setting :email_footer %>
+<%= TravelSupport::Config.setting :email_footer %>

app/views/layouts/_external_links.html.haml

@@ -1,4 +1,4 @@
-- elinks = TravelSupportProgram::Config.setting :external_links
+- elinks = TravelSupport::Config.setting :external_links
 - if elinks && !elinks.empty?
   .well.sidebar-nav
     %ul.nav.nav-list

app/views/layouts/_footer.html.haml

@@ -1,3 +1,3 @@
 %footer#footer
   .container-fluid
-    %span.pull-right= t(:version, :version => TravelSupportProgram::VERSION)
+    %span.pull-right= t(:version, :version => TravelSupport::VERSION)

app/views/layouts/_navbar_top.html.haml

@@ -1,4 +1,4 @@
-=link_to TravelSupportProgram::Config.setting(:program_name), root_path, :class => "brand"
+=link_to TravelSupport::Config.setting(:program_name), root_path, :class => "brand"
 .container.nav-collapse
   %ul.nav
     - if user_signed_in?
@@ -8,9 +8,9 @@
       - else
         %li= link_to t(:logout), destroy_user_session_path, :method => :delete
     - else
-      - if TravelSupportProgram::Config.setting :authentication, :database, :enabled
+      - if TravelSupport::Config.setting :authentication, :database, :enabled
         %li= link_to t(:login), new_user_session_path
         %li= link_to t(:sign_up), new_registration_path(User)
-      - if TravelSupportProgram::Config.setting :authentication, :ichain, :enabled
+      - if TravelSupport::Config.setting :authentication, :ichain, :enabled
         %li= link_to t(:ichain_login), new_user_ichain_session_path
         %li= link_to t(:ichain_sign_up), new_ichain_registration_path(User)

app/views/layouts/application.html.haml

@@ -4,7 +4,7 @@
     %meta(charset="utf-8")
     %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
-    %title= content_for?(:title) ? yield(:title) : TravelSupportProgram::Config.setting(:program_name)
+    %title= content_for?(:title) ? yield(:title) : TravelSupport::Config.setting(:program_name)
     = csrf_meta_tags
     / Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]

app/views/pages/userguide.en.html.haml

@@ -88,11 +88,11 @@
   on your username, in the top right corner of the page, next to the 'log out'
   link.
 
-- if TravelSupportProgram::Config.setting :opensuse_connect, :enabled
+- if TravelSupport::Config.setting :opensuse_connect, :enabled
   %p
     Some of the information in the profile cannot be entered directly in the
     application. That information is read from
-    = link_to "openSUSE Connect", TravelSupportProgram::Config.setting(:opensuse_connect, :base_url)
+    = link_to "openSUSE Connect", TravelSupport::Config.setting(:opensuse_connect, :base_url)
     and should be updated in the Connect profile of the user.
 
 %p

app/views/reimbursements/show.pdf.prawn

@@ -55,7 +55,7 @@ prawn_document :page_size => "A4" do |pdf|
   pdf.fill_and_stroke
   pdf.move_down(20)
   pdf.bounding_box [ pdf.bounds.left, pdf.cursor ], :width => 550, :height => 650 do
-    pdf.text TravelSupportProgram::Config.setting(:program_name), :size => 16, :style => :bold
+    pdf.text TravelSupport::Config.setting(:program_name), :size => 16, :style => :bold
     pdf.move_down(10)
     pdf.text "#{Reimbursement.model_name.human.titleize} ##{resource.id} (#{resource.human_state_name}) - #{profile.full_name}", :size => 14, :style => :bold
     # Requester

config.ru

@@ -2,5 +2,5 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 map (ENV['RAILS_RELATIVE_URL_ROOT'] || '/') do
-  run TravelSupportProgram::Application
+  run TravelSupport::Application
 end

config/application.rb

@@ -6,7 +6,7 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env)
 
-module TravelSupportProgram
+module TravelSupport
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-TravelSupportProgram::Application.initialize!
+TravelSupport::Application.initialize!

config/environments/development.rb

@@ -1,4 +1,4 @@
-TravelSupportProgram::Application.configure do
+TravelSupport::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on

config/environments/production.rb

@@ -1,4 +1,4 @@
-TravelSupportProgram::Application.configure do
+TravelSupport::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests

config/environments/test.rb

@@ -1,4 +1,4 @@
-TravelSupportProgram::Application.configure do
+TravelSupport::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's

config/initializers/config.rb

@@ -1,8 +1,8 @@
-TravelSupportProgram::Config.init(Rails.env)
+TravelSupport::Config.init(Rails.env)
 
-ActionMailer::Base.default_url_options = TravelSupportProgram::Config.setting(:email_default_url_options).symbolize_keys
+ActionMailer::Base.default_url_options = TravelSupport::Config.setting(:email_default_url_options).symbolize_keys
 
-if theme = TravelSupportProgram::Config.setting("theme")
+if theme = TravelSupport::Config.setting("theme")
   path = "#{Rails.root}/app/themes/#{theme}/"
   ActionController::Base.prepend_view_path "#{path}views"
   Rails.application.config.assets.paths.unshift "#{path}assets/images", "#{path}assets/javascripts", "#{path}assets/stylesheets"

config/initializers/devise.rb

@@ -4,7 +4,7 @@
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = TravelSupportProgram::Config.setting(:email_from)
+  config.mailer_sender = TravelSupport::Config.setting(:email_from)
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
@@ -242,5 +242,5 @@
 
   # ==> iChain authenticatable configuration
   # config.ichain_test_mode = true
-  config.ichain_base_url = TravelSupportProgram::Config.setting(:authentication, :ichain, :base_url)
+  config.ichain_base_url = TravelSupport::Config.setting(:authentication, :ichain, :base_url)
 end

config/initializers/secret_token.rb

@@ -4,5 +4,5 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-TravelSupportProgram::Application.config.secret_token = '814559f18a98c99b92689e04a22283698e25334cb99f0652842ca0eeab0a8b7c7c9af593ac7c8aea451db5f794f68ba2dad5ec9b38587446cf56f3869bc01122'
-TravelSupportProgram::Application.config.secret_key_base = 'd60bee54c6e45a4ddf6f86748433c16518f25a41df253df66044519b75c58d710a7c93d8175602a2f435a9cef61aede4e1dc5c9db1fe3bc3dcf3dcd4b899682c'
+TravelSupport::Application.config.secret_token = '814559f18a98c99b92689e04a22283698e25334cb99f0652842ca0eeab0a8b7c7c9af593ac7c8aea451db5f794f68ba2dad5ec9b38587446cf56f3869bc01122'
+TravelSupport::Application.config.secret_key_base = 'd60bee54c6e45a4ddf6f86748433c16518f25a41df253df66044519b75c58d710a7c93d8175602a2f435a9cef61aede4e1dc5c9db1fe3bc3dcf3dcd4b899682c'

config/initializers/session_store.rb

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-TravelSupportProgram::Application.config.session_store :cookie_store, key: '_travel_sp_session'
+TravelSupport::Application.config.session_store :cookie_store, key: '_travel_sp_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-# TravelSupportProgram::Application.config.session_store :active_record_store
+# TravelSupport::Application.config.session_store :active_record_store

config/routes.rb

@@ -1,4 +1,4 @@
-TravelSupportProgram::Application.routes.draw do
+TravelSupport::Application.routes.draw do
   devise_for :users,
     :controllers => { :registrations => 'registrations',
                       :ichain_registrations => "ichain_registrations"},

lib/travel_support_program/config.rb → lib/travel_support/config.rb

@@ -1,7 +1,7 @@
 #
 # Module for application-wide code
 #
-module TravelSupportProgram
+module TravelSupport
   #
   # Facility class for system configuration
   #

lib/travel_support_program/version.rb → lib/travel_support/version.rb

@@ -1,7 +1,7 @@
 #
 # Module for application-wide code
 #
-module TravelSupportProgram
+module TravelSupport
   # Current version of the application
   VERSION = "0.8.0"
 end

script/clockwork.rb

@@ -4,7 +4,7 @@
 
 module Clockwork
   every(1.day, 'notify.pending') do
-    date = TravelSupportProgram::Config.setting(:days_for_reminder)
+    date = TravelSupport::Config.setting(:days_for_reminder)
     unless date.blank?
       date = date.to_i.days.ago
       Request.notify_inactive_since date