From 9fed8e1ae1657f97e92afb0bd28875b9fe29654a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 4 May 2012 10:40:01 +0200
Subject: particle: rename merge->merge! add merged_shift, remove merged_count

---
 lib/evendoors/particle.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/evendoors/particle.rb b/lib/evendoors/particle.rb
index 7b951f9..7c2af07 100644
--- a/lib/evendoors/particle.rb
+++ b/lib/evendoors/particle.rb
@@ -119,11 +119,7 @@ module EvenDoors
         #
         # merge particles management
         #
-        def merged_count
-            @merged.length
-        end
-        #
-        def merge p
+        def merge! p
             @merged << p
         end
         #
@@ -131,6 +127,10 @@ module EvenDoors
             @merged[i]
         end
         #
+        def merged_shift
+            @merged.shift
+        end
+        #
     end
     #
 end
-- 
cgit v1.1-2-g2b99