ocg 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d6d020cfd6918a3911fdbdf27adf4a188e9fe643f43cadb2ff9132b8419d47
-  data.tar.gz: aa8b3b23e632a29ffdc103c0292e77e91ee79c4e64979c7c0e73e252864ce1ed
+  metadata.gz: 50c5eb6bcb6811b447d8e2d3fa1609cf7d0c83194a7566e65ba2392f9196a66c
+  data.tar.gz: 29e197326bf5c3f119f36b0a3bed9a380c3fda086ae60d3321409033a08a2a77
 SHA512:
-  metadata.gz: 2988e11f4f3576c5cd648832f29256fb6cfc705301954c7b000d61fde7dc343b7f3f99dd6dcc8281191cabf87e8dcc42f7cae3ed1153907f510fdb4ef535450d
-  data.tar.gz: b1093946df6b54282fcc4c7019c20f453042880068862e0a9fc682033b28b1385b503d1f08f388f44c8119a201ea573f3a54c217b34b1bd89275d8e468981a9e
+  metadata.gz: 4874eb2a787efcd8d4b413a24017957c00216847372eb339e1967a9a63648de036a3407c98c161837e7743e451aac777339e60e48f5b3a1d0fa2851f2d41a814
+  data.tar.gz: ff01b8071d785bd7c2df2dc4da5bc65baf428e66aad00128e0a19f560700eb710c038a391a4179f08ce38944e714aead12d16974f039d51e88abff68fc832717

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.2".freeze
+  VERSION = "1.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocg
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -24,20 +24,34 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !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
@@ -145,7 +159,8 @@ files:
 homepage: https://github.com/andrew-aladev/ocg
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -161,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Option combination generator.