From: <kt...@us...> - 2010-09-18 03:51:27
|
Revision: 4142 http://milter-manager.svn.sourceforge.net/milter-manager/?rev=4142&view=rev Author: ktou Date: 2010-09-18 03:51:20 +0000 (Sat, 18 Sep 2010) Log Message: ----------- * binding/ruby/lib/milter/client.rb, binding/ruby/lib/milter/manager/child-context.rb, binding/ruby/lib/milter/toolkit.rb: share convenience macro predicates. Modified Paths: -------------- milter-manager/trunk/ChangeLog milter-manager/trunk/binding/ruby/lib/milter/client.rb milter-manager/trunk/binding/ruby/lib/milter/manager/child-context.rb milter-manager/trunk/binding/ruby/lib/milter/toolkit.rb Modified: milter-manager/trunk/ChangeLog =================================================================== --- milter-manager/trunk/ChangeLog 2010-09-18 03:29:09 UTC (rev 4141) +++ milter-manager/trunk/ChangeLog 2010-09-18 03:51:20 UTC (rev 4142) @@ -1,3 +1,10 @@ +2010-09-18 Kouhei Sutou <ko...@cl...> + + * binding/ruby/lib/milter/client.rb, + binding/ruby/lib/milter/manager/child-context.rb, + binding/ruby/lib/milter/toolkit.rb: share convenience macro + predicates. + 2010-09-18 Kouhei Sutou <ko...@co...> * binding/ruby/lib/milter/client.rb: reset status in each response. Modified: milter-manager/trunk/binding/ruby/lib/milter/client.rb =================================================================== --- milter-manager/trunk/binding/ruby/lib/milter/client.rb 2010-09-18 03:29:09 UTC (rev 4141) +++ milter-manager/trunk/binding/ruby/lib/milter/client.rb 2010-09-18 03:51:20 UTC (rev 4142) @@ -62,7 +62,7 @@ session_context.status = status_on_error end status = session_context.status - session_context.status = :continue + session_context.continue status end end @@ -89,7 +89,7 @@ option.remove_step(Milter::StepFlags::HEADER_VALUE_WITH_LEADING_SPACE) end option.remove_step(Milter::StepFlags::NO_REPLY_MASK) - @context.status = :continue + continue end private @@ -139,6 +139,8 @@ end class ClientSessionContext + include MacroPredicates + def initialize(context) @context = context @status = nil @@ -177,6 +179,10 @@ end end + def [](name) + @context.macros[name] + end + def method_missing(*args, &block) @context.send(*args, &block) end Modified: milter-manager/trunk/binding/ruby/lib/milter/manager/child-context.rb =================================================================== --- milter-manager/trunk/binding/ruby/lib/milter/manager/child-context.rb 2010-09-18 03:29:09 UTC (rev 4141) +++ milter-manager/trunk/binding/ruby/lib/milter/manager/child-context.rb 2010-09-18 03:51:20 UTC (rev 4142) @@ -15,6 +15,8 @@ module Milter::Manager class ChildContext + include Milter::MacroPredicates + def initialize(child, children, client_context) @child = child @children = children @@ -59,22 +61,6 @@ @child_contexts ||= create_child_contexts end - def postfix? - if /\bPostfix\b/i =~ (self["v"] || '') - true - else - false - end - end - - def authenticated? - if self["auth_type"] || self["auth_authen"] - true - else - false - end - end - def n_processing_sessions @client_context.n_processing_sessions end Modified: milter-manager/trunk/binding/ruby/lib/milter/toolkit.rb =================================================================== --- milter-manager/trunk/binding/ruby/lib/milter/toolkit.rb 2010-09-18 03:29:09 UTC (rev 4141) +++ milter-manager/trunk/binding/ruby/lib/milter/toolkit.rb 2010-09-18 03:51:20 UTC (rev 4142) @@ -161,4 +161,14 @@ end end end + + module MacroPredicates + def authenticated? + (self["auth_type"] or self["auth_authen"]) ? true : false + end + + def postfix? + (/\bPostfix\b/i =~ (self["v"] || '')) ? true : false + end + end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |