ocg 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b0c6aa85ed30a2ae8c65d872e90136d223822fc8d970c26c6515f56ee84b98
-  data.tar.gz: 248d46514c8fba336fef0347f5d21d40752651cfc4b3846110e69480f8da02a2
+  metadata.gz: a3e653800a9ddc59e36ee81e45dd0a85b3e0120418c2155aa4d4a1a4b659d949
+  data.tar.gz: 3f22c5f598564d3c57844e8048258795b8868763912322b156e079ce966464b9
 SHA512:
-  metadata.gz: 15fb346aa655fe3cf505439073ccdd8156c1b341b5ddd38ef4ce7a7e89e4982f2c5ebad4e43ebe3bde8172bd2c46776d9a154db37b2acab94bdcd088df5afb69
-  data.tar.gz: 4ff7e04a1684f0c073f0366360d1145e0bdaf9323a6d03ff2c828756bf88c53ecf7eae79b2055f3ccce5605c558b09d6804202d1cdc29d1d069e8b1adc0199f2
+  metadata.gz: 32cb6bd02ff29e283d6e7acbc15c62c493bd5aa84855f3bc3dc18090bf7ce60fed2044dafcbf194fc60a0daa060bc6d411c821045fde54fbecfa63cff0c85292
+  data.tar.gz: 335fd3ee150a0386d28a30cbd234e0b258d2e7298989b3990728fbb125ae88fba057fcc6001bae8fcb8d6a35b2ae15c804fe8574a0537aa3daf25dd9a5e757c1

data/README.md

@@ -62,8 +62,13 @@ It will provide all possible option combinations.
 | `started?`  | returns true when at least one combination was generated |
 | `finished?` | returns true when all combination were generated |
 | `length`    | returns combinations length |
+| `dup`       | returns generator duplicate |
+| `clone`     | returns generator clone |
 
 Generator is responsible to any method from [`Enumerable`](https://ruby-doc.org/core-2.7.2/Enumerable.html).
+Enumerator will be provided using generator duplicate.
+So enumerable api is separated from bare metal api (`reset`, `next`, `last`, `started?`, `finished?`).
+
 You can combine generators using `and`, `mix` and `or`.
 
 Options should be prepared in the following form:

data/lib/ocg/copyable.rb

@@ -0,0 +1,17 @@
+# Option combination generator.
+# Copyright (c) 2019 AUTHORS, MIT License.
+
+class OCG
+  module Copyable
+    VARIABLES_TO_COPY = [].freeze
+
+    def initialize_copy(source)
+      self.class::VARIABLES_TO_COPY.each do |variable|
+        key   = "@#{variable}".to_sym
+        value = source.instance_variable_get key
+
+        instance_variable_set key, value.dup
+      end
+    end
+  end
+end

data/lib/ocg/main.rb

@@ -3,14 +3,19 @@
 
 require "forwardable"
 
+require_relative "copyable"
 require_relative "error"
 require_relative "options"
 
 class OCG
+  include Copyable
   include ::Enumerable
   extend ::Forwardable
 
-  DELEGATORS = %i[reset next last started? finished? length].freeze
+  DELEGATORS        = %i[reset next last started? finished? length].freeze
+  VARIABLES_TO_COPY = %i[generator].freeze
+
+  def_delegators :@generator, *DELEGATORS
 
   def initialize(generator_or_options)
     @generator = self.class.prepare_generator generator_or_options
@@ -22,8 +27,6 @@ class OCG
     Options.new generator_or_options
   end
 
-  def_delegators :@generator, *DELEGATORS
-
   def and(generator_or_options)
     Operator::AND.new self, generator_or_options
   end
@@ -37,11 +40,10 @@ class OCG
   end
 
   def each(&_block)
-    reset
-
-    yield send("next") until finished?
+    instance = dup
+    instance.reset
 
-    reset
+    yield instance.next until instance.finished?
 
     nil
   end

data/lib/ocg/operator/abstract.rb

@@ -6,6 +6,8 @@ require_relative "../error"
 class OCG
   module Operator
     class Abstract < OCG
+      VARIABLES_TO_COPY = %i[left_generator right_generator].freeze
+
       def initialize(left_generator_or_options, right_generator_or_options) # rubocop:disable Lint/MissingSuper
         @left_generator  = OCG.prepare_generator left_generator_or_options
         @right_generator = OCG.prepare_generator right_generator_or_options

data/lib/ocg/operator/mix.rb

@@ -9,6 +9,16 @@ class OCG
       def initialize(*args)
         super
 
+        reset_main_generator
+      end
+
+      def initialize_copy(*args)
+        super
+
+        reset_main_generator
+      end
+
+      def reset_main_generator
         @main_generator =
           if @right_generator.length > @left_generator.length
             @right_generator

data/lib/ocg/options.rb

@@ -1,10 +1,15 @@
 # Option combination generator.
 # Copyright (c) 2019 AUTHORS, MIT License.
 
+require_relative "copyable"
 require_relative "validation"
 
 class OCG
   class Options
+    include Copyable
+
+    VARIABLES_TO_COPY = %i[options keys last_options value_indexes].freeze
+
     def initialize(options)
       Validation.validate_options options
       @options = options.transform_values(&:to_a)

data/lib/ocg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Aladjev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - LICENSE
 - README.md
 - lib/ocg.rb
+- lib/ocg/copyable.rb
 - lib/ocg/error.rb
 - lib/ocg/main.rb
 - lib/ocg/operator/abstract.rb