tolk 1.5.2 → 1.6.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c19b0b57cefe554cc66f643db8c50687d893f7b
-  data.tar.gz: ab0b34b9f6b9916bc4704c95c6ef287ff033deb1
+  metadata.gz: ca7dad7fa94ddec0e5d929c9cf06e95af7b2ee6b
+  data.tar.gz: 489d41d64a6a62a3699947467467fc20dce346e8
 SHA512:
-  metadata.gz: 5e86f97bb6601c3b8decb7569b194b9708ee0690c0d68b66e844ed863d59de1b85276542aa1619c8c3d5edd9f7c711e8bc0e357f12de35a290f1f3886265c770
-  data.tar.gz: fe545ba06f6ff8d2d53c5462417bb6a38037a40c1bf6c00a4dd1be19181b065788be4d873d23489e90fe64307219d82d3ac9ffc9e2e331a30652c2381160b696
+  metadata.gz: 9a3be6fb7c98e14dccdb1f5bf9e32c8d956ec528f237626419641cb925012cecd8c622e7d58d3375b4e497d5129ca33c684c376e6fc80987d0f7855f23ead1e2
+  data.tar.gz: 55fa32b0234ec09206e0ce054a6c151bfae8cb17ab22f48edda0360770e268320fa0b2d3201870c2e06349e69abc5a3eb0f2350859e8903492f650314b5666d2

data/app/controllers/tolk/locales_controller.rb

@@ -76,9 +76,13 @@ 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.permit(translations: [:id, :phrase_id, :locale_id, :text])[:translations]
+      params.require(: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
-          where(name: self.primary_locale_name).first_or_create
+          find_or_create_by(name: self.primary_locale_name)
         end
       end
 
@@ -55,7 +55,7 @@ module Tolk
       end
 
       def dump_yaml(name, *args)
-        where(name: name).first.dump(*args)
+          find_by_name(name).dump(*args)
       end
 
       def special_key_or_prefix?(prefix, key)
@@ -75,7 +75,7 @@ module Tolk
     end
 
     def has_updated_translations?
-      translations.where('tolk_translations.primary_updated' => true).count > 0
+      translations.count(:conditions => {:'tolk_translations.primary_updated' => true}) > 0
     end
 
     def phrases_with_translation(page = nil)
@@ -102,7 +102,6 @@ module Tolk
       phrases = phrases.where('tolk_phrases.id NOT IN (?)', existing_ids) if existing_ids.present?
 
       result = phrases.paginate({:page => page, :per_page => Phrase.per_page}.merge(options))
-      ActiveRecord::Associations::Preloader.new result, :translations
       result
     end
 
@@ -133,7 +132,6 @@ module Tolk
 #      phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
       phrases = phrases.where(['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
       result = phrases.paginate({:page => page}.merge(options))
-      ActiveRecord::Associations::Preloader.new result, :translations
       result
     end
 
@@ -162,7 +160,7 @@ module Tolk
     end
 
     def get(key)
-      if phrase = Tolk::Phrase.where(key: key).first
+      if phrase = Tolk::Phrase.find_by_key(key)
         t = self.translations.where(:phrase_id => phrase.id).first
         t.text if t
       end
@@ -171,7 +169,6 @@ module Tolk
     def translations_with_html
       translations = self.translations.all(:conditions => "tolk_translations.text LIKE '%>%' AND
         tolk_translations.text LIKE '%<%' AND tolk_phrases.key NOT LIKE '%_html'", :joins => :phrase)
-      ActiveRecord::Associations::Preloader.new translations, :phrase
       translations
     end
 
@@ -179,7 +176,7 @@ module Tolk
       if old_name.blank? || new_name.blank?
         "You need to provide both names, aborting."
       else
-        if locale = where(name: old_name).first
+        if locale = find_by_name(old_name)
           locale.name = new_name
           locale.save
           "Locale ' #{old_name}' was renamed '#{new_name}'"
@@ -211,7 +208,6 @@ module Tolk
         phrase.translation = phrase.translations.for(self)
       end
 
-      ActiveRecord::Associations::Preloader.new result, :translations
 
       result
     end

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

@@ -19,7 +19,7 @@
         </tr>
         <% @phrases.each do |phrase| %>
 
-          <% if translation = phrase.translations.where(locale_id: @locale.id).first || Tolk::Translation.new(:locale => @locale, :phrase => phrase) %>
+          <% if translation = phrase.translations.find_by_locale_id(@locale.id) || 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,8 +7,10 @@ module Tolk
 
     isolate_namespace Tolk
 
-    initializer :assets do |app|
-      app.config.assets.precompile += ['tolk/libraries.js']
+    if Rails.version >= '3.1'
+      initializer :assets do |app|
+        app.config.assets.precompile += ['tolk/libraries.js']
+      end
     end
   end
 end

data/lib/tolk/import.rb

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

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.5.2"
+  VERSION = "1.6.0.alpha1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0.alpha1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,22 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-05-28 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
@@ -48,98 +34,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        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'
+        version: '0.8'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com
@@ -197,12 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2