ocg 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1bbd2f95185a3f9098a0e861afbcdc5372126c0956adc4b32547c26a22dc35
-  data.tar.gz: 79c9230bcca50efb4cebd233dc16f68e7ac871499c8ce7e519557e56e5cb17cf
+  metadata.gz: 0fa3d1a73808ebe1197e76243c66e4d00b0220c4bbe398e2fcf11e1f58c0f243
+  data.tar.gz: 8709140dacba810330d6ec2b4889002e0a432a1acd4e5af3767ed3a91cded7a4
 SHA512:
-  metadata.gz: 8ff79d40bcf1a14c77809a4c8662aae70c5d597aa5c7be693fa337ea06bf826704ac1ef7ba27177620337cba8bf9b966752ba836e07d5276c798db17c3cee5e8
-  data.tar.gz: 8ef828c80ddc4709b0c7030876f2a06a30954662d8397c06afdb7fc313d93f4283a81664db4bf73d56bdee315ff713d74fe015a15829619e03f41f501a660153
+  metadata.gz: 374148f48f17496aa4d6c572c6e091d08f12b79a8bc1172c2605cb91d30bc1e9a70bda8591fc28e96b1445895c17c930f9dff0b96e5c0460a98d3ed67a9e8b3a
+  data.tar.gz: 1f403b651a77e2b905543008ba198ddbf6ac6eb02dac413de5aab076458d2386815b6c6baf42b77025790273d108e0ba3b13649c7a56ea49e2940dd6245f9a04

data/README.md

@@ -6,6 +6,8 @@
 
 ## Installation
 
+Operating systems: GNU/Linux, OSX, FreeBSD, Windows.
+
 ```sh
 gem install ocg
 ```
@@ -65,7 +67,7 @@ It will provide all possible option combinations.
 | `dup`       | returns generator duplicate |
 | `clone`     | returns generator clone |
 
-Generator is responsible to any method from [`Enumerable`](https://ruby-doc.org/core-3.0.0/Enumerable.html).
+Generator is responsible to any method from [`Enumerable`](https://ruby-doc.org/core-3.0.1/Enumerable.html).
 Enumerator will be provided using generator duplicate.
 So enumerable api is separated from bare metal api (`reset`, `next`, `last`, `started?`, `finished?`).
 
@@ -80,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.
@@ -159,15 +161,10 @@ complete_generator = almost_complete_generator.mix(
 )
 ```
 
-## Operating systems
-
-GNU/Linux, FreeBSD, OSX, Windows (MinGW).
-
 ## CI
 
 Please visit [scripts/test-images](scripts/test-images).
 See universal test script [scripts/ci_test.sh](scripts/ci_test.sh) for CI.
-You can run this script using many native and cross images.
 
 ## License
 

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
@@ -44,7 +44,7 @@ class OCG
     def next
       return nil if @is_finished
 
-      @last_options = Hash[@value_indexes.map { |name, value_index| [name, @options[name][value_index]] }]
+      @last_options = @value_indexes.map { |name, value_index| [name, @options[name][value_index]] }.to_h
 
       @is_finished = @keys.all? do |name|
         values          = @options[name]
@@ -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.1".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.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Option combination generator.