added config yml and updated readme

archiveddomify · Apr 5, 2012 · 7eda280 · 7eda280
1 parent 38dd480
commit 7eda280
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 7 deletions.
diff --git a/README b/README
@@ -4,20 +4,28 @@ Tolk is a Rails engine designed to facilitate the translators doing the dirty wo
 
 To install :
 
-  $ script/plugin install git://github.com/gitlabeu/tolk.git
+  $ script/plugin install git://github.com/dhh/tolk.git
 
 To setup :
+  1) Copy example config file and update required:
+  $ cd vendor/plugins/tolk/config
+  $ cp config-example.yml config.yml
+  $ vi config.yml
 
-  1) Generate tolk migration and migrate your database :
+  2) Generate tolk migration and migrate your database :
 
   $ script/generate tolk_migration
   $ rake db:migrate
 
-  2) Setup Tolk assets by creating a symlink to tolk/public/tolk inside your application's public directory :
+  3) Setup Tolk assets by creating a symlink to tolk/public/tolk inside your application's public directory :
 
   $ cd public
   $ ln -s ../vendor/plugins/tolk/public/tolk tolk
 
+  4) Add custom logo
+
+  Make sure your master application has logo file at master app: /public/images/logo.png
+
   And you're all set!
 
 * Usage

diff --git a/app/controllers/tolk/application_controller.rb b/app/controllers/tolk/application_controller.rb
@@ -8,12 +8,12 @@ class ApplicationController < ActionController::Base
 
     def authenticate
       #self.authenticator.bind(self).call if self.authenticator && self.authenticator.respond_to?(:call)
-      if !['priit', 'testlab'].include?(Socket.gethostname)
+      if !(::ALLOWED_HOSTNAMES.include?(Socket.gethostname))
         return render :text => 'No permission', :status => 403 
       end
 
       authenticate_or_request_with_http_basic do |user_name, password|
-        user_name == 'lux' && password == 'luxtranslation'
+        user_name == ::USERNAME && password == ::PASSWORD
       end
 
     end

diff --git a/app/views/layouts/tolk/application.html.erb b/app/views/layouts/tolk/application.html.erb
@@ -19,7 +19,7 @@
 <body>
   <div id="container">
     <a href='<%= tolk_root_path %>' style='display: block; margin-bottom: 35px'>
-      <img src='/images/lux_express_logo.png' height='60px' />
+      <img src='/images/logo.png' height='60px' />
     </a>
 
     <div id="head">

diff --git a/config/config-example.yml b/config/config-example.yml
@@ -0,0 +1,8 @@
+---
+username: tolk
+password: please-change-password
+
+allowed_hostnames:
+  - priit
+  - veiko
+  - testlux
diff --git a/config/environment.rb b/config/environment.rb
@@ -14,3 +14,4 @@
 
 $KCODE = 'UTF8'
 require 'ya2yaml'
+
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -15,3 +15,4 @@
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
+
diff --git a/config/initializers/load_confing.rb b/config/initializers/load_confing.rb
@@ -0,0 +1,8 @@
+require 'yaml'
+config = File.open('../config.yml')
+
+YAML::load_documents(config) do |conf|
+  ALLOWED_HOSTNAMES = conf['allowed_hostnames']
+  USERNAME  = conf['username']
+  PASSWORD  = conf['password']
+end
diff --git a/lib/tolk.rb b/lib/tolk.rb
@@ -1,2 +1,13 @@
 module Tolk
 end
+
+# load local config file, is there any better place, somehow it didn't work on init.rb
+require 'yaml'
+config_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'config.yml'))
+config = File.open(config_path)
+
+YAML::load_documents(config) do |conf|
+  ALLOWED_HOSTNAMES = conf['allowed_hostnames']
+  USERNAME  = conf['username']
+  PASSWORD  = conf['password']
+end
diff --git a/lib/tolk/import.rb b/lib/tolk/import.rb
@@ -42,6 +42,5 @@ def read_locale_file
 
       self.class.flat_hash(YAML::load(IO.read(locale_file))[self.name])
     end
-
   end
 end