tolk 3.2.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f6680d4fdb375f50c14ea1725d32cf73c395b3825578f9e2f25b1ce6e593d7
-  data.tar.gz: b07c28ea6939450e7f46947d894db437b65142684994d47e6dfa8527356b4cae
+  metadata.gz: 5564840ddc80ff7aa53877b92a53d012c1d7da569d66ebc62f0de81b3e048ce9
+  data.tar.gz: 5e341c5940739f53d6d391de924fce6c85894992362b9d3946be674bbc33c0e3
 SHA512:
-  metadata.gz: '0980d8b70e512963c7be3ca8af3c5519b482370a8e5510f00606e6f93e066218583f19627f02df641dffba02476f1ed185ba63f2986e66a7c278c7bd744f607d'
-  data.tar.gz: c329d8a59897919e8a652c314115514d3f532cd6b23067e911f76651fcc5121ffe9eba4034923ab4504c8ee8ad0900f043f20ec1a5240938e2da7d2f5663b412
+  metadata.gz: 27468ef20b2250b344ab1f4e2905eee920f504f37d20b8a2293fd327dd409ce309bf1246bab0b4525652b27d35a7558d3db597a9f3adee3431b4358f045949f6
+  data.tar.gz: 4f4ec9c4114d4d9503f3c7339f9f3cb00e2e0db0454bb36b32f9eb737f8add9f5e9e12fd8fb8dc3596502f5ef4316160b79abf9bf2cf3881854a6be3907c1141

data/app/assets/stylesheets/tolk/screen.scss

@@ -17,7 +17,7 @@ a:hover {color: #000;}
  * Variables
 **/
 $primary_color: #2fadcf;
-$font_family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", sans-serif;
+$font_family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, Arial, sans-serif;
 
 /**
  * Some generic components

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
@@ -92,7 +92,7 @@ module Tolk
     end
 
     def count_phrases_without_translation
-      existing_ids = self.translations.pluck(&:phrase_id).uniq
+      existing_ids = self.translations.pluck(:phrase_id).uniq
       Tolk::Phrase.count - existing_ids.count
     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.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,7 +43,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,16 +74,22 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +168,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
@@ -190,14 +197,14 @@ 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
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files