translation_center 1.7.2 → 2.0.1

data/app/views/layouts/translation_center/application.html.haml

@@ -19,8 +19,6 @@
           %a.brand{:href => root_url}
             = favicon_link_tag
             = Rails.application.class.parent_name
-            %em.center_title
-              = t('translation_center.translation_center')
           .nav-collapse.collapse.navbar-responsive-collapse
             %ul.nav
               %li.divider-vertical

data/app/views/translation_center/translation_keys/_translation_keys.html.haml

@@ -4,7 +4,7 @@
 - else
   .tabbable.tabs-left.all_listing
     
-    %ul.nav.nav-tabs.translation_keys_listing
+    %ul.nav.nav-tabs.translation_keys_listing#keys_ul
       - translation_keys.each_with_index do |translation_key, index|
         = render 'translation_center/translation_keys/show_keys', translation_key: translation_key, index: index
         
@@ -14,3 +14,5 @@
         = render 'translation_center/translation_keys/show', translation_key: translation_key, index: index
 
 
+:javascript   
+  $("#keys_ul").css('max-height', $(window).height()-220);

data/app/views/translation_center/translations/_show.html.haml

@@ -1,9 +1,9 @@
 .well.well-small.translation_box{ id: "translation_id_#{translation.id}", 'data-key-id' => translation.translation_key.id }
-  
+
   %div{class: "translation_info #{language_direction(to_lang)}"}
     %span
       = translation.value
-    
+
     - if translation_admin?
       = link_to '×', translation_path(translation), method: :delete, data: { confirm: t('translation_center.actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
     %br
@@ -22,7 +22,7 @@
       = render 'translation_center/translations/accept_translation', translation: translation
     .votes_count.badge.badge-success.pull-right
       %span.count{ 'data-translation-id' => translation.id }
-        = translation.count_votes_total
+        = translation.votes_for.count
       = t('.votings')
     %a.pull-right{href: '#'}
       - voted = current_user.voted_on?(translation)

data/config/routes.rb

@@ -11,7 +11,7 @@ TranslationCenter::Engine.routes.draw do
   end
 
   resources :translation_keys, except: :create do
-    post :update_translation
+    post :update_translation, defaults: { format: 'json' }
     get :translations
     collection do 
       get :search
@@ -29,6 +29,6 @@ TranslationCenter::Engine.routes.draw do
   root to: 'categories#index'
 
   # set the language from and to for the user
-  match "/set_language_from" => 'center#set_language_from', as: :set_lang_from
-  match "/set_language_to" => 'center#set_language_to', as: :set_lang_to
+  get "/set_language_from" => 'center#set_language_from', as: :set_lang_from
+  get "/set_language_to" => 'center#set_language_to', as: :set_lang_to
 end

data/{test/dummy/db/migrate/20130410084711_acts_as_votable_migration.rb → db/migrate/20130410084605_acts_as_votable_migration.rb}

@@ -7,6 +7,7 @@ class ActsAsVotableMigration < ActiveRecord::Migration
 
       t.boolean :vote_flag
       t.string :vote_scope
+      t.integer :vote_weight
 
       t.timestamps
     end

data/{test/dummy/db → db}/schema.rb

@@ -11,13 +11,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130417134539377014) do
+ActiveRecord::Schema.define(:version => 20130801102021) do
 
   create_table "articles", :force => true do |t|
     t.string   "title"
     t.text     "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "audits", :force => true do |t|
@@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20130417134539377014) do
 
   create_table "translation_center_categories", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "translation_center_translation_keys", :force => true do |t|
@@ -52,8 +52,8 @@ ActiveRecord::Schema.define(:version => 20130417134539377014) do
     t.integer  "category_id"
     t.datetime "last_accessed"
     t.string   "en_status",     :default => "untranslated"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                :null => false
+    t.datetime "updated_at",                                :null => false
     t.string   "de_status",     :default => "untranslated"
     t.string   "ar_status",     :default => "untranslated"
   end
@@ -66,8 +66,8 @@ ActiveRecord::Schema.define(:version => 20130417134539377014) do
     t.string   "lang"
     t.integer  "translator_id"
     t.string   "status",             :default => "pending"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                :null => false
+    t.datetime "updated_at",                                :null => false
     t.string   "translator_type"
   end
 
@@ -84,8 +84,8 @@ ActiveRecord::Schema.define(:version => 20130417134539377014) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
   end
 
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
@@ -98,8 +98,8 @@ ActiveRecord::Schema.define(:version => 20130417134539377014) do
     t.string   "voter_type"
     t.boolean  "vote_flag"
     t.string   "vote_scope"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   add_index "votes", ["votable_id", "votable_type", "vote_scope"], :name => "index_votes_on_votable_id_and_votable_type_and_vote_scope"

data/lib/generators/translation_center/add_lang/add_lang_generator.rb

