apstrings 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214c6ebcd43ed72910ca02d269eceb66a9638407
-  data.tar.gz: 2def09e490405096cbb85edbe0ba3d61b8e9ca53
+  metadata.gz: a5484430ea8af15f7c1cee46c176d1208c32353a
+  data.tar.gz: 69d503ac2b6c2eb39f0f9ec3bcf000485849b2a6
 SHA512:
-  metadata.gz: 74c27433007ed1dfaa1486b58a8a1b2cc0f0300d52538ea5ecef08aff5de2c5f9f408d2e320fa480fb1dd207354e733191268cfdf75471ae99dcae7edb1738bb
-  data.tar.gz: 18643aff518885079e3ed02b2165a6bbeb5711b65e147bd66b1b50fc25db28581e2a71ade167b3794bcaa5a823b84f2a9e2e0dc22bbc1502af2f1897be27d39c
+  metadata.gz: e6664b1c85584555a343ed344caf63a7086932d9ed09c4d88e9e8a13e20d5245748310bcc7bfd696a5fd31bb789d6e58660038096a6f053cc0aec0f1d9cdf8a8
+  data.tar.gz: 2eaff8297a82c636ac6dd4139abefc6584e16c8334fdb84706d01c1078d1537881e19408c5b5df7a17674a47540ee2cb1bcdfc968a420d4a2c157dfba1566aec

data/lib/apstrings/line.rb

@@ -42,7 +42,8 @@ module Apstrings
     end
 
     def key_value_pair?
-      !!(/^\s*"([^"]+)"\s*=/.match(content))
+      #Bugfix:  支持 "Key text \" with \" " = "Value text \" with \" ";  格式
+      !!(/^\s*"([^"]+)\S*\s*=/.match(content))
     end
 
     def cleaned_content
@@ -53,7 +54,7 @@ module Apstrings
       if key_value_pair?
         !!(/;[\s]*$/.match(content))
       else
-        true
+        false
       end
     end
 

data/lib/apstrings/strings_parser.rb

@@ -16,7 +16,6 @@ module Apstrings
             current_comment = nil
             comments_for_keys = {}
             @read_file.each do |content_line|
-
                 current_line = Line.new(content_line)
                 next if (current_line.empty_line? && current_line.in_comment == false) || !content_line.strip.start_with?("\"")
                 

data/lib/apstrings/strings_validator.rb

@@ -31,8 +31,8 @@ module Apstrings
 		end 
 		
 		def to_hash
-			{   :file=> File.basename(@file), 
-				:masterFile => File.basename(@masterFile), 
+			{   :file=> @file, 
+				:masterFile => @masterFile, 
 				:master_special_character_error => @master_special_character_error,
 				:file_special_character_errors => @file_special_character_errors , 
 				:missing_keys => @missing_keys , 

data/lib/apstrings/version.rb

@@ -1,3 +1,3 @@
 module Apstrings
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/lib/js/formatValidate.js

@@ -2,14 +2,16 @@
  *  Formats validate.
  *
  *  Example
- *  var master = 'Amount:  %d  Object: %@ String: %s  Other: %u ';
- *  var slave = '数值:  %d  OC对象: %@ 字符串: %s  其它: %u ';
- *  var slave_err = '数值:  %  OC对象: %@ 字符串: %s  其它: %u ';
- *  var result = validate(master, slave) // true
- *  var result = validate(master, slave_err) // false
+ *   var master = 'Amount: %.2f  %2$lld  Object: %@ String: %s  Other: %u ';
+ *   var slave = '数值: %.2f  %2$lld   OC对象: %@ 字符串: %s  其它: %u ';
+ *   var slave_err = '数值: % f  %2$lld   OC对象: %@ 字符串: %s  其它: %u ';
+ *   var result = formats_validate(master, slave) // true
+ *   var result_err = formats_validate(master, slave_err) // false
  *
- *  Created by Jason Kaer on 6/17/16.
+ *  This implements format validation in IEEE Std 1003.1, 2004 Edition .
+ *  Ref:  http://pubs.opengroup.org/onlinepubs/009695399/functions/printf.html
  *
+ *  Created by Jason Kaer on 6/17/16.
  */
 
 /***
@@ -57,7 +59,7 @@ function formats_validate(master, slave) {
   try {
     var format_m = formats_in_string(master);
     var format_s = formats_in_string(slave);
-    return format_m.sort().equals(format_s.sort());
+    return format_m.equals(format_s);
   } catch (err) {
     console.log(err);
     return false;
@@ -73,7 +75,7 @@ function formats_validate(master, slave) {
 function formats_in_string(input) {
 
   var fix_regex = /%\d\$/g ;
-  var scan_regex = /%[hlqLztj]?[@%dDuUxXoOfeEgGcCsSpaAF]/g ;
+  var scan_regex = /%['\-\+\#0]*[shlqLztj\.\*\d]*[@%diDuUxXoOfeEgGcCsSpPaAFn]/g ;
 
   //Strip numbered format placeholders , e.g. %1$@ --> %@
   var fixed_input = input.replace(fix_regex, "%");
@@ -88,3 +90,5 @@ function formats_in_string(input) {
 
   return result;
 }
+
+

data/lib/test.rb

@@ -1,6 +1,4 @@
 require './apstrings.rb'
 
-puts Apstrings.parse('/Users/Jason/Desktop/test.strings').to_json
+puts Apstrings.parse('/Users/Jason/Desktop/zh-Hans.strings').to_json
 
-
-puts "aa : \" ".rstrip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apstrings
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - JasonWorking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- apstrings-0.3.7.gem
 - apstrings.gemspec
 - bin/apstrings
 - lib/apstrings.rb