tolk 1.4.00 → 1.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDI5NjM5ZWYxNzY0YmJkNmI3ZDM3ZmY2MzdjZmM2MmM5YmMxODRkOA==
-  data.tar.gz: !binary |-
-    MzY0ZmU1ZGU4ZGRmYmZmMDQ0NDU5MzQ0MjMzMDI4YjE3NGM4OTE4OA==
+SHA1:
+  metadata.gz: 3c7fdf39ee1f10310cb7c34dfcabdc8e8018468e
+  data.tar.gz: 54d0cd52a00f4cb2af889e73a112c119dc2f57ad
 SHA512:
-  metadata.gz: !binary |-
-    NDA4YzMwOWU0ZjdhZDA0Y2QyNmNiYmMzOGI1ZjcyYTY4NmE2MzkwY2ZkNmRl
-    NWViYjMwYmY5MGFlYzk2ODlhYzkzYmU3OWRlOTkwM2EyOTNmMGFkM2QyYTg5
-    YTYzOTM1ZTE4ZWRkYjhkY2M4ZDlkMTUxNjgyNmY1OTkwZTBhNGI=
-  data.tar.gz: !binary |-
-    NTIzZjY4MGQyOGIyY2Y0ODgwM2VmNTZkZmM5NjhjYWQ0YjIzZjdjNDg1ZTZm
-    NGVjYTA3Zjg5M2UwOTJmNGQ0ZTNkZTViNTQxZTVhMjI5MTZlODNkMDU5YjU1
-    MWRjZTg5NGM3ZTU3OGViMDQzMzE1YjBkNmY3MGUxYzU5YjQ0ZDM=
+  metadata.gz: 5a0e9a6cb1d4aad16bbf424fe82e89caece0909d6a4e5a7b69ae034c221483e859d1f006604d0653ac869f1e8f33c0c9b25eaedf507abbdd919b36d25afdc9d8
+  data.tar.gz: 33462659545170ca060c92484a0760abfade2578eaaead46cec9b205ba8bbb7c16f459f594fa9a9569120f94d0f0e26ed4d27ca3d3d86b3bac1d96dea5bc8d1d

data/app/controllers/tolk/locales_controller.rb

@@ -24,7 +24,7 @@ module Tolk
     end
 
     def update
-      @locale.translations_attributes = params[:translations]
+      @locale.translations_attributes = translation_params
       @locale.save
       redirect_to request.referrer
     end
@@ -39,7 +39,7 @@ module Tolk
     end
 
     def create
-      Tolk::Locale.create!(params[:tolk_locale])
+      Tolk::Locale.create!(locale_params)
       redirect_to :action => :index
     end
 
@@ -71,5 +71,18 @@ module Tolk
     def find_locale
       @locale = Tolk::Locale.where('UPPER(name) = UPPER(?)', params[:id]).first!
     end
+
+    def locale_params
+      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)
+    end
+
+
   end
 end

data/app/models/tolk/locale.rb

@@ -15,7 +15,6 @@ 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 = self._dump_path
 
@@ -51,10 +50,12 @@ module Tolk
         all - [primary_locale]
       end
 
-      def dump_all(to = self.locales_config_path, exporter = Tolk::Export)
-        secondary_locales.each do |locale|
-          exporter.dump(name: locale.name, data: locale.to_hash, destination: to)
-        end
+      def dump_all(*args)
+        secondary_locales.each { |locale| locale.dump(*args) }
+      end
+
+      def dump_yaml(name, *args)
+          find_by_name(name).dump(*args)
       end
 
       def special_key_or_prefix?(prefix, key)
@@ -69,6 +70,10 @@ module Tolk
       end
     end
 
+    def dump(to = self.locales_config_path, exporter = Tolk::Export)
+      exporter.dump(name: name, data: to_hash, destination: to)
+    end
+
     def has_updated_translations?
       translations.count(:conditions => {:'tolk_translations.primary_updated' => true}) > 0
     end
@@ -123,8 +128,8 @@ module Tolk
 
       phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
 
