Converted tolk to mountable engine

2 tests still fail and integration tests must be run with selenium because of bug in capybara.
tolk · Sep 12, 2010 · 7e06bea · 7e06bea
1 parent 863399b
commit 7e06bea
Show file tree

Hide file tree

Showing 82 changed files with 66,881 additions and 283 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
-tmp/**/*
+tmp/**/*
+test/dummy/db/migrate/*.tolk.rb
+Gemfile.lock
+.bundle
diff --git a/Gemfile b/Gemfile
@@ -1 +1,17 @@
+source "http://rubygems.org"
+
+gem "rails", :git => "http://github.com/rails/rails.git"
+gem "arel", :git => "http://github.com/rails/arel.git"
+
 gem 'will_paginate', :git => 'http://github.com/mislav/will_paginate.git', :branch => 'rails3'
+gem "ya2yaml"
+
+gem "factory_girl_rails"
+gem "capybara", ">= 0.3.9"
+gem "sqlite3-ruby", :require => "sqlite3"
+gem "mocha"
+
+if RUBY_VERSION < '1.9'
+  gem "ruby-debug", ">= 0.10.3"
+end
+
diff --git a/Rakefile b/Rakefile
@@ -1,10 +1,39 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
+# encoding: UTF-8
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rake/gempackagetask'
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task :default => :test
+
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Tolk'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = "tolk"
+  s.summary = "Rails engine providing web interface for managing i18n yaml files"
+  s.description = "Tolk is a web interface for doing i18n translations packaged as an engine for Rails applications."
+  s.files =  FileList["[A-Z]*", "lib/**/*"]
+  s.version = "2.0.0.beta"
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+end
 
-require 'tasks/rails'
+desc "Install the gem #{spec.name}-#{spec.version}.gem"
+task :install do
+  system("gem install pkg/#{spec.name}-#{spec.version}.gem --no-ri --no-rdoc")
+end
diff --git a/app/controllers/tolk/application_controller.rb b/app/controllers/tolk/application_controller.rb
@@ -11,7 +11,7 @@ def authenticate
     end
 
     def ensure_no_primary_locale
-      redirect_to tolk_locales_path if @locale.primary?
+      redirect_to tolk.locales_path if @locale.primary?
     end
   end
 end
diff --git a/app/models/tolk/locale.rb b/app/models/tolk/locale.rb
@@ -133,7 +133,7 @@ def phrases_without_translation(page = nil, options = {})
       existing_ids = self.translations.all(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
       phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?)', existing_ids]) if existing_ids.present?
 
-      result = phrases.paginate({:page => page}.merge(options))
+      result = phrases.paginate({:page => page, :per_page => Phrase.per_page}.merge(options))
       Tolk::Phrase.send :preload_associations, result, :translations
       result
     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">
     <div id="head">
-      <h1><span class="home"><%= link_to "Tolk", tolk_root_path %></span><%= yield :locale %></h1>
+      <h1><span class="home"><%= link_to "Tolk", tolk.root_path %></span><%= yield :locale %></h1>
     </div>
     <%= yield %>
   </div>

diff --git a/app/views/tolk/locales/all.html.erb b/app/views/tolk/locales/all.html.erb
@@ -4,7 +4,7 @@
 <h3 class="switch">Completed translations <span>(<%= link_to 'See phrases missing translation', @locale %>)</span></h3>
 
 <% if @locale.has_updated_translations? && action_name != 'updated' %>
-  <span class="notice">Some phrases have changed. <%= link_to "Update translations", updated_tolk_locale_path(@locale) %>.</span>
+  <span class="notice">Some phrases have changed. <%= link_to "Update translations", tolk.updated_locale_path(@locale) %>.</span>
 <% end %>
 
 <div class="search">

diff --git a/app/views/tolk/locales/index.html.erb b/app/views/tolk/locales/index.html.erb
@@ -21,7 +21,6 @@
 <% end %>
 <%= form_for(Tolk::Locale.new) do |f| %>
 <div class="submit">
-  <%= f.error_messages %>
   <p>
     <%= f.label "Add a new Locale" %>
     <select id="select_tolk_locale_name" name="tolk_locale[name]">

diff --git a/app/views/tolk/locales/show.html.erb b/app/views/tolk/locales/show.html.erb
@@ -3,13 +3,13 @@
 <% end %>
 
 <% content_for :head do %>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= tolk_locale_path(@locale, :format => 'atom') -%>" />
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= tolk.locale_path(@locale, :format => 'atom') -%>" />
 <% end %>
 
-<h3 class="switch">Phrases missing translation (<%= @locale.count_phrases_without_translation %>) <span>(<%= link_to 'See completed translations', all_tolk_locale_path(@locale) %>)</span></h3>
+<h3 class="switch">Phrases missing translation (<%= @locale.count_phrases_without_translation %>) <span>(<%= link_to 'See completed translations', tolk.all_locale_path(@locale) %>)</span></h3>
 
 <% if @locale.has_updated_translations? && action_name != 'updated' %>
-  <span class="notice">Some phrases have changed. <%= link_to "Update translations", updated_tolk_locale_path(@locale) %>.</span>
+  <span class="notice">Some phrases have changed. <%= link_to "Update translations", tolk.updated_locale_path(@locale) %>.</span>
 <% end %>
 
 <div class="search">

diff --git a/app/views/tolk/searches/show.html.erb b/app/views/tolk/searches/show.html.erb
@@ -9,7 +9,7 @@
 <div class="search_exits">
   <%= link_to "Phrases missing translation", @locale %>
   &nbsp;
-  <%= link_to "Completed translations", all_tolk_locale_path(@locale) %>
+  <%= link_to "Completed translations", tolk.all_locale_path(@locale) %>
 </div>
 
 <div class="translations">

diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,7 +1,10 @@
-Rails.application.routes.draw do |map|
-  map.namespace('tolk') do |tolk|
-    tolk.root :controller => 'locales'
-    tolk.resources :locales, :member => {:all => :get, :updated => :get}
-    tolk.resource :search
+Tolk::Engine.routes.draw do
+  root :to => 'locales#index'
+  resources :locales do
+    member do
+      get :all
+      get :updated
+    end
   end
+  resource :search
 end
diff --git a/lib/tolk.rb b/lib/tolk.rb
@@ -1,6 +1,8 @@
 require 'will_paginate'
 require 'ya2yaml'
 require 'tolk/engine'
+require 'tolk/sync'
+require 'tolk/import'
 
 module Tolk
 end
diff --git a/lib/tolk/engine.rb b/lib/tolk/engine.rb
@@ -2,6 +2,6 @@
 
 module Tolk
   class Engine < Rails::Engine
-    engine_name :tolk
+    namespace Tolk
   end
 end
diff --git a/test/dummy/Rakefile b/test/dummy/Rakefile
@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Dummy::Application.load_tasks