adding new version of dsl pattern

shvets · Aug 16, 2010 · 19cccf0 · 19cccf0
1 parent 1783b99
commit 19cccf0
Show file tree

Hide file tree

Showing 8 changed files with 660 additions and 142 deletions.
diff --git a/.idea/design_patterns_in_ruby.iml b/.idea/design_patterns_in_ruby.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/behavioral/visitor.rb b/behavioral/visitor.rb
@@ -9,7 +9,7 @@
 
 # 1. type and visitor interfaces
 
-class Visitable
+module Visitable
   def accept(&visitor_code)
     visitor_code.call(self)
   end
@@ -27,15 +27,24 @@ def accept(&visitor_code)
 
 # basic parts
 
-class MyVisitable1 < Visitable; end
+class MyVisitable1 
+  include Visitable
+end
 
-class MyVisitable2 < Visitable; end
+class MyVisitable2
+  include Visitable
+end
+
+class MyVisitable3
+  include Visitable
+end
 
-class MyVisitable3 < Visitable; end
 
 # compound
 
-class MyCompoundVisitable < Visitable
+class MyCompoundVisitable
+  include Visitable
+
   def initialize
     @visitable1 = MyVisitable1.new
     @visitable2 = MyVisitable2.new
@@ -63,29 +72,17 @@ def accept(&visitor_code)
 
 visitable = MyCompoundVisitable.new
 
-# creating visitors dynamically
-
-visitable.accept do |visitable|
-  if(visitable.kind_of? MyVisitable1)
-    puts "visitor1: visiting my visitable 1"
-  elsif(visitable.kind_of? MyVisitable2)
-    puts "visitor1: visiting my visible 2"
-  elsif(visitable.kind_of? MyVisitable3)
-    puts "visitor1: visiting my visitable 3"
-  elsif(visitable.kind_of? MyCompoundVisitable)
-    puts "visitor1: visiting my compound visitable"
-  end
-end
+# creating visitor dynamically
 
 visitable.accept do |visitable|
   if(visitable.kind_of? MyVisitable1)
-    puts "visitor2: visiting my visitable 1"
+    puts "visitor: visiting my visitable 1"
   elsif(visitable.kind_of? MyVisitable2)
-    puts "visitor2: visiting my visible 2"
+    puts "visitor: visiting my visible 2"
   elsif(visitable.kind_of? MyVisitable3)
-    puts "visitor2: visiting my visitable 3"
+    puts "visitor: visiting my visitable 3"
   elsif(visitable.kind_of? MyCompoundVisitable)
-    puts "visitor2: visiting my compound visitable"
+    puts "visitor: visiting my compound visitable"
   end
 end