tolk 1.1.0 → 1.2.0

data/app/assets/stylesheets/tolk/application.css

@@ -0,0 +1,2 @@
+# =require 'tolk/reset.css'
+# =require 'tolk/screen.css'

data/app/controllers/tolk/application_controller.rb

@@ -1,3 +1,5 @@
+require 'tolk/application_controller'
+
 module Tolk
   class ApplicationController < ActionController::Base
     helper :all

data/app/controllers/tolk/searches_controller.rb

@@ -3,7 +3,7 @@ module Tolk
     before_filter :find_locale
   
     def show
-      @phrases = @locale.search_phrases(params[:q], params[:scope].to_sym, params[:page])
+      @phrases = @locale.search_phrases(params[:q], params[:scope].to_sym, params[:k], params[:page])
     end
 
     private

data/app/models/tolk/locale.rb

@@ -57,6 +57,7 @@ module Tolk
     accepts_nested_attributes_for :translations, :reject_if => proc { |attributes| attributes['text'].blank? }
     before_validation :remove_invalid_translations_from_target, :on => :update
 
+    attr_accessible :name
     cattr_accessor :locales_config_path
     self.locales_config_path = "#{Rails.root}/config/locales"
 
@@ -140,8 +141,8 @@ module Tolk
       result
     end
 
-    def search_phrases(query, scope, page = nil, options = {})
-      return [] unless query.present?
+    def search_phrases(query, scope, key_query, page = nil, options = {})
+      return [] unless query.present? || key_query.present?
 
       translations = case scope
       when :origin
@@ -151,6 +152,8 @@ module Tolk
       end
 
       phrases = Tolk::Phrase.scoped(:order => 'tolk_phrases.key ASC')
+      phrases = phrases.containing_text(key_query)
+
       phrases = phrases.scoped(:conditions => ['tolk_phrases.id IN(?)', translations.map(&:phrase_id).uniq])
       phrases.paginate({:page => page}.merge(options))
     end

data/app/models/tolk/phrase.rb

@@ -2,6 +2,8 @@ module Tolk
   class Phrase < ActiveRecord::Base
     self.table_name = "tolk_phrases"
 
+    attr_accessible :key
+
     validates_uniqueness_of :key
 
     cattr_accessor :per_page
@@ -18,5 +20,9 @@ module Tolk
     end
 
     attr_accessor :translation
+
+    scope :containing_text, lambda { |query|
+      { :conditions => ["tolk_phrases.key LIKE ?", "%#{query}%"] }
+    }
   end
 end

data/app/models/tolk/translation.rb

@@ -14,6 +14,7 @@ module Tolk
     belongs_to :locale, :class_name => 'Tolk::Locale'
     validates_presence_of :locale_id
 
+    attr_accessible :phrase_id, :locale_id, :text, :primary_updated, :previous_text, :locale, :phrase
 
     attr_accessor :force_set_primary_update
     before_save :set_primary_updated

data/app/views/layouts/tolk/application.html.erb

@@ -6,14 +6,8 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <title>Tolk</title>
 
-  <% if respond_to?(:sprockets_include_tag) %>
-    <%= sprockets_include_tag %>
-  <% else %>
-    <%= javascript_include_tag :defaults %>
-  <% end %>
-
-  <%= stylesheet_link_tag "tolk/reset" %>
-  <%= stylesheet_link_tag "tolk/screen" %>
+  <%= javascript_include_tag "tolk/application" %>
+  <%= stylesheet_link_tag "tolk/application" %>
   <%= yield :head %>
 </head>
 

data/app/views/tolk/searches/_form.html.erb

@@ -4,5 +4,7 @@
   <%= scope_selector_for(@locale) %>
   phrase:
   <%= text_field_tag :q, params[:q] %>
+  within key:
+  <%= text_field_tag :k, params[:k] %>
   <%= submit_tag "Search", :name => nil %>
 <% end %>

data/app/views/tolk/searches/show.html.erb

@@ -36,7 +36,9 @@
                 <% else -%>
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
                 <% end -%>
-                <span class="key" title="<%= phrase.key %>"><%= truncate(phrase.key, :length => 100) %></span>
+                <span class="key" title="<%= phrase.key %>"><%= params[:k].present? ?
+                  highlight(h(truncate(phrase.key, :length => 100)), params[:k]) :
+                  h(truncate(phrase.key, :length => 100)) %></span>
               </td>
             </tr>
           <% end %>

data/lib/tolk/sync.rb

@@ -46,6 +46,7 @@ module Tolk
         phrases = Tolk::Phrase.all
 
         translations.each do |key, value|
+          next if value.is_a?(Proc)
           # Create phrase and primary translation if missing
           existing_phrase = phrases.detect {|p| p.key == key} || Tolk::Phrase.create!(:key => key)
           translation = existing_phrase.translations.primary || primary_locale.translations.build(:phrase_id => existing_phrase.id)

data/lib/tolk/version.rb

@@ -0,0 +1,3 @@
+module Tolk
+  VERSION = "1.2.0"
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
 - David Heinemeier Hansson
+- Piotr Sarnacki
 - Emilio Tagua
 - Thomas Darde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -61,7 +62,14 @@ files:
 - lib/tolk/engine.rb
 - lib/tolk/import.rb
 - lib/tolk/sync.rb
+- lib/tolk/version.rb
 - lib/tolk.rb
+- app/assets/javascripts/tolk/application.js
+- app/assets/javascripts/tolk/controls.js
+- app/assets/javascripts/tolk/dragdrop.js
+- app/assets/javascripts/tolk/effects.js
+- app/assets/javascripts/tolk/prototype.js
+- app/assets/stylesheets/tolk/application.css
 - app/assets/stylesheets/tolk/reset.css
 - app/assets/stylesheets/tolk/screen.css
 - app/controllers/tolk/application_controller.rb