phrase_assembler 1.0.9 → 1.1.0

data/lib/{PAProxies/PAAssembleProxy.rb → pa_proxies/pa_assemble_proxy.rb}

@@ -1,4 +1,4 @@
-require 'PAProxies/PALinkProxy'
+require 'pa_proxies/pa_link_proxy'
 class PAAssembleProxy < PALinkProxy
   attr_accessor :max_tokens_level
 

data/lib/{PAProxies/PAAutomateProxy.rb → pa_proxies/pa_automate_proxy.rb}

@@ -1,4 +1,4 @@
-require 'PAProxies/PAAssembleProxy'
+require 'pa_proxies/pa_assemble_proxy'
 class PAAutomateProxy < PAAssembleProxy
   attr_accessor :automate_data
   

data/lib/{PAProxies/PACompositeProxy.rb → pa_proxies/pa_composite_proxy.rb}

@@ -1,6 +1,6 @@
-require 'PAProxies/PAAutomateProxy'
-require 'PAProxies/PAStringProxy'
-require 'PAProxies/PACacheProxy'
+require 'pa_proxies/pa_automate_proxy'
+require 'pa_proxies/pa_string_proxy'
+require 'pa_proxies/pa_cache_proxy'
 class PACompositeProxy < PAAutomateProxy
   include PAStringProxy
   include PACacheProxy

data/lib/{PAProxies/PALangProxy.rb → pa_proxies/pa_lang_proxy.rb}

@@ -1,4 +1,4 @@
-require 'PAProxies/PATokenProxy'
+require 'pa_proxies/pa_token_proxy'
 class PALangProxy < PATokenProxy
   attr_accessor :grammar
   

data/lib/{PAProxies/PALinkProxy.rb → pa_proxies/pa_link_proxy.rb}

@@ -1,4 +1,4 @@
-require 'PAProxies/PALangProxy'
+require 'pa_proxies/pa_lang_proxy'
 class PALinkProxy < PALangProxy
   def new_instance(p_data)
     return self.class.new(p_data, self.logger, self.grammar, false)

data/lib/{PAProxies/PAProxy.rb → pa_proxies/pa_proxy.rb}

@@ -1,5 +1,5 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
-require 'PAProxies/PAProxyData'
+require 'pa_proxies/pa_proxy_data'
 class PAProxy < PAProxyData
   def new_instance(p_data)
     return self.class.new(p_data, self.logger)

data/lib/{PAProxies/PAProxyData.rb → pa_proxies/pa_proxy_data.rb}

@@ -1,6 +1,6 @@
 require 'yaml'
-require 'hash_add_on'
-require 'RArray'
+require 'utils/hash_add_on'
+require 'utils/r_array'
 class PAProxyData
   attr_accessor :data
   attr_accessor :logger

data/lib/{PAProxies/PAStringProxy.rb → pa_proxies/pa_string_proxy.rb}

@@ -6,7 +6,7 @@ module PAStringProxy
     elsif temp_data.is_a? Hash
       raise "Can not put Hash to String"
     else
-      return temp_data.to_s
+      return temp_data.to_s.html_safe
     end
   end
 end

data/lib/{PAProxies/PATokenProxy.rb → pa_proxies/pa_token_proxy.rb}

@@ -1,4 +1,5 @@
-require 'PAProxies/PAProxy'
+require 'erb'
+require 'pa_proxies/pa_proxy'
 class PATokenProxyOptions
   attr_accessor :options_hash
   attr_accessor :indices_hash
@@ -45,6 +46,8 @@ class PATokenProxyOptions
 end
 
 class PATokenProxy < PAProxy
+  include ERB::Util
+  
   def new_instance(p_data)
     return self.class.new(p_data, self.logger)
   end
@@ -89,7 +92,7 @@ class PATokenProxy < PAProxy
           result = add_options[sym_token]
         end
         
-        result
+        html_escape(result)
       }
      return_p_data 
   end

data/lib/phrase_assembler.rb

@@ -1,5 +1,5 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
-require 'PAProxies/PACompositeProxy'
+require 'pa_proxies/pa_composite_proxy'
 module PhraseAssembler
   def supress_errors
     @@supress_errors

data/lib/utils/hash_add_on.rb

@@ -0,0 +1,33 @@
+module HashAddOn
+  def self.symbolize_keys_recursive_for_hash(hash, downcase)
+    if hash.is_a? Hash
+      sym_hash = {}
+      
+      hash.each{|key, value| 
+        if (downcase)
+          if (key.is_a? String)
+            down_key = key.downcase
+          else 
+            down_key = key.to_s.downcase
+          end
+        else
+          down_key = key
+        end
+        sym_hash[down_key.to_sym] = value
+      }
+      
+      sym_hash.keys.each{|key|
+        if (sym_hash[key].is_a? Hash or sym_hash[key].is_a? Array)
+          sym_hash[key] = self.symbolize_keys_recursive_for_hash(sym_hash[key], downcase)
+        end
+        }
+      return sym_hash  
+    elsif hash.is_a? Array
+      hash = hash.collect{|val| self.symbolize_keys_recursive_for_hash(val, downcase)}
+      return hash
+    else
+      return hash
+    end
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phrase_assembler
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Lovro \xC5\xBDmak, Radan Skori\xC4\x87, Drap"
@@ -42,18 +42,19 @@ extra_rdoc_files: []
 
 files: 
 - lib/hash_add_on.rb
-- lib/PAProxies/PAAssembleProxy.rb
-- lib/PAProxies/PAAutomateProxy.rb
-- lib/PAProxies/PACacheProxy.rb
-- lib/PAProxies/PACompositeProxy.rb
-- lib/PAProxies/PALangProxy.rb
-- lib/PAProxies/PALinkProxy.rb
-- lib/PAProxies/PAProxy.rb
-- lib/PAProxies/PAProxyData.rb
-- lib/PAProxies/PAStringProxy.rb
-- lib/PAProxies/PATokenProxy.rb
+- lib/pa_proxies/pa_assemble_proxy.rb
+- 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_lang_proxy.rb
+- lib/pa_proxies/pa_link_proxy.rb
+- lib/pa_proxies/pa_proxy.rb
+- lib/pa_proxies/pa_proxy_data.rb
+- lib/pa_proxies/pa_string_proxy.rb
+- lib/pa_proxies/pa_token_proxy.rb
 - lib/phrase_assembler.rb
-- lib/RArray.rb
+- lib/utils/hash_add_on.rb
+- lib/utils/r_array.rb
 has_rdoc: true
 homepage: http://www.drap.hr
 licenses: []