zlocalize 6.0.1.3 → 6.0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5651dc41c98a14458f171ab2aff8a696edb9d256
-  data.tar.gz: 5f04f8f4e09450c28c45665c1c6103f0d69e38ef
+SHA256:
+  metadata.gz: b47c0bdc87138208ef5941ce9e4bbe02fcd1ab5c61d7ac96cb4b1152a1ae9183
+  data.tar.gz: c41a5e58777b8d804bb65508e74d6ce2590e8e091fd8bce509c1e48355f644dc
 SHA512:
-  metadata.gz: 6ea3f6afbc8b4b6361a12f9fe4796ed3c9768296ff0eb1e2c22dcfab328722708ebd3e4c2146a208974455690dbd463b08f3af34eb1a849236bc3cfdcee18de7
-  data.tar.gz: ec98c7d8a1b5ad8a6e94eae0eb4497cb09a6f9ca26e6143e8747ac872e84c627209749e63dd620293ae6e676cb8539765f2363d633ae6c35040a7dcb42bf74bb
+  metadata.gz: 2ef0a7650d371550f99899ae77d0eb617d332186aa27333442fbb40893ba2b6ad4071726b0d75308ae555570b16753b407f8ef97e1d814879f73450f505de213
+  data.tar.gz: 5ff9fd2151b32aac19cda55738f8f3d91e6f84d060acd863da03d437aa7d965e5a8dac6237425a4645ec9f7cd8dead6e92611430ef1911d933779d07e8215843

data/lib/zlocalize/source_processor.rb

@@ -1,5 +1,5 @@
 require 'parser/all'
-require 'action_view/template/handlers/erb'
+require 'action_view/template/handlers/erb/erubi'
 require File.join(File.dirname(__FILE__),'translation_file')
 require File.join(File.dirname(__FILE__),'harvester')
 
@@ -18,8 +18,12 @@ module ZLocalize
         content = ActionView::Template::Handlers::ERB::Erubi.new(content, escape: true, trim: true).src
       end
       @parser = create_parser_for_ruby_version
-      @stree = @parser.parse(content)
-      process(@stree)
+      begin
+        @stree = @parser.parse(content)
+        process(@stree)
+      rescue ArgumentError => ae
+        raise ArgumentError.new("In #{filename} #{ae.message}")
+      end
     end
 
     def create_parser_for_ruby_version
@@ -59,14 +63,14 @@ module ZLocalize
 
     def get_string_node_value(node)
       unless node.is_a?(AST::Node) && node.type  == :str
-        raise ArgumentError.new("String Expected but got: #{node.inspect}")
+        raise ArgumentError.new("On line #{node.loc.selector.line} at column #{node.loc.selector.column+1} : String Expected but got: #{node.inspect}")
       end
       return node.children[0]
     end
 
     def get_string_array_node_value(node)
       unless node.is_a?(AST::Node) || node.type != :array
-        raise ArgumentError.new("Array expected but got: #{node.inspect}")
+        raise ArgumentError.new("On line #{node.loc.selector.line} at column #{node.loc.selector.column+1} : Array expected but got: #{node.inspect}")
       end
       a = []
       for i in 0..node.children.size - 1

data/lib/zlocalize/translation_file.rb

@@ -199,7 +199,11 @@ module ZLocalize
       if File.exists?(filename)
         content = File.open(filename,"r") { |f| f.read }
         read_yaml_header(content)
-        entries = YAML::load(content)
+        begin
+          entries = YAML::load(content)
+        rescue StandardError => e
+          raise TranslationFileError.new("Error reading ZLocalize TranslationFile #{filename} : #{e.message}")
+        end
         if entries && !entries.is_a?(Hash)
           raise TranslationFileError.new("Invalid YAML translation file #{filename}\n\n#{entries.inspect}")
         end

metadata

@@ -1,56 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: zlocalize
 version: !ruby/object:Gem::Version
-  version: 6.0.1.3
+  version: 6.0.2.0
 platform: ruby
 authors:
 - Charles Bedard
 - Stephane Volet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -77,17 +77,17 @@ dependencies:
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-description: 
+description:
 email:
 - zzeligg@gmail.com
 - steph@zboing.ca
@@ -118,7 +118,7 @@ homepage: https://github.com/zzeligg/zlocalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Translation engine for Rails applications
 test_files: []