jmadlibs 0.8.2 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f83474876cd9a7be9c1bf10249339431f0b2d4f
-  data.tar.gz: 0ba2f288cc8a1a18c69fcd32cfd7cc48e8417e3e
+  metadata.gz: 70bb528dc1a0d1055a27ad44eda45f83f249e79e
+  data.tar.gz: fae188b16c19d5216101ba0b679e4b032ef76545
 SHA512:
-  metadata.gz: a8d2a726486a64425d4a3329c507a2cdbf25149ad976c078a4c31162022990babc32dc827b0e661a076a25cb4147df2434926c15afabb83f7469fc100322783f
-  data.tar.gz: bb742fdde3dbd1886b49db77e0b7fc14e53d9c9f81038866a8d99a19e68166282ca762ac10af57d653daf01f8285f4ab8f59668071f7ae99d67b4178a0d80076
+  metadata.gz: 51888365ff2bf0092ef38faf4627e72160d31e911c5165fa96d4d916538a3826d2e50238aeff5d55043a7e20eaef853fa8405c5382d49a83e205102ccc5042be
+  data.tar.gz: 56992191263a7624c9028888793830efc5b10c9b0aba6046cf9ad4bb3a43ab2cd1bddeb0b80e8283391eb4c28dd6cb378240c9d32a30a3d566bc5a55513020da

data/lib/jmadlibs.rb

@@ -11,7 +11,7 @@
 #
 # * joins between two lists: <lista+listb>
 
-# All of the above can be combined and appear in the results of a parsing, 
+# All of the above can be combined and appear in the results of a parsing,
 # so having any operator appear in a substitution word list is possible.
 
 # TODO:
@@ -25,10 +25,10 @@ class JMadlibs
     @loglevels = {0 => "NONE", 1 => "ERROR", 2 => "WARN", 3 => "INFO", 4 => "DEBUG", 5 => "ALL"}
 	@loglevel = 3
     @rng = Random.new
-    setPattern(pattern) 
+    setPattern(pattern)
     setLibrary(library)
   end
-  
+
   def log(msg, priority=5)
     if priority.is_a? String then priority = @loglevels.key(priority) end
 	if priority <= @loglevel
@@ -48,7 +48,7 @@ class JMadlibs
   end
 
   def setLibrary(library)
-    if !library.nil? 
+    if !library.nil?
       log "Library updated", "DEBUG"
       @library = library
 	end
@@ -101,6 +101,7 @@ class JMadlibs
   end
 
   def pluralise(word)
+    # TODO
     # add s by default
     # (lf)(fe?) -> ves
 	# y -> ies
@@ -108,7 +109,6 @@ class JMadlibs
     # (se?)(sh)(ch)
 
     # this is a pretty big problem!
-
     return word
   end
 
@@ -119,7 +119,7 @@ class JMadlibs
     # do we need to do post-processing?
     post = target.rindex(/\$[ap]/)
 
-    if !post.nil? 
+    if !post.nil?
       specifier = target.slice(post+1, target.length - post - 1)
       target = target.slice(0, post)
     end
@@ -135,18 +135,18 @@ class JMadlibs
 
     if mult.nil? # only one list
       return "MISSING" if @library[target].nil?
-      result = parse_pattern(@library[target].sample)
+      result = parse_pattern(@library[target].sample(random: @rng))
 
     else # more than one list
       multlist = []
       listnames = []
 
       # as long as we still have alternatives, keep adding them to listnames
-	  while !mult.nil? 
+	  while !mult.nil?
         listnames << target.slice(0, mult)
 		target = target.slice(mult+1, target.length - mult - 1)
         mult = target.index /\+/
-      end 
+      end
 	  listnames << target # append final alternative
 
       # combine lists for sampling
@@ -155,7 +155,7 @@ class JMadlibs
       end
 
 	  return "MISSING" if multlist.length == 0 # no valid options found
-      result = parse_pattern(multlist.sample)
+      result = parse_pattern(multlist.sample(random: @rng))
     end
 
     # do post-processing
@@ -186,23 +186,23 @@ class JMadlibs
       end
     end
 
-    result = options.sample
+    result = options.sample(random: @rng)
     return parse_pattern(result)
   end
-  
+
   def resolve_optional(target)
     chance = 50
 
     ind = target.index("%") # specified chance?
 
-    if !ind.nil? 
+    if !ind.nil?
       chance = target.slice(ind+1, target.length - ind - 1).to_i
       target = target.slice(0, ind)
     end
 
     result = ""
 
-    if rand(100) <= chance
+    if @rng.rand(100) <= chance
       result = target
     end
 
@@ -238,7 +238,7 @@ class JMadlibs
           ind = target.index(">")
           type = "s"
         elsif target.slice(0) == "{"
-          ind = target.index("}")   
+          ind = target.index("}")
           type = "a"
         elsif target.slice(0) == "["
           ind = target.index("]")
@@ -259,13 +259,13 @@ class JMadlibs
     end
 
     # parse tokens
-    tokens.each_with_index { |token, index| 
+    tokens.each_with_index { |token, index|
       if flags[index] == "a"
         tokens[index] = resolve_alternative(token)
       elsif flags[index] == "o"
         tokens[index] = resolve_optional(token)
       elsif flags[index] == "s"
-        tokens[index] = resolve_substitution(token)      
+        tokens[index] = resolve_substitution(token)
       end
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmadlibs
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.5
 platform: ruby
 authors:
 - Gareth Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies: []
 description: A madlibs engine with several powerful features
 email: jacelium@gmail.com