tcl-msgcat 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff7447fc76a7ccb6dea7788a0a3aacf27ed2870
-  data.tar.gz: a4af1f28cce43b76238c5e5cf100bab394e7da78
+  metadata.gz: 89c47db074b3409ff9c670defdb7a9b256294b61
+  data.tar.gz: 5b5d217ddcf76f716a5cdeb9879ba4d3e583ce99
 SHA512:
-  metadata.gz: 4842aa60208f3879df71e0eced768922d73c4c56b8251069f103a963fd69302062958ab3b546d21114aaffffad768754d50e6b5b42f13e1cea8575617ba1873b
-  data.tar.gz: dfc920dd5da1beb4dadf8a16d424567c55940dadcc4a83ccdf04ebc9e74bc76b6650198b9f3712861a598f40b87e8b9f86ab041ec04dd5674b4cfa6a47f3ab91
+  metadata.gz: 3c9a407328c7a8ec11b9ee6066ebfa42759b07b13efa1238139a86fdfbceae3f651590a1e4dc72ad396baf9d4052bf9bf05276c212077ebb5fffb4dd79a27f0f
+  data.tar.gz: e0687bb8c40892a2a3b77169fb62f3f91e0ca7c8ced48aefa52c9eac097a64eb9d610c1413b5c841af77a66f6edc7279b2ec87e808852d9dbb7a6a6dc14bf72c

data/bin/tcl-msgcat

@@ -11,7 +11,11 @@ when "uglify", "u"
   puts Tcl::Msgcat.parse(file).to_json(false)
 when "render", "r"
   file = ARGV[1]
-  puts Tcl::Msgcat.render(file).to_s
+  begin
+    puts Tcl::Msgcat.render(file).to_s
+  rescue MultiJson::ParseError => e
+    abort "ERROR: Invalid JSON: #{e.message}"
+  end
 when "merge", "m"
   root = ARGV[1]
   files = ARGV[2..-1]

data/lib/tcl/msgcat.rb

@@ -1,4 +1,6 @@
 require 'json'
+require 'oj'
+require 'multi_json'
 require "tcl/msgcat/version"
 require "tcl/msgcat/catalog"
 require "tcl/msgcat/parser"
@@ -18,8 +20,9 @@ module Tcl
 
       def render(json_file)
         raise ArgumentError, "File not found: #{json_file}" unless File.exist? json_file
-        msgs = JSON.parse(File.read(json_file))
-        Tcl::Msgcat::Renderer.new(msgs).render
+        msgs = MultiJson.load(File.read(json_file))
+        lang = File.basename(json_file, File.extname(json_file))
+        Tcl::Msgcat::Renderer.new(msgs, lang).render
       end
 
       def merge(root_file, translation_files=[])
@@ -27,15 +30,23 @@ module Tcl
           translation_files = Dir[translation_files]
         end
 
-        root = Tcl::Msgcat::Catalog.load(root_file)
+        begin
+          root = Tcl::Msgcat::Catalog.load(root_file)
+        rescue MultiJson::ParseError => e
+          raise MultiJson::ParseError, "Failed to parse #{root_file}: #{e.message}"
+        end
 
         translation_files.each do |file|
-          next if File.basename(file) == File.basename(root_file)
-          print "Merging new translations into #{file}... "
-          catalog = Tcl::Msgcat::Catalog.load(file)
-          catalog.merge!(root)
-          File.open(file, "w") {|f| f.write catalog.to_json }
-          puts "done"
+          begin
+            next if File.basename(file) == File.basename(root_file)
+            print "Merging new translations into #{file}... "
+            catalog = Tcl::Msgcat::Catalog.load(file)
+            catalog.merge!(root)
+            File.open(file, "w") {|f| f.write catalog.to_json }
+            puts "done"
+          rescue MultiJson::ParseError => e
+            raise MultiJson::ParseError, "Failed to parse #{file}: #{e.message}"
+          end
         end
       end
 
@@ -46,10 +57,12 @@ module Tcl
         Dir["#{source}/*.json"].each do |src|
           dst = File.basename(src, ".json")+".msg"
           print "Compiling #{src} to #{target}/#{dst}... "
-          msgs = JSON.parse(File.read(src))
-          renderer = Tcl::Msgcat::Renderer.new(msgs).render
-          File.write("#{target}/#{dst}") {|f| f.write renderer.to_s }
-          puts "done"
+          begin
+            File.write("#{target}/#{dst}") {|f| f.write render(src) }
+            puts "done"
+          rescue ArgumentError => e
+            puts e.message
+          end
         end
       end
     end

data/lib/tcl/msgcat/catalog.rb

@@ -16,7 +16,7 @@ module Tcl
       end
 
       def self.load(file)
-        msgs = JSON.parse(File.read(file))
+        msgs = MultiJson.load(File.read(file))
         Tcl::Msgcat::Catalog.new(msgs)
       end
     end

data/lib/tcl/msgcat/renderer.rb

@@ -2,14 +2,21 @@ module Tcl
   module Msgcat
     class Renderer
       attr_reader :msgs, :lines
-      def initialize(msgs)
+      def initialize(msgs, lang=nil)
         @msgs  = msgs
+        @lang  = lang
         @lines = []
       end
 
       def render
         @lines << "package require mchelper"
-        @lines << "msg_lang {}"
+        
+        if (@lang.nil? or @lang.downcase == "root")
+          @lines << "msg_lang {}"
+        else
+          @lines << "msg_lang #{@lang}"
+        end
+
         @lines << ""
         _render(@msgs)
 

data/lib/tcl/msgcat/version.rb

@@ -1,5 +1,5 @@
 module Tcl
   module Msgcat
-    VERSION = "1.0.4"
+    VERSION = "1.0.6"
   end
 end

data/tcl-msgcat.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "multi_json"
+  spec.add_dependency "oj"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tcl-msgcat
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Robert McLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement