poefy 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2836cb70692fce83aa7c647d66d5165b786c2a4c
-  data.tar.gz: 359f87bf030ca881585f696d6bad29cf442e143d
+  metadata.gz: '06059d000cd8bcb1337f205e71c7aef33d6cebc5'
+  data.tar.gz: 66b55d23d1ed3f633f95d40b6a5cd6f1995a4273
 SHA512:
-  metadata.gz: 19f4e4e13177e712efce9919ad4f524a008c6cb257d81d39e3e43ad24b8397107d6265b06ed55da22ed7dafa8b010f4947a2e05251976f6206ff7c5c186be063
-  data.tar.gz: 9ef68d0b24110653b8d496be8f17618a5558697e426a024a78bb747b8943f2b137935fd1d456de81acd801b16c309166c0b935b917e4feb06e986dedb82bcffb
+  metadata.gz: '09fb8bb6486cffe87fc73810e161f3760fd237e8d8c86e79606752751e3748b0914612795cbaa33215282a65274f0373d8477dd60c57a342316b242494641fc2'
+  data.tar.gz: dcc401e9907c144d01e4d6cb1042335669a4b762e087b6c07da576eaaab838876b2c56a1732be2643c7a5793f9280700249108564c4ca5956526a064088bae7b

data/lib/poefy/generation.rb

@@ -206,10 +206,6 @@ module Poefy
           #   words as there are lines to be matched.
           rhymes = nil
 
-          # If all the lines include a 'regex' condition,
-          #   then we can specify to only query for matching lines.
-          regex_all = regex_for_all line_conds
-
           # If all the lines include a 'syllable' condition,
           #   then we can specify to only query for matching lines.
           begin
@@ -226,7 +222,7 @@ module Poefy
           # For each rhyme, get all lines and try to sastify all conditions.
           out = []
           rhymes.shuffle.each do |rhyme|
-            out = try_rhyme(conditions, rhyme, min_max, regex_all)
+            out = try_rhyme(conditions, rhyme, min_max, line_conds)
             break if !out.empty?
           end
           if out.empty?
@@ -300,14 +296,26 @@ module Poefy
 
       # Loop through the rhymes until we find one that works.
       # (In a reasonable time-frame)
-      def try_rhyme conditions, rhyme, syllable_min_max = nil, regex_all = nil
+      private def try_rhyme conditions, rhyme, syllable_min_max = nil, line_conds = nil
         output = []
         lines = @corpus.lines_by_rhyme(rhyme, syllable_min_max)
 
         # To reduce the number of permutations, reject lines
         #   that do not match any of the lines regex.
-        lines.reject! { |i| !(i['line'].match(regex_all)) } if regex_all
+        regex_conds = line_conds.map { |i| i[:regex] }
+        if !regex_conds.include?(nil) and !regex_conds.include?(//)
+          new_lines = []
+          [*regex_conds].each do |regex_group|
+            possible_lines = lines.dup
+            [*regex_group].each do |regex|
+              possible_lines.reject! { |i| !(i['line'].match(regex)) }
+            end
+            new_lines += possible_lines
+          end
+          lines = new_lines
+        end
 
+        # Get a sample from the lines that works for all the conditions.
         begin
           Timeout::timeout(2) do
             output = lines.shuffle.conditional_sample(conditions)
@@ -334,16 +342,6 @@ module Poefy
         min_max
       end
 
-      # If every line has a regex, then return a regex union.
-      def regex_for_all line_conds
-        output = nil
-        if line_conds.all?{ |i| i[:regex] }
-          all_regex = line_conds.map{ |i| i[:regex] }
-          output = Regexp.union all_regex.flatten
-        end
-        output
-      end
-
   end
 
 end

data/lib/poefy/version.rb

@@ -10,7 +10,7 @@ module Poefy
   def self.version_number
     major = 1
     minor = 1
-    tiny  = 0
+    tiny  = 1
     pre   = nil
 
     string = [major, minor, tiny, pre].compact.join('.')
@@ -18,7 +18,7 @@ module Poefy
   end
 
   def self.version_date
-    '2017-10-31'
+    '2017-11-05'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poefy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Paul Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler