phrase_assembler 1.1.5 → 1.1.9

data/lib/pa_proxies/pa_composite_proxy.rb

@@ -5,12 +5,15 @@ class PACompositeProxy < PAAutomateProxy
   include PAStringProxy
   include PACacheProxy
   
-  def initialize(p_data = {}, p_logger = nil, p_grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
+  attr_accessor :proxy_cache
+  
+  def initialize(p_proxy_cache, p_data = {}, p_logger = nil, p_grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
+    self.proxy_cache = p_proxy_cache
     super(p_data, p_logger, p_grammar, init_grammar, init_data, max_tokens_level, p_automate_data)
   end
   
   def new_instance(p_data)
-    return self.class.new(p_data, self.logger, self.grammar, false, false, self.max_tokens_level, self.automate_data)
+    return self.class.new(self.proxy_cache, p_data, self.logger, self.grammar, false, false, self.max_tokens_level, self.automate_data)
   end
   
   @@proxy_cache = {}
@@ -18,10 +21,10 @@ class PACompositeProxy < PAAutomateProxy
     @@proxy_cache
   end
   
-  def set_uncacheable_args(p_data = {}, p_logger = nil, p_grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
+  def set_uncacheable_args(p_proxy_cache, p_data = {}, p_logger = nil, p_grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
   end
   
-  def self.cache_id(p_data = {}, logger = nil, options = {}, grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
+  def self.cache_id(p_proxy_cache, p_data = {}, logger = nil, options = {}, grammar = {}, init_grammar = true, init_data = true, max_tokens_level = 5, p_automate_data = [])
     if p_data.nil?
       return nil
     else

data/lib/pa_proxies/pa_lang_proxy.rb

@@ -65,6 +65,7 @@ class PALangProxy < PATokenProxy
       end
       
       values = clear_token[/\?.+/][1..-1].split(':')
+      
       if p_options.options_hash.has_key?(options_key.to_sym)
         if opt_params.nil?
           grammar_value = p_options.options_hash[options_key.to_sym].send(:"get_#{grammar_key}")

data/lib/pa_proxies/pa_string_proxy.rb

@@ -1,5 +1,5 @@
 module PAStringProxy
-  def to_s(p_options = nil)
+  def to_s(p_options = {})
     temp_data = get_data(p_options)
     if temp_data.is_a? Array
       raise "Can not put Array to String"

data/lib/pa_proxies/pa_user_proxy.rb

@@ -0,0 +1,39 @@
+class PAUserProxy
+  attr_accessor :user
+  attr_accessor :proxy
+  def initialize(p_user, p_proxy = nil)
+    self.user = p_user
+    self.proxy = p_proxy
+  end
+  
+  def to_s(options = {})
+    puts self.proxy.inspect
+    self.proxy.to_s(options)
+  end
+  
+  def method_missing(sym, *args, &block)
+    i = 0
+    options_found = false
+    while !options_found and i < args.length
+      if args[i].is_a? Hash
+        options_found = true
+        args[i][:default] = self.user
+      end
+      i = i + 1
+    end
+    
+    return_proxy_or_value(self.proxy.method_missing(sym, *args, &block))
+  end
+  
+  def [](index)
+    return_proxy_or_value(self.proxy[index])
+  end
+  
+  def return_proxy_or_value(p_proxy)
+    if p_proxy.is_a? self.proxy.class
+      return self.class.new(self.user, p_proxy)
+    else
+      return p_proxy
+    end
+  end
+end

data/lib/phrase_assembler.rb

@@ -1,5 +1,6 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'pa_proxies/pa_composite_proxy'
+require 'pa_proxies/pa_user_proxy'
 module PhraseAssembler
   def supress_errors
     @@supress_errors
@@ -75,6 +76,22 @@ module PhraseAssembler
       def self._automate_data=(value)
         self.send(:class_variable_set, :@@_automate_data, value)
       end
+      
+      def self._max_tokens_level
+        self.send(:class_variable_get, :@@_max_tokens_level)
+      end
+      
+      def self._max_tokens_level=(value)
+        self.send(:class_variable_set, :@@_max_tokens_level, value)
+      end
+      
+      def self._proxy_cache
+        self.send(:class_variable_get, :@@_proxy_cache)
+      end
+      
+      def self._proxy_cache=(value)
+        self.send(:class_variable_set, :@@_proxy_cache, value)
+      end
     end
   end
 
@@ -88,8 +105,10 @@ module PhraseAssembler
       self._languages_files_path = (options[:languages_files_path] || File.join(::Rails.root.to_s, 'app', 'yaml', 'languages'))
       self._logger = (options[:logger] || RAILS_DEFAULT_LOGGER)
       self._automate_data = (options[:automate_data] || [:pages, "controller", "action"])
+      self._max_tokens_level = (options[:max_tokens_level] || 5)
       
       self._proxies = {}
+      self._proxy_cache = {}
       
       send :include, InstanceMethods
     end
@@ -102,16 +121,17 @@ module PhraseAssembler
       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(nil, self.class._logger)
+        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 == {}
-        self.class._proxies[t_pref_language]
+        proxy = self.class._proxies[t_pref_language]
       else
-        self.class._proxies[t_pref_language].auto(params)
+        proxy = self.class._proxies[t_pref_language].auto(params)
       end
+      return PAUserProxy.new(self, proxy)
     end
     
     def get_sex

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phrase_assembler
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 9
+  version: 1.1.9
 platform: ruby
 authors: 
 - "Lovro \xC5\xBDmak, Radan Skori\xC4\x87, Drap"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/pa_proxies/pa_proxy_data.rb
 - lib/pa_proxies/pa_string_proxy.rb
 - lib/pa_proxies/pa_token_proxy.rb
+- lib/pa_proxies/pa_user_proxy.rb
 - lib/phrase_assembler.rb
 - lib/utils/hash_add_on.rb
 - lib/utils/r_array.rb