tolk 1.3.5 → 1.3.6

data/app/models/tolk/locale.rb

@@ -55,7 +55,7 @@ module Tolk
         secondary_locales.each do |locale|
           File.open("#{to}/#{locale.name}.yml", "w+") do |file|
             data = locale.to_hash
-            data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : YAML.dump(locale.to_hash, file)
+            data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : file.write(YAML.dump(data).force_encoding file.external_encoding.name)
           end
         end
       end

data/app/models/tolk/translation.rb

@@ -17,7 +17,6 @@ module Tolk
 
     attr_accessible :phrase_id, :locale_id, :text, :primary_updated, :previous_text, :locale, :phrase
 
-    attr_accessor :force_set_primary_update
     before_save :set_primary_updated
 
     before_save :set_previous_text
@@ -114,7 +113,7 @@ module Tolk
       if primary_translation.present?
         if self.text.is_a?(String) && !primary_translation.text.is_a?(String)
           self.text = begin
-            YAML.load(self.text.strip)
+            YAML.safe_load(self.text.strip)
           rescue ArgumentError
             nil
           end
@@ -138,7 +137,7 @@ module Tolk
     end
 
     def set_primary_updated
-      self.primary_updated = self.force_set_primary_update ? true : false
+      self.primary_updated = false
       true
     end
 

data/lib/tolk.rb

@@ -5,6 +5,8 @@ require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
 
+SafeYAML::OPTIONS[:suppress_warnings] = true
+
 module Tolk
   # Setup Tolk
   def self.config(&block)

data/lib/tolk/import.rb

@@ -53,7 +53,7 @@ module Tolk
 
       puts "[INFO] Reading #{locale_file} for locale #{self.name}"
       begin
-        self.class.flat_hash(YAML::load(IO.read(locale_file))[self.name])
+        self.class.flat_hash(YAML::safe_load(IO.read(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

@@ -38,7 +38,6 @@ module Tolk
 
       def sync_phrases(translations)
         primary_locale = self.primary_locale
-        secondary_locales = self.secondary_locales
 
         # Handle deleted phrases
         translations.present? ? Tolk::Phrase.destroy_all(["tolk_phrases.key NOT IN (?)", translations.keys]) : Tolk::Phrase.destroy_all
@@ -54,12 +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.
-            secondary_locales.each do |locale|
-              if existing_translation = existing_phrase.translations.detect {|t| t.locale_id == locale.id }
-                existing_translation.force_set_primary_update = true
-                existing_translation.save!
-              end
-            end
+            existing_phrase.translations.update_all({ :primary_updated => true }, Tolk::Translation.arel_table[:locale_id].not_eq(primary_locale.id))
           end
 
           translation.primary = true

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -35,17 +35,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails engine providing web interface for managing i18n yaml files