-      found_translations_ids = Tolk::Locale.primary_locale.translations.all(:conditions => ["tolk_translations.text LIKE ?", "%#{query}%"], :select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
-      existing_ids = self.translations.all(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
+      found_translations_ids = Tolk::Locale.primary_locale.translations.where(["tolk_translations.text LIKE ?", "%#{query}%"]).to_a.map(&:phrase_id).uniq
+      existing_ids = self.translations.select('tolk_translations.phrase_id').to_a.map(&:phrase_id).uniq
 #      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))
@@ -133,13 +138,15 @@ module Tolk
     end
 
     def to_hash
-      { name => translations.each_with_object({}) do |translation, locale|
-        if translation.phrase.key.include?(".")
-          locale.deep_merge!(unsquish(translation.phrase.key, translation.value))
-        else
-          locale[translation.phrase.key] = translation.value
+      data = translations.includes(:phrase).references(:phrases).order(phrases.arel_table[:key]).
+        each_with_object({}) do |translation, locale|
+          if translation.phrase.key.include?(".")
+            locale.deep_merge!(unsquish(translation.phrase.key, translation.value))
+          else
+            locale[translation.phrase.key] = translation.value
+          end
         end
-      end }
+      { name => data }
     end
 
     def to_param
@@ -198,9 +205,7 @@ module Tolk
     end
 
     def find_phrases_with_translations(page, conditions = {})
-      result = Tolk::Phrase.paginate(:page => page,
-        :conditions => { :'tolk_translations.locale_id' => self.id }.merge(conditions),
-        :joins => :translations, :order => 'tolk_phrases.key ASC')
+      result = Tolk::Phrase.where({ :'tolk_translations.locale_id' => self.id }.merge(conditions)).joins(:translations).order('tolk_phrases.key ASC').paginate(:page => page)
 
       result.each do |phrase|
         phrase.translation = phrase.translations.for(self)

data/app/models/tolk/phrase.rb

@@ -2,8 +2,6 @@ module Tolk
   class Phrase < ActiveRecord::Base
     self.table_name = "tolk_phrases"
 
-    attr_accessible :key
-
     validates_uniqueness_of :key
 
     cattr_accessor :per_page

data/app/models/tolk/translation.rb

@@ -15,8 +15,6 @@ 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
-
     before_save :set_primary_updated
 
     before_save :set_previous_text
@@ -156,7 +154,7 @@ module Tolk
         end
       end
     end
-    
+
     def validate_text_not_nil
       return unless text.nil?
       errors.add :text, :blank

data/lib/tasks/tolk_tasks.rake

@@ -24,6 +24,11 @@ namespace :tolk do
     Tolk::Locale.dump_all
   end
 
+  desc "Generate a single yml file for a specific locale"
+  task :dump_yaml, [:locale] => :environment do
+    Tolk::Locale.dump_yaml(locale)
+  end
+
   desc "Imports data all non default locale yml files to Tolk"
   task :import => :environment do
     Rake::Task['tolk:sync'].invoke

data/lib/tolk/export.rb

@@ -10,7 +10,12 @@ module Tolk
 
     def dump
       File.open("#{destination}/#{name}.yml", "w+") do |file|
-        data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : file.write(YAML.dump(data).force_encoding file.external_encoding.name)
+        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)
       end
     end
 
@@ -23,6 +28,5 @@ module Tolk
         Tolk::Locale._dump_path
       end
     end
-
   end
-end
+end

data/lib/tolk/sync.rb

@@ -53,7 +53,7 @@ module Tolk
 
           if translation.changed? && !translation.new_record?
             # Set the primary updated flag if the primary translation has changed and it is not a new record.
-            existing_phrase.translations.update_all({ :primary_updated => true }, Tolk::Translation.arel_table[:locale_id].not_eq(primary_locale.id))
+            existing_phrase.translations.where(Tolk::Translation.arel_table[:locale_id].not_eq(primary_locale.id)).update_all({ :primary_updated => true })
           end
 
           translation.primary = true

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.4.00"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.4.00
+  version: 1.5.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,48 +12,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
   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: protected_attributes
-  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: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
@@ -64,20 +50,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- config/routes.rb
-- init.rb
-- lib/generators/tolk/install_generator.rb
-- lib/generators/tolk/templates/initializer.erb
-- lib/generators/tolk/templates/migration.rb
-- lib/generators/tolk/utils.rb
-- lib/tasks/tolk_tasks.rake
-- lib/tolk/config.rb
-- lib/tolk/engine.rb
-- lib/tolk/export.rb
-- lib/tolk/import.rb
-- lib/tolk/sync.rb
-- lib/tolk/version.rb
-- lib/tolk.rb
 - app/assets/javascripts/tolk/actions.js
 - app/assets/javascripts/tolk/application.js
 - app/assets/javascripts/tolk/interpolations.js
@@ -101,6 +73,20 @@ files:
 - app/views/tolk/locales/show.html.erb
 - 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
+- lib/generators/tolk/utils.rb
+- lib/tasks/tolk_tasks.rake
+- lib/tolk.rb
+- lib/tolk/config.rb
+- lib/tolk/engine.rb
+- lib/tolk/export.rb
+- lib/tolk/import.rb
+- lib/tolk/sync.rb
+- lib/tolk/version.rb
 homepage: http://github.com/tolk/tolk
 licenses:
 - MIT
@@ -111,18 +97,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files
 test_files: []
+has_rdoc: