tidying up a bit

infochimps-labs · Sep 24, 2013 · 3c9a763 · 3c9a763
1 parent 732544d
commit 3c9a763
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/ironfan.rb b/lib/ironfan.rb
@@ -86,9 +86,7 @@ def self.realm(name, attrs={}, &block)
     else
       rlm = Ironfan::Dsl::Realm.new(:name => name)
       rlm.receive!(attrs, &block)
-      rlm.wire_clusters
-      realm_clusters = Hash[rlm.clusters.keys.map{|k| [k.to_sym, rlm.clusters[k].resolve]}]
-      @@clusters.merge!(realm_clusters)
+      rlm.clusters.keys.each{|k| @@clusters[k.to_sym] = rlm.clusters[k].resolve}
       @@realms[name] = rlm
     end
   end

diff --git a/lib/ironfan/dsl/realm.rb b/lib/ironfan/dsl/realm.rb
@@ -16,10 +16,6 @@ def cluster(label, attrs={},&blk)
       end
 
       def realm_name()        name;   end
-
-      def wire_clusters()
-        STDERR.puts "wiring!!!"
-      end
     end
 
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,10 +16,6 @@ def cluster(label, attrs={},&blk) @@
           end
           def realm_name()        name;   end
-          def wire_clusters()
-            STDERR.puts "wiring!!!"
-          end
         end
       end
@@ Expand Down @@