tolk 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac7a92ba13f6cddb5ddb3970d66785cddbf148c
-  data.tar.gz: 6bc7fc1e492b8594dd64fb82de0483b441f988a0
+  metadata.gz: 1c19b0b57cefe554cc66f643db8c50687d893f7b
+  data.tar.gz: ab0b34b9f6b9916bc4704c95c6ef287ff033deb1
 SHA512:
-  metadata.gz: 7fab81bf15cf9a483046851bbe20ad88877736ea4a396264fa5f2b5cb7f68037cba687cac3c94191fb280f2676c5cf3731511c313700a70a86687db1d1014eee
-  data.tar.gz: 0148444497e74ec2f305c249b1623bc6fb7e0b16101a2e1f42c80087b6a03d0a90401db88e426ab78bb8401669d70e0c7741bf2d0e39c3fcb29472a7029c668c
+  metadata.gz: 5e86f97bb6601c3b8decb7569b194b9708ee0690c0d68b66e844ed863d59de1b85276542aa1619c8c3d5edd9f7c711e8bc0e357f12de35a290f1f3886265c770
+  data.tar.gz: fe545ba06f6ff8d2d53c5462417bb6a38037a40c1bf6c00a4dd1be19181b065788be4d873d23489e90fe64307219d82d3ac9ffc9e2e331a30652c2381160b696

data/app/controllers/tolk/locales_controller.rb

@@ -76,13 +76,9 @@ module Tolk
       params.require(:tolk_locale).permit(:name)
     end
 
-    # TODO: whitelist incoming translation params
-    # translation permitted params: :phrase_id, :locale_id, :text, :primary_updated, :previous_text, :locale, :phrase
-    # test params: "translations"=>[{"id"=>"", "phrase_id"=>"8", "locale_id"=>"5", "text"=>"Dead men don't bite"}, {"id"=>"", "phrase_id"=>"7", "locale_id"=>"5", "text"=>""}]
     def translation_params
-      params.require(:translations)
+      params.permit(translations: [:id, :phrase_id, :locale_id, :text])[:translations]
     end
 
-
   end
 end

data/app/models/tolk/locale.rb

@@ -38,7 +38,7 @@ module Tolk
         @_primary_locale = nil if reload
         @_primary_locale ||= begin
           raise "Primary locale is not set. Please set Locale.primary_locale_name in your application's config file" unless self.primary_locale_name
-          find_or_create_by(name: self.primary_locale_name)
+          where(name: self.primary_locale_name).first_or_create
         end
       end
 
@@ -55,7 +55,7 @@ module Tolk
       end
 
       def dump_yaml(name, *args)
-          find_by_name(name).dump(*args)
+        where(name: name).first.dump(*args)
       end
 
       def special_key_or_prefix?(prefix, key)
@@ -75,7 +75,7 @@ module Tolk
     end
 
     def has_updated_translations?
-      translations.count(:conditions => {:'tolk_translations.primary_updated' => true}) > 0
+      translations.where('tolk_translations.primary_updated' => true).count > 0
     end
 
     def phrases_with_translation(page = nil)
@@ -162,7 +162,7 @@ module Tolk
     end
 
     def get(key)
-      if phrase = Tolk::Phrase.find_by_key(key)
+      if phrase = Tolk::Phrase.where(key: key).first
         t = self.translations.where(:phrase_id => phrase.id).first
         t.text if t
       end
@@ -179,7 +179,7 @@ module Tolk
       if old_name.blank? || new_name.blank?
         "You need to provide both names, aborting."
       else
-        if locale = find_by_name(old_name)
+        if locale = where(name: old_name).first
           locale.name = new_name
           locale.save
           "Locale ' #{old_name}' was renamed '#{new_name}'"

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

@@ -19,7 +19,7 @@
         </tr>
         <% @phrases.each do |phrase| %>
 
-          <% if translation = phrase.translations.find_by_locale_id(@locale.id) || Tolk::Translation.new(:locale => @locale, :phrase => phrase) %>
+          <% if translation = phrase.translations.where(locale_id: @locale.id).first || Tolk::Translation.new(:locale => @locale, :phrase => phrase) %>
             <tr>
               <td class="translation">
                 <%= hidden_field_tag :"translations[][id]", translation.id, :id => "#{translation.object_id}_id" %>
@@ -40,7 +40,7 @@
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
                 <% end -%>
                 <%= boolean_warning if phrase.translations.primary.boolean? -%>
-                
+
                 <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>

data/lib/tolk/engine.rb

@@ -7,10 +7,8 @@ module Tolk
 
     isolate_namespace Tolk
 
-    if Rails.version >= '3.1'
-      initializer :assets do |app|
-        app.config.assets.precompile += ['tolk/libraries.js']
-      end
+    initializer :assets do |app|
+      app.config.assets.precompile += ['tolk/libraries.js']
     end
   end
 end

data/lib/tolk/import.rb

@@ -20,7 +20,7 @@ module Tolk
       end
 
       def import_locale(locale_name)
-        locale = Tolk::Locale.find_or_create_by_name(locale_name)
+        locale = Tolk::Locale.where(name: locale_name).first_or_create
         data = locale.read_locale_file
         return unless data
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,8 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -34,14 +48,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.6
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com
@@ -99,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="