tolk 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d8d26b2098b0ae5b40b1a283d50d6cb099f8d83ce6630a7d1807e669e7e864
-  data.tar.gz: b5d904bee635dc8271da82a1dca6e1a487696ecd68d5b99cc38169ed6491f6cf
+  metadata.gz: a3b8241abe4dc3fb29b314cc2d10706ed44d87534bfca91938274f22b2efb6c3
+  data.tar.gz: ece4b7e9dd20ee3729a3ef3151fafd79e1aa24d1d7a87755d868853e3bf93b5e
 SHA512:
-  metadata.gz: faa81169ad3e11e3cd4a53443e58a0ce884f1cf81657b0cf257129b81fa72211d414e89e7b45104d1f68486695f82695da0e5c2fe8746c123698aa7fcde8efd1
-  data.tar.gz: e052ecc99b90cc40fe7dd5626a52da884bf4ef67758b2b189c37b21b2be0736c255cb4d58af8a5dc67d7b19aadb7770188fa7c199e48620672121a2a6f03828c
+  metadata.gz: a61d50cc51fc2902366b8a3afd1da39fbaebcb9b8ffdde5a7978252b492be160a11c0e6b3561637c750590cb2357ea954a78afe86cfced76c31f225df6ecfa84
+  data.tar.gz: 8c0f00f1862c654e5d55b59ad6c5579e5ea83068ff8dfe965c8453195f0d599b82ed9266aa032f1b35a8b600626190003b41ee615ccdddc21ced81bac0076867

data/app/models/tolk/locale.rb

@@ -153,14 +153,14 @@ module Tolk
     end
 
     def to_hash
-      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
+      data = translations.joins(:phrase).order("tolk_phrases.key ASC").pluck("tolk_phrases.key, text").
+      each_with_object(Hash.new(0)) do |translation, locale|
+        if translation[0].include?(".")
+          locale.deep_merge!(unsquish(translation[0], translation[1]))
+        else
+          locale[translation[0]] = translation[1]
         end
+      end
       { name => data }
     end
 

data/lib/tolk/config.rb

@@ -23,6 +23,9 @@ module Tolk
       # strip translation texts automatically
       attr_accessor :strip_texts
 
+      # specify line width which Yaml.dump will use to break lines. -1 for not breaking
+      attr_accessor :yaml_line_width
+
       def reset
         @exclude_gems_token = false
 
@@ -78,6 +81,8 @@ module Tolk
           'zh-CN' => 'Chinese (Simplified)',
           'zh-TW' => 'Chinese (Traditional)'
         }
+
+        @yaml_line_width = Psych::Handler::OPTIONS.line_width # Psych::Handler::DumperOptions uses 0 as "default" for unset
       end
     end
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/tolk/yaml.rb

@@ -22,7 +22,7 @@ module Tolk
       if payload.respond_to?(:ya2yaml)
         payload.ya2yaml(:syck_compatible => true)
       else
-        ::YAML.dump(payload)
+        ::YAML.dump(payload, line_width: Tolk::Config.yaml_line_width)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files