tolk 1.6.0.alpha1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7dad7fa94ddec0e5d929c9cf06e95af7b2ee6b
-  data.tar.gz: 489d41d64a6a62a3699947467467fc20dce346e8
+  metadata.gz: 2f7b2a28f97a99af1b49df29efb4e65da9f5f819
+  data.tar.gz: 06dc422c8a9203b5aea8646e33929b05d27377a9
 SHA512:
-  metadata.gz: 9a3be6fb7c98e14dccdb1f5bf9e32c8d956ec528f237626419641cb925012cecd8c622e7d58d3375b4e497d5129ca33c684c376e6fc80987d0f7855f23ead1e2
-  data.tar.gz: 55fa32b0234ec09206e0ce054a6c151bfae8cb17ab22f48edda0360770e268320fa0b2d3201870c2e06349e69abc5a3eb0f2350859e8903492f650314b5666d2
+  metadata.gz: 66e7419915337fe0d1bfacce4401d7c1c9fb824c779dce354189c6c9cb58d3b956134fe7160e6741c41b96c828825d776cee23832a9375b85669f4796bca2fb7
+  data.tar.gz: 06c8167af0cae8c8a28d1b1ca532241704e2d0b6ab6a6875c7222d86a210dec020feb18d00aeee86a29b0e15a2ecbefc85936dec1c6aa52c2bcf41066feaf081

data/app/controllers/tolk/locales_controller.rb

@@ -17,7 +17,7 @@ module Tolk
 
         format.yaml do
           data = @locale.to_hash
-          render :text => data.respond_to?(:ya2yaml) ? data.ya2yaml(:syck_compatible => true) : YAML.dump(data).force_encoding("UTF-8")
+          render :text => Tolk::YAML.dump(data)
         end
 
       end
@@ -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/helpers/tolk/application_helper.rb

@@ -21,7 +21,7 @@ module Tolk
     def yaml_value(value)
       if value.present?
         unless value.is_a?(String) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
-          value = value.respond_to?(:ya2yaml) ? value.ya2yaml(:syck_compatible => true) : value.to_yaml
+          value = Tolk::YAML.dump(value)
         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)
@@ -102,6 +102,12 @@ 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))
+      if Rails.version =~ /^4\.0/
+        ActiveRecord::Associations::Preloader.new result, :translations
+      else
+        ActiveRecord::Associations::Preloader.new().preload(result, :translations)
+      end
+
       result
     end
 
@@ -132,6 +138,12 @@ 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))
+      if Rails.version =~ /^4\.0/
+        ActiveRecord::Associations::Preloader.new result, :translations
+      else
+        ActiveRecord::Associations::Preloader.new().preload(result, :translations)
+      end
+
       result
     end
 
@@ -160,7 +172,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
@@ -169,6 +181,11 @@ 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)
+      if Rails.version =~ /^4\.0/
+        ActiveRecord::Associations::Preloader.new translations, :phrase
+      else
+        ActiveRecord::Associations::Preloader.new().preload(translations, :phrase)
+      end
       translations
     end
 
@@ -176,7 +193,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}'"
@@ -208,6 +225,11 @@ module Tolk
         phrase.translation = phrase.translations.for(self)
       end
 
+      if Rails.version =~ /^4\.0/
+        ActiveRecord::Associations::Preloader.new result, :translations
+      else
+        ActiveRecord::Associations::Preloader.new().preload(result, :translations)
+      end
 
       result
     end

data/app/models/tolk/translation.rb

@@ -112,7 +112,7 @@ module Tolk
       if primary_translation.present?
         if self.text.is_a?(String) && !primary_translation.text.is_a?(String)
           self.text = begin
-            YAML.safe_load(self.text.strip)
+            YAML.load(self.text.strip)
           rescue ArgumentError
             nil
           end

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.rb

@@ -1,10 +1,11 @@
 require 'will_paginate'
-require 'safe_yaml'
+require 'safe_yaml/load'
 require 'tolk/config'
 require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
 require 'tolk/export'
