phrase_assembler 1.1.9 → 1.2.0

data/lib/pa_proxies/pa_composite_proxy.rb

@@ -32,32 +32,4 @@ class PACompositeProxy < PAAutomateProxy
     end
   end
   
-  def method_missing(sym, *args, &block)
-    if args[0].is_a? Hash
-      options = args.delete_at(0)
-      end_proxy = super(sym, *args, &block)
-      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
-      proxy = super(sym, *args, &block)
-      if proxy.data.is_a? String
-        return proxy.to_s({})
-      else
-        return proxy
-      end
-    end
-  end
-  
-  def [](index)
-    proxy = super(index)
-    if proxy.data.is_a? String
-      return proxy.data.to_s
-    else
-      return proxy
-    end
-  end
-  
 end

data/lib/pa_proxies/pa_user_proxy.rb

@@ -7,33 +7,37 @@ class PAUserProxy
   end
   
   def to_s(options = {})
-    puts self.proxy.inspect
+    options = {:default => @user}.merge(options)
     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
+    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
+      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)
       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)
+    proxy = self.proxy[index]
+    if proxy.data.is_a? String
+      return proxy.to_s(:default => @user)
     else
-      return p_proxy
+      return self.class.new(self.user, proxy)
     end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phrase_assembler
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 9
-  version: 1.1.9
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Lovro \xC5\xBDmak, Radan Skori\xC4\x87, Drap"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency