ocg 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c061519b8e290df24b149da93956abfafc1376a873a9b035481a78478619aa6
-  data.tar.gz: c8c32a9bc9011616c618c8f4bf8adae21e90931ac1061fefa09c5db23879535f
+  metadata.gz: 0fa3d1a73808ebe1197e76243c66e4d00b0220c4bbe398e2fcf11e1f58c0f243
+  data.tar.gz: 8709140dacba810330d6ec2b4889002e0a432a1acd4e5af3767ed3a91cded7a4
 SHA512:
-  metadata.gz: aa1359a517003142c14bbf01fc65a09583eb1f7fbe8feca02c5c318ce3ff625f9701d118fdaee261c88fb5bdff3fa2a4f83de9e258df447cd126736e1abe2692
-  data.tar.gz: 86a7fc958ba29efb13a8048c0b5fc221b5dc24b553dc8a21462b7bed93a13ace4da8a4d0faeb03492b070a897e42143e42c082c0a1e6d0d8ec7eddaff49796a3
+  metadata.gz: 374148f48f17496aa4d6c572c6e091d08f12b79a8bc1172c2605cb91d30bc1e9a70bda8591fc28e96b1445895c17c930f9dff0b96e5c0460a98d3ed67a9e8b3a
+  data.tar.gz: 1f403b651a77e2b905543008ba198ddbf6ac6eb02dac413de5aab076458d2386815b6c6baf42b77025790273d108e0ba3b13649c7a56ea49e2940dd6245f9a04

data/README.md

@@ -82,7 +82,7 @@ Options should be prepared in the following form:
 }
 ```
 
-Options hash should not be empty.
+Options hash may be empty.
 `option_name` can be any valid hash key.
 `option_values` should be convertable to array using `to_a`.
 `option_values` should not be empty.

data/lib/ocg/main.rb

@@ -17,7 +17,7 @@ class OCG
 
   def_delegators :@generator, *DELEGATORS
 
-  def initialize(generator_or_options)
+  def initialize(generator_or_options = {})
     @generator = self.class.prepare_generator generator_or_options
   end
 
@@ -27,15 +27,15 @@ class OCG
     Options.new generator_or_options
   end
 
-  def and(generator_or_options)
+  def and(generator_or_options = {})
     Operator::AND.new self, generator_or_options
   end
 
-  def mix(generator_or_options)
+  def mix(generator_or_options = {})
     Operator::MIX.new self, generator_or_options
   end
 
-  def or(generator_or_options)
+  def or(generator_or_options = {})
     Operator::OR.new self, generator_or_options
   end
 

data/lib/ocg/operator/abstract.rb

@@ -22,6 +22,16 @@ class OCG
         nil
       end
 
+      protected def merge_results(left, right)
+        if left.nil?
+          right
+        elsif right.nil?
+          left
+        else
+          left.merge right
+        end
+      end
+
       # :nocov:
       def next
         raise NotImplementedError, "\"next\" is not implemented"

data/lib/ocg/operator/and.rb

@@ -11,21 +11,22 @@ class OCG
 
         if @right_generator.finished?
           @right_generator.reset
-          @left_generator.next.merge @right_generator.next
+          left = @left_generator.next
         else
-          left_last = @left_generator.last
-          left_last = @left_generator.next if left_last.nil?
-          left_last.merge @right_generator.next
+          left = @left_generator.last
+          left = @left_generator.next if left.nil?
         end
+
+        right = @right_generator.next
+
+        merge_results left, right
       end
 
       def last
-        left_last  = @left_generator.last
-        right_last = @right_generator.last
-
-        return nil if left_last.nil? || right_last.nil?
+        left  = @left_generator.last
+        right = @right_generator.last
 
-        left_last.merge right_last
+        merge_results left, right
       end
 
       def started?
@@ -37,7 +38,16 @@ class OCG
       end
 
       def length
-        @left_generator.length * @right_generator.length
+        left_length  = @left_generator.length
+        right_length = @right_generator.length
+
+        if left_length.zero?
+          right_length
+        elsif right_length.zero?
+          left_length
+        else
+          left_length * right_length
+        end
       end
     end
   end

data/lib/ocg/operator/mix.rb

@@ -32,16 +32,18 @@ class OCG
 
         @left_generator.reset if @left_generator.finished?
         @right_generator.reset if @right_generator.finished?
-        @left_generator.next.merge @right_generator.next
+
+        left  = @left_generator.next
+        right = @right_generator.next
+
+        merge_results left, right
       end
 
       def last
-        left_last  = @left_generator.last
-        right_last = @right_generator.last
-
-        return nil if left_last.nil? || right_last.nil?
+        left  = @left_generator.last
+        right = @right_generator.last
 
-        left_last.merge right_last
+        merge_results left, right
       end
 
       def started?

data/lib/ocg/operator/or.rb

@@ -17,13 +17,13 @@ class OCG
       end
 
       def last
-        left_last  = @left_generator.last
-        right_last = @right_generator.last
+        left  = @left_generator.last
+        right = @right_generator.last
 
-        if right_last.nil?
-          left_last
+        if right.nil?
+          left
         else
-          right_last
+          right
         end
       end
 

data/lib/ocg/options.rb

@@ -21,7 +21,7 @@ class OCG
 
       reset_value_indexes
 
-      @is_finished = false
+      @is_finished = length.zero?
     end
 
     protected def reset_value_indexes
@@ -36,7 +36,7 @@ class OCG
       # If state is finished than all value indexes are already zero.
       reset_value_indexes unless @is_finished
 
-      @is_finished = false
+      @is_finished = length.zero?
 
       nil
     end
@@ -76,7 +76,13 @@ class OCG
     end
 
     def length
-      @options.reduce(1) { |length, (_name, values)| length * values.length }
+      @options.reduce(0) do |length, (_name, values)|
+        if length.zero?
+          values.length
+        else
+          length * values.length
+        end
+      end
     end
   end
 end

data/lib/ocg/validation.rb

@@ -7,7 +7,6 @@ class OCG
   module Validation
     def self.validate_options(options)
       raise ValidateError, "invalid options hash" unless options.is_a? ::Hash
-      raise ValidateError, "options should not be empty" if options.empty?
 
       options.each do |_name, values|
         raise ValidateError, "option values should respond to \"to_a\"" unless values.respond_to? :to_a

data/lib/ocg/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2019 AUTHORS, MIT License.
 
 class OCG
-  VERSION = "1.3.4".freeze
+  VERSION = "1.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocg
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement