translation_center 1.6.10 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYxMGNlNTM2ZDE2MTczZTAzM2VlYzA0NjJhM2ZmYWQ0N2RkZTczMg==
+    MTg1YzRkNDU5ZGY0M2ZiMjAwMzExNTRlMTgxZjUwYzI3NjNhNThkNQ==
   data.tar.gz: !binary |-
-    YmM4YjI1OTQ1NjM3NGVmMmQ0M2YzYmI3YjQ0MmZlZDQ1NjMwMzgzNQ==
+    MzYxOTMyNTQyMmE1MjUxMTIwZDhkOTFjMmM2ZGI3NzIzZjE0NDg3NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yzc4NDJlNTNjNWNjYzM0MDVlNDJiYTRhYWFmOWRjNDQ4MDlhZjVmZDViYWE2
-    OGY1ZGE0Y2MwOTgyNjM3OTkyZTYwNmFhYTM5ODUxMTExOTAxZTcwZmM2MTgy
-    ZWEwMzNlODNlZmUyYTM0Y2Y2NDVjYzE1OTAzYjFlN2ZjODNlMjQ=
+    NjMxYzgyNWM5ZGEyM2ExZTBmNzA2MTQ3ZDM0Y2ZkMGJmODI0ZTk3Y2ZkZDdi
+    ZTBjZGUwZTZlZjY2ZmE1NGE5Y2M5ZGNmMTU1MTRhMzJiMzc2NGZkNmY5NzFl
+    YjU2ZDc0Y2EzYTg5MTIwMzk2MjdhNzZiMWI3Y2RjMTk2Mzc4MzM=
   data.tar.gz: !binary |-
-    MDE3YmNhOGM5ZjhiNjUxOWI5ZGMzMzNjYWQ1M2ExNmNmYTc2ODAyOTIzMmY3
-    NmExMDUzNjBhN2NhZjMzYTdlZDE4Njk4ZGU2NzU4OGQ0MDRkZTg1YjUyNGY1
-    MTAyNjdjOWY0OTg0MjdkMTMxMTg2NzgzYjA2YmRiYjYyZmQ3NDU=
+    ODBjNGMzNGE1MzZjYTk0YTc1Mjk2OTM1ZDdhYmM4NzQ5ZWFmZmE0ZDY3ZTZi
+    ODA0MzhjMTMzNjUxOGY4Y2NmOWRjMjc2YWVkMzNhYWQ3NzNiNjEyMGJmNTZl
+    MGNmMDJlMWNjZWU5N2JiM2RkMzdiODEzZmYyZjUwNGNjOTE2NTM=

data/README.md

@@ -76,17 +76,17 @@ And run the migrations
 rake db:migrate
 ```
 
-And then run this rake to get all current translations to the db
-```ruby
-rake translation_center:synch
-```
-
 Add this line to the translator model (typically `User`)
 
 ```ruby
 acts_as_translator
 ```
 
+And then run this rake to get all current translations to the db
+```ruby
+rake translation_center:synch
+```
+
 and change the `translator_type` in `translation_center.yml` to the translator model name (if it is `User` keep it commented)
 
 ```ruby

data/app/controllers/translation_center/center_controller.rb

@@ -26,11 +26,13 @@ module TranslationCenter
     def dashboard
       @stats = TranslationKey.langs_stats
       @langs = @stats.keys
-      # to be used for meta search
-      @search = Audited::Adapters::ActiveRecord::Audit.search(params[:search])
+
+      # build an empty activity query
+      @activity_query = ActivityQuery.new(params[:activity_query])
+
       #TODO perpage constant should be put somewhere else