@@ -18,13 +18,16 @@ module TranslationCenter
       langs.each do |lang|
         @lang = lang
         # check if language already supported
-        if(TranslationCenter::TranslationKey.column_names.include? "#{lang.downcase.gsub("-","_")}_status")
+        language_supported = TranslationCenter::TranslationKey.column_names.include?("#{lang.downcase.gsub("-","_")}_status")
+        if language_supported
           puts 'This language is already supported, just make sure it is listed in config/translation_center.yml'
           return
         end
         # Generate migration templates for the models needed
-        migration_template 'migrations/add_lang_status_translation_keys.rb', "db/migrate/add_#{lang.downcase.gsub("-","_")}_status_translation_center_translation_keys.rb"
+        migration_template 'migrations/add_lang_status_translation_keys.rb',
+          "db/migrate/add_#{lang.downcase.gsub("-","_")}_status_translation_center_translation_keys.rb"
       end
+
       puts "Language(s) added, don't forget to add the language(s) to config/translation_center.yml"
     end
   end

data/lib/generators/translation_center/install/install_generator.rb

@@ -16,9 +16,9 @@ module TranslationCenter
       migration_template 'migrations/create_translation_center_translations.rb', 'db/migrate/create_translation_center_translations.rb'
 
       # generate votes if it doesn't already exist
-      unless ActiveRecord::Base.connection.table_exists? 'votes'
+      # unless ActiveRecord::Base.connection.table_exists? 'votes'
         Rails::Generators.invoke('acts_as_votable:migration')
-      end
+      # end
       
       copy_file 'config/translation_center.yml', 'config/translation_center.yml'
 
@@ -27,10 +27,10 @@ module TranslationCenter
 
       sleep(1) # to avoid duplicate migrations between acts_as_votable and auditable
 
-      unless ActiveRecord::Base.connection.table_exists? 'audits'
+      # unless ActiveRecord::Base.connection.table_exists? 'audits'
         # we use audited for tracking activity
         Rails::Generators.invoke('audited:install')
-      end
+      # end
     end
 
   end

data/lib/translation_center/acts_as_translator.rb

@@ -9,7 +9,7 @@ module ActsAsTranslator
   module InstanceMethods
     # returns the translation a user has made for a certain key in a certain language
     def translation_for(key, lang)
-      self.translations.find_or_initialize_by_translation_key_id_and_lang_and_translator_type(key.id, lang.to_s, self.class.name)
+      self.translations.find_or_initialize_by(translation_key_id: key.id, lang: lang.to_s, translator_type: self.class.name)
     end
 
     # returns true if the user can admin translations

data/lib/translation_center/engine.rb

@@ -11,5 +11,12 @@ module TranslationCenter
 
   class Engine < ::Rails::Engine
     isolate_namespace TranslationCenter
+
+    config.generators do |g|
+      g.test_framework :rspec, :fixture => false
+      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false
+    end
   end
 end

data/lib/translation_center/translation_helpers.rb

@@ -60,7 +60,7 @@ module TranslationCenter
     complete_key = prepare_key(key, options) # prepare complete key
 
     # add the new key or update it
-    translation_key = TranslationCenter::TranslationKey.find_or_create_by_name(complete_key)
+    translation_key = TranslationCenter::TranslationKey.find_or_create_by(name: complete_key)
     #  UNCOMMENT THIS LATER TO SET LAST ACCESSED AT
     # translation_key.update_attribute(:last_accessed, Time.now)
 

data/lib/translation_center/translations_transfer.rb

@@ -28,14 +28,17 @@ module TranslationCenter
   # returns true if the translation was fonud in yaml 
   def self.yaml2db_key(locale, translation_key, translator, all_yamls)
     I18n.locale = locale
-    translation = TranslationCenter::Translation.find_or_initialize_by_translation_key_id_and_lang_and_translator_id(translation_key.id, locale.to_s, translator.id)
+    translation = TranslationCenter::Translation.find_or_initialize_by(translation_key_id: translation_key.id, lang: locale.to_s, translator_id: translator.id)
     translation.translator_type = TranslationCenter::CONFIG['translator_type']
     
     # get the translation for this key from the yamls
     value = get_translation_from_hash(translation_key.name, all_yamls[locale])
 
     # if the value is not empty and is different from the existing value the update
-    if !value.blank? && value != translation.value
+    if value.is_a? Proc
+      puts "proc removed for key #{translation_key.name}"
+      translation.destroy unless translation.new_record?
+    elsif !value.blank? && value != translation.value
       translation.update_attribute(:value, value)
       # accept this yaml translation
       translation.accept if TranslationCenter::CONFIG['yaml2db_translations_accepted']
@@ -55,8 +58,7 @@ module TranslationCenter
     # for each key create it in the db if it doesn't exist, and add its translation to
     # the db in every locale
     keys.each do |key|
-
-      translation_key = TranslationCenter::TranslationKey.find_or_initialize_by_name(key)
+      translation_key = TranslationCenter::TranslationKey.find_or_initialize_by(name: key)
       if translation_key.new_record?
         translation_key.save
         new_keys += 1
@@ -97,7 +99,6 @@ module TranslationCenter
     all_keys = all_yamls.collect do |check_locale, translations|
       collect_keys([], translations).sort
     end.flatten.uniq
-
     puts "#{all_keys.size} #{all_keys.size == 1 ? 'unique key' : 'unique keys'} found."
 
     locales = locale.blank? ? I18n.available_locales : [locale.to_sym]

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.7.2"
+  VERSION = "2.0.1"
 end

data/spec/controllers/categories_controller_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+module TranslationCenter
+	describe CategoriesController, :type => :controller do
+	  let(:user) {FactoryGirl.create(:user)}
+	  before(:each) do
+	    sign_in user
+   	  end
+
+	  describe "GET index" do
+	    it "assigns @categories & render index template" do
+	      categories = Category.all
+
+	      get :index, use_route: "trancelaion_center"
+	      expect(assigns(:categories)).to eq(categories)
+	      expect(response).to render_template(:index)
+	    end
+	  end
+
+	 describe "GET show" do
+	    it "assigns @category & render show template" do
+	  	category = FactoryGirl.create(:category)
+
+	      get :show, id: category.id, use_route: "trancelaion_center"
+	      expect(assigns(:category)).to eq(category)
+	      expect(response).to render_template(:show)
+	    end
+	  end
+
+	  describe "GET more_keys" do
+	  	it "assigns @category & render keys", :js => true do
+	  	  category = FactoryGirl.create(:category)
+	  	  get :more_keys, category_id: category.id, format: :js, use_route: "trancelaion_center"
+	      	  expect(response).to render_template(:keys)
+	  	end
+	  end
+
+	    describe "GET destroy" do
+	  	it "assigns @category & render index" do
+	  	  category = FactoryGirl.create(:category)
+	        get :destroy, id: category.id, use_route: "trancelaion_center"
+	      	  expect(Category.where(id: category.id)).to be_empty
+	      	  expect(response).to redirect_to(:categories)
+	    end
+	  end
+
+  end
+end

data/spec/controllers/center_controller_spec.rb

@@ -0,0 +1,77 @@
+require "spec_helper"
+module TranslationCenter
+  describe CenterController, :type => :controller do
+  	let(:user) {FactoryGirl.create(:user)}
+	let(:translation_key) {FactoryGirl.create(:translation_key)}
+	before(:each) do
+	  sign_in user
+ 	end
+      after(:all) do
+         FileUtils.rm_r("config/locales")
+      end
+
+   describe "GET set_language_from" do
+ 	it "should set language the user is translating from & render nothing" do
+        get :set_language_from, lang: "en", use_route: "trancelaion_center"
+ 	  expect(I18n.locale).to eq :en
+ 	  expect(response.body).to be_blank
+ 	end
+   end
+
+   describe "GET set_language_to" do
+	it "should set language the user is translating to & redirect to root" do
+ 	  get :set_language_to, lang: "ar", use_route: "trancelaion_center"
+ 	  expect(session[:lang_to]).to eq :ar
+        expect(response).to redirect_to(:root)
+ 	end
+ 
+ 	it "should render nothing" do
+ 	  get :set_language_to, lang: "ar", format: :js, use_route: "trancelaion_center"
+ 	  expect(session[:lang_to]).to eq :ar
+ 	  expect(response.body).to be_blank
+ 	end
+    end
+
+     describe "GET dashboard" do
+ 	it "should set dashboard stats & render dashboard.html" do
+ 	  get :dashboard, use_route: "trancelaion_center"
+  	  expect(assigns(:translations_changes).class.name).to eq "ActiveRecord::Relation"
+  	  expect(assigns(:total_pages).class.name).to eq "Fixnum"
+        expect(response).to render_template(:dashboard)
+ 	end
+
+ 	it "should render search_activity.html" do
+ 	  get :dashboard, format: :js, use_route: "trancelaion_center"
+        expect(response).to render_template(:search_activity)
+ 	end
+   end
+     
+    describe "GET search_activity" do
+    	it "should render search_activity.js" do
+ 	  get :search_activity, format: :js, use_route: "trancelaion_center"
+ 	  expect(assigns(:translations_changes).class.name).to eq "ActiveRecord::Relation"
+  	  expect(assigns(:total_pages).class.name).to eq "Fixnum"
+        expect(response).to render_template(:search_activity)
+ 	end
+    end
+
+     describe "GET manage" do
+        Dir.mkdir "config/locales"  
+        File.open( "config/locales/en.yml", "w+")
+        File.open( "config/locales/ar.yml", "w+")
+    	it "should run yaml2db" do
+ 	  get :manage, locale: "en", manage_action: "yaml2db", format: :js, use_route: "trancelaion_center"
+ 	end
+
+ 	it "should run db2yaml" do
+
+ 	  get :manage, locale: "en", manage_action: "db2yaml", format: :js, use_route: "trancelaion_center"
+ 	end
+ 	
+ 	it "should run yaml2db & render manage.js" do
+ 	  get :manage, locale: "all", manage_action: "db2yaml", format: :js, use_route: "trancelaion_center"
+        expect(response).to render_template(:manage)
+ 	end
+    end
+  end
+end

data/spec/controllers/translation_keys_controller_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+module TranslationCenter
+  describe TranslationKeysController, :type => :controller do
+  	let(:user) {FactoryGirl.create(:user)}
+	let(:translation_key) {FactoryGirl.create(:translation_key)}
+	before(:each) do
+	  sign_in user
+ 	end
+ 	describe "POST update_translation" do
+ 	  it "should assigns @translation & render nothing" do
+ 	  	post :update_translation, translation_key_id: translation_key.id, format: :json, use_route: "trancelaion_center"
+ 	  	  expect(assigns(:translation_key)).to eq translation_key
+ 	  	  expect(response.body).to be_blank
+ 	  end
+ 	  it "should assigns @translation & render json" do
+ 	  	post :update_translation, translation_key_id: translation_key.id, value: "value value", format: :json, use_route: "trancelaion_center"
+ 	  	  expect(assigns(:translation_key)).to eq translation_key
+ 	  end
+ 	end
+
+	describe "GET translations" do
+ 	  it "should assigns @translations sorted by votes & render translations.js" do
+		FactoryGirl.create(:translation, translation_key: translation_key)
+		# FactoryGirl.create(:translation, value: "value", translation_key: translation_key)
+ 	  	get :translations, translation_key_id: translation_key.id, sort_by: "votes", format: :js, use_route: "trancelaion_center"
+ 	  	expect(assigns(:translations).first.class.name).to eq "TranslationCenter::Translation"
+	      	expect(response).to render_template(:translations)
+ 	  end
+ 	  it "should assigns @translations sorted by created_at" do
+ 	  	FactoryGirl.create(:translation, translation_key: translation_key)
+ 	  	get :translations, translation_key_id: translation_key.id, format: :js, use_route: "trancelaion_center"
+ 	  	expect(assigns(:translations).first.class.name).to eq "TranslationCenter::Translation"
+ 	  end
+ 	end
+
+ 	describe "GET show" do
+  	  it "should assign @translation_key & render show" do
+  	  	get :show, id: translation_key.id, use_route: "trancelaion_center"
+  	  	expect(assigns(:translation_key)).to eq translation_key
+	      	expect(response).to render_template(:show)
+  	  end
+  	end
+
+  	describe "PUT update" do
+  	  it "should assign @translation_key" do
+  	  	put :update, id: translation_key.id, format: :json, use_route: "trancelaion_center"
+  	  	expect(assigns(:translation_key)).to eq translation_key
+  	  	expect(TranslationKey.find(translation_key).name).to eq translation_key.name
+  	  end
+
+  	  it "should assign @translation_key & update value" do
+  	  	put :update, id: translation_key.id, format: :json, value: "new value", use_route: "trancelaion_center"
+  	  	expect(assigns(:translation_key)).to eq translation_key
+  	  	expect(TranslationKey.find(translation_key).name).to eq "new value"
+  	  end
+  	end
+  
+  	describe "POST destroy" do
+  	  it "should assign translation & render destroy.js" do
+  	  	delete :destroy, id: translation_key.id, format: :js, use_route: "trancelaion_center"
+  	  	expect(assigns(:category)).to eq translation_key.category
+  	  	expect(assigns(:translation_key)).to eq translation_key
+	      	expect(TranslationKey.where(id: translation_key.id)).to be_empty
+	      	expect(response).to render_template(:destroy)
+  	  end
+
+  	   it "should assign render categories/show.html" do
+  	  	delete :destroy, id: translation_key.id, use_route: "trancelaion_center"
+	      	expect(response).to redirect_to(translation_key.category)
+  	  end
+  	end
+
+      describe "GET search" do
+        it "should assign translations & render search" do
+          get :search, search_key_name: translation_key.name, use_route: "trancelaion_center"
+          expect(assigns(:translation_key)).to eq translation_key
+          expect(response).to redirect_to(translation_key)
+        end
+
+         it "should render search.js" do
+          get :search, query: " ", format: :json, use_route: "trancelaion_center"
+          expect(assigns(:key_names).class.name).to eq "ActiveRecord::Relation"
+          expect(response).not_to redirect_to(translation_key)
+        end
+    end  
+  end
+end