lorem-ipsum 0.1.0 → 0.1.1

data/bin/lorem-ipsum

@@ -7,7 +7,7 @@ require 'lorem-ipsum'
 require 'optparse'
 
 init_options = { :max_ngraph => 3 }
-gen_options = { :words => 100 }
+gen_options = { :words => 100 , :paras => 1, :variance => 0 }
 
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] data-files"
@@ -24,16 +24,26 @@ opts = OptionParser.new do |opts|
     int_val
   end
 
-  opts.on("--max-ngraph MAX",
-      "Maximum length of n-graphs to track. Default is 3") do |v|
+  opts.on("--max-ngraph MAX=3",
+      "Max length of n-graphs.") do |v|
     init_options[:max_ngraph] = check_int_arg(v, :min => 1)
   end
 
-  opts.on("-w", "--words WORDS",
-      "Number of words to generate. Default is 100") do |v|
+  opts.on("-w", "--words WORDS=100",
+      "Number of words to generate.") do |v|
     gen_options[:words] = check_int_arg(v, :min => 1)
   end
 
+  opts.on("-p", "--paragraphs PARAS=1",
+      "Number of paragraphs to generate.") do |v|
+    gen_options[:paras] = check_int_arg(v, :min=>1)
+  end
+
+  opts.on("-v", "--variance VAR=0",
+      "Paragraphs should be within this percent of word count") do |v|
+    gen_options[:variance] = check_int_arg(v, :min=>0, :max=>100)
+  end
+
 end
 
 begin
@@ -42,16 +52,7 @@ rescue
   opts.abort
 end
 
-# There has to be a more Ruby way to do this...
-if ARGV.empty?
-  files = Dir.entries($DATA_DIR).reject do |f|
-    f =~ /^\.\.?$/
-  end.collect do |f|
-    "#{$DATA_DIR}/#{f}"
-  end
-else
-  files = ARGV
-end
+files = ARGV.empty? ? Dir.glob($DATA_DIR + "/*") : ARGV
 
 gen = LoremIpsum::Generator.new(files, init_options)
 puts gen.generate(gen_options).strip

data/lib/lorem-ipsum.rb

@@ -35,27 +35,43 @@ class Generator
     end
   end
 
-  def generate(options = { :words => 100 })
+  def generate(options)
+    options[:paras] ||= 1
+    options[:variance] ||= 0
+    options[:words] ||= 100
+
     str = ""
-    if options[:words]
-      to_next_sentence = rand(10) + 5
-      start_of_sentence = true
-      1.upto(options[:words]) do |i|
-        word = next_word
-        if start_of_sentence
-          word.capitalize!
-          start_of_sentence = false
-        end
+    1.upto(options[:paras]) do |i|
+      str << next_paragraph(options[:words], options[:variance]) << "\n"
+    end
 
-        to_next_sentence -= 1
-        if to_next_sentence == 0 || i == options[:words]
-          word.gsub!(/ /,'. ')
-          to_next_sentence = rand(10) + 5
-          start_of_sentence = true
-        end
-        
-        str << word
-      end
+    str
+  end
+
+  def next_paragraph(word_count, variance = 0)
+    str = ""
+
+    if variance != 0
+      range = (2 * variance * word_count / 100.0).to_i
+      word_count = word_count + rand(range) - range / 2
+    end
+
+    while word_count > 0
+      sentence_count = [rand(10) + 5, word_count].min
+      str << next_sentence(sentence_count)
+      word_count -= sentence_count
+    end
+
+    str << "\n"
+  end
+
+  def next_sentence(word_count)
+    str = ""
+    1.upto(word_count) do |i|
+      word = next_word
+      word.capitalize! if i == 1
+      word.gsub!(/ /,'. ') if i == word_count
+      str << word
     end
 
     str

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lorem-ipsum
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt Austin
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -04:00
-default_executable: 
+date: 2011-06-26 00:00:00 Z
 dependencies: []
 
 description: lorem-ipsum is a simple, trainable dummy text generator.
@@ -31,7 +30,6 @@ files:
 - lib/lorem-ipsum.rb
 - data/lorem.txt
 - bin/lorem-ipsum
-has_rdoc: true
 homepage: http://github.com/maafy6/lorem-ipsum
 licenses: 
 - MIT
@@ -61,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A simple dummy text generator.