-      @translations_changes = Translation.recent_changes.offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
-      @total_pages = (Translation.recent_changes.count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
+      @translations_changes = @activity_query.activities.offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
+      @total_pages = (@activity_query.activities.count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
 
       respond_to do |format|
         format.html
@@ -39,8 +41,8 @@ module TranslationCenter
     end
 
     def search_activity
-      @translations_changes = Translation.recent_changes(params[:search]).offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
-      @total_pages =  (Translation.recent_changes(params[:search]).count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
+      @translations_changes = ActivityQuery.new(params[:activity_query]).activities.offset(Translation::CHANGES_PER_PAGE * (@page - 1)).limit(Translation::CHANGES_PER_PAGE)
+      @total_pages =  (ActivityQuery.new(params[:activity_query]).activities.count / (Translation::CHANGES_PER_PAGE * 1.0)).ceil
       
       respond_to do |format|
         format.js

data/app/helpers/translation_center/center_helper.rb

@@ -11,5 +11,9 @@ module TranslationCenter
         "<span class=\"label label-info\">#{attribute}</span> has new value <span class=\"label label-success\">#{value}</span>".html_safe
       end
     end
+
+    def translator_identifier_placeholder
+      "#{TranslationCenter::CONFIG['translator_type']} #{TranslationCenter::CONFIG['identifier_type']}".upcase
+    end
   end
 end

data/app/models/translation_center/activity_query.rb

@@ -0,0 +1,46 @@
+module TranslationCenter
+  class ActivityQuery
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+
+    attr_accessor :translation_key_name, :translator_identifier, :lang, :created_at_gteq, :created_at_lteq
+    
+    def persisted?
+      false
+    end
+    
+    def initialize args={}
+      args ||= {}
+      args.each do |k,v|
+        instance_variable_set("@#{k}", v) unless v.blank?
+      end
+    end
+
+    # retuns and ActiveRecord Relation of Audit(s) that matches this search criteria
+    def activities
+      query = Audited::Adapters::ActiveRecord::Audit.where(auditable_id: translation_ids).scoped
+      query = query.where("DATE(created_at) <= DATE(?)", created_at_lteq) unless created_at_lteq.blank?
+      query = query.where("DATE(created_at) >= DATE(?)", created_at_gteq) unless created_at_gteq.blank?
+      query.order('created_at DESC')
+    end
+
+    protected
+
+    # return translation ids that matches this search criteria
+    def translation_ids
+      query = Translation.scoped
+      query = query.where(lang: lang) unless lang.blank?
+      query = query.joins(:translation_key).where("translation_center_translation_keys.name LIKE ?", "%#{translation_key_name}%") unless translation_key_name.blank?
+
+      if translator_identifier
+        translator_class = TranslationCenter::CONFIG['translator_type'].camelize.constantize
+        translators_ids = translator_class.where("#{TranslationCenter::CONFIG['identifier_type']} LIKE ? ", "%#{translator_identifier}%").map(&:id)
+
+        query = query.where(translator_id: translators_ids)
+      end
+
+      query.map(&:id)
+    end
+
+  end
+end

data/app/models/translation_center/translation.rb

@@ -71,7 +71,8 @@ module TranslationCenter
     end
 
     # gets recent changes on translations
-    def self.recent_changes(params = {})
+    # TODO: remove this method as it is not being used elsewhere
+    def self.recent_changes
       Audited::Adapters::ActiveRecord::Audit.where('auditable_type = ?', 'TranslationCenter::Translation').search(params).relation.reorder('created_at DESC')
     end
 

data/app/views/translation_center/center/_activity.html.haml

@@ -34,15 +34,16 @@
             = distance_of_time_in_words_to_now change.created_at
             = t('.ago')
   .pagination
-    = link_to t('pagination.first'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=1"
+    - query_without_page_param = request.query_string.gsub(/&?page=\d*/, '')
+    = link_to t('pagination.first'), "#{request.protocol}#{request.host_with_port}#{request.path}?#{query_without_page_param}&page=1"
     - if @page != 1
       |
-      = link_to t('pagination.prev'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@page - 1}"
+      = link_to t('pagination.prev'), "#{request.protocol}#{request.host_with_port}#{request.path}?#{query_without_page_param}&page=#{@page - 1}"
     |
-    = link_to t('pagination.next'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@page + 1}"
+    = link_to t('pagination.next'), "#{request.protocol}#{request.host_with_port}#{request.path}?#{query_without_page_param}&page=#{@page + 1}"
     - if @page != @total_pages
       |
-      = link_to t('pagination.last'), "#{request.protocol}#{request.host_with_port}#{request.fullpath.gsub('&page=' + @page.to_s, '')}?&page=#{@total_pages}"
+      = link_to t('pagination.last'), "#{request.protocol}#{request.host_with_port}#{request.path}?#{query_without_page_param}&page=#{@total_pages}"
     = @page
     = t('.of')
     = @total_pages

data/app/views/translation_center/center/dashboard.html.haml

@@ -51,13 +51,13 @@
 %h1
   = t('.activity')
 .span12
-  
-  = form_for @search, url: :search_activity, html: { method: :get, id: :search_form, class: 'pull-left form-search' } do |f|
-    = f.text_field 'auditable_TranslationCenter::Translation_type_translation_key_name_matches', class: 'search_field input-medium',  placeholder: 'KEY'
 
-    = f.select 'auditable_TranslationCenter::Translation_type_lang_equals', I18n.available_locales.collect { |locale| [locale.to_s, locale.to_s] }, {:include_blank => t('.select_locale')}, class: 'search_field'
+  = form_for @activity_query, url: :search_activity, html: { method: :get, id: :search_form, class: 'pull-left form-search' } do |f|
+    = f.text_field :translation_key_name, class: 'search_field input-medium',  placeholder: 'KEY'
+
+    = f.select :lang, I18n.available_locales.collect { |locale| [locale.to_s, locale.to_s] }, {:include_blank => t('.select_locale')}, class: 'search_field'
 
-    = f.text_field 'user_user_type_email_matches', class: 'search_field input-medium',  placeholder: 'USER'
+    = f.text_field :translator_identifier, class: 'search_field input-medium',  placeholder: translator_identifier_placeholder
 
     = f.text_field :created_at_gteq, class: 'search_field datepicker input-medium',  placeholder: 'FROM DATE'
 
@@ -88,6 +88,13 @@
     return false;
   })
 
+  // hit search directly when pressing enter
+  $(".search_field").keyup(function(event){
+    if(event.keyCode == 13){
+        $('#search_activity').click();
+    }
+  });
+
       
 
 

data/lib/translation_center/engine.rb

@@ -6,7 +6,6 @@ require 'acts_as_votable'
 require 'ya2yaml'
 require 'font-awesome-rails'
 require 'audited-activerecord'
-require 'meta_search'
 
 module TranslationCenter
 

data/lib/translation_center/translation_helpers.rb

@@ -7,7 +7,8 @@ module TranslationCenter
     
     # if translator doesn't exist then create him
     if translator.blank?
-      translator = TranslationCenter::CONFIG['translator_type'].camelize.constantize.new(TranslationCenter::CONFIG['identifier_type'] => TranslationCenter::CONFIG['yaml_translator_identifier'])
+      translator = TranslationCenter::CONFIG['translator_type'].camelize.constantize.new
+      translator.send "#{TranslationCenter::CONFIG['identifier_type']}=", TranslationCenter::CONFIG['yaml_translator_identifier']
       begin
         translator.save(validate: false)
         # needed if the user is using confirmable with devise

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.6.10"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation_center
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.7.0
 platform: ruby
 authors:
 - BadrIT
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,20 +96,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +157,7 @@ files:
 - app/controllers/translation_center/center_controller.rb
 - app/controllers/translation_center/translations_controller.rb
 - app/controllers/translation_center/application_controller.rb
+- app/models/translation_center/activity_query.rb
 - app/models/translation_center/translation_key.rb
 - app/models/translation_center/category.rb
 - app/models/translation_center/translation.rb