phrase_assembler 1.2.4 → 1.2.5

data/lib/pa_proxies/pa_error_proxy.rb

@@ -0,0 +1,13 @@
+class PAErrorProxy < String
+  def [](index)
+    return self
+  end
+  
+  def to_s
+    return ""
+  end
+  
+  def method_missing(sym, *args, &block)
+    return self
+  end
+end

data/lib/pa_proxies/pa_user_proxy.rb

@@ -1,46 +1,87 @@
+require 'pa_proxies/pa_error_proxy'
 class PAUserProxy
   attr_accessor :user
   attr_accessor :proxy
-  def initialize(p_user, p_proxy = nil)
+  attr_accessor :supress_errors
+  attr_accessor :logger
+  
+  def initialize(p_user, p_proxy = nil, p_supress_errors = true, p_logger = nil)
     self.user = p_user
     self.proxy = p_proxy
+    self.supress_errors = p_supress_errors
+    self.logger = p_logger
   end
   
   def to_s(options = {})
-    options = {:default => @user}.merge(options)
-    self.proxy.to_s(options)
+    begin
+      options = {:default => @user}.merge(options)
+      self.proxy.to_s(options)
+    rescue Exception => e
+      if self.supress_errors
+        self.logger.error "Phrase: #{e}" unless self.logger.nil?
+        return PAErrorProxy.new("")
+      else
+        raise(e)
+      end
+    end
   end
   
   def method_missing(sym, *args, &block)
-    if args[0].is_a? Hash
-      options = args.delete_at(0)
-      end_proxy = self.proxy.method_missing(sym, *args, &block)
-      options[:default] = self.user
-      if end_proxy.data.is_a? Array
-        return end_proxy.collect{|proxy| proxy.to_s(options)}
+    begin
+      if args[0].is_a? Hash
+        options = args.delete_at(0)
+        end_proxy = self.proxy.method_missing(sym, *args, &block)
+        options[:default] = self.user
+        if end_proxy.data.is_a? Array
+          return end_proxy.collect{|proxy| proxy.to_s(options)}
+        else
+          return end_proxy.to_s(options)
+        end
       else
-        return end_proxy.to_s(options)
+        proxy = self.proxy.method_missing(sym, *args, &block)
+        if proxy.data.is_a? String
+          return proxy.to_s({:default => self.user})
+        else
+          return self.class.new(self.user, proxy, self.supress_errors)
+        end
       end
-    else
-      proxy = self.proxy.method_missing(sym, *args, &block)
-      if proxy.data.is_a? String
-        return proxy.to_s({:default => self.user})
+    rescue Exception => e
+      if self.supress_errors
+        self.logger.error "Phrase: #{e}" unless self.logger.nil?
+        return PAErrorProxy.new("")
       else
-        return self.class.new(self.user, proxy)
+        raise(e)
       end
     end
   end
   
   def length
-    return self.proxy.length
+    begin
+      return self.proxy.length
+    rescue Exception => e
+      if self.supress_errors
+        return 0
+      else
+        raise(e)
+      end
+    end
   end
   
   def [](index)
-    proxy = self.proxy[index]
-    if proxy.data.is_a? String
-      return proxy.to_s(:default => @user)
-    else
-      return self.class.new(self.user, proxy)
+    begin
+      proxy = self.proxy[index]
+      if proxy.data.is_a? String
+        return proxy.to_s(:default => @user)
+      else
+        return self.class.new(self.user, proxy, self.supress_errors)
+      end
+    rescue Exception => e
+      if self.supress_errors
+        self.logger.error "Phrase: #{e}" unless self.logger.nil?
+        return PAErrorProxy.new("")
+      else
+        raise(e)
+      end
     end
   end
 

data/lib/phrase_assembler.rb

@@ -1,7 +1,9 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'pa_proxies/pa_composite_proxy'
 require 'pa_proxies/pa_user_proxy'
+require 'pa_proxies/pa_error_proxy'
 module PhraseAssembler
+  @@supress_errors = true
   def supress_errors
     @@supress_errors
   end
@@ -118,24 +120,40 @@ module PhraseAssembler
     attr_reader :phrase
     
     def phrase(params = {})
-      t_pref_language = self.send(self.class._fields[:pref_language])
-      t_pref_language = self.class._default_pref_language if (t_pref_language.nil? or t_pref_language.empty?)
-      if self.class._proxies[t_pref_language].nil?
-        self.class._proxies[t_pref_language] = PACompositeProxy.new(self.class._proxy_cache, nil, self.class._logger, {}, false, false, self.class._max_tokens_level)
-        self.class._proxies[t_pref_language].load(File.join(self.class._languages_files_path, self.class._languages[t_pref_language]) )
-        self.class._proxies[t_pref_language].load_grammar(File.join(self.class._languages_files_path, self.class._grammars[t_pref_language]))
-        self.class._proxies[t_pref_language].automate_data = self.class._automate_data
-      end
-      if params == {}
-        proxy = self.class._proxies[t_pref_language]
-      else
-        proxy = self.class._proxies[t_pref_language].auto(params)
-      end
-      return PAUserProxy.new(self, proxy)
+      begin
+        t_pref_language = self.send(self.class._fields[:pref_language])
+        t_pref_language = self.class._default_pref_language if (t_pref_language.nil? or t_pref_language.empty?)
+        if self.class._proxies[t_pref_language].nil?
+          self.class._proxies[t_pref_language] = PACompositeProxy.new(self.class._proxy_cache, nil, self.class._logger, {}, false, false, self.class._max_tokens_level)
+          self.class._proxies[t_pref_language].load(File.join(self.class._languages_files_path, self.class._languages[t_pref_language]) )
+          self.class._proxies[t_pref_language].load_grammar(File.join(self.class._languages_files_path, self.class._grammars[t_pref_language]))
+          self.class._proxies[t_pref_language].automate_data = self.class._automate_data
+        end
+        if params == {}
+          proxy = self.class._proxies[t_pref_language]
+        else
+          proxy = self.class._proxies[t_pref_language].auto(params)
+        end
+        return PAUserProxy.new(self, proxy, PhraseAssembler.supress_errors)
+      rescue Exception => e
+        if PhraseAssembler.supress_errors
+          return PAErrorProxy.new("")
+        else
+          raise e
+        end
+      end
     end
     
     def get_sex
-      self.send(self.class._fields[:sex])
+      begin
+        self.send(self.class._fields[:sex])
+      rescue Exception => e
+        if PhraseAssembler.supress_errors
+          return :default
+        else
+          raise e
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phrase_assembler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - "Lovro \xC5\xBDmak, Radan Skori\xC4\x87, Drap"
@@ -46,6 +46,7 @@ files:
 - lib/pa_proxies/pa_automate_proxy.rb
 - lib/pa_proxies/pa_cache_proxy.rb
 - lib/pa_proxies/pa_composite_proxy.rb
+- lib/pa_proxies/pa_error_proxy.rb
 - lib/pa_proxies/pa_lang_proxy.rb
 - lib/pa_proxies/pa_link_proxy.rb
 - lib/pa_proxies/pa_proxy.rb