laowaihua 0.1.0 → 0.1.1

data/README

@@ -1,13 +1,35 @@
 LaoWaiHua
-=========
+======
 
 A "Lorem Ipsum" generator for Chinese (simplified)
 
-Example
-=======
+taken from the tongue-twister
+
+  一位爷爷他姓顾，
+  上街打醋又买布。
+  买了布，打了醋，
+  回头看见鹰抓兔。
+  放下布，搁下醋，
+  上前去追鹰和兔，
+  飞了鹰，跑了兔。
+  打翻醋，醋湿布
+
+  yi wei ye ye ta xing gu
+  shang jie da cu you mai bu
+  mai le bu, da le cu
+  hui tou kan jian ying zhuan tu
+  fang xia bu, ge xia cu
+  shang qian qu zhui ying he tu
+  fei le ying, pao le tu
+  da fan cu, cu shi bu.
 
+Example
+======
   >> require 'laowaihua'
   
   >> LaoWaiHua(25)
   => "一位爷爷他姓顾，上街打醋又买布。买了布，打了醋，回"
+  
+  >> LaoWaiHua.random(20)
+  => "跑抓跑，姓打，追顾布顾，位翻。上兔醋顾。"
   

data/lib/lao_wai_hua.rb

@@ -11,14 +11,52 @@ module LaoWaiHua
    打 翻 醋 ， 醋 湿 布 
   )
   
-  def self.generate(length=WORDS.length)
-    words = []
-	  while words.length < length
-	    words += LaoWaiHua::WORDS[0, length]
-	  end
-	  words.join("")
-  end
+  PUNCTUATION = %w( ，  。 )
+  
+  WORDS_WITHOUT_PUNCTUATION = WORDS.select{|word| !PUNCTUATION.include?(word)}
+  
+  class << self
+  
+    # return a string of *length* taken from the provided tongue twister
+    # defaults to the full length of the text
+    def generate(length=WORDS.length)
+  	  words = []
+  	  while words.length < length
+  		  words += WORDS[0, length]
+  	  end
+  	  words.join("")
+    end
 
+    # return a random word (excluding punctuation) from our text
+    def random_word()
+  	  WORDS_WITHOUT_PUNCTUATION[rand(WORDS_WITHOUT_PUNCTUATION.length)]
+    end
+  
+    # return a string or random words of the provided *length*
+    def random(length)
+  	  words = []
+      next_punctuation = nil
+      
+    	1.upto(length) do
+    	  next_punctuation ||= rand(3)+2
+    	  if next_punctuation == 0
+    	    next_punctuation = nil
+    	    words << random_punctuation
+    	  else
+    	    next_punctuation -= 1
+    	    words << random_word
+    	  end
+    	end
+    	words.join("")
+    end
+    
+    protected
+    
+    def random_punctuation()
+      PUNCTUATION[rand(PUNCTUATION.length)]
+    end
+
+  end
 end
 
 def LaoWaiHua(*args)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matthew Rudy