tolk 3.2.1 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ecae48e940351234af122638232761da8c02a804a85438079ea2414bb2ab21
-  data.tar.gz: bb2014cbede3663c125d97d014d1cbcb1010c27176a28acf958eb07eecf95d76
+  metadata.gz: aa3e3637012d66b5b6cff958c18cda0db63548646e78b9c85c7521d9b6cf376a
+  data.tar.gz: ca4f20139cdd4a9af95fa316f5c1b663afceac4af1a313c493a9dde2ea4e7a26
 SHA512:
-  metadata.gz: 105a2363643a899dbfef1e079f156595f424efdc4b1ab6cc0828b216eab4ef4e82edb0255a21dfa5aa0602241fb104f7ec27bdb71b0145c88adac585c16e501a
-  data.tar.gz: fd52227d39d9b0a603de42f5ac3c72daa4ec5cf71b2ee543c7451c16c5ea40aad3687df905bb167ea5f99e419a072686dc9ee85049ae7abc9c687649fcd6b556
+  metadata.gz: 44f35db53e0209edfb14a35bbe394df5db895bc0c7131c4a885a7a5d1718c81a8baf33fdda3d3943e04817e9a2009b44ed011da8d266101213aa3f04dd98c39f
+  data.tar.gz: bb7b84a1ee6ee5b9541954efae240e7e2167f326f6ec506e3be7bfd5f0a3b61f2f4bec81c0116775ae9fbc2b9e35f693f22520518ec941a132926fae13787d39

data/app/helpers/tolk/application_helper.rb

@@ -17,7 +17,7 @@ module Tolk
     end
 
     def format_i18n_text_area_value(value)
-      yaml_value(value).to_s.force_encoding("UTF-8")
+      yaml_value(value).to_s.dup.force_encoding("UTF-8")
     end
 
     def yaml_value(value)

data/app/models/tolk/locale.rb

@@ -27,7 +27,7 @@ module Tolk
     include Tolk::Sync
     include Tolk::Import
 
-    validates_uniqueness_of :name
+    validates_uniqueness_of :name, case_sensitive: false
     validates_presence_of :name
 
     cattr_accessor :special_prefixes
@@ -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/config/initializers/assets.rb

@@ -0,0 +1,4 @@
+# Add the assets for Rails 6 app
+if defined?(Rails)
+  Rails.application.config.assets.precompile += %w[tolk/application.js tolk/application.css]
+end

data/lib/tolk/pagination.rb

@@ -20,7 +20,7 @@ module Tolk
           will_paginate collection, options
         else
           # Otherwise use Kaminari
-          paginate collection, options
+          paginate collection, **options
         end
       end
     end

data/lib/tolk/sync.rb

@@ -97,7 +97,7 @@ module Tolk
 
         ignored_escaped = ignored.map { |key| Regexp.escape(key) }
 
-        regexp = Regexp.new(/\A#{ignored_escaped.join('|')}/)
+        regexp = Regexp.new(/\A(#{ignored_escaped.join('|')})(:?\.|\Z)/)
 
         flat_hash.reject { |key, _| regexp === key }
       end

data/lib/tolk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  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: 2019-05-22 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,6 +28,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +57,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -57,63 +71,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: cuprite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,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
@@ -162,6 +196,7 @@ files:
 - app/views/tolk/locales/show.html.erb
 - app/views/tolk/searches/_form.html.erb
 - app/views/tolk/searches/show.html.erb
+- config/initializers/assets.rb
 - config/initializers/will_paginate.rb
 - config/routes.rb
 - lib/generators/tolk/install_generator.rb
@@ -182,7 +217,7 @@ homepage: https://github.com/tolk/tolk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,15 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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: []