zlocalize 6.0.1.4 → 6.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab48a7af792bda52284423a958db0a488a8cdeb3
-  data.tar.gz: 95e0ecdc08d5d98d2d772e05b61c8ef31302ae91
+SHA256:
+  metadata.gz: f1d045086410b4219efddf96ff7165fffbf4d6f79f3c058d1b8a64a4a014d67e
+  data.tar.gz: ddf36c917e025267baadf4d3dbdf4d47fcce6028d73f570170b1fe73c642060d
 SHA512:
-  metadata.gz: 1254ec7559b47cb9e7c8b50557ec24429872b381733b920274c7778569c842fb5c6ff42c4a640d42c3c65dc4006de16664fe158e22b0c1f11b2ab71baabcd5e2
-  data.tar.gz: 7077576b666ade075b9f2c879e53cf24c725f679f08e69b09e3b159461981cbe673593a21956c08e9fc7135574d7b513d5570447e6d05c5a2bd2e2854ccdc607
+  metadata.gz: 5def0cdcc38cb4711f069683a03cf75c63e4da9e18c0319790f20c80a2c497418679c619b550eb1843b8f476694e405f8f763a7e95acd7fa2a90f11f2b88d53c
+  data.tar.gz: 9bb5d022d727b30904b4269575e9e3c7b566061cac95228015b9bfa3e82ef2671e267e1fd98e3606b5fb5ecbcd86415613f8f72333d6f024852be691d346f3ff

data/lib/zlocalize/source_processor.rb

@@ -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

@@ -196,10 +196,14 @@ module ZLocalize
     end
 
     def load(filename)
-      if File.exists?(filename)
+      if File.exist?(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.4
+  version: 6.0.2.1
 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: []