+require 'tolk/yaml'
 
 module Tolk
   # Setup Tolk

data/lib/tolk/engine.rb

@@ -2,15 +2,10 @@ require 'rails'
 
 module Tolk
   class Engine < Rails::Engine
-    SafeYAML::OPTIONS[:default_mode] = :safe
-    SafeYAML::OPTIONS[:deserialize_symbols] = true
-
     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/export.rb

@@ -10,12 +10,7 @@ module Tolk
 
     def dump
       File.open("#{destination}/#{name}.yml", "w+") do |file|
-        yml = if data.respond_to?(:ya2yaml)
-          data.ya2yaml(:syck_compatible => true)
-        else
-          YAML.dump(data).force_encoding(file.external_encoding.name)
-        end
-        file.write(yml)
+        file.write(Tolk::YAML.dump(data))
       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
 
@@ -53,7 +53,7 @@ module Tolk
 
       puts "[INFO] Reading #{locale_file} for locale #{self.name}"
       begin
-        self.class.flat_hash(YAML::safe_load(IO.read(locale_file))[self.name])
+        self.class.flat_hash(Tolk::YAML.load_file(locale_file)[self.name])
       rescue
         puts "[ERROR] File #{locale_file} expected to declare #{self.name} locale, but it does not. Skipping this file."
         nil

data/lib/tolk/sync.rb

@@ -17,7 +17,11 @@ module Tolk
 
       def read_primary_locale_file
         primary_file = "#{self.locales_config_path}/#{self.primary_locale_name}.yml"
-        File.exists?(primary_file) ? flat_hash(YAML::safe_load(IO.read(primary_file))[self.primary_locale_name]) : {}
+        if File.exists?(primary_file)
+          flat_hash(Tolk::YAML.load_file(primary_file)[self.primary_locale_name])
+        else
+          {}
+        end
       end
 
       def flat_hash(data, prefix = '', result = {})

data/lib/tolk/version.rb

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

data/lib/tolk/yaml.rb

@@ -0,0 +1,29 @@
+module Tolk
+  module YAML
+    SAFE_YAML_OPTIONS = SafeYAML::Deep.freeze({
+      :default_mode => :safe,
+      :deserialize_symbols => true
+    })
+
+    def self.load(yaml)
+      # SafeYAML.load has different arity depending on the YAML engine used.
+      if SafeYAML::YAML_ENGINE == "psych"
+        SafeYAML.load(yaml, nil, SAFE_YAML_OPTIONS)
+      else # syck
+        SafeYAML.load(yaml, SAFE_YAML_OPTIONS)
+      end
+    end
+
+    def self.load_file(filename)
+      SafeYAML.load_file(filename, SAFE_YAML_OPTIONS)
+    end
+
+    def self.dump(payload)
+      if payload.respond_to?(:ya2yaml)
+        payload.ya2yaml(:syck_compatible => true)
+      else
+        ::YAML.dump(payload)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.6.0.alpha1
+  version: 1.6.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,8 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-09-24 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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -34,14 +54,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
@@ -74,7 +178,6 @@ files:
 - app/views/tolk/searches/_form.html.erb
 - app/views/tolk/searches/show.html.erb
 - config/routes.rb
-- init.rb
 - lib/generators/tolk/install_generator.rb
 - lib/generators/tolk/templates/initializer.erb
 - lib/generators/tolk/templates/migration.rb
@@ -87,6 +190,7 @@ files:
 - lib/tolk/import.rb
 - lib/tolk/sync.rb
 - lib/tolk/version.rb
+- lib/tolk/yaml.rb
 homepage: http://github.com/tolk/tolk
 licenses:
 - MIT
@@ -99,12 +203,12 @@ 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:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/init.rb

@@ -1,8 +0,0 @@
-Mime::Type.register_alias "text/yaml", :yml
-
-$KCODE = 'UTF8'
-begin
-  require 'ya2yaml'
-rescue LoadError => e
-  Rails.logger.debug "[Tolk] Could not load ya2yaml"
-end