tolk 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5564840ddc80ff7aa53877b92a53d012c1d7da569d66ebc62f0de81b3e048ce9
-  data.tar.gz: 5e341c5940739f53d6d391de924fce6c85894992362b9d3946be674bbc33c0e3
+  metadata.gz: aa3e3637012d66b5b6cff958c18cda0db63548646e78b9c85c7521d9b6cf376a
+  data.tar.gz: ca4f20139cdd4a9af95fa316f5c1b663afceac4af1a313c493a9dde2ea4e7a26
 SHA512:
-  metadata.gz: 27468ef20b2250b344ab1f4e2905eee920f504f37d20b8a2293fd327dd409ce309bf1246bab0b4525652b27d35a7558d3db597a9f3adee3431b4358f045949f6
-  data.tar.gz: 4f4ec9c4114d4d9503f3c7339f9f3cb00e2e0db0454bb36b32f9eb737f8add9f5e9e12fd8fb8dc3596502f5ef4316160b79abf9bf2cf3881854a6be3907c1141
+  metadata.gz: 44f35db53e0209edfb14a35bbe394df5db895bc0c7131c4a885a7a5d1718c81a8baf33fdda3d3943e04817e9a2009b44ed011da8d266101213aa3f04dd98c39f
+  data.tar.gz: bb7b84a1ee6ee5b9541954efae240e7e2167f326f6ec506e3be7bfd5f0a3b61f2f4bec81c0116775ae9fbc2b9e35f693f22520518ec941a132926fae13787d39

data/app/models/tolk/locale.rb

@@ -153,14 +153,14 @@ module Tolk
     end
 
     def to_hash
-      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]
+      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
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,10 +9,10 @@ authors:
 - Emilio Tagua
 - Thomas Darde
 - Ferran Basora
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,47 +29,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,7 +119,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: cuprite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,6 +146,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com
@@ -189,7 +217,7 @@ homepage: https://github.com/tolk/tolk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files
 test_files: []