phrase_assembler 1.2.6 → 1.2.7

data/lib/pa_proxies/pa_csv_proxy.rb

@@ -9,8 +9,10 @@ module PACsvProxy
   
   def to_csv(file_name, options = {})
     self.current_replace_token = "AAA"
-    substitute_default_tokens(data, options)
-  end
+    substituted_values = substitute_default_tokens(data, options)
+    File.open(file_name, 'w') {|f| f.write(substituted_values) }
+    return substituted_values
+ end
   
   def get_csv_safe_string_line(s)
     return "\"#{s.gsub('"', '""')}\"\n"
@@ -58,12 +60,22 @@ module PACsvProxy
       end
     }
     
+    add_lang_options = {}
     #Odi po svim vrijednostim za jezik
     p_data.gsub(/\{\*[^\{\}\*\?]+\?[^\{\}\*:]+(:[^\{\}\*:]+)+\*\}/){|token|
       clear_token = token[2...-2]
       key = clear_token[/[^\?]+/]
+      
+      opt_params = key[/\(.+\)/]
+      unless opt_params.nil?
+        opt_params = opt_params[1...-1].split(',').each{|v| 
+          add_options[v.strip.to_sym] = 1
+        }
+      end
+      
       key = key[/[^(\(.+\))]+/]
       keys = key.split('_')
+      
       if keys.length <= 1
         options_key = "default"
         grammar_key = keys[0]
@@ -71,16 +83,27 @@ module PACsvProxy
         options_key = keys[0...keys.length-1].join("_")
         grammar_key = keys[keys.length - 1]
       end
+      add_lang_options["#{options_key}_#{grammar_key}".to_sym] = [] if add_lang_options["#{options_key}_#{grammar_key}".to_sym].nil?
       self.grammar[grammar_key.to_s.to_sym].keys.sort{|a, b| a.to_s <=> b.to_s}.each{|k|
         if k == :default
-          add_options["#{options_key}_#{grammar_key}".to_sym] = nil
+          add_lang_options["#{options_key}_#{grammar_key}".to_sym] << nil
         else
-          add_options["#{options_key}_#{grammar_key}".to_sym] = k.to_s
+          add_lang_options["#{options_key}_#{grammar_key}".to_sym] << k.to_s
         end
-        result << get_csv_safe_string_line(substitute_token(String.new(p_data), p_options, PATokenProxyOptions.new_if_needed(add_options)))
       }
     }
-    result << get_csv_safe_string_line(substitute_token(p_data, p_options, PATokenProxyOptions.new_if_needed(add_options))) if result == ""
+    unless add_lang_options == {}
+      max_length = 0
+      add_lang_options.values.each{|v| max_length = v.length if v.length > max_length}
+      for i in 0...max_length
+        temp_lang_options = {}
+        add_lang_options.keys.each{|k| v=add_lang_options[k]; temp_lang_options[k] = v[((i > v.length - 1) ? (v.length - 1) : i)]}
+        result << get_csv_safe_string_line(substitute_token(String.new(p_data), p_options, PATokenProxyOptions.new_if_needed(temp_lang_options.merge(add_options))))
+      end
+    else
+      result << get_csv_safe_string_line(substitute_token(p_data, p_options, PATokenProxyOptions.new_if_needed(add_options)))
+    end
+    
     return result
   end
 

data/lib/tasks/phrase_assembler.rake

@@ -1,3 +1,4 @@
+require 'pa_proxies/pa_composite_proxy'
 namespace :phrase_assembler do
   task(:get_csv_file) do
     if ENV['out'].nil?
@@ -20,9 +21,9 @@ namespace :phrase_assembler do
     end
     
     cache = {}
-    PACompositeProxy.new(cache)
-    PACompositeProxy.load(File.join(default_dir, file_name))
-    PACompositeProxy.load_grammar(File.join(default_dir, grammar_file_name))
-    PACompositeProxy.to_csv(ENV['out'])
+    proxy = PACompositeProxy.new(cache)
+    proxy.load(File.join(default_dir, file_name))
+    proxy.load_grammar(File.join(default_dir, grammar_file_name))
+    proxy.to_csv(ENV['out'])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phrase_assembler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - "Lovro \xC5\xBDmak, Radan Skori\xC4\x87, Drap"