tolk 5.0.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5de6a79064d4d85e04496152aac11d8fa60e14bde292f51990cc4cc006d146b
-  data.tar.gz: 302345bdea17f7f41be7ebf0c141c872a628e6d1693036fc961327c79a2e1c3b
+  metadata.gz: ef7dfd14b400818821775dd81554dd57d93067cdc411dc326fb1ba84a63cb429
+  data.tar.gz: 7d6461627242236ef9244f455fb1d351df38e9aa48b9bc66a95e546ed8e9283d
 SHA512:
-  metadata.gz: b674e81e5b20f24a5e9b573d63cbf18b5ee4881ee6522101635950757fee8947bd555fbb1e15b04c9a616b42eff2441b0844abbee2250a045de040d48e8ca7dd
-  data.tar.gz: 1f1e0385b73dcd992a86965c4e98c9713fca8c7feae0865aa1a2c3886b367d594b85611011cb483606806c410f1a41ace06bde97d2a002b5068036e6bee92b5b
+  metadata.gz: bc32c25878d1cfa7624e3ffcece01b86b4ee53328a51cc52b032228e2fa7621207e8346f23c2ed2decbffce5a2259e55b01526a1a229f326fed14e2dd071d439
+  data.tar.gz: cb4dea705b81ca1563370b1ff7e951a6b1e42b5b5ca81f938dadc038dbdc9484dea7f849e3c3dcb3b650013260e06ee91caeefde5e8300db4f5557c39f5d68d7

data/app/controllers/tolk/locales_controller.rb

@@ -17,7 +17,7 @@ module Tolk
 
         format.yaml do
           data = @locale.to_hash
-          render :plain => Tolk::YAML.dump(data)
+          render :plain => YAML.dump(data)
         end
 
       end

data/app/helpers/tolk/application_helper.rb

@@ -23,7 +23,7 @@ module Tolk
     def yaml_value(value)
       if value.present?
         unless value.is_a?(String) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
-          value = Tolk::YAML.dump(value)
+          value = YAML.dump(value)
         end
       end
 

data/app/models/tolk/translation.rb

@@ -4,8 +4,8 @@ module Tolk
 
     scope :containing_text, lambda {|query| where("tolk_translations.text LIKE ?", "%#{query}%") }
 
-    serialize :text
-    serialize :previous_text
+    serialize :text, coder: YAML, yaml: { permitted_classes: [Symbol, Time, nil, String, Array, Hash] }
+    serialize :previous_text, coder: YAML, yaml: { permitted_classes: [Symbol, Time, nil, String, Array, Hash] }
     validate :validate_text_not_nil, :if => proc {|r| r.primary.blank? && !r.explicit_nil && !r.boolean?}
     validate :check_matching_variables, :if => proc { |tr| tr.primary_translation.present? }
 

data/lib/tolk/export.rb

@@ -10,7 +10,7 @@ module Tolk
 
     def dump
       File.open("#{destination}/#{name}.yml", "w+") do |file|
-        file.write(Tolk::YAML.dump(data))
+        file.write(YAML.dump(data))
       end
     end
 

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(Tolk::YAML.load_file(locale_file)[self.name])
+        self.class.flat_hash(YAML.load_file(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

@@ -47,7 +47,7 @@ module Tolk
       def read_primary_locale_file
         primary_file = "#{self.locales_config_path}/#{self.primary_locale_name}.yml"
         if File.exist?(primary_file)
-          flat_hash(Tolk::YAML.load_file(primary_file)[self.primary_locale_name])
+          flat_hash(YAML.load_file(primary_file)[self.primary_locale_name])
         else
           {}
         end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "5.0.2"
+  VERSION = "6.0.0"
 end

data/lib/tolk.rb

@@ -1,10 +1,8 @@
-require 'safe_yaml/load'
 require 'tolk/config'
 require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
 require 'tolk/export'
-require 'tolk/yaml'
 require 'tolk/pagination'
 
 module Tolk

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 6.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,20 +20,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -48,20 +48,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +90,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -150,16 +150,16 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,6 @@ files:
 - lib/tolk/pagination.rb
 - lib/tolk/sync.rb
 - lib/tolk/version.rb
-- lib/tolk/yaml.rb
 homepage: https://github.com/tolk/tolk
 licenses:
 - MIT
@@ -239,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/tolk/yaml.rb

@@ -1,29 +0,0 @@
-module Tolk
-  module YAML
-    SAFE_YAML_OPTIONS = SafeYAML::Deep.freeze({
-      :default_mode => :safe,
-      :deserialize_symbols => true
-    })
-
-    def self.load(yaml)
-      # SafeYAML.load has different arity depending on the YAML engine used.
-      if SafeYAML::YAML_ENGINE == "psych"
-        SafeYAML.load(yaml, nil, SAFE_YAML_OPTIONS)
-      else # syck
-        SafeYAML.load(yaml, SAFE_YAML_OPTIONS)
-      end
-    end
-
-    def self.load_file(filename)
-      SafeYAML.load_file(filename, SAFE_YAML_OPTIONS)
-    end
-
-    def self.dump(payload)
-      if payload.respond_to?(:ya2yaml)
-        payload.ya2yaml(:syck_compatible => true)
-      else
-        ::YAML.dump(payload, line_width: Tolk::Config.yaml_line_width)
-      end
-    end
-  end
-end